diff --git a/shell/platform/android/BUILD.gn b/shell/platform/android/BUILD.gn
index 8264567d9cb9eafa771430defaab9540d24299b0..c061ff633a742ebc4f523619e96f2756f1e037cd 100644
--- a/shell/platform/android/BUILD.gn
+++ b/shell/platform/android/BUILD.gn
@@ -9,7 +9,7 @@ import("//build/config/android/rules.gni")
 shared_library("flutter_shell_native") {
   visibility = [ ":*" ]
 
-  output_name = "sky_shell"
+  output_name = "flutter"
 
   sources = [
     "android_context_gl.cc",
@@ -123,7 +123,7 @@ action("android") {
 
   inputs = [
     "$root_build_dir/flutter_java.jar",
-    "$root_build_dir/libsky_shell.so",
+    "$root_build_dir/libflutter.so",
     "$root_build_dir/flutter_shell_assets/icudtl.dat",
   ]
 
@@ -139,7 +139,7 @@ action("android") {
     "--asset_dir",
     rebase_path("flutter_shell_assets", root_build_dir, root_build_dir),
     "--native_lib",
-    rebase_path("libsky_shell.so", root_build_dir, root_build_dir),
+    rebase_path("libflutter.so", root_build_dir, root_build_dir),
     "--android_abi",
     "$android_app_abi",
   ]
diff --git a/shell/platform/android/io/flutter/util/PathUtils.java b/shell/platform/android/io/flutter/util/PathUtils.java
index 5d6707319c002f543b32a4265b62fa17dff7dd25..93ba68497c95a79147d98f14943f371eea88e673 100644
--- a/shell/platform/android/io/flutter/util/PathUtils.java
+++ b/shell/platform/android/io/flutter/util/PathUtils.java
@@ -10,7 +10,7 @@ import java.lang.String;
 
 public final class PathUtils {
     public static String getDataDirectory(Context applicationContext) {
-        return applicationContext.getDir("sky_shell", Context.MODE_PRIVATE).getPath();
+        return applicationContext.getDir("flutter", Context.MODE_PRIVATE).getPath();
     }
 
     public static String getCacheDirectory(Context applicationContext) {
diff --git a/shell/platform/android/io/flutter/view/FlutterMain.java b/shell/platform/android/io/flutter/view/FlutterMain.java
index b3b4315ea057b5129e69b88d947a1af9781059af..abe5794e8775ea7e751ad27541f9e8988e7ae1ae 100644
--- a/shell/platform/android/io/flutter/view/FlutterMain.java
+++ b/shell/platform/android/io/flutter/view/FlutterMain.java
@@ -57,7 +57,6 @@ public class FlutterMain {
     private static final String DEFAULT_FLX = "app.flx";
 
     private static final String MANIFEST = "flutter.yaml";
-    private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "sky_shell";
 
     private static final Set<String> SKY_RESOURCES = ImmutableSetBuilder.<String>newInstance()
         .add("icudtl.dat")
@@ -138,7 +137,7 @@ public class FlutterMain {
         long initStartTimestampMillis = SystemClock.uptimeMillis();
         initConfig(applicationContext);
         initResources(applicationContext);
-        System.loadLibrary("sky_shell");
+        System.loadLibrary("flutter");
         initAot(applicationContext);
 
         // We record the initialization time using SystemClock because at the start of the