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 a060473c4..b44fbd740 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
@@ -11,7 +11,7 @@ import com.facebook.flipper.core.FlipperClient;
 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.LithoSonarDescriptors;
+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.sharedpreferences.SharedPreferencesSonarPlugin;
@@ -43,7 +43,7 @@ public class FlipperSampleApplication extends Application {
     // Normally, you would want to make this dependent on a BuildConfig flag, but
     // for this demo application we can safely assume that you always want to debug.
     ComponentsConfiguration.isDebugModeEnabled = true;
-    LithoSonarDescriptors.add(descriptorMapping);
+    LithoFlipperDescriptors.add(descriptorMapping);
     client.addPlugin(new InspectorFlipperPlugin(this, descriptorMapping));
     client.addPlugin(networkPlugin);
     client.addPlugin(new SharedPreferencesSonarPlugin(this, "sample"));
diff --git a/android/src/main/java/com/facebook/flipper/plugins/litho/LithoSonarDescriptors.java b/android/src/main/java/com/facebook/flipper/plugins/litho/LithoFlipperDescriptors.java
similarity index 91%
rename from android/src/main/java/com/facebook/flipper/plugins/litho/LithoSonarDescriptors.java
rename to android/src/main/java/com/facebook/flipper/plugins/litho/LithoFlipperDescriptors.java
index f5cf9f044..8dabec84b 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/litho/LithoSonarDescriptors.java
+++ b/android/src/main/java/com/facebook/flipper/plugins/litho/LithoFlipperDescriptors.java
@@ -6,7 +6,7 @@ import com.facebook.litho.DebugComponent;
 import com.facebook.litho.LithoView;
 import com.facebook.flipper.plugins.inspector.DescriptorMapping;
 
-public final class LithoSonarDescriptors {
+public final class LithoFlipperDescriptors {
 
   public static void add(DescriptorMapping descriptorMapping) {
     descriptorMapping.register(LithoView.class, new LithoViewDescriptor());
diff --git a/docs/layout-plugin.md b/docs/layout-plugin.md
index c8de93bfa..ddf459e08 100644
--- a/docs/layout-plugin.md
+++ b/docs/layout-plugin.md
@@ -36,7 +36,7 @@ the descriptor with Litho-specific settings and add some addition dependencies.
 import com.facebook.litho.config.ComponentsConfiguration;
 import com.facebook.sonar.plugins.inspector.DescriptorMapping;
 import com.facebook.sonar.plugins.inspector.InspectorSonarPlugin;
-import com.facebook.sonar.plugins.litho.LithoSonarDescriptors;
+import com.facebook.sonar.plugins.litho.LithoFlipperDescriptors;
 
 // Instead of hard-coding this setting, it's a good practice to tie
 // this to a BuildConfig flag, that you only enable for debug builds
@@ -45,7 +45,7 @@ ComponentsConfiguration.isDebugModeEnabled = true;
 
 final DescriptorMapping descriptorMapping = DescriptorMapping.withDefaults();
 // This adds Litho capabilities to the layout inspector.
-LithoSonarDescriptors.add(descriptorMapping);
+LithoFlipperDescriptors.add(descriptorMapping);
 
 client.addPlugin(new InspectorSonarPlugin(mApplicationContext, descriptorMapping));
 ```