diff --git a/.opensource/project.json b/.opensource/project.json
index e06e94c2e..07eab5f6e 100644
--- a/.opensource/project.json
+++ b/.opensource/project.json
@@ -19,7 +19,7 @@
       "crash/README.md": "Crashlytics",
       "database/README.md": "Realtime Database",
       "dynamiclinks/README.md": "Dynamic Links",
-      "firestore/README.md": "Cloud Firestore",
+      "firestore/README.md": "Firestore",
       "functions/README.md": "Cloud Functions",
       "inappmessaging/README.md": "In App Messaging",
       "messaging/README.md": "Cloud Messaging",
diff --git a/firestore/README.md b/firestore/README.md
index 370c5f3c2..095cd6550 100644
--- a/firestore/README.md
+++ b/firestore/README.md
@@ -1,13 +1,13 @@
-# Cloud Firestore Quickstart
+# Firestore Quickstart
 
 ## Introduction
 
-Friendly Eats is a restaurant recommendation app built on Cloud Firestore.
+Friendly Eats is a restaurant recommendation app built on Firestore.
 For more information about Firestore visit [the docs][firestore-docs].
 
 ## Getting Started
 
-  * [Set up your Android app for Cloud Firestore][setup-android]
+  * [Set up your Android app for Firestore][setup-android]
     * Use the package name `com.google.firebase.example.fireeats`
   * In the Authentication tab of the Firebase console go to the 
     [Sign-in Method][auth-providers] page and enable 'Email/Password'.
@@ -64,7 +64,7 @@ com.google.firebase.firestore.FirebaseFirestoreException: FAILED_PRECONDITION: T
 ```
 
 This is because indexes are required for most compound queries in
-Cloud Firestore. Clicking on the link from the error message will
+Firestore. Clicking on the link from the error message will
 automatically open the index creation UI in the Firebase console
 with the correct paramters filled in:
 
diff --git a/firestore/app/build.gradle b/firestore/app/build.gradle
index d65bd75c8..a1dd2f0dd 100644
--- a/firestore/app/build.gradle
+++ b/firestore/app/build.gradle
@@ -42,10 +42,10 @@ dependencies {
     // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom)
     implementation platform('com.google.firebase:firebase-bom:26.1.1')
 
-    // Cloud Firestore (Java)
+    // Firestore (Java)
     implementation 'com.google.firebase:firebase-firestore'
 
-    // Cloud Firestore (Kotlin)
+    // Firestore (Kotlin)
     implementation 'com.google.firebase:firebase-firestore-ktx'
 
     // Firebase Authentication (Java)
diff --git a/firestore/app/src/main/java/com/google/firebase/example/fireeats/EntryChoiceActivity.kt b/firestore/app/src/main/java/com/google/firebase/example/fireeats/EntryChoiceActivity.kt
index 9b3f85011..d1babb98b 100644
--- a/firestore/app/src/main/java/com/google/firebase/example/fireeats/EntryChoiceActivity.kt
+++ b/firestore/app/src/main/java/com/google/firebase/example/fireeats/EntryChoiceActivity.kt
@@ -10,11 +10,11 @@ class EntryChoiceActivity : BaseEntryChoiceActivity() {
         return listOf(
                 Choice(
                         "Java",
-                        "Run the Cloud Firestore quickstart written in Java.",
+                        "Run the Firestore quickstart written in Java.",
                         Intent(this, com.google.firebase.example.fireeats.java.MainActivity::class.java)),
                 Choice(
                         "Kotlin",
-                        "Run the Cloud Firestore quickstart written in Kotlin.",
+                        "Run the Firestore quickstart written in Kotlin.",
                         Intent(this, com.google.firebase.example.fireeats.kotlin.MainActivity::class.java))
         )
     }