diff --git a/android/src/main/java/com/facebook/flipper/plugins/common/BufferingSonarPlugin.java b/android/src/main/java/com/facebook/flipper/plugins/common/BufferingFlipperPlugin.java
similarity index 96%
rename from android/src/main/java/com/facebook/flipper/plugins/common/BufferingSonarPlugin.java
rename to android/src/main/java/com/facebook/flipper/plugins/common/BufferingFlipperPlugin.java
index e64d1a7ae..915334b62 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/common/BufferingSonarPlugin.java
+++ b/android/src/main/java/com/facebook/flipper/plugins/common/BufferingFlipperPlugin.java
@@ -18,7 +18,7 @@ import javax.annotation.Nullable;
  * <p>In order to send data to the {@link FlipperConnection}, use {@link #send(String, FlipperObject)}
  * instead of {@link FlipperConnection#send(String, FlipperObject)}.
  */
-public abstract class BufferingSonarPlugin implements FlipperPlugin {
+public abstract class BufferingFlipperPlugin implements FlipperPlugin {
 
   private static final int BUFFER_SIZE = 500;
 
diff --git a/android/src/main/java/com/facebook/flipper/plugins/common/MainThreadSonarReceiver.java b/android/src/main/java/com/facebook/flipper/plugins/common/MainThreadFlipperReceiver.java
similarity index 88%
rename from android/src/main/java/com/facebook/flipper/plugins/common/MainThreadSonarReceiver.java
rename to android/src/main/java/com/facebook/flipper/plugins/common/MainThreadFlipperReceiver.java
index 9885a1fde..31adb5e25 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/common/MainThreadSonarReceiver.java
+++ b/android/src/main/java/com/facebook/flipper/plugins/common/MainThreadFlipperReceiver.java
@@ -15,9 +15,9 @@ import com.facebook.flipper.core.FlipperObject;
 import com.facebook.flipper.core.FlipperReceiver;
 import com.facebook.flipper.core.FlipperResponder;
 
-public abstract class MainThreadSonarReceiver implements FlipperReceiver {
+public abstract class MainThreadFlipperReceiver implements FlipperReceiver {
 
-  public MainThreadSonarReceiver(FlipperConnection connection) {
+  public MainThreadFlipperReceiver(FlipperConnection connection) {
     this.mConnection = connection;
   }
 
diff --git a/android/src/main/java/com/facebook/flipper/plugins/console/iface/ConsoleCommandReceiver.java b/android/src/main/java/com/facebook/flipper/plugins/console/iface/ConsoleCommandReceiver.java
index 3cbba5e12..b1485e5b2 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/console/iface/ConsoleCommandReceiver.java
+++ b/android/src/main/java/com/facebook/flipper/plugins/console/iface/ConsoleCommandReceiver.java
@@ -12,7 +12,7 @@ import com.facebook.flipper.core.FlipperConnection;
 import com.facebook.flipper.core.FlipperObject;
 import com.facebook.flipper.core.FlipperReceiver;
 import com.facebook.flipper.core.FlipperResponder;
-import com.facebook.flipper.plugins.common.MainThreadSonarReceiver;
+import com.facebook.flipper.plugins.common.MainThreadFlipperReceiver;
 import org.json.JSONObject;
 
 /**
@@ -39,7 +39,7 @@ public class ConsoleCommandReceiver {
 
     final ScriptingSession session = scriptingEnvironment.startSession();
     final FlipperReceiver executeCommandReceiver =
-        new MainThreadSonarReceiver(connection) {
+        new MainThreadFlipperReceiver(connection) {
           @Override
           public void onReceiveOnMainThread(FlipperObject params, FlipperResponder responder)
               throws Exception {
diff --git a/android/src/main/java/com/facebook/flipper/plugins/inspector/InspectorSonarPlugin.java b/android/src/main/java/com/facebook/flipper/plugins/inspector/InspectorSonarPlugin.java
index 5ab27a66a..db6b4cc8f 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/inspector/InspectorSonarPlugin.java
+++ b/android/src/main/java/com/facebook/flipper/plugins/inspector/InspectorSonarPlugin.java
@@ -23,7 +23,7 @@ import com.facebook.flipper.core.FlipperObject;
 import com.facebook.flipper.core.FlipperPlugin;
 import com.facebook.flipper.core.FlipperReceiver;
 import com.facebook.flipper.core.FlipperResponder;
-import com.facebook.flipper.plugins.common.MainThreadSonarReceiver;
+import com.facebook.flipper.plugins.common.MainThreadFlipperReceiver;
 import com.facebook.flipper.plugins.console.iface.ConsoleCommandReceiver;
 import com.facebook.flipper.plugins.console.iface.NullScriptingEnvironment;
 import com.facebook.flipper.plugins.console.iface.ScriptingEnvironment;
@@ -174,7 +174,7 @@ public class InspectorSonarPlugin implements FlipperPlugin {
   }
 
   final FlipperReceiver mShouldShowLithoAccessibilitySettings =
-          new MainThreadSonarReceiver(mConnection) {
+          new MainThreadFlipperReceiver(mConnection) {
             @Override
             public void onReceiveOnMainThread(FlipperObject params, FlipperResponder responder)
                     throws Exception {
@@ -183,7 +183,7 @@ public class InspectorSonarPlugin implements FlipperPlugin {
           };
 
   final FlipperReceiver mGetRoot =
-      new MainThreadSonarReceiver(mConnection) {
+      new MainThreadFlipperReceiver(mConnection) {
         @Override
         public void onReceiveOnMainThread(FlipperObject params, FlipperResponder responder)
             throws Exception {
@@ -192,7 +192,7 @@ public class InspectorSonarPlugin implements FlipperPlugin {
       };
 
   final FlipperReceiver mGetAXRoot =
-      new MainThreadSonarReceiver(mConnection) {
+      new MainThreadFlipperReceiver(mConnection) {
         @Override
         public void onReceiveOnMainThread(FlipperObject params, FlipperResponder responder)
             throws Exception {
@@ -202,7 +202,7 @@ public class InspectorSonarPlugin implements FlipperPlugin {
       };
 
   final FlipperReceiver mGetNodes =
-      new MainThreadSonarReceiver(mConnection) {
+      new MainThreadFlipperReceiver(mConnection) {
         @Override
         public void onReceiveOnMainThread(final FlipperObject params, final FlipperResponder responder)
             throws Exception {
@@ -229,7 +229,7 @@ public class InspectorSonarPlugin implements FlipperPlugin {
       };
 
   final FlipperReceiver mGetAXNodes =
-      new MainThreadSonarReceiver(mConnection) {
+      new MainThreadFlipperReceiver(mConnection) {
         @Override
         public void onReceiveOnMainThread(final FlipperObject params, final FlipperResponder responder)
             throws Exception {
@@ -278,7 +278,7 @@ public class InspectorSonarPlugin implements FlipperPlugin {
       };
 
   final FlipperReceiver mOnRequestAXFocus =
-          new MainThreadSonarReceiver(mConnection) {
+          new MainThreadFlipperReceiver(mConnection) {
             @Override
             public void onReceiveOnMainThread(final FlipperObject params, final FlipperResponder responder)
                     throws Exception {
@@ -294,7 +294,7 @@ public class InspectorSonarPlugin implements FlipperPlugin {
           };
 
   final FlipperReceiver mSetData =
-      new MainThreadSonarReceiver(mConnection) {
+      new MainThreadFlipperReceiver(mConnection) {
         @Override
         public void onReceiveOnMainThread(final FlipperObject params, FlipperResponder responder)
             throws Exception {
@@ -325,7 +325,7 @@ public class InspectorSonarPlugin implements FlipperPlugin {
       };
 
   final FlipperReceiver mSetHighlighted =
-      new MainThreadSonarReceiver(mConnection) {
+      new MainThreadFlipperReceiver(mConnection) {
         @Override
         public void onReceiveOnMainThread(final FlipperObject params, FlipperResponder responder)
             throws Exception {
@@ -344,7 +344,7 @@ public class InspectorSonarPlugin implements FlipperPlugin {
       };
 
   final FlipperReceiver mSetSearchActive =
-      new MainThreadSonarReceiver(mConnection) {
+      new MainThreadFlipperReceiver(mConnection) {
         @Override
         public void onReceiveOnMainThread(final FlipperObject params, FlipperResponder responder)
             throws Exception {
@@ -374,7 +374,7 @@ public class InspectorSonarPlugin implements FlipperPlugin {
       };
 
   final FlipperReceiver mIsSearchActive =
-          new MainThreadSonarReceiver(mConnection) {
+          new MainThreadFlipperReceiver(mConnection) {
             @Override
             public void onReceiveOnMainThread(final FlipperObject params, FlipperResponder responder)
                     throws Exception {
@@ -383,7 +383,7 @@ public class InspectorSonarPlugin implements FlipperPlugin {
           };
 
   final FlipperReceiver mGetSearchResults =
-      new MainThreadSonarReceiver(mConnection) {
+      new MainThreadFlipperReceiver(mConnection) {
         @Override
         public void onReceiveOnMainThread(FlipperObject params, FlipperResponder responder)
             throws Exception {
diff --git a/android/src/main/java/com/facebook/flipper/plugins/litho/GenerateLithoAccessibilityRenderExtensionCommand.java b/android/src/main/java/com/facebook/flipper/plugins/litho/GenerateLithoAccessibilityRenderExtensionCommand.java
index df504f8ca..14cf5bbda 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/litho/GenerateLithoAccessibilityRenderExtensionCommand.java
+++ b/android/src/main/java/com/facebook/flipper/plugins/litho/GenerateLithoAccessibilityRenderExtensionCommand.java
@@ -9,7 +9,7 @@ import com.facebook.flipper.core.FlipperConnection;
 import com.facebook.flipper.core.FlipperObject;
 import com.facebook.flipper.core.FlipperReceiver;
 import com.facebook.flipper.core.FlipperResponder;
-import com.facebook.flipper.plugins.common.MainThreadSonarReceiver;
+import com.facebook.flipper.plugins.common.MainThreadFlipperReceiver;
 import com.facebook.flipper.plugins.inspector.ApplicationWrapper;
 import com.facebook.flipper.plugins.inspector.InspectorSonarPlugin;
 import com.facebook.flipper.plugins.inspector.ObjectTracker;
@@ -25,7 +25,7 @@ public final class GenerateLithoAccessibilityRenderExtensionCommand implements I
 
     @Override
     public FlipperReceiver receiver(final ObjectTracker tracker, final FlipperConnection connection) {
-        return new MainThreadSonarReceiver(connection) {
+        return new MainThreadFlipperReceiver(connection) {
             @Override
             public void onReceiveOnMainThread(final FlipperObject params, final FlipperResponder responder)
                     throws Exception {
diff --git a/android/src/main/java/com/facebook/flipper/plugins/network/NetworkSonarPlugin.java b/android/src/main/java/com/facebook/flipper/plugins/network/NetworkSonarPlugin.java
index 6140e8cd5..1a45510a2 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/network/NetworkSonarPlugin.java
+++ b/android/src/main/java/com/facebook/flipper/plugins/network/NetworkSonarPlugin.java
@@ -12,10 +12,10 @@ import android.util.Base64;
 import com.facebook.flipper.core.ErrorReportingRunnable;
 import com.facebook.flipper.core.FlipperArray;
 import com.facebook.flipper.core.FlipperObject;
-import com.facebook.flipper.plugins.common.BufferingSonarPlugin;
+import com.facebook.flipper.plugins.common.BufferingFlipperPlugin;
 import java.util.List;
 
-public class NetworkSonarPlugin extends BufferingSonarPlugin implements NetworkReporter {
+public class NetworkSonarPlugin extends BufferingFlipperPlugin implements NetworkReporter {
   public static final String ID = "Network";
 
   private final List<NetworkResponseFormatter> mFormatters;