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 0b0eb1f76..a154a1cdd 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
@@ -6,7 +6,7 @@ import android.app.Application;
 import android.content.Context;
 import com.facebook.litho.config.ComponentsConfiguration;
 import com.facebook.soloader.SoLoader;
-import com.facebook.flipper.android.AndroidSonarClient;
+import com.facebook.flipper.android.AndroidFlipperClient;
 import com.facebook.flipper.core.FlipperClient;
 import com.facebook.flipper.plugins.inspector.DescriptorMapping;
 import com.facebook.flipper.plugins.inspector.InspectorSonarPlugin;
@@ -27,7 +27,7 @@ public class FlipperSampleApplication extends Application {
     super.onCreate();
     SoLoader.init(this, false);
 
-    final FlipperClient client = AndroidSonarClient.getInstance(this);
+    final FlipperClient client = AndroidFlipperClient.getInstance(this);
     final DescriptorMapping descriptorMapping = DescriptorMapping.withDefaults();
 
     NetworkSonarPlugin networkPlugin = new NetworkSonarPlugin();
diff --git a/android/src/main/java/com/facebook/flipper/android/AndroidSonarClient.java b/android/src/main/java/com/facebook/flipper/android/AndroidFlipperClient.java
similarity index 98%
rename from android/src/main/java/com/facebook/flipper/android/AndroidSonarClient.java
rename to android/src/main/java/com/facebook/flipper/android/AndroidFlipperClient.java
index 646fd319e..2d8258c5e 100644
--- a/android/src/main/java/com/facebook/flipper/android/AndroidSonarClient.java
+++ b/android/src/main/java/com/facebook/flipper/android/AndroidFlipperClient.java
@@ -16,7 +16,7 @@ import android.support.v4.content.ContextCompat;
 import android.util.Log;
 import com.facebook.flipper.core.FlipperClient;
 
-public final class AndroidSonarClient {
+public final class AndroidFlipperClient {
   private static boolean sIsInitialized = false;
   private static SonarThread sSonarThread;
   private static SonarThread sConnectionThread;
diff --git a/android/src/main/java/com/facebook/flipper/android/diagnostics/FlipperDiagnosticActivity.java b/android/src/main/java/com/facebook/flipper/android/diagnostics/FlipperDiagnosticActivity.java
index 57494fc24..c798d548c 100644
--- a/android/src/main/java/com/facebook/flipper/android/diagnostics/FlipperDiagnosticActivity.java
+++ b/android/src/main/java/com/facebook/flipper/android/diagnostics/FlipperDiagnosticActivity.java
@@ -4,7 +4,7 @@ import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
 import android.widget.Toast;
-import com.facebook.flipper.android.AndroidSonarClient;
+import com.facebook.flipper.android.AndroidFlipperClient;
 import com.facebook.flipper.core.FlipperClient;
 import com.facebook.flipper.core.FlipperStateUpdateListener;
 import com.facebook.flipper.core.StateSummary;
@@ -39,7 +39,7 @@ public class FlipperDiagnosticActivity extends Activity implements FlipperStateU
 
   protected void onStart() {
     super.onStart();
-    final FlipperClient client = AndroidSonarClient.getInstance(this);
+    final FlipperClient client = AndroidFlipperClient.getInstance(this);
     client.subscribeForUpdates(this);
 
     summaryView.setText(getSummary());
@@ -53,7 +53,7 @@ public class FlipperDiagnosticActivity extends Activity implements FlipperStateU
 
 @Override
   public void onUpdate() {
-    final String state = AndroidSonarClient.getInstance(this).getState();
+    final String state = AndroidFlipperClient.getInstance(this).getState();
     final String summary = getSummary();
 
    runOnUiThread(new Runnable() {
@@ -68,7 +68,7 @@ public class FlipperDiagnosticActivity extends Activity implements FlipperStateU
 
   private String getSummary() {
     final Context context = this;
-    final StateSummary summary = AndroidSonarClient.getInstance(context).getStateSummary();
+    final StateSummary summary = AndroidFlipperClient.getInstance(context).getStateSummary();
     final StringBuilder stateText = new StringBuilder();
     for (StateElement e: summary.mList) {
       final String status;
@@ -85,7 +85,7 @@ public class FlipperDiagnosticActivity extends Activity implements FlipperStateU
 
   protected void onStop() {
     super.onStop();
-    final FlipperClient client = AndroidSonarClient.getInstance(this);
+    final FlipperClient client = AndroidFlipperClient.getInstance(this);
     client.unsubscribe();
   }
 }
diff --git a/android/src/main/java/com/facebook/flipper/plugins/leakcanary/RecordLeakService.java b/android/src/main/java/com/facebook/flipper/plugins/leakcanary/RecordLeakService.java
index 138aefad5..f98f5ff7e 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/leakcanary/RecordLeakService.java
+++ b/android/src/main/java/com/facebook/flipper/plugins/leakcanary/RecordLeakService.java
@@ -9,7 +9,7 @@ package com.facebook.flipper.plugins.leakcanary;
 
 import static com.squareup.leakcanary.LeakCanary.leakInfo;
 
-import com.facebook.flipper.android.AndroidSonarClient;
+import com.facebook.flipper.android.AndroidFlipperClient;
 import com.facebook.flipper.core.FlipperClient;
 import com.squareup.leakcanary.AbstractAnalysisResultService;
 import com.squareup.leakcanary.AnalysisResult;
@@ -24,7 +24,7 @@ public class RecordLeakService extends AbstractAnalysisResultService {
   @Override
   protected void onHeapAnalyzed(HeapDump heapDump, AnalysisResult result) {
     final String leakInfo = leakInfo(this, heapDump, result, true);
-    final FlipperClient client = AndroidSonarClient.getInstance(this);
+    final FlipperClient client = AndroidFlipperClient.getInstance(this);
 
     if (client != null) {
       final LeakCanarySonarPlugin plugin = client.getPlugin("LeakCanary");
diff --git a/docs/getting-started.md b/docs/getting-started.md
index fae512fad..6bbcf5474 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -60,7 +60,7 @@ public class MyApplication extends Application {
     SoLoader.init(this, false);
 
     if (BuildConfig.DEBUG && SonarUtils.shouldEnableSonar(this)) {
-      final SonarClient client = AndroidSonarClient.getInstance(this);
+      final SonarClient client = AndroidFlipperClient.getInstance(this);
       client.addPlugin(new InspectorSonarPlugin(this, DescriptorMapping.withDefaults()));
       client.start();
     }
diff --git a/docs/send-data.md b/docs/send-data.md
index 39840e394..31b772bf4 100644
--- a/docs/send-data.md
+++ b/docs/send-data.md
@@ -13,8 +13,8 @@ Plugins are identified by the string that their identifier method returns, in th
 ### Android
 
 ```java
-final SonarClient client = AndroidSonarClient.getInstance(context);
-// Client may be null if AndroidSonarClient.createInstance() was never called
+final SonarClient client = AndroidFlipperClient.getInstance(context);
+// Client may be null if AndroidFlipperClient.createInstance() was never called
 // which is the case in production builds.
 if (client != null) {
   final MySonarPlugin plugin = client.getPlugin("MySonarPlugin");