diff --git a/android/src/main/java/com/facebook/flipper/core/FlipperStateUpdateListener.java b/android/src/main/java/com/facebook/flipper/core/FlipperStateUpdateListener.java
index 747d9eade..32b8db574 100644
--- a/android/src/main/java/com/facebook/flipper/core/FlipperStateUpdateListener.java
+++ b/android/src/main/java/com/facebook/flipper/core/FlipperStateUpdateListener.java
@@ -3,7 +3,7 @@ package com.facebook.flipper.core;
 public interface FlipperStateUpdateListener {
 
   /**
-   * Called when the state of the sonar client changes.
+   * Called when the state of the Flipper client changes.
    * Typical implementations will subscribe by calling {@link com.facebook.flipper.core.FlipperClient#subscribeForUpdates()}, to start receiving update events.
    * Calling {@link com.facebook.flipper.core.FlipperClient#getState()} will retrieve the updated state.
    */
diff --git a/android/src/main/java/com/facebook/flipper/plugins/common/BufferingFlipperPlugin.java b/android/src/main/java/com/facebook/flipper/plugins/common/BufferingFlipperPlugin.java
index b03b01d7c..49af9bfce 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/common/BufferingFlipperPlugin.java
+++ b/android/src/main/java/com/facebook/flipper/plugins/common/BufferingFlipperPlugin.java
@@ -45,21 +45,21 @@ public abstract class BufferingFlipperPlugin implements FlipperPlugin {
     return mConnection != null;
   }
 
-  public synchronized void send(String method, FlipperObject sonarObject) {
+  public synchronized void send(String method, FlipperObject flipperObject) {
     if (mEventQueue == null) {
       mEventQueue = new RingBuffer<>(BUFFER_SIZE);
     }
     if (mConnection != null) {
-      mConnection.send(method, sonarObject);
+      mConnection.send(method, flipperObject);
     } else {
-      mEventQueue.enqueue(new CachedFlipperEvent(method, sonarObject));
+      mEventQueue.enqueue(new CachedFlipperEvent(method, flipperObject));
     }
   }
 
   private synchronized void sendBufferedEvents() {
     if (mEventQueue != null && mConnection != null) {
       for (CachedFlipperEvent cachedFlipperEvent : mEventQueue.asList()) {
-        mConnection.send(cachedFlipperEvent.method, cachedFlipperEvent.sonarObject);
+        mConnection.send(cachedFlipperEvent.method, cachedFlipperEvent.flipperObject);
       }
       mEventQueue.clear();
     }
@@ -67,11 +67,11 @@ public abstract class BufferingFlipperPlugin implements FlipperPlugin {
 
   private static class CachedFlipperEvent {
     final String method;
-    final FlipperObject sonarObject;
+    final FlipperObject flipperObject;
 
-    private CachedFlipperEvent(String method, FlipperObject sonarObject) {
+    private CachedFlipperEvent(String method, FlipperObject flipperObject) {
       this.method = method;
-      this.sonarObject = sonarObject;
+      this.flipperObject = flipperObject;
     }
   }
 }
diff --git a/android/src/main/java/com/facebook/flipper/plugins/console/JavascriptSession.java b/android/src/main/java/com/facebook/flipper/plugins/console/JavascriptSession.java
index be6d5f46c..d7be7e611 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/console/JavascriptSession.java
+++ b/android/src/main/java/com/facebook/flipper/plugins/console/JavascriptSession.java
@@ -76,7 +76,7 @@ public class JavascriptSession implements Closeable, ScriptingSession {
       mContextFactory.enterContext();
       return toJson(
           mContext.evaluateString(
-              scope, command, "sonar-console", lineNumber.incrementAndGet(), null));
+              scope, command, "flipper-console", lineNumber.incrementAndGet(), null));
     } finally {
       Context.exit();
     }
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 345994e24..67b09b66c 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
@@ -25,7 +25,7 @@ public class ConsoleCommandReceiver {
   /**
    * Incoming command execution calls may reference a context ID that means something to your
    * plugin. Implement {@link ContextProvider} to provide a mapping from context ID to java object.
-   * This will allow your sonar plugin to control the execution context of the command.
+   * This will allow your Flipper plugin to control the execution context of the command.
    */
   public interface ContextProvider {
     @Nullable
diff --git a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ApplicationDescriptor.java b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ApplicationDescriptor.java
index 003c9c90a..3438d1ce8 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ApplicationDescriptor.java
+++ b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ApplicationDescriptor.java
@@ -78,7 +78,7 @@ public class ApplicationDescriptor extends NodeDescriptor<ApplicationWrapper> {
       boolean hasDelegateAlready = ViewCompat.hasAccessibilityDelegate(view);
       if (view instanceof ViewGroup && !hasDelegateAlready) {
 
-        // add delegate to root to catch accessibility events so we can update focus in sonar
+        // add delegate to root to catch accessibility events so we can update focus in Flipper
         view.setAccessibilityDelegate(new View.AccessibilityDelegate() {
           @Override
           public boolean onRequestSendAccessibilityEvent(ViewGroup host, View child, AccessibilityEvent event) {