diff --git a/android/sample/AndroidManifest.xml b/android/sample/AndroidManifest.xml
index d053db33a..0a3c59a71 100644
--- a/android/sample/AndroidManifest.xml
+++ b/android/sample/AndroidManifest.xml
@@ -24,7 +24,7 @@
         <category android:name="android.intent.category.LAUNCHER"/>
       </intent-filter>
     </activity>
-    <activity android:name="com.facebook.sonar.android.diagnostics.SonarDiagnosticActivity"
+    <activity android:name="com.facebook.flipper.android.diagnostics.SonarDiagnosticActivity"
         android:exported="true"/>
   </application>
 
diff --git a/android/sample/src/main/java/com/facebook/flipper/sample/FlipperSampleApplication.java b/android/sample/src/main/java/com/facebook/flipper/sample/FlipperSampleApplication.java
index 05cee4d69..c610845d3 100644
--- a/android/sample/src/main/java/com/facebook/flipper/sample/FlipperSampleApplication.java
+++ b/android/sample/src/main/java/com/facebook/flipper/sample/FlipperSampleApplication.java
@@ -6,15 +6,15 @@ import android.app.Application;
 import android.content.Context;
 import com.facebook.litho.config.ComponentsConfiguration;
 import com.facebook.soloader.SoLoader;
-import com.facebook.sonar.android.AndroidSonarClient;
-import com.facebook.sonar.core.SonarClient;
-import com.facebook.sonar.plugins.inspector.DescriptorMapping;
-import com.facebook.sonar.plugins.inspector.InspectorSonarPlugin;
-import com.facebook.sonar.plugins.leakcanary.LeakCanarySonarPlugin;
-import com.facebook.sonar.plugins.litho.LithoSonarDescriptors;
-import com.facebook.sonar.plugins.network.NetworkSonarPlugin;
-import com.facebook.sonar.plugins.network.SonarOkhttpInterceptor;
-import com.facebook.sonar.plugins.sharedpreferences.SharedPreferencesSonarPlugin;
+import com.facebook.flipper.android.AndroidSonarClient;
+import com.facebook.flipper.core.SonarClient;
+import com.facebook.flipper.plugins.inspector.DescriptorMapping;
+import com.facebook.flipper.plugins.inspector.InspectorSonarPlugin;
+import com.facebook.flipper.plugins.leakcanary.LeakCanarySonarPlugin;
+import com.facebook.flipper.plugins.litho.LithoSonarDescriptors;
+import com.facebook.flipper.plugins.network.NetworkSonarPlugin;
+import com.facebook.flipper.plugins.network.SonarOkhttpInterceptor;
+import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesSonarPlugin;
 import java.util.concurrent.TimeUnit;
 import okhttp3.OkHttpClient;
 
diff --git a/android/sample/src/main/java/com/facebook/flipper/sample/RootComponentSpec.java b/android/sample/src/main/java/com/facebook/flipper/sample/RootComponentSpec.java
index 26996c756..633c5db13 100644
--- a/android/sample/src/main/java/com/facebook/flipper/sample/RootComponentSpec.java
+++ b/android/sample/src/main/java/com/facebook/flipper/sample/RootComponentSpec.java
@@ -12,7 +12,7 @@ import com.facebook.litho.annotations.LayoutSpec;
 import com.facebook.litho.annotations.OnCreateLayout;
 import com.facebook.litho.annotations.OnEvent;
 import com.facebook.litho.widget.Text;
-import com.facebook.sonar.android.diagnostics.SonarDiagnosticActivity;
+import com.facebook.flipper.android.diagnostics.SonarDiagnosticActivity;
 
 import java.io.IOException;
 import okhttp3.Call;
