diff --git a/android/src/main/cpp/sonar.cpp b/android/src/main/cpp/sonar.cpp
index 12c0eb30a..7a014cba5 100644
--- a/android/src/main/cpp/sonar.cpp
+++ b/android/src/main/cpp/sonar.cpp
@@ -97,7 +97,7 @@ class JFlipperResponder : public jni::JavaClass<JFlipperResponder> {
 
 class JFlipperResponderImpl : public jni::HybridClass<JFlipperResponderImpl, JFlipperResponder> {
  public:
-  constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/android/SonarResponderImpl;";
+  constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/android/FlipperResponderImpl;";
 
   static void registerNatives() {
     registerHybrid({
@@ -143,7 +143,7 @@ class JFlipperConnection : public jni::JavaClass<JFlipperConnection> {
 
 class JFlipperConnectionImpl : public jni::HybridClass<JFlipperConnectionImpl, JFlipperConnection> {
  public:
-  constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/android/SonarConnectionImpl;";
+  constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/android/FlipperConnectionImpl;";
 
   static void registerNatives() {
     registerHybrid({
@@ -267,7 +267,7 @@ public:
 
 class JFlipperClient : public jni::HybridClass<JFlipperClient> {
  public:
-  constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/android/SonarClientImpl;";
+  constexpr static auto kJavaDescriptor = "Lcom/facebook/flipper/android/FlipperClientImpl;";
 
   static void registerNatives() {
     registerHybrid({
diff --git a/android/src/main/java/com/facebook/flipper/android/AndroidFlipperClient.java b/android/src/main/java/com/facebook/flipper/android/AndroidFlipperClient.java
index 2d8258c5e..2a0ed30a1 100644
--- a/android/src/main/java/com/facebook/flipper/android/AndroidFlipperClient.java
+++ b/android/src/main/java/com/facebook/flipper/android/AndroidFlipperClient.java
@@ -18,22 +18,22 @@ import com.facebook.flipper.core.FlipperClient;
 
 public final class AndroidFlipperClient {
   private static boolean sIsInitialized = false;
-  private static SonarThread sSonarThread;
-  private static SonarThread sConnectionThread;
+  private static FlipperThread sSonarThread;
+  private static FlipperThread sConnectionThread;
   private static final String[] REQUIRED_PERMISSIONS =
       new String[] {"android.permission.INTERNET", "android.permission.ACCESS_WIFI_STATE"};
 
   public static synchronized FlipperClient getInstance(Context context) {
     if (!sIsInitialized) {
       checkRequiredPermissions(context);
-      sSonarThread = new SonarThread("SonarEventBaseThread");
+      sSonarThread = new FlipperThread("SonarEventBaseThread");
       sSonarThread.start();
-      sConnectionThread = new SonarThread("SonarConnectionThread");
+      sConnectionThread = new FlipperThread("SonarConnectionThread");
       sConnectionThread.start();
 
       final Context app =
           context.getApplicationContext() == null ? context : context.getApplicationContext();
-      SonarClientImpl.init(
+      FlipperClientImpl.init(
           sSonarThread.getEventBase(),
           sConnectionThread.getEventBase(),
           getServerHost(app),
@@ -45,14 +45,14 @@ public final class AndroidFlipperClient {
           context.getFilesDir().getAbsolutePath());
       sIsInitialized = true;
     }
-    return SonarClientImpl.getInstance();
+    return FlipperClientImpl.getInstance();
   }
 
   public static synchronized FlipperClient getInstanceIfInitialized() {
     if (!sIsInitialized) {
       return null;
     }
-    return SonarClientImpl.getInstance();
+    return FlipperClientImpl.getInstance();
   }
 
   static void checkRequiredPermissions(Context context) {
diff --git a/android/src/main/java/com/facebook/flipper/android/SonarClientImpl.java b/android/src/main/java/com/facebook/flipper/android/FlipperClientImpl.java
similarity index 91%
rename from android/src/main/java/com/facebook/flipper/android/SonarClientImpl.java
rename to android/src/main/java/com/facebook/flipper/android/FlipperClientImpl.java
index bc7146f05..7e05c9885 100644
--- a/android/src/main/java/com/facebook/flipper/android/SonarClientImpl.java
+++ b/android/src/main/java/com/facebook/flipper/android/FlipperClientImpl.java
@@ -17,7 +17,7 @@ import com.facebook.flipper.core.FlipperStateUpdateListener;
 import com.facebook.flipper.core.StateSummary;
 
 @DoNotStrip
-class SonarClientImpl implements FlipperClient {
+class FlipperClientImpl implements FlipperClient {
   static {
     if (BuildConfig.IS_INTERNAL_BUILD) {
       SoLoader.loadLibrary("sonar");
@@ -26,7 +26,7 @@ class SonarClientImpl implements FlipperClient {
 
   private final HybridData mHybridData;
 
-  private SonarClientImpl(HybridData hd) {
+  private FlipperClientImpl(HybridData hd) {
     mHybridData = hd;
   }
 
@@ -41,7 +41,7 @@ class SonarClientImpl implements FlipperClient {
       String appId,
       String privateAppDirectory);
 
-  public static native SonarClientImpl getInstance();
+  public static native FlipperClientImpl getInstance();
 
   @Override
   public native void addPlugin(FlipperPlugin plugin);
diff --git a/android/src/main/java/com/facebook/flipper/android/SonarConnectionImpl.java b/android/src/main/java/com/facebook/flipper/android/FlipperConnectionImpl.java
similarity index 92%
rename from android/src/main/java/com/facebook/flipper/android/SonarConnectionImpl.java
rename to android/src/main/java/com/facebook/flipper/android/FlipperConnectionImpl.java
index 4bac94919..69a6a9b2a 100644
--- a/android/src/main/java/com/facebook/flipper/android/SonarConnectionImpl.java
+++ b/android/src/main/java/com/facebook/flipper/android/FlipperConnectionImpl.java
@@ -17,7 +17,7 @@ import com.facebook.flipper.core.FlipperObject;
 import com.facebook.flipper.core.FlipperReceiver;
 
 @DoNotStrip
-class SonarConnectionImpl implements FlipperConnection {
+class FlipperConnectionImpl implements FlipperConnection {
   static {
     if (BuildConfig.IS_INTERNAL_BUILD) {
       SoLoader.loadLibrary("sonar");
@@ -26,7 +26,7 @@ class SonarConnectionImpl implements FlipperConnection {
 
   private final HybridData mHybridData;
 
-  private SonarConnectionImpl(HybridData hd) {
+  private FlipperConnectionImpl(HybridData hd) {
     mHybridData = hd;
   }
 
diff --git a/android/src/main/java/com/facebook/flipper/android/SonarResponderImpl.java b/android/src/main/java/com/facebook/flipper/android/FlipperResponderImpl.java
similarity index 91%
rename from android/src/main/java/com/facebook/flipper/android/SonarResponderImpl.java
rename to android/src/main/java/com/facebook/flipper/android/FlipperResponderImpl.java
index 926348dda..372c30fb8 100644
--- a/android/src/main/java/com/facebook/flipper/android/SonarResponderImpl.java
+++ b/android/src/main/java/com/facebook/flipper/android/FlipperResponderImpl.java
@@ -16,7 +16,7 @@ import com.facebook.flipper.core.FlipperObject;
 import com.facebook.flipper.core.FlipperResponder;
 
 @DoNotStrip
-class SonarResponderImpl implements FlipperResponder {
+class FlipperResponderImpl implements FlipperResponder {
   static {
     if (BuildConfig.IS_INTERNAL_BUILD) {
       SoLoader.loadLibrary("sonar");
@@ -25,7 +25,7 @@ class SonarResponderImpl implements FlipperResponder {
 
   private final HybridData mHybridData;
 
-  private SonarResponderImpl(HybridData hd) {
+  private FlipperResponderImpl(HybridData hd) {
     mHybridData = hd;
   }
 
diff --git a/android/src/main/java/com/facebook/flipper/android/SonarThread.java b/android/src/main/java/com/facebook/flipper/android/FlipperThread.java
similarity index 91%
rename from android/src/main/java/com/facebook/flipper/android/SonarThread.java
rename to android/src/main/java/com/facebook/flipper/android/FlipperThread.java
index 31b7bfaa5..4d3d298b4 100644
--- a/android/src/main/java/com/facebook/flipper/android/SonarThread.java
+++ b/android/src/main/java/com/facebook/flipper/android/FlipperThread.java
@@ -10,10 +10,10 @@ package com.facebook.flipper.android;
 import android.os.Process;
 import javax.annotation.Nullable;
 
-class SonarThread extends Thread {
+class FlipperThread extends Thread {
   private @Nullable EventBase mEventBase;
 
-  SonarThread(final String name) {
+  FlipperThread(final String name) {
     super(name);
   }