diff --git a/_data/navigation_home.yml b/_data/navigation_home.yml
index 45c4a928..26335223 100644
--- a/_data/navigation_home.yml
+++ b/_data/navigation_home.yml
@@ -20,7 +20,7 @@
   icon: cog
   doc: core/naming/introduction
 
-- title: Implement Storage with GAIA
+- title: Implement Storage with Gaia
   desc: Backend storage drivers and interactions between developer APIs and the Gaia service.
   icon: database
   doc: storage/gaia_redirect
diff --git a/_develop/zero_to_dapp_1.md b/_develop/zero_to_dapp_1.md
index cf197014..bd04c8e9 100644
--- a/_develop/zero_to_dapp_1.md
+++ b/_develop/zero_to_dapp_1.md
@@ -181,7 +181,7 @@ The following table describes the key interactions and screens in the DApp.
     </div></td>
   <td><p>First-time visitors to a kingdom are prompted to create an animal persona and
   a territory to rule. Once they make a selection, users click <strong>Done</strong> to create a
-  kingdom to rule. Behind the scenes, the data about the user's selection is stored in the user's GAIA hub.
+  kingdom to rule. Behind the scenes, the data about the user's selection is stored in the user's Gaia hub.
 </p>
   </td>
 </tr>
diff --git a/_develop/zero_to_dapp_2.md b/_develop/zero_to_dapp_2.md
index 8206b36f..3cfd5014 100644
--- a/_develop/zero_to_dapp_2.md
+++ b/_develop/zero_to_dapp_2.md
@@ -33,7 +33,7 @@ technology platform that allows you to:
 * **Build your application in any Javascript framework.**  You can use the blockchain without learning a new programming language or extending your application stack. Currently, Blockstack supports a react generator for web applications and SDKs for both iOS and Android.
 * **Use well-defined REST endpoints that simplify and encapsulate the blockchain backend.** The Blockstack Javascript API reduces blockchain operations to familiar GET and PUT operations.
 * **Access the Blockstack’s Naming System (BNS).**  The system has over 90K users that can immediately start using your application.
-* **Scale quickly to large, performant production systems.**  Blockstack’s GAIA storage system gives fast, scalable performance on a level comparable to Amazon S3, Google Drive, or Azure.
+* **Scale quickly to large, performant production systems.**  Blockstack’s Gaia storage system gives fast, scalable performance on a level comparable to Amazon S3, Google Drive, or Azure.
 
 Using Blockstack’s technology you can start building immediately on the
 blockchain with the knowledge you have today.  You won’t need to spend time or
diff --git a/_develop/zero_to_dapp_3.md b/_develop/zero_to_dapp_3.md
index 9b10aa5a..b1f371e1 100644
--- a/_develop/zero_to_dapp_3.md
+++ b/_develop/zero_to_dapp_3.md
@@ -110,7 +110,7 @@ whether the user already has an existing session in the Blockstack Browser.
 
 Signing in with an identity is the means by which the user grants the DApp
 access. Access means the DApp can read the user profile and read/write user data
-for the DApp. Data is encrypted at a unique URL on a GAIA storage hub.
+for the DApp. Data is encrypted at a unique URL on a Gaia storage hub.
 
 <div class="uk-card uk-card-default uk-card-body">
 <h5>App Mining Requirement: Blockstack Authentication</h5>
@@ -118,11 +118,11 @@ for the DApp. Data is encrypted at a unique URL on a GAIA storage hub.
 </p>
 </div>
 
-### Get and put user data to a GAIA Hub
+### Get and put user data to a Gaia Hub
 
-GAIA is the Blockstack data storage hub (https://hub.blockstack.org). Once a user
+Gaia is the Blockstack data storage hub (https://hub.blockstack.org). Once a user
 authenticates, the application can get and put application data in the user's
-storage. After a user signs in, the `SignedIn.js` code checks the user's GAIA
+storage. After a user signs in, the `SignedIn.js` code checks the user's Gaia
 profile by running the `loadMe()` method.
 
 ```js
@@ -144,7 +144,7 @@ loadMe() {
 
 The `loadMe()` code uses the Blockstack's `getFile()` method to get the
 specified file from the applications data store. If the users' data store on
-GAIA does not have the data, which is the case for new users, the Gaia hub
+Gaia does not have the data, which is the case for new users, the Gaia hub
 responds with HTTP `404` code and the `getFile` promise resolves to null. If you
 are using a Chrome Developer Tools with the DApp, you'll see these errors in a
 browser's developer **Console**.
@@ -152,7 +152,7 @@ browser's developer **Console**.
 <img src="images/kingdom-errors.png" alt="">
 
 After a user chooses an animal persona and a territory, the user presses **Done**
-and the application stores the user data on GAIA.
+and the application stores the user data on Gaia.
 
 ```js
 saveMe(me) {
diff --git a/_org/overview.md b/_org/overview.md
index 15c11f34..11da9ce2 100644
--- a/_org/overview.md
+++ b/_org/overview.md
@@ -32,7 +32,7 @@ developers to:
 
 - Access the Blockstack’s Naming System (BNS). The system has over 70K users that can immediately start using your application.
 
-- Scale quickly to large, performant production systems. Blockstack’s GAIA storage system gives fast, scalable performance on a level comparable to Amazon S3, Google Drive, or Azure.
+- Scale quickly to large, performant production systems. Blockstack’s Gaia storage system gives fast, scalable performance on a level comparable to Amazon S3, Google Drive, or Azure.
 
 Using Blockstack’s technology developers can start building immediately on the
 blockchain with the knowledge you have today. You won’t need to spend time or