diff --git a/android/sample/AndroidManifest.xml b/android/sample/AndroidManifest.xml
index 0a3c59a71..f6f17fd86 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.flipper.android.diagnostics.SonarDiagnosticActivity"
+    <activity android:name="com.facebook.flipper.android.diagnostics.FlipperDiagnosticActivity"
         android:exported="true"/>
   </application>
 
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 633c5db13..35c36ab4f 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.flipper.android.diagnostics.SonarDiagnosticActivity;
+import com.facebook.flipper.android.diagnostics.FlipperDiagnosticActivity;
 
 import java.io.IOException;
 import okhttp3.Call;
@@ -109,7 +109,7 @@ public class RootComponentSpec {
 
     @OnEvent(ClickEvent.class)
     static void openDiagnostics(final ComponentContext c) {
-        Intent intent = new Intent(c, SonarDiagnosticActivity.class);
+        Intent intent = new Intent(c, FlipperDiagnosticActivity.class);
         c.startActivity(intent);
     }
 }
diff --git a/android/src/main/java/com/facebook/flipper/android/diagnostics/AndroidManifest.xml b/android/src/main/java/com/facebook/flipper/android/diagnostics/AndroidManifest.xml
index 7257f645c..900e16ed9 100644
--- a/android/src/main/java/com/facebook/flipper/android/diagnostics/AndroidManifest.xml
+++ b/android/src/main/java/com/facebook/flipper/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.flipper.android.diagnostics.SonarDiagnosticActivity"
+        <activity android:name="com.facebook.flipper.android.diagnostics.FlipperDiagnosticActivity"
                  android:exported="true" />
     </application>
 </manifest>
diff --git a/android/src/main/java/com/facebook/flipper/android/diagnostics/SonarDiagnosticActivity.java b/android/src/main/java/com/facebook/flipper/android/diagnostics/FlipperDiagnosticActivity.java
similarity index 96%
rename from android/src/main/java/com/facebook/flipper/android/diagnostics/SonarDiagnosticActivity.java
rename to android/src/main/java/com/facebook/flipper/android/diagnostics/FlipperDiagnosticActivity.java
index 7ca056286..57494fc24 100644
--- a/android/src/main/java/com/facebook/flipper/android/diagnostics/SonarDiagnosticActivity.java
+++ b/android/src/main/java/com/facebook/flipper/android/diagnostics/FlipperDiagnosticActivity.java
@@ -14,7 +14,7 @@ import android.view.View;
 import android.widget.TextView;
 import android.widget.ScrollView;
 
-public class SonarDiagnosticActivity extends Activity implements FlipperStateUpdateListener {
+public class FlipperDiagnosticActivity extends Activity implements FlipperStateUpdateListener {
 
   private TextView summaryView;
   private TextView logView;
diff --git a/docs/getting-started.md b/docs/getting-started.md
index 6d43a9f9c..fae512fad 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -33,7 +33,7 @@ Add the following permissions to your AndroidManifest.xml. The SDK needs these t
 It's recommended that you add the following activity to the manifest too, which can help diagnose integration issues and other problems:
 
 ```xml
-<activity android:name="com.facebook.sonar.android.diagnostics.SonarDiagnosticActivity"
+<activity android:name="com.facebook.sonar.android.diagnostics.FlipperDiagnosticActivity"
         android:exported="true"/>
 ```
 
diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md
index bca9c601a..35f80eb87 100644
--- a/docs/troubleshooting.md
+++ b/docs/troubleshooting.md
@@ -37,9 +37,9 @@ The Flipper SDK includes an in-app connection diagnostics screen to help you dia
 Replace `<APP_PACKAGE>` below with the package name of your app, e.g. `com.facebook.flipper.sample`.
 On a terminal, run the following:
 ```bash
-adb shell am start -n <APP_PACKAGE>/com.facebook.sonar.android.diagnostics.SonarDiagnosticActivity
+adb shell am start -n <APP_PACKAGE>/com.facebook.sonar.android.diagnostics.FlipperDiagnosticActivity
 ```
-This will only work if you added `SonarDiagnosticActivity` to your `AndroidManifest.xml`. See [getting started](getting-started.html) for help.
+This will only work if you added `FlipperDiagnosticActivity` to your `AndroidManifest.xml`. See [getting started](getting-started.html) for help.
 
 #### iOS
 You'll need to manually add this [ViewController](https://github.com/facebook/flipper/blob/master/iOS/SonarKit/FlipperDiagnosticsViewController.m) to your app to see the in-app diagnostics.