diff --git a/packages/SettingsLib/ActionButtonsPreference/Android.bp b/packages/SettingsLib/ActionButtonsPreference/Android.bp
index cd3fb0c..e518e0b 100644
--- a/packages/SettingsLib/ActionButtonsPreference/Android.bp
+++ b/packages/SettingsLib/ActionButtonsPreference/Android.bp
@@ -1,5 +1,5 @@
 android_library {
-    name: "SettingsLibActionButtonsPreference",
+    name: "ActionButtonsPreference",
 
     srcs: ["src/**/*.java"],
     resource_dirs: ["res"],
diff --git a/packages/SettingsLib/Android.bp b/packages/SettingsLib/Android.bp
index e588e921..cc17b25 100644
--- a/packages/SettingsLib/Android.bp
+++ b/packages/SettingsLib/Android.bp
@@ -16,8 +16,8 @@
         "SettingsLibAppPreference",
         "SettingsLibSearchWidget",
         "SettingsLibSettingsSpinner",
-        "SettingsLibLayoutPreference",
-        "SettingsLibActionButtonsPreference",
+        "SettingsLayoutPreference",
+        "ActionButtonsPreference",
     ],
 
     // ANDROIDMK TRANSLATION ERROR: unsupported assignment to LOCAL_SHARED_JAVA_LIBRARIES
diff --git a/packages/SettingsLib/LayoutPreference/Android.bp b/packages/SettingsLib/SettingsLayoutPreference/Android.bp
similarity index 83%
rename from packages/SettingsLib/LayoutPreference/Android.bp
rename to packages/SettingsLib/SettingsLayoutPreference/Android.bp
index a1f9a76..489d360 100644
--- a/packages/SettingsLib/LayoutPreference/Android.bp
+++ b/packages/SettingsLib/SettingsLayoutPreference/Android.bp
@@ -1,5 +1,5 @@
 android_library {
-    name: "SettingsLibLayoutPreference",
+    name: "SettingsLayoutPreference",
 
     srcs: ["src/**/*.java"],
     resource_dirs: ["res"],
diff --git a/packages/SettingsLib/LayoutPreference/AndroidManifest.xml b/packages/SettingsLib/SettingsLayoutPreference/AndroidManifest.xml
similarity index 100%
rename from packages/SettingsLib/LayoutPreference/AndroidManifest.xml
rename to packages/SettingsLib/SettingsLayoutPreference/AndroidManifest.xml
diff --git a/packages/SettingsLib/LayoutPreference/res/layout/layout_preference_frame.xml b/packages/SettingsLib/SettingsLayoutPreference/res/layout/layout_preference_frame.xml
similarity index 100%
rename from packages/SettingsLib/LayoutPreference/res/layout/layout_preference_frame.xml
rename to packages/SettingsLib/SettingsLayoutPreference/res/layout/layout_preference_frame.xml
diff --git a/packages/SettingsLib/LayoutPreference/res/layout/settings_entity_header.xml b/packages/SettingsLib/SettingsLayoutPreference/res/layout/settings_entity_header.xml
similarity index 100%
rename from packages/SettingsLib/LayoutPreference/res/layout/settings_entity_header.xml
rename to packages/SettingsLib/SettingsLayoutPreference/res/layout/settings_entity_header.xml
diff --git a/packages/SettingsLib/LayoutPreference/res/values/styles.xml b/packages/SettingsLib/SettingsLayoutPreference/res/values/styles.xml
similarity index 100%
rename from packages/SettingsLib/LayoutPreference/res/values/styles.xml
rename to packages/SettingsLib/SettingsLayoutPreference/res/values/styles.xml
diff --git a/packages/SettingsLib/LayoutPreference/src/com/android/settingslib/widget/LayoutPreference.java b/packages/SettingsLib/SettingsLayoutPreference/src/com/android/settingslib/widget/LayoutPreference.java
similarity index 100%
rename from packages/SettingsLib/LayoutPreference/src/com/android/settingslib/widget/LayoutPreference.java
rename to packages/SettingsLib/SettingsLayoutPreference/src/com/android/settingslib/widget/LayoutPreference.java