diff --git a/AUTHORS b/AUTHORS
index 35a541722b..223d9a985b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,5 @@
 # Below is a list of people and organizations that have contributed
-# to the Sky project. Names should be added to the list like so:
+# to the Flutter project. Names should be added to the list like so:
 #
 #   Name/Organization <email address>
 
diff --git a/bin/cache/engine.version b/bin/cache/engine.version
index ec3865d1f4..6731ade1b5 100644
--- a/bin/cache/engine.version
+++ b/bin/cache/engine.version
@@ -1 +1 @@
-94a4b96b40d1e85a4245cf8aafc385fe364c7347
+a299d69f6ca70f325d583eb678b91db24a155743
diff --git a/examples/hello_android/app/src/main/java/com/example/flutter/ExampleActivity.java b/examples/hello_android/app/src/main/java/com/example/flutter/ExampleActivity.java
index cc01d87751..99fe701fe3 100644
--- a/examples/hello_android/app/src/main/java/com/example/flutter/ExampleActivity.java
+++ b/examples/hello_android/app/src/main/java/com/example/flutter/ExampleActivity.java
@@ -18,8 +18,8 @@ import android.widget.TextView;
 
 import org.chromium.base.PathUtils;
 import org.domokit.activity.ActivityImpl;
-import org.domokit.sky.shell.SkyMain;
-import org.domokit.sky.shell.PlatformViewAndroid;
+import io.flutter.view.FlutterMain;
+import io.flutter.view.FlutterView;
 
 import java.io.File;
 import org.json.JSONException;
@@ -28,21 +28,21 @@ import org.json.JSONObject;
 public class ExampleActivity extends Activity {
     private static final String TAG = "ExampleActivity";
 
-    private PlatformViewAndroid flutterView;
+    private FlutterView flutterView;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        SkyMain.ensureInitialized(getApplicationContext(), null);
+        FlutterMain.ensureInitializationComplete(getApplicationContext(), null);
         setContentView(R.layout.flutter_layout);
 
-        flutterView = (PlatformViewAndroid) findViewById(R.id.flutter_view);
-        File appBundle = new File(PathUtils.getDataDirectory(this), SkyMain.APP_BUNDLE);
+        flutterView = (FlutterView) findViewById(R.id.flutter_view);
+        File appBundle = new File(PathUtils.getDataDirectory(this), FlutterMain.APP_BUNDLE);
         flutterView.runFromBundle(appBundle.getPath(), null);
 
         flutterView.addOnMessageListener("getLocation",
-            new PlatformViewAndroid.OnMessageListener() {
+            new FlutterView.OnMessageListener() {
                 @Override
                 public String onMessage(String message) {
                     return onGetLocation(message);
@@ -103,7 +103,7 @@ public class ExampleActivity extends Activity {
         }
 
         flutterView.sendToFlutter("getRandom", message.toString(),
-            new PlatformViewAndroid.MessageReplyCallback() {
+            new FlutterView.MessageReplyCallback() {
                 @Override
                 public void onReply(String json) {
                     onRandomReply(json);
diff --git a/examples/hello_android/app/src/main/res/layout/flutter_layout.xml b/examples/hello_android/app/src/main/res/layout/flutter_layout.xml
index dbdcf3fc33..da1a2eccd0 100644
--- a/examples/hello_android/app/src/main/res/layout/flutter_layout.xml
+++ b/examples/hello_android/app/src/main/res/layout/flutter_layout.xml
@@ -30,7 +30,7 @@
           />
   </LinearLayout>
 
-  <org.domokit.sky.shell.PlatformViewAndroid
+  <io.flutter.view.FlutterView
       android:id="@+id/flutter_view"
       android:layout_width="fill_parent"
       android:layout_height="fill_parent"
diff --git a/packages/flutter_tools/lib/src/android/android_device.dart b/packages/flutter_tools/lib/src/android/android_device.dart
index dd758ba9da..424fd3b4d5 100644
--- a/packages/flutter_tools/lib/src/android/android_device.dart
+++ b/packages/flutter_tools/lib/src/android/android_device.dart
@@ -570,7 +570,7 @@ class _AdbLogReader extends DeviceLogReader {
     if (lastTimestamp != null)
       args.addAll(<String>['-T', lastTimestamp]);
     args.addAll(<String>[
-      '-s', 'flutter:V', 'SkyMain:V', 'AndroidRuntime:W', 'ActivityManager:W', 'System.err:W', '*:F'
+      '-s', 'flutter:V', 'FlutterMain:V', 'FlutterView:V', 'AndroidRuntime:W', 'ActivityManager:W', 'System.err:W', '*:F'
     ]);
     _process = await runCommand(device.adbCommandForDevice(args));
     _stdoutSubscription =