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 b44fbd740..0636cd3a6 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
@@ -12,8 +12,8 @@ import com.facebook.flipper.plugins.inspector.DescriptorMapping;
 import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin;
 import com.facebook.flipper.plugins.leakcanary.LeakCanaryFlipperPlugin;
 import com.facebook.flipper.plugins.litho.LithoFlipperDescriptors;
-import com.facebook.flipper.plugins.network.NetworkSonarPlugin;
-import com.facebook.flipper.plugins.network.SonarOkhttpInterceptor;
+import com.facebook.flipper.plugins.network.NetworkFlipperPlugin;
+import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor;
 import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesSonarPlugin;
 import java.util.concurrent.TimeUnit;
 import okhttp3.OkHttpClient;
@@ -30,8 +30,8 @@ public class FlipperSampleApplication extends Application {
     final FlipperClient client = AndroidFlipperClient.getInstance(this);
     final DescriptorMapping descriptorMapping = DescriptorMapping.withDefaults();
 
-    NetworkSonarPlugin networkPlugin = new NetworkSonarPlugin();
-    SonarOkhttpInterceptor interceptor = new SonarOkhttpInterceptor(networkPlugin);
+    NetworkFlipperPlugin networkPlugin = new NetworkFlipperPlugin();
+    FlipperOkhttpInterceptor interceptor = new FlipperOkhttpInterceptor(networkPlugin);
 
     okhttpClient = new OkHttpClient.Builder()
     .addNetworkInterceptor(interceptor)
diff --git a/android/src/main/java/com/facebook/flipper/plugins/network/SonarOkhttpInterceptor.java b/android/src/main/java/com/facebook/flipper/plugins/network/FlipperOkhttpInterceptor.java
similarity index 93%
rename from android/src/main/java/com/facebook/flipper/plugins/network/SonarOkhttpInterceptor.java
rename to android/src/main/java/com/facebook/flipper/plugins/network/FlipperOkhttpInterceptor.java
index 29ce560d2..8fd802c76 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/network/SonarOkhttpInterceptor.java
+++ b/android/src/main/java/com/facebook/flipper/plugins/network/FlipperOkhttpInterceptor.java
@@ -24,15 +24,15 @@ import okhttp3.Response;
 import okhttp3.ResponseBody;
 import okio.Buffer;
 
-public class SonarOkhttpInterceptor implements Interceptor {
+public class FlipperOkhttpInterceptor implements Interceptor {
 
-  public @Nullable NetworkSonarPlugin plugin;
+  public @Nullable NetworkFlipperPlugin plugin;
 
-  public SonarOkhttpInterceptor() {
+  public FlipperOkhttpInterceptor() {
     this.plugin = null;
   }
 
-  public SonarOkhttpInterceptor(NetworkSonarPlugin plugin) {
+  public FlipperOkhttpInterceptor(NetworkFlipperPlugin plugin) {
     this.plugin = plugin;
   }
 
diff --git a/android/src/main/java/com/facebook/flipper/plugins/network/NetworkSonarPlugin.java b/android/src/main/java/com/facebook/flipper/plugins/network/NetworkFlipperPlugin.java
similarity index 94%
rename from android/src/main/java/com/facebook/flipper/plugins/network/NetworkSonarPlugin.java
rename to android/src/main/java/com/facebook/flipper/plugins/network/NetworkFlipperPlugin.java
index 1a45510a2..dc2500786 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/network/NetworkSonarPlugin.java
+++ b/android/src/main/java/com/facebook/flipper/plugins/network/NetworkFlipperPlugin.java
@@ -15,16 +15,16 @@ import com.facebook.flipper.core.FlipperObject;
 import com.facebook.flipper.plugins.common.BufferingFlipperPlugin;
 import java.util.List;
 
-public class NetworkSonarPlugin extends BufferingFlipperPlugin implements NetworkReporter {
+public class NetworkFlipperPlugin extends BufferingFlipperPlugin implements NetworkReporter {
   public static final String ID = "Network";
 
   private final List<NetworkResponseFormatter> mFormatters;
 
-  public NetworkSonarPlugin() {
+  public NetworkFlipperPlugin() {
     this(null);
   }
 
-  public NetworkSonarPlugin(List<NetworkResponseFormatter> formatters) {
+  public NetworkFlipperPlugin(List<NetworkResponseFormatter> formatters) {
     this.mFormatters = formatters;
   }
 
diff --git a/docs/network-plugin.md b/docs/network-plugin.md
index d19f12b84..632e8d356 100644
--- a/docs/network-plugin.md
+++ b/docs/network-plugin.md
@@ -14,9 +14,9 @@ To use the network plugin, you need to add the plugin to your Flipper client ins
 ### Android
 
 ```java
-import com.facebook.sonar.plugins.network.NetworkSonarPlugin;
+import com.facebook.sonar.plugins.network.NetworkFlipperPlugin;
 
-NetworkSonarPlugin networkSonarPlugin = new NetworkSonarPlugin();
+NetworkFlipperPlugin networkSonarPlugin = new NetworkFlipperPlugin();
 client.addPlugin(networkSonarPlugin);
 ```
 
@@ -25,10 +25,10 @@ client.addPlugin(networkSonarPlugin);
 If you are using the popular OkHttp library, you can use the Interceptors system to automatically hook into your existing stack.
 
 ```java
-import com.facebook.sonar.plugins.network.SonarOkhttpInterceptor;
+import com.facebook.sonar.plugins.network.FlipperOkhttpInterceptor;
 
 new OkHttpClient.Builder()
-    .addNetworkInterceptor(new SonarOkhttpInterceptor(networkSonarPlugin))
+    .addNetworkInterceptor(new FlipperOkhttpInterceptor(networkSonarPlugin))
     .build();
 ```