Rename firebase_firestore to cloud_firestore (#254)

diff --git a/packages/firebase_firestore/.gitignore b/packages/cloud_firestore/.gitignore
similarity index 100%
rename from packages/firebase_firestore/.gitignore
rename to packages/cloud_firestore/.gitignore
diff --git a/packages/firebase_firestore/CHANGELOG.md b/packages/cloud_firestore/CHANGELOG.md
similarity index 71%
rename from packages/firebase_firestore/CHANGELOG.md
rename to packages/cloud_firestore/CHANGELOG.md
index f824c41..5765594 100644
--- a/packages/firebase_firestore/CHANGELOG.md
+++ b/packages/cloud_firestore/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.0.3
+
+* Renamed package to cloud_firestore
+
 ## 0.0.2
 
 * Add path property to DocumentSnapshot
diff --git a/packages/firebase_firestore/LICENSE b/packages/cloud_firestore/LICENSE
similarity index 100%
rename from packages/firebase_firestore/LICENSE
rename to packages/cloud_firestore/LICENSE
diff --git a/packages/firebase_firestore/README.md b/packages/cloud_firestore/README.md
similarity index 92%
rename from packages/firebase_firestore/README.md
rename to packages/cloud_firestore/README.md
index 953cbef..d839efb 100755
--- a/packages/firebase_firestore/README.md
+++ b/packages/cloud_firestore/README.md
@@ -19,12 +19,12 @@
 Follow the assistant, download the generated GoogleService-Info.plist file, open ios/Runner.xcworkspace
 with Xcode, and within Xcode place the file inside ios/Runner. Don't follow the steps named
 "Add Firebase SDK" and "Add initialization code" in the Firebase assistant.
-1. Add `firebase_firestore` as a [dependency in your pubspec.yaml file](https://flutter.io/platform-plugins/).
+1. Add `cloud_firestore` as a [dependency in your pubspec.yaml file](https://flutter.io/platform-plugins/).
 
 ## Usage
 
 ```dart
-import 'package:firebase_firestore/firebase_firestore.dart';
+import 'package:cloud_firestore/cloud_firestore.dart';
 ```
 
 Adding a new `DocumentReference`:
diff --git a/packages/firebase_firestore/android/.gitignore b/packages/cloud_firestore/android/.gitignore
similarity index 100%
rename from packages/firebase_firestore/android/.gitignore
rename to packages/cloud_firestore/android/.gitignore
diff --git a/packages/firebase_firestore/android/build.gradle b/packages/cloud_firestore/android/build.gradle
similarity index 100%
rename from packages/firebase_firestore/android/build.gradle
rename to packages/cloud_firestore/android/build.gradle
diff --git a/packages/firebase_firestore/android/gradle.properties b/packages/cloud_firestore/android/gradle.properties
similarity index 100%
rename from packages/firebase_firestore/android/gradle.properties
rename to packages/cloud_firestore/android/gradle.properties
diff --git a/packages/cloud_firestore/android/settings.gradle b/packages/cloud_firestore/android/settings.gradle
new file mode 100755
index 0000000..caf1065
--- /dev/null
+++ b/packages/cloud_firestore/android/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'cloud_firestore'
diff --git a/packages/firebase_firestore/android/src/main/AndroidManifest.xml b/packages/cloud_firestore/android/src/main/AndroidManifest.xml
similarity index 100%
rename from packages/firebase_firestore/android/src/main/AndroidManifest.xml
rename to packages/cloud_firestore/android/src/main/AndroidManifest.xml
diff --git a/packages/firebase_firestore/android/src/main/java/io/flutter/plugins/firebase/firestore/FirestorePlugin.java b/packages/cloud_firestore/android/src/main/java/io/flutter/plugins/firebase/CloudFirestorePlugin.java
similarity index 95%
rename from packages/firebase_firestore/android/src/main/java/io/flutter/plugins/firebase/firestore/FirestorePlugin.java
rename to packages/cloud_firestore/android/src/main/java/io/flutter/plugins/firebase/CloudFirestorePlugin.java
index 153b889..c30087d 100644
--- a/packages/firebase_firestore/android/src/main/java/io/flutter/plugins/firebase/firestore/FirestorePlugin.java
+++ b/packages/cloud_firestore/android/src/main/java/io/flutter/plugins/firebase/CloudFirestorePlugin.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package io.flutter.plugins.firebase.firestore;
+package io.flutter.plugins.firebase.cloud_firestore;
 
 import android.util.SparseArray;
 import com.google.firebase.firestore.CollectionReference;
@@ -25,8 +25,7 @@
 import java.util.List;
 import java.util.Map;
 
-/** FirebaseDatabasePlugin */
-public class FirestorePlugin implements MethodCallHandler {
+public class CloudFirestorePlugin implements MethodCallHandler {
 
   public static final String TAG = "FirestorePlugin";
   private final MethodChannel channel;
@@ -39,11 +38,11 @@
 
   public static void registerWith(PluginRegistry.Registrar registrar) {
     final MethodChannel channel =
-        new MethodChannel(registrar.messenger(), "plugins.flutter.io/firebase_firestore");
-    channel.setMethodCallHandler(new FirestorePlugin(channel));
+        new MethodChannel(registrar.messenger(), "plugins.flutter.io/cloud_firestore");
+    channel.setMethodCallHandler(new CloudFirestorePlugin(channel));
   }
 
-  private FirestorePlugin(MethodChannel channel) {
+  private CloudFirestorePlugin(MethodChannel channel) {
     this.channel = channel;
   }
 
diff --git a/packages/firebase_firestore/example/.gitignore b/packages/cloud_firestore/example/.gitignore
similarity index 100%
rename from packages/firebase_firestore/example/.gitignore
rename to packages/cloud_firestore/example/.gitignore
diff --git a/packages/firebase_firestore/example/README.md b/packages/cloud_firestore/example/README.md
similarity index 100%
rename from packages/firebase_firestore/example/README.md
rename to packages/cloud_firestore/example/README.md
diff --git a/packages/firebase_firestore/example/android.iml b/packages/cloud_firestore/example/android.iml
similarity index 100%
rename from packages/firebase_firestore/example/android.iml
rename to packages/cloud_firestore/example/android.iml
diff --git a/packages/firebase_firestore/example/android/.gitignore b/packages/cloud_firestore/example/android/.gitignore
similarity index 100%
rename from packages/firebase_firestore/example/android/.gitignore
rename to packages/cloud_firestore/example/android/.gitignore
diff --git a/packages/firebase_firestore/example/android/app/build.gradle b/packages/cloud_firestore/example/android/app/build.gradle
similarity index 100%
rename from packages/firebase_firestore/example/android/app/build.gradle
rename to packages/cloud_firestore/example/android/app/build.gradle
diff --git a/packages/firebase_firestore/example/android/app/google-services.json b/packages/cloud_firestore/example/android/app/google-services.json
similarity index 100%
rename from packages/firebase_firestore/example/android/app/google-services.json
rename to packages/cloud_firestore/example/android/app/google-services.json
diff --git a/packages/firebase_firestore/example/android/app/src/main/AndroidManifest.xml b/packages/cloud_firestore/example/android/app/src/main/AndroidManifest.xml
similarity index 100%
rename from packages/firebase_firestore/example/android/app/src/main/AndroidManifest.xml
rename to packages/cloud_firestore/example/android/app/src/main/AndroidManifest.xml
diff --git a/packages/firebase_firestore/example/android/app/src/main/java/io/flutter/plugins/firebase/firestoreexample/MainActivity.java b/packages/cloud_firestore/example/android/app/src/main/java/io/flutter/plugins/firebase/firestoreexample/MainActivity.java
similarity index 100%
rename from packages/firebase_firestore/example/android/app/src/main/java/io/flutter/plugins/firebase/firestoreexample/MainActivity.java
rename to packages/cloud_firestore/example/android/app/src/main/java/io/flutter/plugins/firebase/firestoreexample/MainActivity.java
diff --git a/packages/firebase_firestore/example/android/app/src/main/java/io/flutter/plugins/firebasedatabaseexample/MainActivity.java b/packages/cloud_firestore/example/android/app/src/main/java/io/flutter/plugins/firebasedatabaseexample/MainActivity.java
similarity index 100%
rename from packages/firebase_firestore/example/android/app/src/main/java/io/flutter/plugins/firebasedatabaseexample/MainActivity.java
rename to packages/cloud_firestore/example/android/app/src/main/java/io/flutter/plugins/firebasedatabaseexample/MainActivity.java
diff --git a/packages/firebase_firestore/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/packages/cloud_firestore/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from packages/firebase_firestore/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to packages/cloud_firestore/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/packages/firebase_firestore/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/packages/cloud_firestore/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from packages/firebase_firestore/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to packages/cloud_firestore/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/packages/firebase_firestore/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/packages/cloud_firestore/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from packages/firebase_firestore/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to packages/cloud_firestore/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/packages/firebase_firestore/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/packages/cloud_firestore/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from packages/firebase_firestore/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to packages/cloud_firestore/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/packages/firebase_firestore/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/packages/cloud_firestore/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from packages/firebase_firestore/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to packages/cloud_firestore/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/packages/firebase_firestore/example/android/build.gradle b/packages/cloud_firestore/example/android/build.gradle
similarity index 100%
rename from packages/firebase_firestore/example/android/build.gradle
rename to packages/cloud_firestore/example/android/build.gradle
diff --git a/packages/firebase_firestore/example/android/gradle.properties b/packages/cloud_firestore/example/android/gradle.properties
similarity index 100%
rename from packages/firebase_firestore/example/android/gradle.properties
rename to packages/cloud_firestore/example/android/gradle.properties
diff --git a/packages/firebase_firestore/example/android/settings.gradle b/packages/cloud_firestore/example/android/settings.gradle
similarity index 100%
rename from packages/firebase_firestore/example/android/settings.gradle
rename to packages/cloud_firestore/example/android/settings.gradle
diff --git a/packages/firebase_firestore/example/firestore_example.iml b/packages/cloud_firestore/example/firestore_example.iml
similarity index 100%
rename from packages/firebase_firestore/example/firestore_example.iml
rename to packages/cloud_firestore/example/firestore_example.iml
diff --git a/packages/firebase_firestore/example/ios/.gitignore b/packages/cloud_firestore/example/ios/.gitignore
similarity index 100%
rename from packages/firebase_firestore/example/ios/.gitignore
rename to packages/cloud_firestore/example/ios/.gitignore
diff --git a/packages/firebase_firestore/example/ios/Flutter/AppFrameworkInfo.plist b/packages/cloud_firestore/example/ios/Flutter/AppFrameworkInfo.plist
similarity index 100%
rename from packages/firebase_firestore/example/ios/Flutter/AppFrameworkInfo.plist
rename to packages/cloud_firestore/example/ios/Flutter/AppFrameworkInfo.plist
diff --git a/packages/firebase_firestore/example/ios/Flutter/Debug.xcconfig b/packages/cloud_firestore/example/ios/Flutter/Debug.xcconfig
similarity index 100%
rename from packages/firebase_firestore/example/ios/Flutter/Debug.xcconfig
rename to packages/cloud_firestore/example/ios/Flutter/Debug.xcconfig
diff --git a/packages/firebase_firestore/example/ios/Flutter/Release.xcconfig b/packages/cloud_firestore/example/ios/Flutter/Release.xcconfig
similarity index 100%
rename from packages/firebase_firestore/example/ios/Flutter/Release.xcconfig
rename to packages/cloud_firestore/example/ios/Flutter/Release.xcconfig
diff --git a/packages/firebase_firestore/example/ios/Podfile b/packages/cloud_firestore/example/ios/Podfile
similarity index 100%
rename from packages/firebase_firestore/example/ios/Podfile
rename to packages/cloud_firestore/example/ios/Podfile
diff --git a/packages/firebase_firestore/example/ios/Runner.xcodeproj/project.pbxproj b/packages/cloud_firestore/example/ios/Runner.xcodeproj/project.pbxproj
similarity index 99%
rename from packages/firebase_firestore/example/ios/Runner.xcodeproj/project.pbxproj
rename to packages/cloud_firestore/example/ios/Runner.xcodeproj/project.pbxproj
index 73e0c8e..40df9e2 100755
--- a/packages/firebase_firestore/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/packages/cloud_firestore/example/ios/Runner.xcodeproj/project.pbxproj
@@ -248,8 +248,6 @@
 			);
 			inputPaths = (
 				"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-resources.sh",
-				"${PODS_ROOT}/GTMOAuth2/Source/Touch/GTMOAuth2ViewTouch.xib",
-				"${PODS_ROOT}/GoogleSignIn/Resources/GoogleSignIn.bundle",
 				"$PODS_CONFIGURATION_BUILD_DIR/gRPC/gRPCCertificates.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
diff --git a/packages/firebase_firestore/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/packages/cloud_firestore/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from packages/firebase_firestore/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
rename to packages/cloud_firestore/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/packages/firebase_firestore/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/cloud_firestore/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
similarity index 100%
rename from packages/firebase_firestore/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
rename to packages/cloud_firestore/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
diff --git a/packages/firebase_firestore/example/ios/Runner.xcworkspace/contents.xcworkspacedata b/packages/cloud_firestore/example/ios/Runner.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from packages/firebase_firestore/example/ios/Runner.xcworkspace/contents.xcworkspacedata
rename to packages/cloud_firestore/example/ios/Runner.xcworkspace/contents.xcworkspacedata
diff --git a/packages/firebase_firestore/example/ios/Runner/AppDelegate.h b/packages/cloud_firestore/example/ios/Runner/AppDelegate.h
similarity index 100%
rename from packages/firebase_firestore/example/ios/Runner/AppDelegate.h
rename to packages/cloud_firestore/example/ios/Runner/AppDelegate.h
diff --git a/packages/firebase_firestore/example/ios/Runner/AppDelegate.m b/packages/cloud_firestore/example/ios/Runner/AppDelegate.m
similarity index 100%
rename from packages/firebase_firestore/example/ios/Runner/AppDelegate.m
rename to packages/cloud_firestore/example/ios/Runner/AppDelegate.m
diff --git a/packages/firebase_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/packages/cloud_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from packages/firebase_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to packages/cloud_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/packages/firebase_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/packages/cloud_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
similarity index 100%
rename from packages/firebase_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
rename to packages/cloud_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
Binary files differ
diff --git a/packages/firebase_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/packages/cloud_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
similarity index 100%
rename from packages/firebase_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
rename to packages/cloud_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
Binary files differ
diff --git a/packages/firebase_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/packages/cloud_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
similarity index 100%
rename from packages/firebase_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
rename to packages/cloud_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
Binary files differ
diff --git a/packages/firebase_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/packages/cloud_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
similarity index 100%
rename from packages/firebase_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
rename to packages/cloud_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
Binary files differ
diff --git a/packages/firebase_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/packages/cloud_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
similarity index 100%
rename from packages/firebase_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
rename to packages/cloud_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
Binary files differ
diff --git a/packages/firebase_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/packages/cloud_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
similarity index 100%
rename from packages/firebase_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
rename to packages/cloud_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
Binary files differ
diff --git a/packages/firebase_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/packages/cloud_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
similarity index 100%
rename from packages/firebase_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
rename to packages/cloud_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
Binary files differ
diff --git a/packages/firebase_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/packages/cloud_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
similarity index 100%
rename from packages/firebase_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
rename to packages/cloud_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
Binary files differ
diff --git a/packages/firebase_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/packages/cloud_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
similarity index 100%
rename from packages/firebase_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
rename to packages/cloud_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
Binary files differ
diff --git a/packages/firebase_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/packages/cloud_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
similarity index 100%
rename from packages/firebase_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
rename to packages/cloud_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
Binary files differ
diff --git a/packages/firebase_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/packages/cloud_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
similarity index 100%
rename from packages/firebase_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
rename to packages/cloud_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
Binary files differ
diff --git a/packages/firebase_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/packages/cloud_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
similarity index 100%
rename from packages/firebase_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
rename to packages/cloud_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
Binary files differ
diff --git a/packages/firebase_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/packages/cloud_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
similarity index 100%
rename from packages/firebase_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
rename to packages/cloud_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
Binary files differ
diff --git a/packages/firebase_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/packages/cloud_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
similarity index 100%
rename from packages/firebase_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
rename to packages/cloud_firestore/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
Binary files differ
diff --git a/packages/firebase_firestore/example/ios/Runner/Base.lproj/LaunchScreen.storyboard b/packages/cloud_firestore/example/ios/Runner/Base.lproj/LaunchScreen.storyboard
similarity index 100%
rename from packages/firebase_firestore/example/ios/Runner/Base.lproj/LaunchScreen.storyboard
rename to packages/cloud_firestore/example/ios/Runner/Base.lproj/LaunchScreen.storyboard
diff --git a/packages/firebase_firestore/example/ios/Runner/Base.lproj/Main.storyboard b/packages/cloud_firestore/example/ios/Runner/Base.lproj/Main.storyboard
similarity index 100%
rename from packages/firebase_firestore/example/ios/Runner/Base.lproj/Main.storyboard
rename to packages/cloud_firestore/example/ios/Runner/Base.lproj/Main.storyboard
diff --git a/packages/firebase_firestore/example/ios/Runner/GoogleService-Info.plist b/packages/cloud_firestore/example/ios/Runner/GoogleService-Info.plist
similarity index 100%
rename from packages/firebase_firestore/example/ios/Runner/GoogleService-Info.plist
rename to packages/cloud_firestore/example/ios/Runner/GoogleService-Info.plist
diff --git a/packages/firebase_firestore/example/ios/Runner/Info.plist b/packages/cloud_firestore/example/ios/Runner/Info.plist
similarity index 100%
rename from packages/firebase_firestore/example/ios/Runner/Info.plist
rename to packages/cloud_firestore/example/ios/Runner/Info.plist
diff --git a/packages/firebase_firestore/example/ios/Runner/main.m b/packages/cloud_firestore/example/ios/Runner/main.m
similarity index 100%
rename from packages/firebase_firestore/example/ios/Runner/main.m
rename to packages/cloud_firestore/example/ios/Runner/main.m
diff --git a/packages/firebase_firestore/example/lib/main.dart b/packages/cloud_firestore/example/lib/main.dart
similarity index 96%
rename from packages/firebase_firestore/example/lib/main.dart
rename to packages/cloud_firestore/example/lib/main.dart
index 70154e4..66cffc0 100755
--- a/packages/firebase_firestore/example/lib/main.dart
+++ b/packages/cloud_firestore/example/lib/main.dart
@@ -5,7 +5,7 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
-import 'package:firebase_firestore/firebase_firestore.dart';
+import 'package:cloud_firestore/cloud_firestore.dart';
 
 void main() {
   runApp(new MaterialApp(title: 'Firestore Example', home: new MyHomePage()));
diff --git a/packages/firebase_firestore/example/pubspec.yaml b/packages/cloud_firestore/example/pubspec.yaml
similarity index 88%
rename from packages/firebase_firestore/example/pubspec.yaml
rename to packages/cloud_firestore/example/pubspec.yaml
index 988b276..dc93321 100755
--- a/packages/firebase_firestore/example/pubspec.yaml
+++ b/packages/cloud_firestore/example/pubspec.yaml
@@ -4,7 +4,7 @@
 dependencies:
   flutter:
     sdk: flutter
-  firebase_firestore:
+  cloud_firestore:
     path: ../
 
 flutter:
diff --git a/packages/firebase_firestore/ios/.gitignore b/packages/cloud_firestore/ios/.gitignore
similarity index 100%
rename from packages/firebase_firestore/ios/.gitignore
rename to packages/cloud_firestore/ios/.gitignore
diff --git a/packages/firebase_firestore/ios/Assets/.gitkeep b/packages/cloud_firestore/ios/Assets/.gitkeep
similarity index 100%
rename from packages/firebase_firestore/ios/Assets/.gitkeep
rename to packages/cloud_firestore/ios/Assets/.gitkeep
diff --git a/packages/firebase_firestore/ios/Classes/FirestorePlugin.h b/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.h
similarity index 77%
rename from packages/firebase_firestore/ios/Classes/FirestorePlugin.h
rename to packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.h
index 7a60992..bdea69a 100644
--- a/packages/firebase_firestore/ios/Classes/FirestorePlugin.h
+++ b/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.h
@@ -4,5 +4,5 @@
 
 #import <Flutter/Flutter.h>
 
-@interface FirestorePlugin : NSObject<FlutterPlugin>
+@interface CloudFirestorePlugin : NSObject<FlutterPlugin>
 @end
diff --git a/packages/firebase_firestore/ios/Classes/FirestorePlugin.m b/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
similarity index 95%
rename from packages/firebase_firestore/ios/Classes/FirestorePlugin.m
rename to packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
index 0b97987..37f7e77 100644
--- a/packages/firebase_firestore/ios/Classes/FirestorePlugin.m
+++ b/packages/cloud_firestore/ios/Classes/CloudFirestorePlugin.m
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "FirestorePlugin.h"
+#import "CloudFirestorePlugin.h"
 
 #import <Firebase/Firebase.h>
 
@@ -24,20 +24,20 @@
   return query;
 }
 
-@interface FirestorePlugin ()
+@interface CloudFirestorePlugin ()
 @property(nonatomic, retain) FlutterMethodChannel *channel;
 @end
 
-@implementation FirestorePlugin {
+@implementation CloudFirestorePlugin {
   NSMutableDictionary<NSNumber *, id<FIRListenerRegistration>> *_listeners;
   int _nextListenerHandle;
 }
 
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
   FlutterMethodChannel *channel =
-      [FlutterMethodChannel methodChannelWithName:@"plugins.flutter.io/firebase_firestore"
+      [FlutterMethodChannel methodChannelWithName:@"plugins.flutter.io/cloud_firestore"
                                   binaryMessenger:[registrar messenger]];
-  FirestorePlugin *instance = [[FirestorePlugin alloc] init];
+  CloudFirestorePlugin *instance = [[CloudFirestorePlugin alloc] init];
   instance.channel = channel;
   [registrar addMethodCallDelegate:instance channel:channel];
 }
diff --git a/packages/firebase_firestore/ios/firebase_firestore.podspec b/packages/cloud_firestore/ios/cloud_firestore.podspec
similarity index 94%
rename from packages/firebase_firestore/ios/firebase_firestore.podspec
rename to packages/cloud_firestore/ios/cloud_firestore.podspec
index ee4a7ca..bfcfb23 100755
--- a/packages/firebase_firestore/ios/firebase_firestore.podspec
+++ b/packages/cloud_firestore/ios/cloud_firestore.podspec
@@ -2,7 +2,7 @@
 # To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html
 #
 Pod::Spec.new do |s|
-  s.name             = 'firebase_firestore'
+  s.name             = 'cloud_firestore'
   s.version          = '0.0.1'
   s.summary          = 'Firestore plugin for Flutter.'
   s.description      = <<-DESC
diff --git a/packages/firebase_firestore/lib/firebase_firestore.dart b/packages/cloud_firestore/lib/cloud_firestore.dart
similarity index 94%
rename from packages/firebase_firestore/lib/firebase_firestore.dart
rename to packages/cloud_firestore/lib/cloud_firestore.dart
index 8eb214c..82d76b4 100755
--- a/packages/firebase_firestore/lib/firebase_firestore.dart
+++ b/packages/cloud_firestore/lib/cloud_firestore.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.
 
-library firebase_firestore;
+library cloud_firestore;
 
 import 'dart:async';
 
diff --git a/packages/firebase_firestore/lib/src/collection_reference.dart b/packages/cloud_firestore/lib/src/collection_reference.dart
similarity index 98%
rename from packages/firebase_firestore/lib/src/collection_reference.dart
rename to packages/cloud_firestore/lib/src/collection_reference.dart
index 842d69c..64d4d1a 100644
--- a/packages/firebase_firestore/lib/src/collection_reference.dart
+++ b/packages/cloud_firestore/lib/src/collection_reference.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.
 
-part of firebase_firestore;
+part of cloud_firestore;
 
 /// A CollectionReference object can be used for adding documents, getting
 /// document references, and querying for documents (using the methods
diff --git a/packages/firebase_firestore/lib/src/document_change.dart b/packages/cloud_firestore/lib/src/document_change.dart
similarity index 98%
rename from packages/firebase_firestore/lib/src/document_change.dart
rename to packages/cloud_firestore/lib/src/document_change.dart
index 8a7f101..0b0e5e1 100644
--- a/packages/firebase_firestore/lib/src/document_change.dart
+++ b/packages/cloud_firestore/lib/src/document_change.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.
 
-part of firebase_firestore;
+part of cloud_firestore;
 
 /// An enumeration of document change types.
 enum DocumentChangeType {
diff --git a/packages/firebase_firestore/lib/src/document_reference.dart b/packages/cloud_firestore/lib/src/document_reference.dart
similarity index 98%
rename from packages/firebase_firestore/lib/src/document_reference.dart
rename to packages/cloud_firestore/lib/src/document_reference.dart
index 8190b3b..0a4bc92 100644
--- a/packages/firebase_firestore/lib/src/document_reference.dart
+++ b/packages/cloud_firestore/lib/src/document_reference.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.
 
-part of firebase_firestore;
+part of cloud_firestore;
 
 /// A [DocumentReference] refers to a document location in a Firestore database
 /// and can be used to write, read, or listen to the location.
diff --git a/packages/firebase_firestore/lib/src/document_snapshot.dart b/packages/cloud_firestore/lib/src/document_snapshot.dart
similarity index 96%
rename from packages/firebase_firestore/lib/src/document_snapshot.dart
rename to packages/cloud_firestore/lib/src/document_snapshot.dart
index a02ebf8..fc2f3b8 100644
--- a/packages/firebase_firestore/lib/src/document_snapshot.dart
+++ b/packages/cloud_firestore/lib/src/document_snapshot.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.
 
-part of firebase_firestore;
+part of cloud_firestore;
 
 /// A DocumentSnapshot contains data read from a document in your Firestore
 /// database.
diff --git a/packages/firebase_firestore/lib/src/firestore.dart b/packages/cloud_firestore/lib/src/firestore.dart
similarity index 95%
rename from packages/firebase_firestore/lib/src/firestore.dart
rename to packages/cloud_firestore/lib/src/firestore.dart
index d5c902e..b980029 100644
--- a/packages/firebase_firestore/lib/src/firestore.dart
+++ b/packages/cloud_firestore/lib/src/firestore.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.
 
-part of firebase_firestore;
+part of cloud_firestore;
 
 /// The entry point for accessing a Firestore.
 ///
@@ -10,7 +10,7 @@
 class Firestore {
   @visibleForTesting
   static const MethodChannel channel = const MethodChannel(
-    'plugins.flutter.io/firebase_firestore',
+    'plugins.flutter.io/cloud_firestore',
   );
 
   static final Map<int, StreamController<QuerySnapshot>> _queryObservers =
diff --git a/packages/firebase_firestore/lib/src/query.dart b/packages/cloud_firestore/lib/src/query.dart
similarity index 98%
rename from packages/firebase_firestore/lib/src/query.dart
rename to packages/cloud_firestore/lib/src/query.dart
index bb46596..58a15c3 100644
--- a/packages/firebase_firestore/lib/src/query.dart
+++ b/packages/cloud_firestore/lib/src/query.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.
 
-part of firebase_firestore;
+part of cloud_firestore;
 
 /// Represents a query over the data at a particular location.
 class Query {
diff --git a/packages/firebase_firestore/lib/src/query_snapshot.dart b/packages/cloud_firestore/lib/src/query_snapshot.dart
similarity index 97%
rename from packages/firebase_firestore/lib/src/query_snapshot.dart
rename to packages/cloud_firestore/lib/src/query_snapshot.dart
index 6f80abc..7617929 100644
--- a/packages/firebase_firestore/lib/src/query_snapshot.dart
+++ b/packages/cloud_firestore/lib/src/query_snapshot.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.
 
-part of firebase_firestore;
+part of cloud_firestore;
 
 /// A QuerySnapshot contains zero or more DocumentSnapshot objects.
 class QuerySnapshot {
diff --git a/packages/firebase_firestore/lib/src/utils/push_id_generator.dart b/packages/cloud_firestore/lib/src/utils/push_id_generator.dart
similarity index 100%
rename from packages/firebase_firestore/lib/src/utils/push_id_generator.dart
rename to packages/cloud_firestore/lib/src/utils/push_id_generator.dart
diff --git a/packages/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/pubspec.yaml
new file mode 100755
index 0000000..d47809d
--- /dev/null
+++ b/packages/cloud_firestore/pubspec.yaml
@@ -0,0 +1,22 @@
+name: cloud_firestore
+
+description: Cloud Firestore plugin for Flutter.
+author: Flutter Team <flutter-dev@googlegroups.com>
+homepage: https://github.com/flutter/plugins/tree/master/packages/cloud_firestore
+version: 0.0.3
+
+flutter:
+  plugin:
+    androidPackage: io.flutter.plugins.firebase.cloud_firestore
+    pluginClass: CloudFirestorePlugin
+
+dependencies:
+  flutter:
+    sdk: flutter
+  meta: "^1.0.5"
+
+dev_dependencies:
+  test: 0.12.24+8
+
+environment:
+    sdk: ">=1.8.0 <2.0.0-dev.infinity"
diff --git a/packages/firebase_firestore/test/firestore_test.dart b/packages/cloud_firestore/test/cloud_firestore_test.dart
similarity index 96%
rename from packages/firebase_firestore/test/firestore_test.dart
rename to packages/cloud_firestore/test/cloud_firestore_test.dart
index 29d46c8..02960a1 100755
--- a/packages/firebase_firestore/test/firestore_test.dart
+++ b/packages/cloud_firestore/test/cloud_firestore_test.dart
@@ -8,12 +8,12 @@
 
 import 'package:flutter/services.dart';
 
-import 'package:firebase_firestore/firebase_firestore.dart';
+import 'package:cloud_firestore/cloud_firestore.dart';
 
 void main() {
   group('$Firestore', () {
     const MethodChannel channel = const MethodChannel(
-      'plugins.flutter.io/firebase_firestore',
+      'plugins.flutter.io/cloud_firestore',
     );
 
     int mockHandleId = 0;
diff --git a/packages/firebase_firestore/android/settings.gradle b/packages/firebase_firestore/android/settings.gradle
deleted file mode 100755
index be1cf33..0000000
--- a/packages/firebase_firestore/android/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = 'firebase_firestore'
diff --git a/packages/firebase_firestore/pubspec.yaml b/packages/firebase_firestore/pubspec.yaml
deleted file mode 100755
index 616e510..0000000
--- a/packages/firebase_firestore/pubspec.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: firebase_firestore
-
-description: Firestore plugin for Flutter.
-author: Flutter Team <flutter-dev@googlegroups.com>
-homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_firestore
-version: 0.0.2
-
-flutter:
-  plugin:
-    androidPackage: io.flutter.plugins.firebase.firestore
-    pluginClass: FirestorePlugin
-
-dependencies:
-  flutter:
-    sdk: flutter
-  meta: "^1.0.5"
-
-dev_dependencies:
-  test: 0.12.24+8
-
-environment:
-    sdk: ">=1.8.0 <2.0.0-dev.infinity"