diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3992fe5b..2bcbabfe 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -131,7 +131,7 @@ jobs:
       - name: Run dart_firebase_admin tests with coverage
         run: ${{ github.workspace }}/scripts/coverage.sh
 
-      - name: Run googleapis_firestore tests with coverage
+      - name: Run google_cloud_firestore tests with coverage
         run: ${{ github.workspace }}/scripts/firestore-coverage.sh
 
       - name: Run googleapis_storage tests with coverage
@@ -141,14 +141,14 @@ jobs:
         run: |
           # Save individual package coverage files before merging
           cp coverage.lcov coverage_admin.lcov
-          cp ../googleapis_firestore/coverage.lcov coverage_firestore.lcov
+          cp ../google_cloud_firestore/coverage.lcov coverage_firestore.lcov
           cp ../googleapis_storage/coverage.lcov coverage_storage.lcov
           
           # Merge coverage reports from all packages (relative to packages/dart_firebase_admin)
           # Only merge files that exist
           COVERAGE_FILES=""
           [ -f coverage.lcov ] && COVERAGE_FILES="$COVERAGE_FILES coverage.lcov"
-          [ -f ../googleapis_firestore/coverage.lcov ] && COVERAGE_FILES="$COVERAGE_FILES ../googleapis_firestore/coverage.lcov"
+          [ -f ../google_cloud_firestore/coverage.lcov ] && COVERAGE_FILES="$COVERAGE_FILES ../google_cloud_firestore/coverage.lcov"
           [ -f ../googleapis_storage/coverage.lcov ] && COVERAGE_FILES="$COVERAGE_FILES ../googleapis_storage/coverage.lcov"
           
           if [ -n "$COVERAGE_FILES" ]; then
@@ -219,7 +219,7 @@ jobs:
           # Console output
           echo "=== Coverage Report ==="
           echo "dart_firebase_admin: ${ADMIN_PCT}% (${ADMIN_HIT}/${ADMIN_TOTAL} lines)"
-          echo "googleapis_firestore: ${FIRESTORE_PCT}% (${FIRESTORE_HIT}/${FIRESTORE_TOTAL} lines)"
+          echo "google_cloud_firestore: ${FIRESTORE_PCT}% (${FIRESTORE_HIT}/${FIRESTORE_TOTAL} lines)"
           echo "googleapis_storage: ${STORAGE_PCT}% (${STORAGE_HIT}/${STORAGE_TOTAL} lines)"
           echo "----------------------"
           echo "Total: ${COVERAGE_PCT}% (${HIT_LINES}/${TOTAL_LINES} lines)"
@@ -256,7 +256,7 @@ jobs:
             | Package | Coverage |
             |---------|----------|
             | dart_firebase_admin | ${adminCov}% |
-            | googleapis_firestore | ${firestoreCov}% |
+            | google_cloud_firestore | ${firestoreCov}% |
             | googleapis_storage | ${storageCov}% |
 
             _Minimum threshold: 40%_`;
diff --git a/doc/index.html b/doc/index.html
index 56e25ae4..5b105dd2 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -61,9 +61,9 @@ <h2>dart_firebase_admin</h2>
         </li>
 
         <li class="package-item">
-            <h2>googleapis_firestore</h2>
+            <h2>google_cloud_firestore</h2>
             <p>Standalone Cloud Firestore client library for Dart. Provides direct access to Firestore database operations including documents, collections, queries, transactions, and batch writes.</p>
-            <a href="api/googleapis_firestore/index.html">View Documentation →</a>
+            <a href="api/google_cloud_firestore/index.html">View Documentation →</a>
         </li>
 
         <li class="package-item">
diff --git a/packages/dart_firebase_admin/README.md b/packages/dart_firebase_admin/README.md
index c1c1d6f0..8311f12b 100644
--- a/packages/dart_firebase_admin/README.md
+++ b/packages/dart_firebase_admin/README.md
@@ -192,7 +192,7 @@ print('Token: ${result.token}');
 ```dart
 import 'dart:async';
 import 'package:dart_firebase_admin/dart_firebase_admin.dart';
-import 'package:googleapis_firestore/googleapis_firestore.dart';
+import 'package:google_cloud_firestore/google_cloud_firestore.dart';
 
 final app = FirebaseApp.initializeApp();
 final firestore = app.firestore();
@@ -543,7 +543,7 @@ The Firebase Admin Dart SDK currently supports the following Firebase services:
 
 Alongside the Firebase Admin Dart SDK, this repository contains additional workspace/pub.dev packages to accomodate the SDK:
 
-- [googleapis_firestore](/packages/googleapis_firestore/): Standalone Google APIs Firestore SDK, which the Firebase SDK extends.
+- [google_cloud_firestore](/packages/google_cloud_firestore/): Standalone Google APIs Firestore SDK, which the Firebase SDK extends.
 - [googleapis_storage](/packages/googleapis_storage/): Standalone Google APIs Storage SDK, which the Firebase SDK extends.
 
 # Contributing
