diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index af9aaeea8..fc20fad09 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.facebook.sonar">
+    package="com.facebook.flipper">
 </manifest>
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 db90b35f2..0a3db024d 100644
--- a/android/src/main/java/com/facebook/sonar/android/EventBase.java
+++ b/android/src/main/java/com/facebook/sonar/android/EventBase.java
@@ -10,7 +10,7 @@ package com.facebook.sonar.android;
 import com.facebook.jni.HybridClassBase;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.soloader.SoLoader;
-import com.facebook.sonar.BuildConfig;
+import com.facebook.flipper.BuildConfig;
 
 @DoNotStrip
 class EventBase extends HybridClassBase {
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 11ca1a467..a8706a967 100644
--- a/android/src/main/java/com/facebook/sonar/android/SonarClientImpl.java
+++ b/android/src/main/java/com/facebook/sonar/android/SonarClientImpl.java
@@ -10,7 +10,7 @@ package com.facebook.sonar.android;
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.soloader.SoLoader;
-import com.facebook.sonar.BuildConfig;
+import com.facebook.flipper.BuildConfig;
 import com.facebook.sonar.core.SonarClient;
 import com.facebook.sonar.core.SonarPlugin;
 import com.facebook.sonar.core.SonarStateUpdateListener;
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 7b4b49984..b1cbd7131 100644
--- a/android/src/main/java/com/facebook/sonar/android/SonarConnectionImpl.java
+++ b/android/src/main/java/com/facebook/sonar/android/SonarConnectionImpl.java
@@ -10,7 +10,7 @@ package com.facebook.sonar.android;
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.soloader.SoLoader;
-import com.facebook.sonar.BuildConfig;
+import com.facebook.flipper.BuildConfig;
 import com.facebook.sonar.core.SonarArray;
 import com.facebook.sonar.core.SonarConnection;
 import com.facebook.sonar.core.SonarObject;
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 e9902fd66..3d9b893f2 100644
--- a/android/src/main/java/com/facebook/sonar/android/SonarResponderImpl.java
+++ b/android/src/main/java/com/facebook/sonar/android/SonarResponderImpl.java
@@ -10,7 +10,7 @@ package com.facebook.sonar.android;
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.soloader.SoLoader;
-import com.facebook.sonar.BuildConfig;
+import com.facebook.flipper.BuildConfig;
 import com.facebook.sonar.core.SonarArray;
 import com.facebook.sonar.core.SonarObject;
 import com.facebook.sonar.core.SonarResponder;
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 6150c273c..2027f15c9 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
@@ -9,7 +9,7 @@ package com.facebook.sonar.android.utils;
 
 import android.app.ActivityManager;
 import android.content.Context;
-import com.facebook.sonar.BuildConfig;
+import com.facebook.flipper.BuildConfig;
 import java.util.List;
 
 public final class SonarUtils {
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 c1c09c83c..3c85e7d1a 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
@@ -16,7 +16,7 @@ import static com.facebook.sonar.plugins.inspector.InspectorValue.Type.Enum;
 import android.os.Build;
 import android.view.View;
 import android.view.ViewGroup;
-import com.facebook.sonar.R;
+import com.facebook.flipper.R;
 import com.facebook.sonar.core.SonarDynamic;
 import com.facebook.sonar.core.SonarObject;
 import com.facebook.sonar.plugins.inspector.HiddenNode;