diff --git a/android/src/main/java/com/facebook/flipper/nativeplugins/components/JsonSidebarSection.java b/android/src/main/java/com/facebook/flipper/nativeplugins/components/JsonSection.java
similarity index 77%
rename from android/src/main/java/com/facebook/flipper/nativeplugins/components/JsonSidebarSection.java
rename to android/src/main/java/com/facebook/flipper/nativeplugins/components/JsonSection.java
index a6a6dcf3e..00b587776 100644
--- a/android/src/main/java/com/facebook/flipper/nativeplugins/components/JsonSidebarSection.java
+++ b/android/src/main/java/com/facebook/flipper/nativeplugins/components/JsonSection.java
@@ -2,11 +2,11 @@ package com.facebook.flipper.nativeplugins.components;
 
 import com.facebook.flipper.core.FlipperObject;
 
-public class JsonSidebarSection implements SidebarSection {
+public class JsonSection implements UISection {
   private final String title;
   private final FlipperObject content;
 
-  public JsonSidebarSection(String title, FlipperObject content) {
+  public JsonSection(String title, FlipperObject content) {
     this.title = title;
     this.content = content;
   }
diff --git a/android/src/main/java/com/facebook/flipper/nativeplugins/components/Sidebar.java b/android/src/main/java/com/facebook/flipper/nativeplugins/components/Sidebar.java
index 0216788b7..f79968e58 100644
--- a/android/src/main/java/com/facebook/flipper/nativeplugins/components/Sidebar.java
+++ b/android/src/main/java/com/facebook/flipper/nativeplugins/components/Sidebar.java
@@ -6,7 +6,7 @@ public class Sidebar {
 
   private final FlipperArray.Builder sections = new FlipperArray.Builder();
 
-  public Sidebar addSection(SidebarSection section) {
+  public Sidebar addSection(UISection section) {
     sections.put(section.serialize());
     return this;
   }
diff --git a/android/src/main/java/com/facebook/flipper/nativeplugins/components/ToolbarSidebarSection.java b/android/src/main/java/com/facebook/flipper/nativeplugins/components/ToolbarSection.java
similarity index 71%
rename from android/src/main/java/com/facebook/flipper/nativeplugins/components/ToolbarSidebarSection.java
rename to android/src/main/java/com/facebook/flipper/nativeplugins/components/ToolbarSection.java
index 95bccedec..7e63393b1 100644
--- a/android/src/main/java/com/facebook/flipper/nativeplugins/components/ToolbarSidebarSection.java
+++ b/android/src/main/java/com/facebook/flipper/nativeplugins/components/ToolbarSection.java
@@ -3,10 +3,10 @@ package com.facebook.flipper.nativeplugins.components;
 import com.facebook.flipper.core.FlipperArray;
 import com.facebook.flipper.core.FlipperObject;
 
-public class ToolbarSidebarSection implements SidebarSection {
-  FlipperArray.Builder items = new FlipperArray.Builder();
+public class ToolbarSection implements UISection {
+  private FlipperArray.Builder items = new FlipperArray.Builder();
 
-  public ToolbarSidebarSection addLink(String label, String destination) {
+  public ToolbarSection addLink(String label, String destination) {
     items.put(
         new FlipperObject.Builder()
             .put("type", "link")
diff --git a/android/src/main/java/com/facebook/flipper/nativeplugins/components/SidebarSection.java b/android/src/main/java/com/facebook/flipper/nativeplugins/components/UISection.java
similarity index 83%
rename from android/src/main/java/com/facebook/flipper/nativeplugins/components/SidebarSection.java
rename to android/src/main/java/com/facebook/flipper/nativeplugins/components/UISection.java
index 0d3c4d9b4..3d2a05381 100644
--- a/android/src/main/java/com/facebook/flipper/nativeplugins/components/SidebarSection.java
+++ b/android/src/main/java/com/facebook/flipper/nativeplugins/components/UISection.java
@@ -2,7 +2,7 @@ package com.facebook.flipper.nativeplugins.components;
 
 import com.facebook.flipper.core.FlipperObject;
 
-interface SidebarSection {
+interface UISection {
 
   FlipperObject serialize();
 }