diff --git a/packages/dart_firebase_admin/example/lib/firestore_example.dart b/packages/dart_firebase_admin/example/lib/firestore_example.dart
index 98a93734..3354b3aa 100644
--- a/packages/dart_firebase_admin/example/lib/firestore_example.dart
+++ b/packages/dart_firebase_admin/example/lib/firestore_example.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 import 'package:dart_firebase_admin/dart_firebase_admin.dart';
-import 'package:googleapis_firestore/googleapis_firestore.dart';
+import 'package:google_cloud_firestore/google_cloud_firestore.dart';
 
 /// Main entry point for all Firestore examples
 Future<void> firestoreExample(FirebaseApp admin) async {
diff --git a/packages/dart_firebase_admin/example/pubspec.yaml b/packages/dart_firebase_admin/example/pubspec.yaml
index 42dcea29..6013e52a 100644
--- a/packages/dart_firebase_admin/example/pubspec.yaml
+++ b/packages/dart_firebase_admin/example/pubspec.yaml
@@ -6,14 +6,14 @@ environment:
 
 dependencies:
   dart_firebase_admin: ^0.1.0
-  googleapis_firestore: ^0.1.0
+  google_cloud_firestore: ^0.1.0
   googleapis_storage: ^0.1.0
 
 dependency_overrides:
   dart_firebase_admin:
     path: ../../dart_firebase_admin
-  googleapis_firestore:
-    path: ../../googleapis_firestore
+  google_cloud_firestore:
+    path: ../../google_cloud_firestore
   googleapis_storage:
     path: ../../googleapis_storage
 
diff --git a/packages/dart_firebase_admin/lib/src/app.dart b/packages/dart_firebase_admin/lib/src/app.dart
index e47b016e..83e63fc5 100644
--- a/packages/dart_firebase_admin/lib/src/app.dart
+++ b/packages/dart_firebase_admin/lib/src/app.dart
@@ -8,10 +8,10 @@ import 'dart:typed_data';
 import 'package:equatable/equatable.dart';
 import 'package:google_cloud/constants.dart' as google_cloud;
 import 'package:google_cloud/google_cloud.dart' as google_cloud;
+import 'package:google_cloud_firestore/google_cloud_firestore.dart'
+    as google_cloud_firestore;
 import 'package:googleapis/identitytoolkit/v3.dart' as auth3;
 import 'package:googleapis_auth/auth_io.dart' as googleapis_auth;
-import 'package:googleapis_firestore/googleapis_firestore.dart'
-    as googleapis_firestore;
 import 'package:http/http.dart';
 import 'package:meta/meta.dart';
 
@@ -33,5 +33,5 @@ part 'app/emulator_client.dart';
 part 'app/environment.dart';
 part 'app/exception.dart';
 part 'app/firebase_app.dart';
-part 'app/firebase_user_agent_client.dart';
 part 'app/firebase_service.dart';
+part 'app/firebase_user_agent_client.dart';
diff --git a/packages/dart_firebase_admin/lib/src/app/firebase_app.dart b/packages/dart_firebase_admin/lib/src/app/firebase_app.dart
index a6b913b7..6338c428 100644
--- a/packages/dart_firebase_admin/lib/src/app/firebase_app.dart
+++ b/packages/dart_firebase_admin/lib/src/app/firebase_app.dart
@@ -193,8 +193,8 @@ class FirebaseApp {
   ///
   /// For multi-database support, use [databaseId] to specify a named database.
   /// Default is '(default)'.
-  googleapis_firestore.Firestore firestore({
-    googleapis_firestore.Settings? settings,
+  google_cloud_firestore.Firestore firestore({
+    google_cloud_firestore.Settings? settings,
     String databaseId = kDefaultDatabaseId,
   }) {
     final service = Firestore.internal(this);
diff --git a/packages/dart_firebase_admin/lib/src/firestore/firestore.dart b/packages/dart_firebase_admin/lib/src/firestore/firestore.dart
index 87fdb403..7022df3b 100644
--- a/packages/dart_firebase_admin/lib/src/firestore/firestore.dart
+++ b/packages/dart_firebase_admin/lib/src/firestore/firestore.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 
-import 'package:googleapis_firestore/googleapis_firestore.dart'
-    as googleapis_firestore;
+import 'package:google_cloud_firestore/google_cloud_firestore.dart'
+    as google_cloud_firestore;
 import 'package:meta/meta.dart';
 
 import '../app.dart';
@@ -27,17 +27,17 @@ class Firestore implements FirebaseService {
   final FirebaseApp app;
 
   // Maps database IDs to Firestore delegate instances
-  final Map<String, googleapis_firestore.Firestore> _databases = {};
+  final Map<String, google_cloud_firestore.Firestore> _databases = {};
 
   // Maps database IDs to their settings
-  final Map<String, googleapis_firestore.Settings?> _settings = {};
+  final Map<String, google_cloud_firestore.Settings?> _settings = {};
 
   /// Gets the settings used to initialize a specific database.
   /// Returns null if the database hasn't been initialized yet.
   ///
   /// This is exposed for testing purposes to verify credential extraction.
   @visibleForTesting
-  googleapis_firestore.Settings? getSettingsForDatabase(String databaseId) {
+  google_cloud_firestore.Settings? getSettingsForDatabase(String databaseId) {
     return _settings[databaseId];
   }
 
@@ -46,16 +46,16 @@ class Firestore implements FirebaseService {
   ///
   /// This is exposed for testing purposes to verify settings construction.
   @visibleForTesting
-  googleapis_firestore.Settings buildSettingsForTesting(
+  google_cloud_firestore.Settings buildSettingsForTesting(
     String databaseId,
-    googleapis_firestore.Settings? userSettings,
+    google_cloud_firestore.Settings? userSettings,
   ) {
     return _buildSettings(databaseId, userSettings);
   }
 
   /// Gets or creates a Firestore instance for the specified database.
   @internal
-  googleapis_firestore.Firestore getDatabase([
+  google_cloud_firestore.Firestore getDatabase([
     String databaseId = kDefaultDatabaseId,
   ]) {
     var database = _databases[databaseId];
@@ -70,9 +70,9 @@ class Firestore implements FirebaseService {
   /// Initializes a Firestore instance with specific settings.
   /// Throws if the database was already initialized with different settings.
   @internal
-  googleapis_firestore.Firestore initializeDatabase(
+  google_cloud_firestore.Firestore initializeDatabase(
     String databaseId,
-    googleapis_firestore.Settings? settings,
+    google_cloud_firestore.Settings? settings,
   ) {
     final existingInstance = _databases[databaseId];
     if (existingInstance != null) {
@@ -99,27 +99,28 @@ class Firestore implements FirebaseService {
   }
 
   /// Creates Firestore settings from the Firebase app configuration
-  googleapis_firestore.Settings _buildSettings(
+  google_cloud_firestore.Settings _buildSettings(
     String databaseId,
-    googleapis_firestore.Settings? userSettings,
+    google_cloud_firestore.Settings? userSettings,
   ) {
     final projectId = app.projectId;
     final appCredential = app.options.credential;
 
-    var settings = userSettings ?? const googleapis_firestore.Settings();
+    var settings = userSettings ?? const google_cloud_firestore.Settings();
 
     if (settings.credential == null) {
       if (appCredential is ServiceAccountCredential) {
         settings = settings.copyWith(
-          credential: googleapis_firestore.Credential.fromServiceAccountParams(
-            email: appCredential.clientEmail,
-            privateKey: appCredential.privateKey,
-            projectId: appCredential.projectId,
-          ),
+          credential:
+              google_cloud_firestore.Credential.fromServiceAccountParams(
+                email: appCredential.clientEmail,
+                privateKey: appCredential.privateKey,
+                projectId: appCredential.projectId,
+              ),
         );
       } else if (appCredential is ApplicationDefaultCredential) {
         settings = settings.copyWith(
-          credential: googleapis_firestore
+          credential: google_cloud_firestore
               .Credential.fromApplicationDefaultCredentials(),
         );
       } else if (appCredential != null) {
@@ -140,17 +141,17 @@ class Firestore implements FirebaseService {
     return settings;
   }
 
-  googleapis_firestore.Firestore _initFirestore(
+  google_cloud_firestore.Firestore _initFirestore(
     String databaseId,
-    googleapis_firestore.Settings? settings,
+    google_cloud_firestore.Settings? settings,
   ) {
     final firestoreSettings = _buildSettings(databaseId, settings);
-    return googleapis_firestore.Firestore(settings: firestoreSettings);
+    return google_cloud_firestore.Firestore(settings: firestoreSettings);
   }
 
   bool _areSettingsEqual(
-    googleapis_firestore.Settings? a,
-    googleapis_firestore.Settings? b,
+    google_cloud_firestore.Settings? a,
+    google_cloud_firestore.Settings? b,
   ) {
     if (a == null && b == null) return true;
     if (a == null || b == null) return false;
diff --git a/packages/dart_firebase_admin/pubspec.yaml b/packages/dart_firebase_admin/pubspec.yaml
index db1a9e94..4a75f3b0 100644
--- a/packages/dart_firebase_admin/pubspec.yaml
+++ b/packages/dart_firebase_admin/pubspec.yaml
@@ -15,10 +15,10 @@ dependencies:
   dart_jsonwebtoken: ^3.0.0
   equatable: ^2.0.7
   google_cloud: ^0.3.0
+  google_cloud_firestore: ^0.1.0
   googleapis: ^15.0.0
   googleapis_auth: ^2.1.0
   googleapis_beta: ^9.0.0
-  googleapis_firestore: ^0.1.0
   googleapis_storage: ^0.1.0
   http: ^1.0.0
   intl: ^0.20.0
diff --git a/packages/dart_firebase_admin/test/app/firebase_app_test.dart b/packages/dart_firebase_admin/test/app/firebase_app_test.dart
index 2eac615a..1b364a42 100644
--- a/packages/dart_firebase_admin/test/app/firebase_app_test.dart
+++ b/packages/dart_firebase_admin/test/app/firebase_app_test.dart
@@ -7,8 +7,8 @@ import 'package:dart_firebase_admin/src/app.dart';
 import 'package:dart_firebase_admin/src/app_check/app_check.dart';
 import 'package:dart_firebase_admin/src/auth.dart';
 import 'package:dart_firebase_admin/storage.dart';
-import 'package:googleapis_firestore/googleapis_firestore.dart'
-    as googleapis_firestore;
+import 'package:google_cloud_firestore/google_cloud_firestore.dart'
+    as google_cloud_firestore;
 import 'package:mocktail/mocktail.dart';
 import 'package:test/test.dart';
 
@@ -487,7 +487,7 @@ void main() {
 
       test('firestore returns Firestore instance', () {
         final firestore = app.firestore(settings: mockFirestoreSettings);
-        expect(firestore, isA<googleapis_firestore.Firestore>());
+        expect(firestore, isA<google_cloud_firestore.Firestore>());
         // Verify we can use Firestore methods
         expect(firestore.collection('test'), isNotNull);
       });
@@ -516,7 +516,7 @@ void main() {
       test('firestore throws when reinitializing with different settings', () {
         // Initialize with first settings
         app.firestore(
-          settings: const googleapis_firestore.Settings(
+          settings: const google_cloud_firestore.Settings(
             host: 'localhost:8080',
             environmentOverride: {'FIRESTORE_EMULATOR_HOST': 'localhost:8080'},
           ),
@@ -525,7 +525,7 @@ void main() {
         // Try to initialize again with different settings - should throw
         expect(
           () => app.firestore(
-            settings: const googleapis_firestore.Settings(
+            settings: const google_cloud_firestore.Settings(
               host: 'different:9090',
               environmentOverride: {
                 'FIRESTORE_EMULATOR_HOST': 'localhost:8080',
diff --git a/packages/dart_firebase_admin/test/firestore/firestore_integration_test.dart b/packages/dart_firebase_admin/test/firestore/firestore_integration_test.dart
index 0083ff1c..a562eb68 100644
--- a/packages/dart_firebase_admin/test/firestore/firestore_integration_test.dart
+++ b/packages/dart_firebase_admin/test/firestore/firestore_integration_test.dart
@@ -1,5 +1,5 @@
 import 'package:dart_firebase_admin/src/app.dart';
-import 'package:googleapis_firestore/googleapis_firestore.dart' as gfs;
+import 'package:google_cloud_firestore/google_cloud_firestore.dart' as gfs;
 import 'package:test/test.dart';
 
 import '../helpers.dart';
diff --git a/packages/dart_firebase_admin/test/firestore/firestore_test.dart b/packages/dart_firebase_admin/test/firestore/firestore_test.dart
index b8f47421..0c7c0d1e 100644
--- a/packages/dart_firebase_admin/test/firestore/firestore_test.dart
+++ b/packages/dart_firebase_admin/test/firestore/firestore_test.dart
@@ -2,8 +2,8 @@ import 'dart:io';
 
 import 'package:dart_firebase_admin/dart_firebase_admin.dart';
 import 'package:dart_firebase_admin/src/firestore/firestore.dart';
+import 'package:google_cloud_firestore/google_cloud_firestore.dart' as gfs;
 import 'package:googleapis_auth/auth_io.dart' as auth;
-import 'package:googleapis_firestore/googleapis_firestore.dart' as gfs;
 import 'package:mocktail/mocktail.dart';
 import 'package:test/test.dart';
 
diff --git a/packages/dart_firebase_admin/test/helpers.dart b/packages/dart_firebase_admin/test/helpers.dart
index aea1b6d5..00f1d7b7 100644
--- a/packages/dart_firebase_admin/test/helpers.dart
+++ b/packages/dart_firebase_admin/test/helpers.dart
@@ -1,27 +1,29 @@
 import 'dart:async';
 import 'dart:io';
+
 import 'package:dart_firebase_admin/dart_firebase_admin.dart';
+import 'package:google_cloud_firestore/google_cloud_firestore.dart'
+    as google_cloud_firestore;
 import 'package:googleapis_auth/googleapis_auth.dart' as googleapis_auth;
-import 'package:googleapis_firestore/googleapis_firestore.dart'
-    as googleapis_firestore;
 import 'package:test/test.dart';
 
 const projectId = 'dart-firebase-admin';
 
 /// Mock Firestore settings that use emulator override to avoid ADC loading.
 /// Use this in tests that need to initialize Firestore without real credentials.
-const mockFirestoreSettings = googleapis_firestore.Settings(
+const mockFirestoreSettings = google_cloud_firestore.Settings(
   projectId: projectId,
   environmentOverride: {'FIRESTORE_EMULATOR_HOST': 'localhost:8080'},
 );
 
 /// Creates mock Firestore settings with a custom database ID.
-googleapis_firestore.Settings mockFirestoreSettingsWithDb(String databaseId) =>
-    googleapis_firestore.Settings(
-      projectId: projectId,
-      databaseId: databaseId,
-      environmentOverride: const {'FIRESTORE_EMULATOR_HOST': 'localhost:8080'},
-    );
+google_cloud_firestore.Settings mockFirestoreSettingsWithDb(
+  String databaseId,
+) => google_cloud_firestore.Settings(
+  projectId: projectId,
+  databaseId: databaseId,
+  environmentOverride: const {'FIRESTORE_EMULATOR_HOST': 'localhost:8080'},
+);
 
 /// Whether Google Application Default Credentials are available.
 /// Used to skip tests that require production Firebase access.
diff --git a/packages/googleapis_firestore/.gitignore b/packages/google_cloud_firestore/.gitignore
similarity index 100%
rename from packages/googleapis_firestore/.gitignore
rename to packages/google_cloud_firestore/.gitignore
diff --git a/packages/googleapis_firestore/lib/googleapis_firestore.dart b/packages/google_cloud_firestore/lib/google_cloud_firestore.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/googleapis_firestore.dart
rename to packages/google_cloud_firestore/lib/google_cloud_firestore.dart
diff --git a/packages/googleapis_firestore/lib/src/aggregate.dart b/packages/google_cloud_firestore/lib/src/aggregate.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/aggregate.dart
rename to packages/google_cloud_firestore/lib/src/aggregate.dart
diff --git a/packages/googleapis_firestore/lib/src/aggregation_reader.dart b/packages/google_cloud_firestore/lib/src/aggregation_reader.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/aggregation_reader.dart
rename to packages/google_cloud_firestore/lib/src/aggregation_reader.dart
diff --git a/packages/googleapis_firestore/lib/src/backoff.dart b/packages/google_cloud_firestore/lib/src/backoff.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/backoff.dart
rename to packages/google_cloud_firestore/lib/src/backoff.dart
diff --git a/packages/googleapis_firestore/lib/src/bulk_writer.dart b/packages/google_cloud_firestore/lib/src/bulk_writer.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/bulk_writer.dart
rename to packages/google_cloud_firestore/lib/src/bulk_writer.dart
diff --git a/packages/googleapis_firestore/lib/src/bundle.dart b/packages/google_cloud_firestore/lib/src/bundle.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/bundle.dart
rename to packages/google_cloud_firestore/lib/src/bundle.dart
diff --git a/packages/googleapis_firestore/lib/src/collection_group.dart b/packages/google_cloud_firestore/lib/src/collection_group.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/collection_group.dart
rename to packages/google_cloud_firestore/lib/src/collection_group.dart
diff --git a/packages/googleapis_firestore/lib/src/convert.dart b/packages/google_cloud_firestore/lib/src/convert.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/convert.dart
rename to packages/google_cloud_firestore/lib/src/convert.dart
diff --git a/packages/googleapis_firestore/lib/src/credential.dart b/packages/google_cloud_firestore/lib/src/credential.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/credential.dart
rename to packages/google_cloud_firestore/lib/src/credential.dart
diff --git a/packages/googleapis_firestore/lib/src/document.dart b/packages/google_cloud_firestore/lib/src/document.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/document.dart
rename to packages/google_cloud_firestore/lib/src/document.dart
diff --git a/packages/googleapis_firestore/lib/src/document_change.dart b/packages/google_cloud_firestore/lib/src/document_change.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/document_change.dart
rename to packages/google_cloud_firestore/lib/src/document_change.dart
diff --git a/packages/googleapis_firestore/lib/src/document_reader.dart b/packages/google_cloud_firestore/lib/src/document_reader.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/document_reader.dart
rename to packages/google_cloud_firestore/lib/src/document_reader.dart
diff --git a/packages/googleapis_firestore/lib/src/environment.dart b/packages/google_cloud_firestore/lib/src/environment.dart
similarity index 98%
rename from packages/googleapis_firestore/lib/src/environment.dart
rename to packages/google_cloud_firestore/lib/src/environment.dart
index 288dbc43..360abb04 100644
--- a/packages/googleapis_firestore/lib/src/environment.dart
+++ b/packages/google_cloud_firestore/lib/src/environment.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'dart:io';
 
-import '../googleapis_firestore.dart';
+import '../google_cloud_firestore.dart';
 
 /// Environment variable names used by Google Cloud Firestore.
 ///
diff --git a/packages/googleapis_firestore/lib/src/field_value.dart b/packages/google_cloud_firestore/lib/src/field_value.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/field_value.dart
rename to packages/google_cloud_firestore/lib/src/field_value.dart
diff --git a/packages/googleapis_firestore/lib/src/filter.dart b/packages/google_cloud_firestore/lib/src/filter.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/filter.dart
rename to packages/google_cloud_firestore/lib/src/filter.dart
diff --git a/packages/googleapis_firestore/lib/src/firestore.dart b/packages/google_cloud_firestore/lib/src/firestore.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/firestore.dart
rename to packages/google_cloud_firestore/lib/src/firestore.dart
diff --git a/packages/googleapis_firestore/lib/src/firestore_exception.dart b/packages/google_cloud_firestore/lib/src/firestore_exception.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/firestore_exception.dart
rename to packages/google_cloud_firestore/lib/src/firestore_exception.dart
diff --git a/packages/googleapis_firestore/lib/src/firestore_http_client.dart b/packages/google_cloud_firestore/lib/src/firestore_http_client.dart
similarity index 99%
rename from packages/googleapis_firestore/lib/src/firestore_http_client.dart
rename to packages/google_cloud_firestore/lib/src/firestore_http_client.dart
index f0201873..7aa5187d 100644
--- a/packages/googleapis_firestore/lib/src/firestore_http_client.dart
+++ b/packages/google_cloud_firestore/lib/src/firestore_http_client.dart
@@ -7,7 +7,7 @@ import 'package:googleapis_auth/auth_io.dart' as googleapis_auth;
 import 'package:http/http.dart';
 import 'package:meta/meta.dart';
 
-import '../googleapis_firestore.dart';
+import '../google_cloud_firestore.dart';
 import 'environment.dart';
 import 'firestore_exception.dart';
 
diff --git a/packages/googleapis_firestore/lib/src/geo_point.dart b/packages/google_cloud_firestore/lib/src/geo_point.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/geo_point.dart
rename to packages/google_cloud_firestore/lib/src/geo_point.dart
diff --git a/packages/googleapis_firestore/lib/src/logger.dart b/packages/google_cloud_firestore/lib/src/logger.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/logger.dart
rename to packages/google_cloud_firestore/lib/src/logger.dart
diff --git a/packages/googleapis_firestore/lib/src/order.dart b/packages/google_cloud_firestore/lib/src/order.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/order.dart
rename to packages/google_cloud_firestore/lib/src/order.dart
diff --git a/packages/googleapis_firestore/lib/src/path.dart b/packages/google_cloud_firestore/lib/src/path.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/path.dart
rename to packages/google_cloud_firestore/lib/src/path.dart
diff --git a/packages/googleapis_firestore/lib/src/query_partition.dart b/packages/google_cloud_firestore/lib/src/query_partition.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/query_partition.dart
rename to packages/google_cloud_firestore/lib/src/query_partition.dart
diff --git a/packages/googleapis_firestore/lib/src/query_profile.dart b/packages/google_cloud_firestore/lib/src/query_profile.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/query_profile.dart
rename to packages/google_cloud_firestore/lib/src/query_profile.dart
diff --git a/packages/googleapis_firestore/lib/src/query_reader.dart b/packages/google_cloud_firestore/lib/src/query_reader.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/query_reader.dart
rename to packages/google_cloud_firestore/lib/src/query_reader.dart
diff --git a/packages/googleapis_firestore/lib/src/rate_limiter.dart b/packages/google_cloud_firestore/lib/src/rate_limiter.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/rate_limiter.dart
rename to packages/google_cloud_firestore/lib/src/rate_limiter.dart
diff --git a/packages/googleapis_firestore/lib/src/recursive_delete.dart b/packages/google_cloud_firestore/lib/src/recursive_delete.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/recursive_delete.dart
rename to packages/google_cloud_firestore/lib/src/recursive_delete.dart
diff --git a/packages/googleapis_firestore/lib/src/reference/aggregate_query.dart b/packages/google_cloud_firestore/lib/src/reference/aggregate_query.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/reference/aggregate_query.dart
rename to packages/google_cloud_firestore/lib/src/reference/aggregate_query.dart
diff --git a/packages/googleapis_firestore/lib/src/reference/aggregate_query_snapshot.dart b/packages/google_cloud_firestore/lib/src/reference/aggregate_query_snapshot.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/reference/aggregate_query_snapshot.dart
rename to packages/google_cloud_firestore/lib/src/reference/aggregate_query_snapshot.dart
diff --git a/packages/googleapis_firestore/lib/src/reference/collection_reference.dart b/packages/google_cloud_firestore/lib/src/reference/collection_reference.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/reference/collection_reference.dart
rename to packages/google_cloud_firestore/lib/src/reference/collection_reference.dart
diff --git a/packages/googleapis_firestore/lib/src/reference/composite_filter_internal.dart b/packages/google_cloud_firestore/lib/src/reference/composite_filter_internal.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/reference/composite_filter_internal.dart
rename to packages/google_cloud_firestore/lib/src/reference/composite_filter_internal.dart
diff --git a/packages/googleapis_firestore/lib/src/reference/constants.dart b/packages/google_cloud_firestore/lib/src/reference/constants.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/reference/constants.dart
rename to packages/google_cloud_firestore/lib/src/reference/constants.dart
diff --git a/packages/googleapis_firestore/lib/src/reference/document_reference.dart b/packages/google_cloud_firestore/lib/src/reference/document_reference.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/reference/document_reference.dart
rename to packages/google_cloud_firestore/lib/src/reference/document_reference.dart
diff --git a/packages/googleapis_firestore/lib/src/reference/field_filter_internal.dart b/packages/google_cloud_firestore/lib/src/reference/field_filter_internal.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/reference/field_filter_internal.dart
rename to packages/google_cloud_firestore/lib/src/reference/field_filter_internal.dart
diff --git a/packages/googleapis_firestore/lib/src/reference/field_order.dart b/packages/google_cloud_firestore/lib/src/reference/field_order.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/reference/field_order.dart
rename to packages/google_cloud_firestore/lib/src/reference/field_order.dart
diff --git a/packages/googleapis_firestore/lib/src/reference/filter_internal.dart b/packages/google_cloud_firestore/lib/src/reference/filter_internal.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/reference/filter_internal.dart
rename to packages/google_cloud_firestore/lib/src/reference/filter_internal.dart
diff --git a/packages/googleapis_firestore/lib/src/reference/query.dart b/packages/google_cloud_firestore/lib/src/reference/query.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/reference/query.dart
rename to packages/google_cloud_firestore/lib/src/reference/query.dart
diff --git a/packages/googleapis_firestore/lib/src/reference/query_options.dart b/packages/google_cloud_firestore/lib/src/reference/query_options.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/reference/query_options.dart
rename to packages/google_cloud_firestore/lib/src/reference/query_options.dart
diff --git a/packages/googleapis_firestore/lib/src/reference/query_snapshot.dart b/packages/google_cloud_firestore/lib/src/reference/query_snapshot.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/reference/query_snapshot.dart
rename to packages/google_cloud_firestore/lib/src/reference/query_snapshot.dart
diff --git a/packages/googleapis_firestore/lib/src/reference/query_util.dart b/packages/google_cloud_firestore/lib/src/reference/query_util.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/reference/query_util.dart
rename to packages/google_cloud_firestore/lib/src/reference/query_util.dart
diff --git a/packages/googleapis_firestore/lib/src/reference/types.dart b/packages/google_cloud_firestore/lib/src/reference/types.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/reference/types.dart
rename to packages/google_cloud_firestore/lib/src/reference/types.dart
diff --git a/packages/googleapis_firestore/lib/src/reference/vector_query.dart b/packages/google_cloud_firestore/lib/src/reference/vector_query.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/reference/vector_query.dart
rename to packages/google_cloud_firestore/lib/src/reference/vector_query.dart
diff --git a/packages/googleapis_firestore/lib/src/reference/vector_query_options.dart b/packages/google_cloud_firestore/lib/src/reference/vector_query_options.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/reference/vector_query_options.dart
rename to packages/google_cloud_firestore/lib/src/reference/vector_query_options.dart
diff --git a/packages/googleapis_firestore/lib/src/reference/vector_query_snapshot.dart b/packages/google_cloud_firestore/lib/src/reference/vector_query_snapshot.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/reference/vector_query_snapshot.dart
rename to packages/google_cloud_firestore/lib/src/reference/vector_query_snapshot.dart
diff --git a/packages/googleapis_firestore/lib/src/serializer.dart b/packages/google_cloud_firestore/lib/src/serializer.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/serializer.dart
rename to packages/google_cloud_firestore/lib/src/serializer.dart
diff --git a/packages/googleapis_firestore/lib/src/set_options.dart b/packages/google_cloud_firestore/lib/src/set_options.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/set_options.dart
rename to packages/google_cloud_firestore/lib/src/set_options.dart
diff --git a/packages/googleapis_firestore/lib/src/status_code.dart b/packages/google_cloud_firestore/lib/src/status_code.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/status_code.dart
rename to packages/google_cloud_firestore/lib/src/status_code.dart
diff --git a/packages/googleapis_firestore/lib/src/timestamp.dart b/packages/google_cloud_firestore/lib/src/timestamp.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/timestamp.dart
rename to packages/google_cloud_firestore/lib/src/timestamp.dart
diff --git a/packages/googleapis_firestore/lib/src/transaction.dart b/packages/google_cloud_firestore/lib/src/transaction.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/transaction.dart
rename to packages/google_cloud_firestore/lib/src/transaction.dart
diff --git a/packages/googleapis_firestore/lib/src/types.dart b/packages/google_cloud_firestore/lib/src/types.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/types.dart
rename to packages/google_cloud_firestore/lib/src/types.dart
diff --git a/packages/googleapis_firestore/lib/src/util.dart b/packages/google_cloud_firestore/lib/src/util.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/util.dart
rename to packages/google_cloud_firestore/lib/src/util.dart
diff --git a/packages/googleapis_firestore/lib/src/validate.dart b/packages/google_cloud_firestore/lib/src/validate.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/validate.dart
rename to packages/google_cloud_firestore/lib/src/validate.dart
diff --git a/packages/googleapis_firestore/lib/src/write_batch.dart b/packages/google_cloud_firestore/lib/src/write_batch.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/src/write_batch.dart
rename to packages/google_cloud_firestore/lib/src/write_batch.dart
diff --git a/packages/googleapis_firestore/lib/version.g.dart b/packages/google_cloud_firestore/lib/version.g.dart
similarity index 100%
rename from packages/googleapis_firestore/lib/version.g.dart
rename to packages/google_cloud_firestore/lib/version.g.dart
diff --git a/packages/googleapis_firestore/pubspec.yaml b/packages/google_cloud_firestore/pubspec.yaml
similarity index 93%
rename from packages/googleapis_firestore/pubspec.yaml
rename to packages/google_cloud_firestore/pubspec.yaml
index eb1e03de..35c705bc 100644
--- a/packages/googleapis_firestore/pubspec.yaml
+++ b/packages/google_cloud_firestore/pubspec.yaml
@@ -1,4 +1,4 @@
-name: googleapis_firestore
+name: google_cloud_firestore
 description: Google Cloud Firestore client library for Dart.
 resolution: workspace
 version: 0.1.0
diff --git a/packages/googleapis_firestore/test/aggregate_query_test.dart b/packages/google_cloud_firestore/test/aggregate_query_test.dart
similarity index 99%
rename from packages/googleapis_firestore/test/aggregate_query_test.dart
rename to packages/google_cloud_firestore/test/aggregate_query_test.dart
index 9c1d6829..94601bca 100644
--- a/packages/googleapis_firestore/test/aggregate_query_test.dart
+++ b/packages/google_cloud_firestore/test/aggregate_query_test.dart
@@ -1,4 +1,4 @@
-import 'package:googleapis_firestore/googleapis_firestore.dart';
+import 'package:google_cloud_firestore/google_cloud_firestore.dart';
 import 'package:test/test.dart';
 
 import 'helpers.dart';
diff --git a/packages/googleapis_firestore/test/bulk_writer_integration_test.dart b/packages/google_cloud_firestore/test/bulk_writer_integration_test.dart
similarity index 99%
rename from packages/googleapis_firestore/test/bulk_writer_integration_test.dart
rename to packages/google_cloud_firestore/test/bulk_writer_integration_test.dart
index 37b16962..c7828ec8 100644
--- a/packages/googleapis_firestore/test/bulk_writer_integration_test.dart
+++ b/packages/google_cloud_firestore/test/bulk_writer_integration_test.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:googleapis_firestore/googleapis_firestore.dart';
+import 'package:google_cloud_firestore/google_cloud_firestore.dart';
 import 'package:test/test.dart';
 
 import 'helpers.dart';
diff --git a/packages/googleapis_firestore/test/bulk_writer_test.dart b/packages/google_cloud_firestore/test/bulk_writer_test.dart
similarity index 99%
rename from packages/googleapis_firestore/test/bulk_writer_test.dart
rename to packages/google_cloud_firestore/test/bulk_writer_test.dart
index 11eb8d0b..9e4ccfae 100644
--- a/packages/googleapis_firestore/test/bulk_writer_test.dart
+++ b/packages/google_cloud_firestore/test/bulk_writer_test.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:googleapis_firestore/googleapis_firestore.dart';
+import 'package:google_cloud_firestore/google_cloud_firestore.dart';
 import 'package:test/test.dart';
 
 /// Creates a mock Firestore instance for unit testing without needing an emulator
diff --git a/packages/googleapis_firestore/test/bundle_integration_test.dart b/packages/google_cloud_firestore/test/bundle_integration_test.dart
similarity index 99%
rename from packages/googleapis_firestore/test/bundle_integration_test.dart
rename to packages/google_cloud_firestore/test/bundle_integration_test.dart
index 8dbfbbe4..152625f4 100644
--- a/packages/googleapis_firestore/test/bundle_integration_test.dart
+++ b/packages/google_cloud_firestore/test/bundle_integration_test.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 import 'dart:typed_data';
 
-import 'package:googleapis_firestore/googleapis_firestore.dart';
+import 'package:google_cloud_firestore/google_cloud_firestore.dart';
 import 'package:test/test.dart';
 
 import 'helpers.dart';
diff --git a/packages/googleapis_firestore/test/bundle_test.dart b/packages/google_cloud_firestore/test/bundle_test.dart
similarity index 99%
rename from packages/googleapis_firestore/test/bundle_test.dart
rename to packages/google_cloud_firestore/test/bundle_test.dart
index 23b89f0a..f9341f49 100644
--- a/packages/googleapis_firestore/test/bundle_test.dart
+++ b/packages/google_cloud_firestore/test/bundle_test.dart
@@ -1,7 +1,8 @@
 import 'dart:convert';
 import 'dart:typed_data';
+
+import 'package:google_cloud_firestore/google_cloud_firestore.dart';
 import 'package:googleapis/firestore/v1.dart' as firestore_v1;
-import 'package:googleapis_firestore/googleapis_firestore.dart';
 import 'package:test/test.dart';
 
 const testBundleId = 'test-bundle';
diff --git a/packages/googleapis_firestore/test/collection_group_test.dart b/packages/google_cloud_firestore/test/collection_group_test.dart
similarity index 96%
rename from packages/googleapis_firestore/test/collection_group_test.dart
rename to packages/google_cloud_firestore/test/collection_group_test.dart
index a436bd2a..c7b6ae95 100644
--- a/packages/googleapis_firestore/test/collection_group_test.dart
+++ b/packages/google_cloud_firestore/test/collection_group_test.dart
@@ -1,4 +1,4 @@
-import 'package:googleapis_firestore/googleapis_firestore.dart';
+import 'package:google_cloud_firestore/google_cloud_firestore.dart';
 import 'package:test/test.dart';
 
 import 'helpers.dart';
diff --git a/packages/googleapis_firestore/test/collection_test.dart b/packages/google_cloud_firestore/test/collection_test.dart
similarity index 99%
rename from packages/googleapis_firestore/test/collection_test.dart
rename to packages/google_cloud_firestore/test/collection_test.dart
index 3d1339d8..e38d4f4a 100644
--- a/packages/googleapis_firestore/test/collection_test.dart
+++ b/packages/google_cloud_firestore/test/collection_test.dart
@@ -1,4 +1,4 @@
-import 'package:googleapis_firestore/googleapis_firestore.dart';
+import 'package:google_cloud_firestore/google_cloud_firestore.dart';
 import 'package:test/test.dart' hide throwsArgumentError;
 
 import 'helpers.dart';
diff --git a/packages/googleapis_firestore/test/document_test.dart b/packages/google_cloud_firestore/test/document_test.dart
similarity index 99%
rename from packages/googleapis_firestore/test/document_test.dart
rename to packages/google_cloud_firestore/test/document_test.dart
index 45c79e7c..a61b4009 100644
--- a/packages/googleapis_firestore/test/document_test.dart
+++ b/packages/google_cloud_firestore/test/document_test.dart
@@ -1,4 +1,4 @@
-import 'package:googleapis_firestore/googleapis_firestore.dart';
+import 'package:google_cloud_firestore/google_cloud_firestore.dart';
 import 'package:test/test.dart' hide throwsArgumentError;
 
 import 'helpers.dart';
diff --git a/packages/googleapis_firestore/test/explain_prod_test.dart b/packages/google_cloud_firestore/test/explain_prod_test.dart
similarity index 99%
rename from packages/googleapis_firestore/test/explain_prod_test.dart
rename to packages/google_cloud_firestore/test/explain_prod_test.dart
index 9d2243a5..6b02b0bb 100644
--- a/packages/googleapis_firestore/test/explain_prod_test.dart
+++ b/packages/google_cloud_firestore/test/explain_prod_test.dart
@@ -1,5 +1,5 @@
 import 'dart:async';
-import 'package:googleapis_firestore/googleapis_firestore.dart';
+import 'package:google_cloud_firestore/google_cloud_firestore.dart';
 import 'package:test/test.dart';
 import 'helpers.dart';
 
diff --git a/packages/googleapis_firestore/test/field_value_test.dart b/packages/google_cloud_firestore/test/field_value_test.dart
similarity index 98%
rename from packages/googleapis_firestore/test/field_value_test.dart
rename to packages/google_cloud_firestore/test/field_value_test.dart
index a500f883..d0e7560d 100644
--- a/packages/googleapis_firestore/test/field_value_test.dart
+++ b/packages/google_cloud_firestore/test/field_value_test.dart
@@ -1,4 +1,4 @@
-import 'package:googleapis_firestore/googleapis_firestore.dart';
+import 'package:google_cloud_firestore/google_cloud_firestore.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/packages/googleapis_firestore/test/filter_test.dart b/packages/google_cloud_firestore/test/filter_test.dart
similarity index 99%
rename from packages/googleapis_firestore/test/filter_test.dart
rename to packages/google_cloud_firestore/test/filter_test.dart
index 4aa3bfa7..4b5652b2 100644
--- a/packages/googleapis_firestore/test/filter_test.dart
+++ b/packages/google_cloud_firestore/test/filter_test.dart
@@ -1,4 +1,4 @@
-import 'package:googleapis_firestore/googleapis_firestore.dart';
+import 'package:google_cloud_firestore/google_cloud_firestore.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/packages/googleapis_firestore/test/firestore_integration_test.dart b/packages/google_cloud_firestore/test/firestore_integration_test.dart
similarity index 88%
rename from packages/googleapis_firestore/test/firestore_integration_test.dart
rename to packages/google_cloud_firestore/test/firestore_integration_test.dart
index a2bae1e4..f7c3c2bf 100644
--- a/packages/googleapis_firestore/test/firestore_integration_test.dart
+++ b/packages/google_cloud_firestore/test/firestore_integration_test.dart
@@ -1,4 +1,4 @@
-import 'package:googleapis_firestore/googleapis_firestore.dart';
+import 'package:google_cloud_firestore/google_cloud_firestore.dart';
 import 'package:test/test.dart';
 
 import 'helpers.dart';
diff --git a/packages/googleapis_firestore/test/firestore_test.dart b/packages/google_cloud_firestore/test/firestore_test.dart
similarity index 98%
rename from packages/googleapis_firestore/test/firestore_test.dart
rename to packages/google_cloud_firestore/test/firestore_test.dart
index 102567f2..f035990d 100644
--- a/packages/googleapis_firestore/test/firestore_test.dart
+++ b/packages/google_cloud_firestore/test/firestore_test.dart
@@ -1,4 +1,4 @@
-import 'package:googleapis_firestore/googleapis_firestore.dart';
+import 'package:google_cloud_firestore/google_cloud_firestore.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/packages/googleapis_firestore/test/get_all_integration_test.dart b/packages/google_cloud_firestore/test/get_all_integration_test.dart
similarity index 98%
rename from packages/googleapis_firestore/test/get_all_integration_test.dart
rename to packages/google_cloud_firestore/test/get_all_integration_test.dart
index 86eec34f..dca661e8 100644
--- a/packages/googleapis_firestore/test/get_all_integration_test.dart
+++ b/packages/google_cloud_firestore/test/get_all_integration_test.dart
@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:googleapis_firestore/googleapis_firestore.dart';
-import 'package:googleapis_firestore/src/firestore.dart' show FieldMask;
+import 'package:google_cloud_firestore/google_cloud_firestore.dart';
+import 'package:google_cloud_firestore/src/firestore.dart' show FieldMask;
 import 'package:test/test.dart';
 import 'helpers.dart' as helpers;
 
diff --git a/packages/googleapis_firestore/test/get_all_test.dart b/packages/google_cloud_firestore/test/get_all_test.dart
similarity index 97%
rename from packages/googleapis_firestore/test/get_all_test.dart
rename to packages/google_cloud_firestore/test/get_all_test.dart
index 362f7c19..8e7e490c 100644
--- a/packages/googleapis_firestore/test/get_all_test.dart
+++ b/packages/google_cloud_firestore/test/get_all_test.dart
@@ -1,7 +1,7 @@
+import 'package:google_cloud_firestore/google_cloud_firestore.dart';
+import 'package:google_cloud_firestore/src/firestore.dart' show FieldMask;
+import 'package:google_cloud_firestore/src/firestore_http_client.dart';
 import 'package:googleapis/firestore/v1.dart' as firestore_v1;
-import 'package:googleapis_firestore/googleapis_firestore.dart';
-import 'package:googleapis_firestore/src/firestore.dart' show FieldMask;
-import 'package:googleapis_firestore/src/firestore_http_client.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:test/test.dart';
 
diff --git a/packages/googleapis_firestore/test/helpers.dart b/packages/google_cloud_firestore/test/helpers.dart
similarity index 98%
rename from packages/googleapis_firestore/test/helpers.dart
rename to packages/google_cloud_firestore/test/helpers.dart
index b8c45491..1aca0326 100644
--- a/packages/googleapis_firestore/test/helpers.dart
+++ b/packages/google_cloud_firestore/test/helpers.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:googleapis_firestore/googleapis_firestore.dart';
+import 'package:google_cloud_firestore/google_cloud_firestore.dart';
 import 'package:http/http.dart' show ClientException;
 import 'package:test/test.dart';
 
diff --git a/packages/googleapis_firestore/test/order_test.dart b/packages/google_cloud_firestore/test/order_test.dart
similarity index 99%
rename from packages/googleapis_firestore/test/order_test.dart
rename to packages/google_cloud_firestore/test/order_test.dart
index 8f5044b1..a56b3b7e 100644
--- a/packages/googleapis_firestore/test/order_test.dart
+++ b/packages/google_cloud_firestore/test/order_test.dart
@@ -1,5 +1,5 @@
+import 'package:google_cloud_firestore/src/firestore.dart';
 import 'package:googleapis/firestore/v1.dart' as firestore_v1;
-import 'package:googleapis_firestore/src/firestore.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/packages/googleapis_firestore/test/query_partition_prod_test.dart b/packages/google_cloud_firestore/test/query_partition_prod_test.dart
similarity index 99%
rename from packages/googleapis_firestore/test/query_partition_prod_test.dart
rename to packages/google_cloud_firestore/test/query_partition_prod_test.dart
index fa35556d..82ccaf8f 100644
--- a/packages/googleapis_firestore/test/query_partition_prod_test.dart
+++ b/packages/google_cloud_firestore/test/query_partition_prod_test.dart
@@ -1,5 +1,5 @@
 import 'dart:async';
-import 'package:googleapis_firestore/googleapis_firestore.dart';
+import 'package:google_cloud_firestore/google_cloud_firestore.dart';
 import 'package:test/test.dart';
 import 'helpers.dart';
 
diff --git a/packages/googleapis_firestore/test/query_partition_test.dart b/packages/google_cloud_firestore/test/query_partition_test.dart
similarity index 98%
rename from packages/googleapis_firestore/test/query_partition_test.dart
rename to packages/google_cloud_firestore/test/query_partition_test.dart
index 5e75c368..d22a0ca2 100644
--- a/packages/googleapis_firestore/test/query_partition_test.dart
+++ b/packages/google_cloud_firestore/test/query_partition_test.dart
@@ -1,8 +1,8 @@
 import 'dart:async';
 
+import 'package:google_cloud_firestore/google_cloud_firestore.dart';
+import 'package:google_cloud_firestore/src/firestore_http_client.dart';
 import 'package:googleapis/firestore/v1.dart' as firestore_v1;
-import 'package:googleapis_firestore/googleapis_firestore.dart';
-import 'package:googleapis_firestore/src/firestore_http_client.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:test/test.dart';
 
diff --git a/packages/googleapis_firestore/test/query_test.dart b/packages/google_cloud_firestore/test/query_test.dart
similarity index 99%
rename from packages/googleapis_firestore/test/query_test.dart
rename to packages/google_cloud_firestore/test/query_test.dart
index bc337e23..7a930a13 100644
--- a/packages/googleapis_firestore/test/query_test.dart
+++ b/packages/google_cloud_firestore/test/query_test.dart
@@ -1,4 +1,4 @@
-import 'package:googleapis_firestore/googleapis_firestore.dart';
+import 'package:google_cloud_firestore/google_cloud_firestore.dart';
 import 'package:test/test.dart';
 
 import 'helpers.dart';
diff --git a/packages/googleapis_firestore/test/recursive_delete_integration_test.dart b/packages/google_cloud_firestore/test/recursive_delete_integration_test.dart
similarity index 98%
rename from packages/googleapis_firestore/test/recursive_delete_integration_test.dart
rename to packages/google_cloud_firestore/test/recursive_delete_integration_test.dart
index 4d152ec3..13ab50aa 100644
--- a/packages/googleapis_firestore/test/recursive_delete_integration_test.dart
+++ b/packages/google_cloud_firestore/test/recursive_delete_integration_test.dart
@@ -1,4 +1,4 @@
-import 'package:googleapis_firestore/googleapis_firestore.dart';
+import 'package:google_cloud_firestore/google_cloud_firestore.dart';
 import 'package:test/test.dart';
 
 import 'helpers.dart';
diff --git a/packages/googleapis_firestore/test/recursive_delete_test.dart b/packages/google_cloud_firestore/test/recursive_delete_test.dart
similarity index 99%
rename from packages/googleapis_firestore/test/recursive_delete_test.dart
rename to packages/google_cloud_firestore/test/recursive_delete_test.dart
index 400df4ea..5161b047 100644
--- a/packages/googleapis_firestore/test/recursive_delete_test.dart
+++ b/packages/google_cloud_firestore/test/recursive_delete_test.dart
@@ -1,8 +1,8 @@
 import 'dart:async';
 
+import 'package:google_cloud_firestore/google_cloud_firestore.dart';
+import 'package:google_cloud_firestore/src/firestore_http_client.dart';
 import 'package:googleapis/firestore/v1.dart' as firestore_v1;
-import 'package:googleapis_firestore/googleapis_firestore.dart';
-import 'package:googleapis_firestore/src/firestore_http_client.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:test/test.dart';
 
diff --git a/packages/googleapis_firestore/test/set_options_integration_test.dart b/packages/google_cloud_firestore/test/set_options_integration_test.dart
similarity index 97%
rename from packages/googleapis_firestore/test/set_options_integration_test.dart
rename to packages/google_cloud_firestore/test/set_options_integration_test.dart
index c8d7e5f9..0a04ba22 100644
--- a/packages/googleapis_firestore/test/set_options_integration_test.dart
+++ b/packages/google_cloud_firestore/test/set_options_integration_test.dart
@@ -1,4 +1,4 @@
-import 'package:googleapis_firestore/googleapis_firestore.dart';
+import 'package:google_cloud_firestore/google_cloud_firestore.dart';
 import 'package:test/test.dart';
 
 import 'helpers.dart';
diff --git a/packages/googleapis_firestore/test/timestamp_test.dart b/packages/google_cloud_firestore/test/timestamp_test.dart
similarity index 98%
rename from packages/googleapis_firestore/test/timestamp_test.dart
rename to packages/google_cloud_firestore/test/timestamp_test.dart
index dfa332df..84cffdeb 100644
--- a/packages/googleapis_firestore/test/timestamp_test.dart
+++ b/packages/google_cloud_firestore/test/timestamp_test.dart
@@ -1,4 +1,4 @@
-import 'package:googleapis_firestore/googleapis_firestore.dart';
+import 'package:google_cloud_firestore/google_cloud_firestore.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/packages/googleapis_firestore/test/transaction_aggregation_test.dart b/packages/google_cloud_firestore/test/transaction_aggregation_test.dart
similarity index 99%
rename from packages/googleapis_firestore/test/transaction_aggregation_test.dart
rename to packages/google_cloud_firestore/test/transaction_aggregation_test.dart
index ae5ac7a0..c3c56a09 100644
--- a/packages/googleapis_firestore/test/transaction_aggregation_test.dart
+++ b/packages/google_cloud_firestore/test/transaction_aggregation_test.dart
@@ -1,4 +1,4 @@
-import 'package:googleapis_firestore/googleapis_firestore.dart';
+import 'package:google_cloud_firestore/google_cloud_firestore.dart';
 import 'package:test/test.dart';
 
 import 'helpers.dart';
diff --git a/packages/googleapis_firestore/test/transaction_query_test.dart b/packages/google_cloud_firestore/test/transaction_query_test.dart
similarity index 99%
rename from packages/googleapis_firestore/test/transaction_query_test.dart
rename to packages/google_cloud_firestore/test/transaction_query_test.dart
index 01c351d2..fa115a7d 100644
--- a/packages/googleapis_firestore/test/transaction_query_test.dart
+++ b/packages/google_cloud_firestore/test/transaction_query_test.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:googleapis_firestore/googleapis_firestore.dart';
+import 'package:google_cloud_firestore/google_cloud_firestore.dart';
 import 'package:test/test.dart';
 import 'helpers.dart' as helpers;
 
diff --git a/packages/googleapis_firestore/test/transaction_test.dart b/packages/google_cloud_firestore/test/transaction_test.dart
similarity index 99%
rename from packages/googleapis_firestore/test/transaction_test.dart
rename to packages/google_cloud_firestore/test/transaction_test.dart
index d569cd78..8dafeee6 100644
--- a/packages/googleapis_firestore/test/transaction_test.dart
+++ b/packages/google_cloud_firestore/test/transaction_test.dart
@@ -4,7 +4,7 @@
 
 import 'dart:core';
 import 'dart:math';
-import 'package:googleapis_firestore/googleapis_firestore.dart';
+import 'package:google_cloud_firestore/google_cloud_firestore.dart';
 import 'package:test/test.dart';
 import 'helpers.dart' as helpers;
 
diff --git a/packages/googleapis_firestore/test/vector_integration_prod_test.dart b/packages/google_cloud_firestore/test/vector_integration_prod_test.dart
similarity index 97%
rename from packages/googleapis_firestore/test/vector_integration_prod_test.dart
rename to packages/google_cloud_firestore/test/vector_integration_prod_test.dart
index 36608a59..89f3e005 100644
--- a/packages/googleapis_firestore/test/vector_integration_prod_test.dart
+++ b/packages/google_cloud_firestore/test/vector_integration_prod_test.dart
@@ -1,5 +1,5 @@
 import 'dart:async';
-import 'package:googleapis_firestore/googleapis_firestore.dart';
+import 'package:google_cloud_firestore/google_cloud_firestore.dart';
 import 'package:test/test.dart';
 import 'helpers.dart';
 
diff --git a/packages/googleapis_firestore/test/vector_integration_test.dart b/packages/google_cloud_firestore/test/vector_integration_test.dart
similarity index 99%
rename from packages/googleapis_firestore/test/vector_integration_test.dart
rename to packages/google_cloud_firestore/test/vector_integration_test.dart
index e3a2936b..e1985f07 100644
--- a/packages/googleapis_firestore/test/vector_integration_test.dart
+++ b/packages/google_cloud_firestore/test/vector_integration_test.dart
@@ -1,4 +1,4 @@
-import 'package:googleapis_firestore/googleapis_firestore.dart';
+import 'package:google_cloud_firestore/google_cloud_firestore.dart';
 import 'package:test/test.dart';
 
 import 'helpers.dart';
diff --git a/packages/googleapis_firestore/test/vector_test.dart b/packages/google_cloud_firestore/test/vector_test.dart
similarity index 99%
rename from packages/googleapis_firestore/test/vector_test.dart
rename to packages/google_cloud_firestore/test/vector_test.dart
index 465fb44e..2dc07de7 100644
--- a/packages/googleapis_firestore/test/vector_test.dart
+++ b/packages/google_cloud_firestore/test/vector_test.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:googleapis_firestore/googleapis_firestore.dart';
+import 'package:google_cloud_firestore/google_cloud_firestore.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/packages/googleapis_firestore/test/write_batch_test.dart b/packages/google_cloud_firestore/test/write_batch_test.dart
similarity index 99%
rename from packages/googleapis_firestore/test/write_batch_test.dart
rename to packages/google_cloud_firestore/test/write_batch_test.dart
index a7afab0c..19664c11 100644
--- a/packages/googleapis_firestore/test/write_batch_test.dart
+++ b/packages/google_cloud_firestore/test/write_batch_test.dart
@@ -1,4 +1,4 @@
-import 'package:googleapis_firestore/googleapis_firestore.dart';
+import 'package:google_cloud_firestore/google_cloud_firestore.dart';
 import 'package:test/test.dart' hide throwsArgumentError;
 
 import 'helpers.dart';
diff --git a/pubspec.yaml b/pubspec.yaml
index ccb41a6a..bd7844fc 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -10,7 +10,7 @@ dev_dependencies:
 
 workspace:
   - packages/dart_firebase_admin
-  - packages/googleapis_firestore
+  - packages/google_cloud_firestore
   - packages/googleapis_storage
 
 melos:
diff --git a/scripts/firestore-coverage.sh b/scripts/firestore-coverage.sh
index b64d2127..0523ad8b 100755
--- a/scripts/firestore-coverage.sh
+++ b/scripts/firestore-coverage.sh
@@ -10,7 +10,7 @@ set -e
 
 # Get the script's directory and the package directory
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-PACKAGE_DIR="$SCRIPT_DIR/../packages/googleapis_firestore"
+PACKAGE_DIR="$SCRIPT_DIR/../packages/google_cloud_firestore"
 
 # Change to package directory
 cd "$PACKAGE_DIR"