diff --git a/android/sample/AndroidManifest.xml b/android/sample/AndroidManifest.xml
index afce9381e..f25295f7f 100644
--- a/android/sample/AndroidManifest.xml
+++ b/android/sample/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.facebook.sonar.sample">
+          package="com.facebook.flipper.sample">
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
   <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
@@ -12,7 +12,7 @@
       />
 
   <application
-      android:name=".SonarSampleApplication"
+      android:name=".FlipperSampleApplication"
       android:label="@string/app_name"
       android:icon="@drawable/ic_launcher"
       android:allowBackup="false"
diff --git a/android/sample/build.gradle b/android/sample/build.gradle
index 771e01fc8..93623e016 100644
--- a/android/sample/build.gradle
+++ b/android/sample/build.gradle
@@ -7,7 +7,7 @@ android {
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
-        applicationId 'com.facebook.sonar.sample'
+        applicationId 'com.facebook.flipper.sample'
     }
 
     lintOptions {
diff --git a/android/sample/src/main/java/com/facebook/sonar/sample/SonarSampleApplication.java b/android/sample/src/main/java/com/facebook/flipper/sample/FlipperSampleApplication.java
similarity index 94%
rename from android/sample/src/main/java/com/facebook/sonar/sample/SonarSampleApplication.java
rename to android/sample/src/main/java/com/facebook/flipper/sample/FlipperSampleApplication.java
index 1bdbbe38d..9fb96887f 100644
--- a/android/sample/src/main/java/com/facebook/sonar/sample/SonarSampleApplication.java
+++ b/android/sample/src/main/java/com/facebook/flipper/sample/FlipperSampleApplication.java
@@ -1,6 +1,6 @@
 // Copyright 2004-present Facebook. All Rights Reserved.
 
-package com.facebook.sonar.sample;
+package com.facebook.flipper.sample;
 
 import android.app.Application;
 import android.content.Context;
@@ -16,7 +16,7 @@ import com.facebook.sonar.plugins.sharedpreferences.SharedPreferencesSonarPlugin
 import java.util.concurrent.TimeUnit;
 import okhttp3.OkHttpClient;
 
-public class SonarSampleApplication extends Application {
+public class FlipperSampleApplication extends Application {
 
   public static OkHttpClient okhttpClient;
 
diff --git a/android/sample/src/main/java/com/facebook/sonar/sample/MainActivity.java b/android/sample/src/main/java/com/facebook/flipper/sample/MainActivity.java
similarity index 95%
rename from android/sample/src/main/java/com/facebook/sonar/sample/MainActivity.java
rename to android/sample/src/main/java/com/facebook/flipper/sample/MainActivity.java
index 3229b4c68..c4c0c2ea2 100644
--- a/android/sample/src/main/java/com/facebook/sonar/sample/MainActivity.java
+++ b/android/sample/src/main/java/com/facebook/flipper/sample/MainActivity.java
@@ -1,6 +1,6 @@
 // Copyright 2004-present Facebook. All Rights Reserved.
 
-package com.facebook.sonar.sample;
+package com.facebook.flipper.sample;
 
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
diff --git a/android/sample/src/main/java/com/facebook/sonar/sample/RootComponentSpec.java b/android/sample/src/main/java/com/facebook/flipper/sample/RootComponentSpec.java
similarity index 82%
rename from android/sample/src/main/java/com/facebook/sonar/sample/RootComponentSpec.java
rename to android/sample/src/main/java/com/facebook/flipper/sample/RootComponentSpec.java
index f3c8ec4a6..89448ce44 100644
--- a/android/sample/src/main/java/com/facebook/sonar/sample/RootComponentSpec.java
+++ b/android/sample/src/main/java/com/facebook/flipper/sample/RootComponentSpec.java
@@ -1,6 +1,6 @@
 // Copyright 2004-present Facebook. All Rights Reserved.
 
-package com.facebook.sonar.sample;
+package com.facebook.flipper.sample;
 
 import android.util.Log;
 import com.facebook.litho.ClickEvent;
@@ -52,19 +52,19 @@ public class RootComponentSpec {
             .url("https://api.github.com/repos/facebook/yoga")
             .get()
             .build();
-       SonarSampleApplication.okhttpClient.newCall(request).enqueue(new Callback() {
+       FlipperSampleApplication.okhttpClient.newCall(request).enqueue(new Callback() {
            @Override
            public void onFailure(Call call, IOException e) {
                e.printStackTrace();
-               Log.d("Sonar", e.getMessage());
+               Log.d("Flipper", e.getMessage());
            }
 
            @Override
            public void onResponse(Call call, Response response) throws IOException {
                if (response.isSuccessful()) {
-                   Log.d("Sonar", response.body().string());
+                   Log.d("Flipper", response.body().string());
                } else {
-               Log.d("Sonar", "not successful");
+               Log.d("Flipper", "not successful");
            }
        }
    });
@@ -74,7 +74,7 @@ public class RootComponentSpec {
   static void hitPostRequest(ComponentContext c) {
 
       RequestBody formBody = new FormBody.Builder()
-              .add("app", "Sonar")
+              .add("app", "Flipper")
               .add("remarks", "Its awesome")
               .build();
 
@@ -83,19 +83,19 @@ public class RootComponentSpec {
             .post(formBody)
             .build();
 
-       SonarSampleApplication.okhttpClient.newCall(request).enqueue(new Callback() {
+       FlipperSampleApplication.okhttpClient.newCall(request).enqueue(new Callback() {
            @Override
            public void onFailure(Call call, IOException e) {
                e.printStackTrace();
-               Log.d("Sonar", e.getMessage());
+               Log.d("Flipper", e.getMessage());
            }
 
            @Override
            public void onResponse(Call call, Response response) throws IOException {
                if (response.isSuccessful()) {
-                   Log.d("Sonar", response.body().string());
+                   Log.d("Flipper", response.body().string());
                } else {
-               Log.d("Sonar", "not successful");
+               Log.d("Flipper", "not successful");
                }
            }
    });
diff --git a/android/sample/src/main/res/values/strings.xml b/android/sample/src/main/res/values/strings.xml
index 16078fc00..df200616e 100644
--- a/android/sample/src/main/res/values/strings.xml
+++ b/android/sample/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
-  <string name="app_name">Sonar</string>
+  <string name="app_name">Flipper</string>
 </resources>
diff --git a/website/i18n/en.json b/website/i18n/en.json
index b9b57f99e..f5feea8a5 100644
--- a/website/i18n/en.json
+++ b/website/i18n/en.json
@@ -36,7 +36,7 @@
     "Understanding Flipper": "Understanding Flipper",
     "Docs": "Docs",
     "GitHub": "GitHub",
-    "Using Sonar": "Using Sonar",
+    "Using Flipper": "Using Flipper",
     "Built-in Plugins": "Built-in Plugins",
     "Plugins: Desktop part": "Plugins: Desktop part",
     "Plugins: Mobile part": "Plugins: Mobile part"