diff --git a/android/src/main/cpp/sonar.cpp b/android/src/main/cpp/sonar.cpp
index 27c05bc74..a28cb76f4 100644
--- a/android/src/main/cpp/sonar.cpp
+++ b/android/src/main/cpp/sonar.cpp
@@ -32,7 +32,7 @@ namespace {
 
 class JEventBase : public jni::HybridClass<JEventBase> {
  public:
-  constexpr static auto kJavaDescriptor = "Lcom/facebook/sonar/android/EventBase;";
+  constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/android/EventBase;";
 
   static void registerNatives() {
     registerHybrid({
@@ -64,7 +64,7 @@ class JEventBase : public jni::HybridClass<JEventBase> {
 
 class JFlipperObject : public jni::JavaClass<JFlipperObject> {
  public:
-  constexpr static auto kJavaDescriptor = "Lcom/facebook/sonar/core/SonarObject;";
+  constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/SonarObject;";
 
   static jni::local_ref<JFlipperObject> create(const folly::dynamic& json) {
     return newInstance(folly::toJson(json));
@@ -78,7 +78,7 @@ class JFlipperObject : public jni::JavaClass<JFlipperObject> {
 
 class JFlipperArray : public jni::JavaClass<JFlipperArray> {
  public:
-  constexpr static auto kJavaDescriptor = "Lcom/facebook/sonar/core/SonarArray;";
+  constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/SonarArray;";
 
   static jni::local_ref<JFlipperArray> create(const folly::dynamic& json) {
     return newInstance(folly::toJson(json));
@@ -92,12 +92,12 @@ class JFlipperArray : public jni::JavaClass<JFlipperArray> {
 
 class JFlipperResponder : public jni::JavaClass<JFlipperResponder> {
  public:
-  constexpr static auto kJavaDescriptor = "Lcom/facebook/sonar/core/FlipperResponder;";
+  constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/SonarResponder;";
 };
 
 class JFlipperResponderImpl : public jni::HybridClass<JFlipperResponderImpl, JFlipperResponder> {
  public:
-  constexpr static auto kJavaDescriptor = "Lcom/facebook/sonar/android/SonarResponderImpl;";
+  constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/android/SonarResponderImpl;";
 
   static void registerNatives() {
     registerHybrid({
@@ -128,7 +128,7 @@ class JFlipperResponderImpl : public jni::HybridClass<JFlipperResponderImpl, JFl
 
 class JFlipperReceiver : public jni::JavaClass<JFlipperReceiver> {
  public:
-  constexpr static auto kJavaDescriptor = "Lcom/facebook/sonar/core/SonarReceiver;";
+  constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/SonarReceiver;";
 
   void receive(const folly::dynamic params, std::shared_ptr<FlipperResponder> responder) const {
     static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFlipperObject::javaobject>, jni::alias_ref<JFlipperResponder::javaobject>)>("onReceive");
@@ -138,12 +138,12 @@ class JFlipperReceiver : public jni::JavaClass<JFlipperReceiver> {
 
 class JFlipperConnection : public jni::JavaClass<JFlipperConnection> {
  public:
-  constexpr static auto kJavaDescriptor = "Lcom/facebook/sonar/core/SonarConnection;";
+  constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/SonarConnection;";
 };
 
 class JFlipperConnectionImpl : public jni::HybridClass<JFlipperConnectionImpl, JFlipperConnection> {
  public:
-  constexpr static auto kJavaDescriptor = "Lcom/facebook/sonar/android/SonarConnectionImpl;";
+  constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/android/SonarConnectionImpl;";
 
   static void registerNatives() {
     registerHybrid({
@@ -182,7 +182,7 @@ class JFlipperConnectionImpl : public jni::HybridClass<JFlipperConnectionImpl, J
 
 class JFlipperPlugin : public jni::JavaClass<JFlipperPlugin> {
  public:
-  constexpr static auto kJavaDescriptor = "Lcom/facebook/sonar/core/SonarPlugin;";
+  constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/SonarPlugin;";
 
   std::string identifier() const {
     static const auto method = javaClassStatic()->getMethod<std::string()>("getId");
@@ -202,7 +202,7 @@ class JFlipperPlugin : public jni::JavaClass<JFlipperPlugin> {
 
 class JFlipperStateUpdateListener : public jni::JavaClass<JFlipperStateUpdateListener> {
  public:
-  constexpr static auto  kJavaDescriptor = "Lcom/facebook/sonar/core/SonarStateUpdateListener;";
+  constexpr static auto  kJavaDescriptor = "Lcom/facebook/flipper/core/SonarStateUpdateListener;";
 
   void onUpdate() {
     static const auto method = javaClassStatic()->getMethod<void()>("onUpdate");
@@ -252,7 +252,7 @@ class JFlipperPluginWrapper : public SonarPlugin {
 
 struct JStateSummary : public jni::JavaClass<JStateSummary> {
 public:
-  constexpr static auto kJavaDescriptor = "Lcom/facebook/sonar/core/StateSummary;";
+  constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/core/StateSummary;";
 
   static jni::local_ref<JStateSummary> create() {
     return newInstance();
@@ -267,7 +267,7 @@ public:
 
 class JFlipperClient : public jni::HybridClass<JFlipperClient> {
  public:
-  constexpr static auto kJavaDescriptor = "Lcom/facebook/sonar/android/SonarClientImpl;";
+  constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/android/SonarClientImpl;";
 
   static void registerNatives() {
     registerHybrid({
diff --git a/android/src/main/java/com/facebook/sonar/android/AndroidSonarClient.java b/android/src/main/java/com/facebook/sonar/android/AndroidSonarClient.java
index 838e46afb..865bad0a6 100644
--- a/android/src/main/java/com/facebook/sonar/android/AndroidSonarClient.java
+++ b/android/src/main/java/com/facebook/sonar/android/AndroidSonarClient.java
@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.android;
+package com.facebook.flipper.android;
 
 import android.content.Context;
 import android.content.pm.PackageManager;
@@ -14,7 +14,7 @@ import android.net.wifi.WifiManager;
 import android.os.Build;
 import android.support.v4.content.ContextCompat;
 import android.util.Log;
-import com.facebook.sonar.core.SonarClient;
+import com.facebook.flipper.core.SonarClient;
 
 public final class AndroidSonarClient {
   private static boolean sIsInitialized = false;
diff --git a/android/src/main/java/com/facebook/sonar/android/EventBase.java b/android/src/main/java/com/facebook/sonar/android/EventBase.java
index 0a3db024d..f7f91d731 100644
--- a/android/src/main/java/com/facebook/sonar/android/EventBase.java
+++ b/android/src/main/java/com/facebook/sonar/android/EventBase.java
@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.android;
+package com.facebook.flipper.android;
 
 import com.facebook.jni.HybridClassBase;
 import com.facebook.proguard.annotations.DoNotStrip;
diff --git a/android/src/main/java/com/facebook/sonar/android/SonarClientImpl.java b/android/src/main/java/com/facebook/sonar/android/SonarClientImpl.java
index a8706a967..99ee2aff7 100644
--- a/android/src/main/java/com/facebook/sonar/android/SonarClientImpl.java
+++ b/android/src/main/java/com/facebook/sonar/android/SonarClientImpl.java
@@ -5,16 +5,16 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.android;
+package com.facebook.flipper.android;
 
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.soloader.SoLoader;
 import com.facebook.flipper.BuildConfig;
-import com.facebook.sonar.core.SonarClient;
-import com.facebook.sonar.core.SonarPlugin;
-import com.facebook.sonar.core.SonarStateUpdateListener;
-import com.facebook.sonar.core.StateSummary;
+import com.facebook.flipper.core.SonarClient;
+import com.facebook.flipper.core.SonarPlugin;
+import com.facebook.flipper.core.SonarStateUpdateListener;
+import com.facebook.flipper.core.StateSummary;
 
 @DoNotStrip
 class SonarClientImpl implements SonarClient {
diff --git a/android/src/main/java/com/facebook/sonar/android/SonarConnectionImpl.java b/android/src/main/java/com/facebook/sonar/android/SonarConnectionImpl.java
index b1cbd7131..2a01e3e34 100644
--- a/android/src/main/java/com/facebook/sonar/android/SonarConnectionImpl.java
+++ b/android/src/main/java/com/facebook/sonar/android/SonarConnectionImpl.java
@@ -5,16 +5,16 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.android;
+package com.facebook.flipper.android;
 
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.soloader.SoLoader;
 import com.facebook.flipper.BuildConfig;
-import com.facebook.sonar.core.SonarArray;
-import com.facebook.sonar.core.SonarConnection;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.core.SonarReceiver;
+import com.facebook.flipper.core.SonarArray;
+import com.facebook.flipper.core.SonarConnection;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.core.SonarReceiver;
 
 @DoNotStrip
 class SonarConnectionImpl implements SonarConnection {
diff --git a/android/src/main/java/com/facebook/sonar/android/SonarResponderImpl.java b/android/src/main/java/com/facebook/sonar/android/SonarResponderImpl.java
index 3d9b893f2..e00fe9130 100644
--- a/android/src/main/java/com/facebook/sonar/android/SonarResponderImpl.java
+++ b/android/src/main/java/com/facebook/sonar/android/SonarResponderImpl.java
@@ -5,15 +5,15 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.android;
+package com.facebook.flipper.android;
 
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.soloader.SoLoader;
 import com.facebook.flipper.BuildConfig;
-import com.facebook.sonar.core.SonarArray;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.core.SonarResponder;
+import com.facebook.flipper.core.SonarArray;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.core.SonarResponder;
 
 @DoNotStrip
 class SonarResponderImpl implements SonarResponder {
diff --git a/android/src/main/java/com/facebook/sonar/android/SonarThread.java b/android/src/main/java/com/facebook/sonar/android/SonarThread.java
index f3edeeb22..31b7bfaa5 100644
--- a/android/src/main/java/com/facebook/sonar/android/SonarThread.java
+++ b/android/src/main/java/com/facebook/sonar/android/SonarThread.java
@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.android;
+package com.facebook.flipper.android;
 
 import android.os.Process;
 import javax.annotation.Nullable;
diff --git a/android/src/main/java/com/facebook/sonar/android/diagnostics/AndroidManifest.xml b/android/src/main/java/com/facebook/sonar/android/diagnostics/AndroidManifest.xml
index 892ddd0d1..7257f645c 100644
--- a/android/src/main/java/com/facebook/sonar/android/diagnostics/AndroidManifest.xml
+++ b/android/src/main/java/com/facebook/sonar/android/diagnostics/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application>
-        <activity android:name="com.facebook.sonar.android.diagnostics.SonarDiagnosticActivity"
+        <activity android:name="com.facebook.flipper.android.diagnostics.SonarDiagnosticActivity"
                  android:exported="true" />
     </application>
 </manifest>
diff --git a/android/src/main/java/com/facebook/sonar/android/diagnostics/SonarDiagnosticActivity.java b/android/src/main/java/com/facebook/sonar/android/diagnostics/SonarDiagnosticActivity.java
index 238bae11e..6983b7395 100644
--- a/android/src/main/java/com/facebook/sonar/android/diagnostics/SonarDiagnosticActivity.java
+++ b/android/src/main/java/com/facebook/sonar/android/diagnostics/SonarDiagnosticActivity.java
@@ -1,14 +1,14 @@
-package com.facebook.sonar.android.diagnostics;
+package com.facebook.flipper.android.diagnostics;
 
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
 import android.widget.Toast;
-import com.facebook.sonar.android.AndroidSonarClient;
-import com.facebook.sonar.core.SonarClient;
-import com.facebook.sonar.core.SonarStateUpdateListener;
-import com.facebook.sonar.core.StateSummary;
-import com.facebook.sonar.core.StateSummary.StateElement;
+import com.facebook.flipper.android.AndroidSonarClient;
+import com.facebook.flipper.core.SonarClient;
+import com.facebook.flipper.core.SonarStateUpdateListener;
+import com.facebook.flipper.core.StateSummary;
+import com.facebook.flipper.core.StateSummary.StateElement;
 import android.widget.LinearLayout;
 import android.view.View;
 import android.widget.TextView;
diff --git a/android/src/main/java/com/facebook/sonar/android/utils/SonarUtils.java b/android/src/main/java/com/facebook/sonar/android/utils/SonarUtils.java
index 2027f15c9..5dd634ca1 100644
--- a/android/src/main/java/com/facebook/sonar/android/utils/SonarUtils.java
+++ b/android/src/main/java/com/facebook/sonar/android/utils/SonarUtils.java
@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.android.utils;
+package com.facebook.flipper.android.utils;
 
 import android.app.ActivityManager;
 import android.content.Context;
diff --git a/android/src/main/java/com/facebook/sonar/core/ErrorReportingRunnable.java b/android/src/main/java/com/facebook/sonar/core/ErrorReportingRunnable.java
index 0fc3e246a..722a96f77 100644
--- a/android/src/main/java/com/facebook/sonar/core/ErrorReportingRunnable.java
+++ b/android/src/main/java/com/facebook/sonar/core/ErrorReportingRunnable.java
@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.core;
+package com.facebook.flipper.core;
 
 public abstract class ErrorReportingRunnable implements Runnable {
 
diff --git a/android/src/main/java/com/facebook/sonar/core/SonarArray.java b/android/src/main/java/com/facebook/sonar/core/SonarArray.java
index 12b0973a2..b5324b9aa 100644
--- a/android/src/main/java/com/facebook/sonar/core/SonarArray.java
+++ b/android/src/main/java/com/facebook/sonar/core/SonarArray.java
@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.core;
+package com.facebook.flipper.core;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/android/src/main/java/com/facebook/sonar/core/SonarClient.java b/android/src/main/java/com/facebook/sonar/core/SonarClient.java
index 583335d6d..f6a42e251 100644
--- a/android/src/main/java/com/facebook/sonar/core/SonarClient.java
+++ b/android/src/main/java/com/facebook/sonar/core/SonarClient.java
@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.core;
+package com.facebook.flipper.core;
 
 public interface SonarClient {
   void addPlugin(SonarPlugin plugin);
diff --git a/android/src/main/java/com/facebook/sonar/core/SonarConnection.java b/android/src/main/java/com/facebook/sonar/core/SonarConnection.java
index bd9ce9dd8..207c3a58e 100644
--- a/android/src/main/java/com/facebook/sonar/core/SonarConnection.java
+++ b/android/src/main/java/com/facebook/sonar/core/SonarConnection.java
@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.core;
+package com.facebook.flipper.core;
 
 /**
  * A connection between a SonarPlugin and the desktop Sonar application. Register request handlers
diff --git a/android/src/main/java/com/facebook/sonar/core/SonarDynamic.java b/android/src/main/java/com/facebook/sonar/core/SonarDynamic.java
index ffda260ee..f1b4ea1d6 100644
--- a/android/src/main/java/com/facebook/sonar/core/SonarDynamic.java
+++ b/android/src/main/java/com/facebook/sonar/core/SonarDynamic.java
@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.core;
+package com.facebook.flipper.core;
 
 import javax.annotation.Nullable;
 import org.json.JSONArray;
diff --git a/android/src/main/java/com/facebook/sonar/core/SonarObject.java b/android/src/main/java/com/facebook/sonar/core/SonarObject.java
index 4c0081735..247cda68d 100644
--- a/android/src/main/java/com/facebook/sonar/core/SonarObject.java
+++ b/android/src/main/java/com/facebook/sonar/core/SonarObject.java
@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.core;
+package com.facebook.flipper.core;
 
 import java.util.Arrays;
 import org.json.JSONArray;
diff --git a/android/src/main/java/com/facebook/sonar/core/SonarPlugin.java b/android/src/main/java/com/facebook/sonar/core/SonarPlugin.java
index f524f2037..dab42a9b2 100644
--- a/android/src/main/java/com/facebook/sonar/core/SonarPlugin.java
+++ b/android/src/main/java/com/facebook/sonar/core/SonarPlugin.java
@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.core;
+package com.facebook.flipper.core;
 
 /**
  * A SonarPlugin is an object which exposes an API to the Desktop Sonar application. When a
diff --git a/android/src/main/java/com/facebook/sonar/core/SonarReceiver.java b/android/src/main/java/com/facebook/sonar/core/SonarReceiver.java
index 08d1c7384..a06195cde 100644
--- a/android/src/main/java/com/facebook/sonar/core/SonarReceiver.java
+++ b/android/src/main/java/com/facebook/sonar/core/SonarReceiver.java
@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.core;
+package com.facebook.flipper.core;
 
 /**
  * A receiver of a remote method call issued by the Sonar desktop application. If the given
diff --git a/android/src/main/java/com/facebook/sonar/core/SonarResponder.java b/android/src/main/java/com/facebook/sonar/core/SonarResponder.java
index 185763ea8..939d6f9b0 100644
--- a/android/src/main/java/com/facebook/sonar/core/SonarResponder.java
+++ b/android/src/main/java/com/facebook/sonar/core/SonarResponder.java
@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.core;
+package com.facebook.flipper.core;
 
 /**
  * FlipperResponder is used to asyncronously response to a messaged recieved from the Sonar desktop
diff --git a/android/src/main/java/com/facebook/sonar/core/SonarStateUpdateListener.java b/android/src/main/java/com/facebook/sonar/core/SonarStateUpdateListener.java
index 3673266a7..e7e42e79b 100644
--- a/android/src/main/java/com/facebook/sonar/core/SonarStateUpdateListener.java
+++ b/android/src/main/java/com/facebook/sonar/core/SonarStateUpdateListener.java
@@ -1,11 +1,11 @@
-package com.facebook.sonar.core;
+package com.facebook.flipper.core;
 
 public interface SonarStateUpdateListener {
 
   /**
    * Called when the state of the sonar client changes.
-   * Typical implementations will subscribe by calling {@link com.facebook.sonar.core.SonarClient#subscribeForUpdates()}, to start receiving update events.
-   * Calling {@link com.facebook.sonar.core.SonarClient#getState()} will retrieve the updated state.
+   * Typical implementations will subscribe by calling {@link com.facebook.flipper.core.SonarClient#subscribeForUpdates()}, to start receiving update events.
+   * Calling {@link com.facebook.flipper.core.SonarClient#getState()} will retrieve the updated state.
    */
   void onUpdate();
 
diff --git a/android/src/main/java/com/facebook/sonar/core/SonarValue.java b/android/src/main/java/com/facebook/sonar/core/SonarValue.java
index 07126d00b..54977ef3b 100644
--- a/android/src/main/java/com/facebook/sonar/core/SonarValue.java
+++ b/android/src/main/java/com/facebook/sonar/core/SonarValue.java
@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.core;
+package com.facebook.flipper.core;
 
 public interface SonarValue {
   SonarObject toSonarObject();
diff --git a/android/src/main/java/com/facebook/sonar/core/StateElement.java b/android/src/main/java/com/facebook/sonar/core/StateElement.java
index 0dc7af096..1de72feea 100644
--- a/android/src/main/java/com/facebook/sonar/core/StateElement.java
+++ b/android/src/main/java/com/facebook/sonar/core/StateElement.java
@@ -1,4 +1,4 @@
-package com.facebook.sonar.core;
+package com.facebook.flipper.core;
 
 public class StateElement {
     private final String mName;
diff --git a/android/src/main/java/com/facebook/sonar/core/StateSummary.java b/android/src/main/java/com/facebook/sonar/core/StateSummary.java
index c036ee995..434c21d41 100644
--- a/android/src/main/java/com/facebook/sonar/core/StateSummary.java
+++ b/android/src/main/java/com/facebook/sonar/core/StateSummary.java
@@ -1,4 +1,4 @@
-package com.facebook.sonar.core;
+package com.facebook.flipper.core;
 
 import java.util.List;
 import java.util.ArrayList;
diff --git a/android/src/main/java/com/facebook/sonar/plugins/common/BufferingSonarPlugin.java b/android/src/main/java/com/facebook/sonar/plugins/common/BufferingSonarPlugin.java
index 48b3ea36e..3ce5cf59f 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/common/BufferingSonarPlugin.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/common/BufferingSonarPlugin.java
@@ -5,11 +5,11 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.common;
+package com.facebook.flipper.plugins.common;
 
-import com.facebook.sonar.core.SonarConnection;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.core.SonarPlugin;
+import com.facebook.flipper.core.SonarConnection;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.core.SonarPlugin;
 import javax.annotation.Nullable;
 
 /**
diff --git a/android/src/main/java/com/facebook/sonar/plugins/common/MainThreadSonarReceiver.java b/android/src/main/java/com/facebook/sonar/plugins/common/MainThreadSonarReceiver.java
index d793af421..63cc9a188 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/common/MainThreadSonarReceiver.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/common/MainThreadSonarReceiver.java
@@ -5,15 +5,15 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.common;
+package com.facebook.flipper.plugins.common;
 
 import android.os.Handler;
 import android.os.Looper;
-import com.facebook.sonar.core.ErrorReportingRunnable;
-import com.facebook.sonar.core.SonarConnection;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.core.SonarReceiver;
-import com.facebook.sonar.core.SonarResponder;
+import com.facebook.flipper.core.ErrorReportingRunnable;
+import com.facebook.flipper.core.SonarConnection;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.core.SonarReceiver;
+import com.facebook.flipper.core.SonarResponder;
 
 public abstract class MainThreadSonarReceiver implements SonarReceiver {
 
diff --git a/android/src/main/java/com/facebook/sonar/plugins/common/RingBuffer.java b/android/src/main/java/com/facebook/sonar/plugins/common/RingBuffer.java
index feb4470c1..910105498 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/common/RingBuffer.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/common/RingBuffer.java
@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.common;
+package com.facebook.flipper.plugins.common;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/android/src/main/java/com/facebook/sonar/plugins/console/ConsoleSonarPlugin.java b/android/src/main/java/com/facebook/sonar/plugins/console/ConsoleSonarPlugin.java
index 53b818799..145bfcc36 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/console/ConsoleSonarPlugin.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/console/ConsoleSonarPlugin.java
@@ -5,11 +5,11 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.console;
+package com.facebook.flipper.plugins.console;
 
-import com.facebook.sonar.core.SonarConnection;
-import com.facebook.sonar.core.SonarPlugin;
-import com.facebook.sonar.plugins.console.iface.ConsoleCommandReceiver;
+import com.facebook.flipper.core.SonarConnection;
+import com.facebook.flipper.core.SonarPlugin;
+import com.facebook.flipper.plugins.console.iface.ConsoleCommandReceiver;
 
 public class ConsoleSonarPlugin implements SonarPlugin {
 
diff --git a/android/src/main/java/com/facebook/sonar/plugins/console/JavascriptEnvironment.java b/android/src/main/java/com/facebook/sonar/plugins/console/JavascriptEnvironment.java
index 7aa0177c9..c9f4f586a 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/console/JavascriptEnvironment.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/console/JavascriptEnvironment.java
@@ -5,9 +5,9 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.console;
+package com.facebook.flipper.plugins.console;
 
-import com.facebook.sonar.plugins.console.iface.ScriptingEnvironment;
+import com.facebook.flipper.plugins.console.iface.ScriptingEnvironment;
 import java.util.HashMap;
 import java.util.Map;
 import org.mozilla.javascript.Context;
diff --git a/android/src/main/java/com/facebook/sonar/plugins/console/JavascriptSession.java b/android/src/main/java/com/facebook/sonar/plugins/console/JavascriptSession.java
index d5a46372e..be6d5f46c 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/console/JavascriptSession.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/console/JavascriptSession.java
@@ -5,9 +5,9 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.console;
+package com.facebook.flipper.plugins.console;
 
-import com.facebook.sonar.plugins.console.iface.ScriptingSession;
+import com.facebook.flipper.plugins.console.iface.ScriptingSession;
 import java.io.Closeable;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/android/src/main/java/com/facebook/sonar/plugins/console/iface/ConsoleCommandReceiver.java b/android/src/main/java/com/facebook/sonar/plugins/console/iface/ConsoleCommandReceiver.java
index 1d28d81b6..24458a507 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/console/iface/ConsoleCommandReceiver.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/console/iface/ConsoleCommandReceiver.java
@@ -5,14 +5,14 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.console.iface;
+package com.facebook.flipper.plugins.console.iface;
 
 import android.support.annotation.Nullable;
-import com.facebook.sonar.core.SonarConnection;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.core.SonarReceiver;
-import com.facebook.sonar.core.SonarResponder;
-import com.facebook.sonar.plugins.common.MainThreadSonarReceiver;
+import com.facebook.flipper.core.SonarConnection;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.core.SonarReceiver;
+import com.facebook.flipper.core.SonarResponder;
+import com.facebook.flipper.plugins.common.MainThreadSonarReceiver;
 import org.json.JSONObject;
 
 /**
diff --git a/android/src/main/java/com/facebook/sonar/plugins/console/iface/NullScriptingEnvironment.java b/android/src/main/java/com/facebook/sonar/plugins/console/iface/NullScriptingEnvironment.java
index 940893e22..8eeff1dae 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/console/iface/NullScriptingEnvironment.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/console/iface/NullScriptingEnvironment.java
@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.console.iface;
+package com.facebook.flipper.plugins.console.iface;
 
 import org.json.JSONException;
 import org.json.JSONObject;
diff --git a/android/src/main/java/com/facebook/sonar/plugins/console/iface/ScriptingEnvironment.java b/android/src/main/java/com/facebook/sonar/plugins/console/iface/ScriptingEnvironment.java
index 3f5c8c17f..55fdf4c83 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/console/iface/ScriptingEnvironment.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/console/iface/ScriptingEnvironment.java
@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.console.iface;
+package com.facebook.flipper.plugins.console.iface;
 
 public interface ScriptingEnvironment {
 
diff --git a/android/src/main/java/com/facebook/sonar/plugins/console/iface/ScriptingSession.java b/android/src/main/java/com/facebook/sonar/plugins/console/iface/ScriptingSession.java
index 89b37d165..1e526719b 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/console/iface/ScriptingSession.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/console/iface/ScriptingSession.java
@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.console.iface;
+package com.facebook.flipper.plugins.console.iface;
 
 import org.json.JSONException;
 import org.json.JSONObject;
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/ApplicationWrapper.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/ApplicationWrapper.java
index c3137d736..2d63d2bf3 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/ApplicationWrapper.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/ApplicationWrapper.java
@@ -6,7 +6,7 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector;
+package com.facebook.flipper.plugins.inspector;
 
 import android.app.Activity;
 import android.app.Application;
@@ -14,8 +14,8 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.view.View;
-import com.facebook.sonar.plugins.inspector.descriptors.utils.AndroidRootResolver;
-import com.facebook.sonar.plugins.inspector.descriptors.utils.AndroidRootResolver.Root;
+import com.facebook.flipper.plugins.inspector.descriptors.utils.AndroidRootResolver;
+import com.facebook.flipper.plugins.inspector.descriptors.utils.AndroidRootResolver.Root;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/BoundsDrawable.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/BoundsDrawable.java
index 01c2ebd8b..85c3b2da9 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/BoundsDrawable.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/BoundsDrawable.java
@@ -6,7 +6,7 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector;
+package com.facebook.flipper.plugins.inspector;
 
 import android.graphics.Canvas;
 import android.graphics.Color;
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/DescriptorMapping.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/DescriptorMapping.java
index cdf906570..12dca2999 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/DescriptorMapping.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/DescriptorMapping.java
@@ -6,7 +6,7 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector;
+package com.facebook.flipper.plugins.inspector;
 
 import android.app.Activity;
 import android.app.Dialog;
@@ -15,20 +15,20 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.widget.TextView;
-import com.facebook.sonar.core.SonarConnection;
-import com.facebook.sonar.plugins.inspector.descriptors.ActivityDescriptor;
-import com.facebook.sonar.plugins.inspector.descriptors.ApplicationDescriptor;
-import com.facebook.sonar.plugins.inspector.descriptors.DialogDescriptor;
-import com.facebook.sonar.plugins.inspector.descriptors.DialogFragmentDescriptor;
-import com.facebook.sonar.plugins.inspector.descriptors.DrawableDescriptor;
-import com.facebook.sonar.plugins.inspector.descriptors.FragmentDescriptor;
-import com.facebook.sonar.plugins.inspector.descriptors.ObjectDescriptor;
-import com.facebook.sonar.plugins.inspector.descriptors.SupportDialogFragmentDescriptor;
-import com.facebook.sonar.plugins.inspector.descriptors.SupportFragmentDescriptor;
-import com.facebook.sonar.plugins.inspector.descriptors.TextViewDescriptor;
-import com.facebook.sonar.plugins.inspector.descriptors.ViewDescriptor;
-import com.facebook.sonar.plugins.inspector.descriptors.ViewGroupDescriptor;
-import com.facebook.sonar.plugins.inspector.descriptors.WindowDescriptor;
+import com.facebook.flipper.core.SonarConnection;
+import com.facebook.flipper.plugins.inspector.descriptors.ActivityDescriptor;
+import com.facebook.flipper.plugins.inspector.descriptors.ApplicationDescriptor;
+import com.facebook.flipper.plugins.inspector.descriptors.DialogDescriptor;
+import com.facebook.flipper.plugins.inspector.descriptors.DialogFragmentDescriptor;
+import com.facebook.flipper.plugins.inspector.descriptors.DrawableDescriptor;
+import com.facebook.flipper.plugins.inspector.descriptors.FragmentDescriptor;
+import com.facebook.flipper.plugins.inspector.descriptors.ObjectDescriptor;
+import com.facebook.flipper.plugins.inspector.descriptors.SupportDialogFragmentDescriptor;
+import com.facebook.flipper.plugins.inspector.descriptors.SupportFragmentDescriptor;
+import com.facebook.flipper.plugins.inspector.descriptors.TextViewDescriptor;
+import com.facebook.flipper.plugins.inspector.descriptors.ViewDescriptor;
+import com.facebook.flipper.plugins.inspector.descriptors.ViewGroupDescriptor;
+import com.facebook.flipper.plugins.inspector.descriptors.WindowDescriptor;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/HiddenNode.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/HiddenNode.java
index 5e54f5bd9..a49ea5aaa 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/HiddenNode.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/HiddenNode.java
@@ -6,7 +6,7 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector;
+package com.facebook.flipper.plugins.inspector;
 
 /** Marker interface to identify nodes which should not be traversed. */
 public interface HiddenNode {}
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/HighlightedOverlay.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/HighlightedOverlay.java
index ab46136b4..a30294f55 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/HighlightedOverlay.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/HighlightedOverlay.java
@@ -6,7 +6,7 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector;
+package com.facebook.flipper.plugins.inspector;
 
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/InspectorSonarPlugin.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/InspectorSonarPlugin.java
index 29550171a..fe029ec30 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/InspectorSonarPlugin.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/InspectorSonarPlugin.java
@@ -6,7 +6,7 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector;
+package com.facebook.flipper.plugins.inspector;
 
 import android.app.Application;
 import android.content.Context;
@@ -15,20 +15,20 @@ import android.view.accessibility.AccessibilityEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
-import com.facebook.sonar.core.ErrorReportingRunnable;
-import com.facebook.sonar.core.SonarArray;
-import com.facebook.sonar.core.SonarConnection;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.core.SonarPlugin;
-import com.facebook.sonar.core.SonarReceiver;
-import com.facebook.sonar.core.SonarResponder;
-import com.facebook.sonar.plugins.common.MainThreadSonarReceiver;
-import com.facebook.sonar.plugins.console.iface.ConsoleCommandReceiver;
-import com.facebook.sonar.plugins.console.iface.NullScriptingEnvironment;
-import com.facebook.sonar.plugins.console.iface.ScriptingEnvironment;
-import com.facebook.sonar.plugins.inspector.descriptors.ApplicationDescriptor;
-import com.facebook.sonar.plugins.inspector.descriptors.utils.AccessibilityUtil;
+import com.facebook.flipper.core.ErrorReportingRunnable;
+import com.facebook.flipper.core.SonarArray;
+import com.facebook.flipper.core.SonarConnection;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.core.SonarPlugin;
+import com.facebook.flipper.core.SonarReceiver;
+import com.facebook.flipper.core.SonarResponder;
+import com.facebook.flipper.plugins.common.MainThreadSonarReceiver;
+import com.facebook.flipper.plugins.console.iface.ConsoleCommandReceiver;
+import com.facebook.flipper.plugins.console.iface.NullScriptingEnvironment;
+import com.facebook.flipper.plugins.console.iface.ScriptingEnvironment;
+import com.facebook.flipper.plugins.inspector.descriptors.ApplicationDescriptor;
+import com.facebook.flipper.plugins.inspector.descriptors.utils.AccessibilityUtil;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/InspectorValue.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/InspectorValue.java
index 15a937c36..8e61f3c69 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/InspectorValue.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/InspectorValue.java
@@ -6,10 +6,10 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector;
+package com.facebook.flipper.plugins.inspector;
 
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.core.SonarValue;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.core.SonarValue;
 
 public class InspectorValue<T> implements SonarValue {
 
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/LinesDrawable.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/LinesDrawable.java
index 3b3b5f205..2f5057c45 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/LinesDrawable.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/LinesDrawable.java
@@ -6,7 +6,7 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector;
+package com.facebook.flipper.plugins.inspector;
 
 import android.graphics.Canvas;
 import android.graphics.Color;
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/Named.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/Named.java
index c0cda4395..cc95a118a 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/Named.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/Named.java
@@ -6,7 +6,7 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector;
+package com.facebook.flipper.plugins.inspector;
 
 public class Named<ValueType> {
   private final String mName;
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/NodeDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/NodeDescriptor.java
index 4100df952..499aab867 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/NodeDescriptor.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/NodeDescriptor.java
@@ -6,12 +6,12 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector;
+package com.facebook.flipper.plugins.inspector;
 
-import com.facebook.sonar.core.SonarArray;
-import com.facebook.sonar.core.SonarConnection;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
+import com.facebook.flipper.core.SonarArray;
+import com.facebook.flipper.core.SonarConnection;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
 import java.util.Collections;
 import java.util.List;
 import javax.annotation.Nullable;
@@ -88,7 +88,7 @@ public abstract class NodeDescriptor<T> {
   }
 
   protected abstract class ErrorReportingRunnable
-      extends com.facebook.sonar.core.ErrorReportingRunnable {
+      extends com.facebook.flipper.core.ErrorReportingRunnable {
     public ErrorReportingRunnable() {
       super(mConnection);
     }
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/ObjectTracker.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/ObjectTracker.java
index 4f6b79ac0..fa7e1c149 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/ObjectTracker.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/ObjectTracker.java
@@ -6,7 +6,7 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector;
+package com.facebook.flipper.plugins.inspector;
 
 import java.lang.ref.WeakReference;
 import java.util.HashMap;
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/SearchResultNode.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/SearchResultNode.java
index 28829cf21..281d549b8 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/SearchResultNode.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/SearchResultNode.java
@@ -6,11 +6,11 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector;
+package com.facebook.flipper.plugins.inspector;
 
 import android.support.annotation.Nullable;
-import com.facebook.sonar.core.SonarArray;
-import com.facebook.sonar.core.SonarObject;
+import com.facebook.flipper.core.SonarArray;
+import com.facebook.flipper.core.SonarObject;
 import java.util.List;
 
 public class SearchResultNode {
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/SelfRegisteringNodeDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/SelfRegisteringNodeDescriptor.java
index 7095cad6a..d2e7408cd 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/SelfRegisteringNodeDescriptor.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/SelfRegisteringNodeDescriptor.java
@@ -6,7 +6,7 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector;
+package com.facebook.flipper.plugins.inspector;
 
 public abstract class SelfRegisteringNodeDescriptor<T> extends NodeDescriptor<T> {
 
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/Touch.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/Touch.java
index 9d44bad99..77e70d362 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/Touch.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/Touch.java
@@ -6,7 +6,7 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector;
+package com.facebook.flipper.plugins.inspector;
 
 /**
  * Used to collect the path from the root node to the node at point [x, y]. This is used for
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ActivityDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ActivityDescriptor.java
index bfb19c243..5da49df93 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ActivityDescriptor.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ActivityDescriptor.java
@@ -6,15 +6,15 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors;
+package com.facebook.flipper.plugins.inspector.descriptors;
 
 import android.app.Activity;
 import android.view.Window;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.inspector.Named;
-import com.facebook.sonar.plugins.inspector.NodeDescriptor;
-import com.facebook.sonar.plugins.inspector.Touch;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.inspector.Named;
+import com.facebook.flipper.plugins.inspector.NodeDescriptor;
+import com.facebook.flipper.plugins.inspector.Touch;
 import com.facebook.stetho.common.android.FragmentActivityAccessor;
 import com.facebook.stetho.common.android.FragmentCompat;
 import com.facebook.stetho.common.android.FragmentManagerAccessor;
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ApplicationDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ApplicationDescriptor.java
index b07bc4ba7..b531c0a3b 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ApplicationDescriptor.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ApplicationDescriptor.java
@@ -6,19 +6,19 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors;
+package com.facebook.flipper.plugins.inspector.descriptors;
 
 import android.app.Activity;
 import android.support.v4.view.ViewCompat;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityEvent;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.inspector.ApplicationWrapper;
-import com.facebook.sonar.plugins.inspector.Named;
-import com.facebook.sonar.plugins.inspector.NodeDescriptor;
-import com.facebook.sonar.plugins.inspector.Touch;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.inspector.ApplicationWrapper;
+import com.facebook.flipper.plugins.inspector.Named;
+import com.facebook.flipper.plugins.inspector.NodeDescriptor;
+import com.facebook.flipper.plugins.inspector.Touch;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/DialogDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/DialogDescriptor.java
index d79aefb11..c9428d0d6 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/DialogDescriptor.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/DialogDescriptor.java
@@ -6,15 +6,15 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors;
+package com.facebook.flipper.plugins.inspector.descriptors;
 
 import android.app.Dialog;
 import android.view.Window;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.inspector.Named;
-import com.facebook.sonar.plugins.inspector.NodeDescriptor;
-import com.facebook.sonar.plugins.inspector.Touch;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.inspector.Named;
+import com.facebook.flipper.plugins.inspector.NodeDescriptor;
+import com.facebook.flipper.plugins.inspector.Touch;
 import java.util.Collections;
 import java.util.List;
 import javax.annotation.Nullable;
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/DialogFragmentDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/DialogFragmentDescriptor.java
index 6cd9ae942..cafa02826 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/DialogFragmentDescriptor.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/DialogFragmentDescriptor.java
@@ -6,16 +6,16 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors;
+package com.facebook.flipper.plugins.inspector.descriptors;
 
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.app.Fragment;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.inspector.Named;
-import com.facebook.sonar.plugins.inspector.NodeDescriptor;
-import com.facebook.sonar.plugins.inspector.Touch;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.inspector.Named;
+import com.facebook.flipper.plugins.inspector.NodeDescriptor;
+import com.facebook.flipper.plugins.inspector.Touch;
 import java.util.List;
 import javax.annotation.Nullable;
 
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/DrawableDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/DrawableDescriptor.java
index e7c8b97f4..956b879e8 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/DrawableDescriptor.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/DrawableDescriptor.java
@@ -6,19 +6,19 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors;
+package com.facebook.flipper.plugins.inspector.descriptors;
 
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.view.View;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.inspector.HighlightedOverlay;
-import com.facebook.sonar.plugins.inspector.InspectorValue;
-import com.facebook.sonar.plugins.inspector.Named;
-import com.facebook.sonar.plugins.inspector.NodeDescriptor;
-import com.facebook.sonar.plugins.inspector.Touch;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.inspector.HighlightedOverlay;
+import com.facebook.flipper.plugins.inspector.InspectorValue;
+import com.facebook.flipper.plugins.inspector.Named;
+import com.facebook.flipper.plugins.inspector.NodeDescriptor;
+import com.facebook.flipper.plugins.inspector.Touch;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/FragmentDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/FragmentDescriptor.java
index 397b34286..dac189b17 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/FragmentDescriptor.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/FragmentDescriptor.java
@@ -6,16 +6,16 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors;
+package com.facebook.flipper.plugins.inspector.descriptors;
 
 import android.app.Fragment;
 import android.os.Bundle;
 import android.view.View;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.inspector.Named;
-import com.facebook.sonar.plugins.inspector.NodeDescriptor;
-import com.facebook.sonar.plugins.inspector.Touch;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.inspector.Named;
+import com.facebook.flipper.plugins.inspector.NodeDescriptor;
+import com.facebook.flipper.plugins.inspector.Touch;
 import com.facebook.stetho.common.android.ResourcesUtil;
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ObjectDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ObjectDescriptor.java
index b822fbdd7..5a667f4a2 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ObjectDescriptor.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ObjectDescriptor.java
@@ -6,13 +6,13 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors;
+package com.facebook.flipper.plugins.inspector.descriptors;
 
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.inspector.Named;
-import com.facebook.sonar.plugins.inspector.NodeDescriptor;
-import com.facebook.sonar.plugins.inspector.Touch;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.inspector.Named;
+import com.facebook.flipper.plugins.inspector.NodeDescriptor;
+import com.facebook.flipper.plugins.inspector.Touch;
 import java.util.Collections;
 import java.util.List;
 import javax.annotation.Nullable;
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/SupportDialogFragmentDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/SupportDialogFragmentDescriptor.java
index 184ecbff0..7d440d0e5 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/SupportDialogFragmentDescriptor.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/SupportDialogFragmentDescriptor.java
@@ -6,16 +6,16 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors;
+package com.facebook.flipper.plugins.inspector.descriptors;
 
 import android.app.Dialog;
 import android.support.v4.app.DialogFragment;
 import android.support.v4.app.Fragment;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.inspector.Named;
-import com.facebook.sonar.plugins.inspector.NodeDescriptor;
-import com.facebook.sonar.plugins.inspector.Touch;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.inspector.Named;
+import com.facebook.flipper.plugins.inspector.NodeDescriptor;
+import com.facebook.flipper.plugins.inspector.Touch;
 import java.util.List;
 import javax.annotation.Nullable;
 
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/SupportFragmentDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/SupportFragmentDescriptor.java
index dbb8a849f..a882565fe 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/SupportFragmentDescriptor.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/SupportFragmentDescriptor.java
@@ -6,16 +6,16 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors;
+package com.facebook.flipper.plugins.inspector.descriptors;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.view.View;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.inspector.Named;
-import com.facebook.sonar.plugins.inspector.NodeDescriptor;
-import com.facebook.sonar.plugins.inspector.Touch;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.inspector.Named;
+import com.facebook.flipper.plugins.inspector.NodeDescriptor;
+import com.facebook.flipper.plugins.inspector.Touch;
 import com.facebook.stetho.common.android.ResourcesUtil;
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/TextViewDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/TextViewDescriptor.java
index aecf9af9a..3efb0301f 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/TextViewDescriptor.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/TextViewDescriptor.java
@@ -6,20 +6,20 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors;
+package com.facebook.flipper.plugins.inspector.descriptors;
 
-import static com.facebook.sonar.plugins.inspector.InspectorValue.Type.Color;
-import static com.facebook.sonar.plugins.inspector.InspectorValue.Type.Number;
-import static com.facebook.sonar.plugins.inspector.InspectorValue.Type.Text;
+import static com.facebook.flipper.plugins.inspector.InspectorValue.Type.Color;
+import static com.facebook.flipper.plugins.inspector.InspectorValue.Type.Number;
+import static com.facebook.flipper.plugins.inspector.InspectorValue.Type.Text;
 
 import android.view.View;
 import android.widget.TextView;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.inspector.InspectorValue;
-import com.facebook.sonar.plugins.inspector.Named;
-import com.facebook.sonar.plugins.inspector.NodeDescriptor;
-import com.facebook.sonar.plugins.inspector.Touch;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.inspector.InspectorValue;
+import com.facebook.flipper.plugins.inspector.Named;
+import com.facebook.flipper.plugins.inspector.NodeDescriptor;
+import com.facebook.flipper.plugins.inspector.Touch;
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Nullable;
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ViewDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ViewDescriptor.java
index 3acf19eb3..ac220be3f 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ViewDescriptor.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ViewDescriptor.java
@@ -6,10 +6,10 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors;
+package com.facebook.flipper.plugins.inspector.descriptors;
 
-import static com.facebook.sonar.plugins.inspector.InspectorValue.Type.Color;
-import static com.facebook.sonar.plugins.inspector.InspectorValue.Type.Enum;
+import static com.facebook.flipper.plugins.inspector.InspectorValue.Type.Color;
+import static com.facebook.flipper.plugins.inspector.InspectorValue.Type.Enum;
 
 import android.annotation.TargetApi;
 import android.graphics.Rect;
@@ -29,18 +29,18 @@ import android.view.ViewGroup.MarginLayoutParams;
 import android.view.ViewParent;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.inspector.HighlightedOverlay;
-import com.facebook.sonar.plugins.inspector.InspectorValue;
-import com.facebook.sonar.plugins.inspector.Named;
-import com.facebook.sonar.plugins.inspector.NodeDescriptor;
-import com.facebook.sonar.plugins.inspector.Touch;
-import com.facebook.sonar.plugins.inspector.descriptors.utils.AccessibilityEvaluationUtil;
-import com.facebook.sonar.plugins.inspector.descriptors.utils.AccessibilityRoleUtil;
-import com.facebook.sonar.plugins.inspector.descriptors.utils.AccessibilityUtil;
-import com.facebook.sonar.plugins.inspector.descriptors.utils.EnumMapping;
-import com.facebook.sonar.plugins.inspector.descriptors.utils.ViewAccessibilityHelper;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.inspector.HighlightedOverlay;
+import com.facebook.flipper.plugins.inspector.InspectorValue;
+import com.facebook.flipper.plugins.inspector.Named;
+import com.facebook.flipper.plugins.inspector.NodeDescriptor;
+import com.facebook.flipper.plugins.inspector.Touch;
+import com.facebook.flipper.plugins.inspector.descriptors.utils.AccessibilityEvaluationUtil;
+import com.facebook.flipper.plugins.inspector.descriptors.utils.AccessibilityRoleUtil;
+import com.facebook.flipper.plugins.inspector.descriptors.utils.AccessibilityUtil;
+import com.facebook.flipper.plugins.inspector.descriptors.utils.EnumMapping;
+import com.facebook.flipper.plugins.inspector.descriptors.utils.ViewAccessibilityHelper;
 import com.facebook.stetho.common.android.ResourcesUtil;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ViewGroupDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ViewGroupDescriptor.java
index 3c85e7d1a..e1e544342 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ViewGroupDescriptor.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ViewGroupDescriptor.java
@@ -6,24 +6,24 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors;
+package com.facebook.flipper.plugins.inspector.descriptors;
 
 import static android.support.v4.view.ViewGroupCompat.LAYOUT_MODE_CLIP_BOUNDS;
 import static android.support.v4.view.ViewGroupCompat.LAYOUT_MODE_OPTICAL_BOUNDS;
-import static com.facebook.sonar.plugins.inspector.InspectorValue.Type.Boolean;
-import static com.facebook.sonar.plugins.inspector.InspectorValue.Type.Enum;
+import static com.facebook.flipper.plugins.inspector.InspectorValue.Type.Boolean;
+import static com.facebook.flipper.plugins.inspector.InspectorValue.Type.Enum;
 
 import android.os.Build;
 import android.view.View;
 import android.view.ViewGroup;
 import com.facebook.flipper.R;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.inspector.HiddenNode;
-import com.facebook.sonar.plugins.inspector.InspectorValue;
-import com.facebook.sonar.plugins.inspector.Named;
-import com.facebook.sonar.plugins.inspector.NodeDescriptor;
-import com.facebook.sonar.plugins.inspector.Touch;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.inspector.HiddenNode;
+import com.facebook.flipper.plugins.inspector.InspectorValue;
+import com.facebook.flipper.plugins.inspector.Named;
+import com.facebook.flipper.plugins.inspector.NodeDescriptor;
+import com.facebook.flipper.plugins.inspector.Touch;
 import com.facebook.stetho.common.android.FragmentCompatUtil;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/WindowDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/WindowDescriptor.java
index 0c0a968d8..b2815c4c9 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/WindowDescriptor.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/WindowDescriptor.java
@@ -6,15 +6,15 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors;
+package com.facebook.flipper.plugins.inspector.descriptors;
 
 import android.view.View;
 import android.view.Window;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.inspector.Named;
-import com.facebook.sonar.plugins.inspector.NodeDescriptor;
-import com.facebook.sonar.plugins.inspector.Touch;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.inspector.Named;
+import com.facebook.flipper.plugins.inspector.NodeDescriptor;
+import com.facebook.flipper.plugins.inspector.Touch;
 import java.util.Collections;
 import java.util.List;
 import javax.annotation.Nullable;
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/AccessibilityEvaluationUtil.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/AccessibilityEvaluationUtil.java
index ddfa683b1..072576a13 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/AccessibilityEvaluationUtil.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/AccessibilityEvaluationUtil.java
@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.inspector.descriptors.utils;
+package com.facebook.flipper.plugins.inspector.descriptors.utils;
 
 import android.graphics.Rect;
 import android.support.v4.view.ViewCompat;
@@ -14,7 +14,7 @@ import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
-import com.facebook.sonar.plugins.inspector.descriptors.utils.AccessibilityRoleUtil.AccessibilityRole;
+import com.facebook.flipper.plugins.inspector.descriptors.utils.AccessibilityRoleUtil.AccessibilityRole;
 import java.util.List;
 import javax.annotation.Nullable;
 
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/AccessibilityRoleUtil.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/AccessibilityRoleUtil.java
index d9c158f76..d6af6ebe6 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/AccessibilityRoleUtil.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/AccessibilityRoleUtil.java
@@ -6,7 +6,7 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors.utils;
+package com.facebook.flipper.plugins.inspector.descriptors.utils;
 
 import android.support.v4.view.ViewCompat;
 import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/AccessibilityUtil.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/AccessibilityUtil.java
index 3fc03f3ee..6e157870c 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/AccessibilityUtil.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/AccessibilityUtil.java
@@ -6,7 +6,7 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors.utils;
+package com.facebook.flipper.plugins.inspector.descriptors.utils;
 
 import static android.content.Context.ACCESSIBILITY_SERVICE;
 
@@ -21,9 +21,9 @@ import android.view.ViewGroup;
 import android.view.ViewParent;
 import android.view.accessibility.AccessibilityManager;
 import android.widget.EditText;
-import com.facebook.sonar.core.SonarArray;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.inspector.InspectorValue;
+import com.facebook.flipper.core.SonarArray;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.inspector.InspectorValue;
 import javax.annotation.Nullable;
 
 /**
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/AndroidRootResolver.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/AndroidRootResolver.java
index c444f897e..248c88030 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/AndroidRootResolver.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/AndroidRootResolver.java
@@ -6,7 +6,7 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors.utils;
+package com.facebook.flipper.plugins.inspector.descriptors.utils;
 
 import static android.view.WindowManager.LayoutParams;
 
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/EnumMapping.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/EnumMapping.java
index 08719a6f4..216db85be 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/EnumMapping.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/EnumMapping.java
@@ -6,12 +6,12 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors.utils;
+package com.facebook.flipper.plugins.inspector.descriptors.utils;
 
-import static com.facebook.sonar.plugins.inspector.InspectorValue.Type.Enum;
+import static com.facebook.flipper.plugins.inspector.InspectorValue.Type.Enum;
 
 import android.support.v4.util.SimpleArrayMap;
-import com.facebook.sonar.plugins.inspector.InspectorValue;
+import com.facebook.flipper.plugins.inspector.InspectorValue;
 
 public class EnumMapping {
   private final SimpleArrayMap<String, Integer> mMapping = new SimpleArrayMap<>();
diff --git a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/ViewAccessibilityHelper.java b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/ViewAccessibilityHelper.java
index 904219916..5401a0520 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/ViewAccessibilityHelper.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/utils/ViewAccessibilityHelper.java
@@ -6,7 +6,7 @@
  *
  */
 
-package com.facebook.sonar.plugins.inspector.descriptors.utils;
+package com.facebook.flipper.plugins.inspector.descriptors.utils;
 
 import android.support.v4.view.ViewCompat;
 import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
diff --git a/android/src/main/java/com/facebook/sonar/plugins/leakcanary/LeakCanarySonarPlugin.java b/android/src/main/java/com/facebook/sonar/plugins/leakcanary/LeakCanarySonarPlugin.java
index d703a0566..5a137f940 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/leakcanary/LeakCanarySonarPlugin.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/leakcanary/LeakCanarySonarPlugin.java
@@ -6,14 +6,14 @@
  *
  */
 
-package com.facebook.sonar.plugins.leakcanary;
+package com.facebook.flipper.plugins.leakcanary;
 
 import android.util.Log;
-import com.facebook.sonar.core.SonarConnection;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.core.SonarPlugin;
-import com.facebook.sonar.core.SonarReceiver;
-import com.facebook.sonar.core.SonarResponder;
+import com.facebook.flipper.core.SonarConnection;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.core.SonarPlugin;
+import com.facebook.flipper.core.SonarReceiver;
+import com.facebook.flipper.core.SonarResponder;
 import java.util.ArrayList;
 import java.util.List;
 import org.json.JSONArray;
diff --git a/android/src/main/java/com/facebook/sonar/plugins/leakcanary/RecordLeakService.java b/android/src/main/java/com/facebook/sonar/plugins/leakcanary/RecordLeakService.java
index c7f06d1b1..1f8cc0242 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/leakcanary/RecordLeakService.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/leakcanary/RecordLeakService.java
@@ -5,12 +5,12 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.leakcanary;
+package com.facebook.flipper.plugins.leakcanary;
 
 import static com.squareup.leakcanary.LeakCanary.leakInfo;
 
-import com.facebook.sonar.android.AndroidSonarClient;
-import com.facebook.sonar.core.SonarClient;
+import com.facebook.flipper.android.AndroidSonarClient;
+import com.facebook.flipper.core.SonarClient;
 import com.squareup.leakcanary.AbstractAnalysisResultService;
 import com.squareup.leakcanary.AnalysisResult;
 import com.squareup.leakcanary.HeapDump;
diff --git a/android/src/main/java/com/facebook/sonar/plugins/litho/DebugComponentDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/litho/DebugComponentDescriptor.java
index 611972e64..aaf1c3a47 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/litho/DebugComponentDescriptor.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/litho/DebugComponentDescriptor.java
@@ -1,10 +1,10 @@
 // Copyright 2004-present Facebook. All Rights Reserved.
 
-package com.facebook.sonar.plugins.litho;
+package com.facebook.flipper.plugins.litho;
 
-import static com.facebook.sonar.plugins.inspector.InspectorValue.Type.Color;
-import static com.facebook.sonar.plugins.inspector.InspectorValue.Type.Enum;
-import static com.facebook.sonar.plugins.inspector.InspectorValue.Type.Number;
+import static com.facebook.flipper.plugins.inspector.InspectorValue.Type.Color;
+import static com.facebook.flipper.plugins.inspector.InspectorValue.Type.Enum;
+import static com.facebook.flipper.plugins.inspector.InspectorValue.Type.Number;
 
 import android.graphics.Rect;
 import android.graphics.drawable.ColorDrawable;
@@ -20,14 +20,14 @@ import com.facebook.litho.StateContainer;
 import com.facebook.litho.annotations.Prop;
 import com.facebook.litho.annotations.State;
 import com.facebook.litho.reference.Reference;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.inspector.HighlightedOverlay;
-import com.facebook.sonar.plugins.inspector.InspectorValue;
-import com.facebook.sonar.plugins.inspector.Named;
-import com.facebook.sonar.plugins.inspector.NodeDescriptor;
-import com.facebook.sonar.plugins.inspector.Touch;
-import com.facebook.sonar.plugins.inspector.descriptors.ObjectDescriptor;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.inspector.HighlightedOverlay;
+import com.facebook.flipper.plugins.inspector.InspectorValue;
+import com.facebook.flipper.plugins.inspector.Named;
+import com.facebook.flipper.plugins.inspector.NodeDescriptor;
+import com.facebook.flipper.plugins.inspector.Touch;
+import com.facebook.flipper.plugins.inspector.descriptors.ObjectDescriptor;
 import com.facebook.yoga.YogaAlign;
 import com.facebook.yoga.YogaDirection;
 import com.facebook.yoga.YogaEdge;
diff --git a/android/src/main/java/com/facebook/sonar/plugins/litho/GenerateLithoAccessibilityRenderExtensionCommand.java b/android/src/main/java/com/facebook/sonar/plugins/litho/GenerateLithoAccessibilityRenderExtensionCommand.java
index 08d2f7f64..796867b5a 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/litho/GenerateLithoAccessibilityRenderExtensionCommand.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/litho/GenerateLithoAccessibilityRenderExtensionCommand.java
@@ -1,18 +1,18 @@
 // Copyright 2004-present Facebook. All Rights Reserved.
 
-package com.facebook.sonar.plugins.litho;
+package com.facebook.flipper.plugins.litho;
 
 import android.view.View;
 import android.view.ViewGroup;
 import com.facebook.litho.LithoView;
-import com.facebook.sonar.core.SonarConnection;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.core.SonarReceiver;
-import com.facebook.sonar.core.SonarResponder;
-import com.facebook.sonar.plugins.common.MainThreadSonarReceiver;
-import com.facebook.sonar.plugins.inspector.ApplicationWrapper;
-import com.facebook.sonar.plugins.inspector.InspectorSonarPlugin;
-import com.facebook.sonar.plugins.inspector.ObjectTracker;
+import com.facebook.flipper.core.SonarConnection;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.core.SonarReceiver;
+import com.facebook.flipper.core.SonarResponder;
+import com.facebook.flipper.plugins.common.MainThreadSonarReceiver;
+import com.facebook.flipper.plugins.inspector.ApplicationWrapper;
+import com.facebook.flipper.plugins.inspector.InspectorSonarPlugin;
+import com.facebook.flipper.plugins.inspector.ObjectTracker;
 
 import java.util.Stack;
 
diff --git a/android/src/main/java/com/facebook/sonar/plugins/litho/LithoSonarDescriptors.java b/android/src/main/java/com/facebook/sonar/plugins/litho/LithoSonarDescriptors.java
index 0f0dd4ffa..f5cf9f044 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/litho/LithoSonarDescriptors.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/litho/LithoSonarDescriptors.java
@@ -1,10 +1,10 @@
 // Copyright 2004-present Facebook. All Rights Reserved.
 
-package com.facebook.sonar.plugins.litho;
+package com.facebook.flipper.plugins.litho;
 
 import com.facebook.litho.DebugComponent;
 import com.facebook.litho.LithoView;
-import com.facebook.sonar.plugins.inspector.DescriptorMapping;
+import com.facebook.flipper.plugins.inspector.DescriptorMapping;
 
 public final class LithoSonarDescriptors {
 
diff --git a/android/src/main/java/com/facebook/sonar/plugins/litho/LithoViewDescriptor.java b/android/src/main/java/com/facebook/sonar/plugins/litho/LithoViewDescriptor.java
index e0ec40042..198caf235 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/litho/LithoViewDescriptor.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/litho/LithoViewDescriptor.java
@@ -1,16 +1,16 @@
 // Copyright 2004-present Facebook. All Rights Reserved.
 
-package com.facebook.sonar.plugins.litho;
+package com.facebook.flipper.plugins.litho;
 
 import android.graphics.Rect;
 import android.view.ViewGroup;
 import com.facebook.litho.DebugComponent;
 import com.facebook.litho.LithoView;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.inspector.Named;
-import com.facebook.sonar.plugins.inspector.NodeDescriptor;
-import com.facebook.sonar.plugins.inspector.Touch;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.inspector.Named;
+import com.facebook.flipper.plugins.inspector.NodeDescriptor;
+import com.facebook.flipper.plugins.inspector.Touch;
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Nullable;
diff --git a/android/src/main/java/com/facebook/sonar/plugins/litho/PropWithDescription.java b/android/src/main/java/com/facebook/sonar/plugins/litho/PropWithDescription.java
index 15f3659d5..5aedacdbd 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/litho/PropWithDescription.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/litho/PropWithDescription.java
@@ -1,6 +1,6 @@
 // Copyright 2004-present Facebook. All Rights Reserved.
 
-package com.facebook.sonar.plugins.litho;
+package com.facebook.flipper.plugins.litho;
 
 public interface PropWithDescription {
 
diff --git a/android/src/main/java/com/facebook/sonar/plugins/network/NetworkReporter.java b/android/src/main/java/com/facebook/sonar/plugins/network/NetworkReporter.java
index e74e3032e..8665750e9 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/network/NetworkReporter.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/network/NetworkReporter.java
@@ -6,7 +6,7 @@
  *
  */
 
-package com.facebook.sonar.plugins.network;
+package com.facebook.flipper.plugins.network;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/android/src/main/java/com/facebook/sonar/plugins/network/NetworkResponseFormatter.java b/android/src/main/java/com/facebook/sonar/plugins/network/NetworkResponseFormatter.java
index 728a2a149..8ca86ed64 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/network/NetworkResponseFormatter.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/network/NetworkResponseFormatter.java
@@ -6,9 +6,9 @@
  *
  */
 
-package com.facebook.sonar.plugins.network;
+package com.facebook.flipper.plugins.network;
 
-import com.facebook.sonar.plugins.network.NetworkReporter.ResponseInfo;
+import com.facebook.flipper.plugins.network.NetworkReporter.ResponseInfo;
 
 public interface NetworkResponseFormatter {
 
diff --git a/android/src/main/java/com/facebook/sonar/plugins/network/NetworkSonarPlugin.java b/android/src/main/java/com/facebook/sonar/plugins/network/NetworkSonarPlugin.java
index 1a2ebf760..3d2e0531b 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/network/NetworkSonarPlugin.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/network/NetworkSonarPlugin.java
@@ -6,13 +6,13 @@
  *
  */
 
-package com.facebook.sonar.plugins.network;
+package com.facebook.flipper.plugins.network;
 
 import android.util.Base64;
-import com.facebook.sonar.core.ErrorReportingRunnable;
-import com.facebook.sonar.core.SonarArray;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.common.BufferingSonarPlugin;
+import com.facebook.flipper.core.ErrorReportingRunnable;
+import com.facebook.flipper.core.SonarArray;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.common.BufferingSonarPlugin;
 import java.util.List;
 
 public class NetworkSonarPlugin extends BufferingSonarPlugin implements NetworkReporter {
diff --git a/android/src/main/java/com/facebook/sonar/plugins/network/SonarOkhttpInterceptor.java b/android/src/main/java/com/facebook/sonar/plugins/network/SonarOkhttpInterceptor.java
index 0ff5155f5..29ce560d2 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/network/SonarOkhttpInterceptor.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/network/SonarOkhttpInterceptor.java
@@ -5,11 +5,11 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.network;
+package com.facebook.flipper.plugins.network;
 
 import android.util.Log;
-import com.facebook.sonar.plugins.network.NetworkReporter.RequestInfo;
-import com.facebook.sonar.plugins.network.NetworkReporter.ResponseInfo;
+import com.facebook.flipper.plugins.network.NetworkReporter.RequestInfo;
+import com.facebook.flipper.plugins.network.NetworkReporter.ResponseInfo;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/android/src/main/java/com/facebook/sonar/plugins/sandbox/SandboxSonarPlugin.java b/android/src/main/java/com/facebook/sonar/plugins/sandbox/SandboxSonarPlugin.java
index e64cb11ab..2cd6c74c4 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/sandbox/SandboxSonarPlugin.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/sandbox/SandboxSonarPlugin.java
@@ -5,14 +5,14 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.sandbox;
+package com.facebook.flipper.plugins.sandbox;
 
-import com.facebook.sonar.core.SonarArray;
-import com.facebook.sonar.core.SonarConnection;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.core.SonarPlugin;
-import com.facebook.sonar.core.SonarReceiver;
-import com.facebook.sonar.core.SonarResponder;
+import com.facebook.flipper.core.SonarArray;
+import com.facebook.flipper.core.SonarConnection;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.core.SonarPlugin;
+import com.facebook.flipper.core.SonarReceiver;
+import com.facebook.flipper.core.SonarResponder;
 import java.util.Map;
 
 public class SandboxSonarPlugin implements SonarPlugin {
diff --git a/android/src/main/java/com/facebook/sonar/plugins/sandbox/SandboxSonarPluginStrategy.java b/android/src/main/java/com/facebook/sonar/plugins/sandbox/SandboxSonarPluginStrategy.java
index a0d96dffc..0b7063180 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/sandbox/SandboxSonarPluginStrategy.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/sandbox/SandboxSonarPluginStrategy.java
@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.sandbox;
+package com.facebook.flipper.plugins.sandbox;
 
 import java.util.Map;
 import javax.annotation.Nullable;
diff --git a/android/src/main/java/com/facebook/sonar/plugins/sharedpreferences/SharedPreferencesSonarPlugin.java b/android/src/main/java/com/facebook/sonar/plugins/sharedpreferences/SharedPreferencesSonarPlugin.java
index d4c978fc6..086fed1a2 100644
--- a/android/src/main/java/com/facebook/sonar/plugins/sharedpreferences/SharedPreferencesSonarPlugin.java
+++ b/android/src/main/java/com/facebook/sonar/plugins/sharedpreferences/SharedPreferencesSonarPlugin.java
@@ -6,17 +6,17 @@
  *
  */
 
-package com.facebook.sonar.plugins.sharedpreferences;
+package com.facebook.flipper.plugins.sharedpreferences;
 
 import static android.content.Context.MODE_PRIVATE;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import com.facebook.sonar.core.SonarConnection;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.core.SonarPlugin;
-import com.facebook.sonar.core.SonarReceiver;
-import com.facebook.sonar.core.SonarResponder;
+import com.facebook.flipper.core.SonarConnection;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.core.SonarPlugin;
+import com.facebook.flipper.core.SonarReceiver;
+import com.facebook.flipper.core.SonarResponder;
 import java.util.Map;
 
 public class SharedPreferencesSonarPlugin implements SonarPlugin {
diff --git a/android/src/main/java/com/facebook/sonar/testing/SonarConnectionMock.java b/android/src/main/java/com/facebook/sonar/testing/SonarConnectionMock.java
index c0979f512..ba3afb602 100644
--- a/android/src/main/java/com/facebook/sonar/testing/SonarConnectionMock.java
+++ b/android/src/main/java/com/facebook/sonar/testing/SonarConnectionMock.java
@@ -5,12 +5,12 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.testing;
+package com.facebook.flipper.testing;
 
-import com.facebook.sonar.core.SonarArray;
-import com.facebook.sonar.core.SonarConnection;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.core.SonarReceiver;
+import com.facebook.flipper.core.SonarArray;
+import com.facebook.flipper.core.SonarConnection;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.core.SonarReceiver;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
diff --git a/android/src/main/java/com/facebook/sonar/testing/SonarResponderMock.java b/android/src/main/java/com/facebook/sonar/testing/SonarResponderMock.java
index 76971b3ef..66fb8e6d0 100644
--- a/android/src/main/java/com/facebook/sonar/testing/SonarResponderMock.java
+++ b/android/src/main/java/com/facebook/sonar/testing/SonarResponderMock.java
@@ -5,11 +5,11 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.testing;
+package com.facebook.flipper.testing;
 
-import com.facebook.sonar.core.SonarArray;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.core.SonarResponder;
+import com.facebook.flipper.core.SonarArray;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.core.SonarResponder;
 import java.util.LinkedList;
 import java.util.List;
 
diff --git a/android/src/test/java/com/facebook/sonar/plugins/console/ConsoleSonarPluginTest.java b/android/src/test/java/com/facebook/sonar/plugins/console/ConsoleSonarPluginTest.java
index 023029aee..52e75ea2c 100644
--- a/android/src/test/java/com/facebook/sonar/plugins/console/ConsoleSonarPluginTest.java
+++ b/android/src/test/java/com/facebook/sonar/plugins/console/ConsoleSonarPluginTest.java
@@ -5,14 +5,14 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.console;
+package com.facebook.flipper.plugins.console;
 
 import static org.hamcrest.CoreMatchers.hasItem;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.testing.SonarConnectionMock;
-import com.facebook.sonar.testing.SonarResponderMock;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.testing.SonarConnectionMock;
+import com.facebook.flipper.testing.SonarResponderMock;
 import com.facebook.testing.robolectric.v3.WithTestDefaultsRunner;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/android/src/test/java/com/facebook/sonar/plugins/console/JavascriptSessionTest.java b/android/src/test/java/com/facebook/sonar/plugins/console/JavascriptSessionTest.java
index 0f02200e1..ae58cab7c 100644
--- a/android/src/test/java/com/facebook/sonar/plugins/console/JavascriptSessionTest.java
+++ b/android/src/test/java/com/facebook/sonar/plugins/console/JavascriptSessionTest.java
@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.console;
+package com.facebook.flipper.plugins.console;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/android/src/test/java/com/facebook/sonar/plugins/inspector/ApplicationWrapperTest.java b/android/src/test/java/com/facebook/sonar/plugins/inspector/ApplicationWrapperTest.java
index d85412b25..68f4addc0 100644
--- a/android/src/test/java/com/facebook/sonar/plugins/inspector/ApplicationWrapperTest.java
+++ b/android/src/test/java/com/facebook/sonar/plugins/inspector/ApplicationWrapperTest.java
@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.inspector;
+package com.facebook.flipper.plugins.inspector;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/android/src/test/java/com/facebook/sonar/plugins/inspector/DescriptorMappingTest.java b/android/src/test/java/com/facebook/sonar/plugins/inspector/DescriptorMappingTest.java
index 19ed24765..6ab45a184 100644
--- a/android/src/test/java/com/facebook/sonar/plugins/inspector/DescriptorMappingTest.java
+++ b/android/src/test/java/com/facebook/sonar/plugins/inspector/DescriptorMappingTest.java
@@ -5,15 +5,15 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.inspector;
+package com.facebook.flipper.plugins.inspector;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-import com.facebook.sonar.core.SonarConnection;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.testing.SonarConnectionMock;
+import com.facebook.flipper.core.SonarConnection;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.testing.SonarConnectionMock;
 import com.facebook.testing.robolectric.v3.WithTestDefaultsRunner;
 import java.util.List;
 import org.junit.Test;
diff --git a/android/src/test/java/com/facebook/sonar/plugins/inspector/InspectorSonarPluginTest.java b/android/src/test/java/com/facebook/sonar/plugins/inspector/InspectorSonarPluginTest.java
index fd106de40..7a30dc2e8 100644
--- a/android/src/test/java/com/facebook/sonar/plugins/inspector/InspectorSonarPluginTest.java
+++ b/android/src/test/java/com/facebook/sonar/plugins/inspector/InspectorSonarPluginTest.java
@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.inspector;
+package com.facebook.flipper.plugins.inspector;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.hasItem;
@@ -16,16 +16,16 @@ import android.graphics.Rect;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
-import com.facebook.sonar.core.SonarArray;
-import com.facebook.sonar.core.SonarConnection;
-import com.facebook.sonar.core.SonarDynamic;
-import com.facebook.sonar.core.SonarObject;
-import com.facebook.sonar.plugins.console.iface.NullScriptingEnvironment;
-import com.facebook.sonar.plugins.console.iface.ScriptingEnvironment;
-import com.facebook.sonar.plugins.inspector.InspectorSonarPlugin.TouchOverlayView;
-import com.facebook.sonar.plugins.inspector.descriptors.ApplicationDescriptor;
-import com.facebook.sonar.testing.SonarConnectionMock;
-import com.facebook.sonar.testing.SonarResponderMock;
+import com.facebook.flipper.core.SonarArray;
+import com.facebook.flipper.core.SonarConnection;
+import com.facebook.flipper.core.SonarDynamic;
+import com.facebook.flipper.core.SonarObject;
+import com.facebook.flipper.plugins.console.iface.NullScriptingEnvironment;
+import com.facebook.flipper.plugins.console.iface.ScriptingEnvironment;
+import com.facebook.flipper.plugins.inspector.InspectorSonarPlugin.TouchOverlayView;
+import com.facebook.flipper.plugins.inspector.descriptors.ApplicationDescriptor;
+import com.facebook.flipper.testing.SonarConnectionMock;
+import com.facebook.flipper.testing.SonarResponderMock;
 import com.facebook.testing.robolectric.v3.WithTestDefaultsRunner;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -49,7 +49,7 @@ public class InspectorSonarPluginTest {
   public void setup() {
     final Application app = Mockito.spy(RuntimeEnvironment.application);
     Mockito.when(app.getApplicationContext()).thenReturn(app);
-    Mockito.when(app.getPackageName()).thenReturn("com.facebook.sonar");
+    Mockito.when(app.getPackageName()).thenReturn("com.facebook.flipper");
 
     mDescriptorMapping = new DescriptorMapping();
     mApplicationDescriptor = new MockApplicationDescriptor();
@@ -97,8 +97,8 @@ public class InspectorSonarPluginTest {
         responder.successes,
         hasItem(
             new SonarObject.Builder()
-                .put("id", "com.facebook.sonar")
-                .put("name", "com.facebook.sonar")
+                .put("id", "com.facebook.flipper")
+                .put("name", "com.facebook.flipper")
                 .put("data", new SonarObject.Builder())
                 .put("children", new SonarArray.Builder().put("test"))
                 .put("attributes", new SonarArray.Builder())
@@ -220,7 +220,7 @@ public class InspectorSonarPluginTest {
 
     plugin.mGetRoot.onReceive(null, responder);
     plugin.mSetHighlighted.onReceive(
-        new SonarObject.Builder().put("id", "com.facebook.sonar").build(), responder);
+        new SonarObject.Builder().put("id", "com.facebook.flipper").build(), responder);
 
     assertThat(mApplicationDescriptor.highlighted, equalTo(true));
 
@@ -268,7 +268,7 @@ public class InspectorSonarPluginTest {
         hasItem(
             new SonarObject.Builder()
                 .put(
-                    "path", new SonarArray.Builder().put("com.facebook.sonar").put("test").put("3"))
+                    "path", new SonarArray.Builder().put("com.facebook.flipper").put("test").put("3"))
                 .build()));
   }
 
diff --git a/android/src/test/java/com/facebook/sonar/plugins/inspector/descriptors/ViewGroupDescriptorTest.java b/android/src/test/java/com/facebook/sonar/plugins/inspector/descriptors/ViewGroupDescriptorTest.java
index c176374f9..9dfae0c99 100644
--- a/android/src/test/java/com/facebook/sonar/plugins/inspector/descriptors/ViewGroupDescriptorTest.java
+++ b/android/src/test/java/com/facebook/sonar/plugins/inspector/descriptors/ViewGroupDescriptorTest.java
@@ -5,7 +5,7 @@
  *  file in the root directory of this source tree.
  *
  */
-package com.facebook.sonar.plugins.inspector.descriptors;
+package com.facebook.flipper.plugins.inspector.descriptors;
 
 import static android.view.View.MeasureSpec.EXACTLY;
 import static android.view.View.MeasureSpec.makeMeasureSpec;
@@ -14,7 +14,7 @@ import static org.mockito.Matchers.any;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
-import com.facebook.sonar.plugins.inspector.Touch;
+import com.facebook.flipper.plugins.inspector.Touch;
 import com.facebook.testing.robolectric.v3.WithTestDefaultsRunner;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/android/third-party/AndroidManifest.xml b/android/third-party/AndroidManifest.xml
index ec6ce3742..2059c0b69 100644
--- a/android/third-party/AndroidManifest.xml
+++ b/android/third-party/AndroidManifest.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.facebook.sonar.thirdparty">
+<manifest package="com.facebook.flipper.thirdparty">
 </manifest>