diff --git a/device.mk b/device.mk
index c13b608..805ef65 100644
--- a/device.mk
+++ b/device.mk
@@ -363,13 +363,13 @@ DEVICE_PACKAGE_OVERLAYS += \
 
 # Overlays RRO
 PRODUCT_PACKAGES += \
-    CarrierConfigOverlay \
-    WifiOverlay \
-    FrameworksResOverlay \
-    SettingsOverlay \
-    SettingsProviderOverlay \
-    SystemUIOverlay \
-    TelephonyOverlay
+    CarrierConfigOverlayStone \
+    WifiOverlayStone \
+    FrameworksResOverlayStone \
+    SettingsOverlayStone \
+    SettingsProviderOverlayStone \
+    SystemUIOverlayStone \
+    TelephonyOverlayStone
 
 # Partitions
 PRODUCT_USE_DYNAMIC_PARTITIONS := true
diff --git a/rro_overlays/CarrierConfigOverlay/Android.bp b/rro_overlays/CarrierConfigOverlayStone/Android.bp
similarity index 80%
rename from rro_overlays/CarrierConfigOverlay/Android.bp
rename to rro_overlays/CarrierConfigOverlayStone/Android.bp
index 8864ba7..0a1e6b3 100644
--- a/rro_overlays/CarrierConfigOverlay/Android.bp
+++ b/rro_overlays/CarrierConfigOverlayStone/Android.bp
@@ -1,5 +1,5 @@
 runtime_resource_overlay {
-    name: "CarrierConfigOverlay",
+    name: "CarrierConfigOverlayStone",
     theme: "CarrierConfigOverlay",
     sdk_version: "current",
     product_specific: true,
diff --git a/rro_overlays/CarrierConfigOverlay/AndroidManifest.xml b/rro_overlays/CarrierConfigOverlayStone/AndroidManifest.xml
similarity index 95%
rename from rro_overlays/CarrierConfigOverlay/AndroidManifest.xml
rename to rro_overlays/CarrierConfigOverlayStone/AndroidManifest.xml
index b19082c..061f5c9 100644
--- a/rro_overlays/CarrierConfigOverlay/AndroidManifest.xml
+++ b/rro_overlays/CarrierConfigOverlayStone/AndroidManifest.xml
@@ -15,7 +15,7 @@
 -->
 <!-- Xiaomi sm8350 specific carrier overlays -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.carrierconfig.xiaomi_sm8350"
+    package="com.android.carrierconfig.stone"
     android:versionCode="1"
     android:versionName="1.0">
     <application android:hasCode="false" />
diff --git a/rro_overlays/CarrierConfigOverlay/res/xml/vendor.xml b/rro_overlays/CarrierConfigOverlayStone/res/xml/vendor.xml
similarity index 100%
rename from rro_overlays/CarrierConfigOverlay/res/xml/vendor.xml
rename to rro_overlays/CarrierConfigOverlayStone/res/xml/vendor.xml
diff --git a/rro_overlays/SystemUIOverlay/Android.bp b/rro_overlays/FrameworksResOverlayStone/Android.bp
similarity index 72%
rename from rro_overlays/SystemUIOverlay/Android.bp
rename to rro_overlays/FrameworksResOverlayStone/Android.bp
index e40ebeb..660f50a 100644
--- a/rro_overlays/SystemUIOverlay/Android.bp
+++ b/rro_overlays/FrameworksResOverlayStone/Android.bp
@@ -1,5 +1,5 @@
 runtime_resource_overlay {
-    name: "SystemUIOverlay",
+    name: "FrameworksResOverlayStone",
     sdk_version: "current",
     resource_dirs: ["res"],
     vendor: true,
diff --git a/rro_overlays/FrameworksResOverlay/AndroidManifest.xml b/rro_overlays/FrameworksResOverlayStone/AndroidManifest.xml
similarity index 94%
rename from rro_overlays/FrameworksResOverlay/AndroidManifest.xml
rename to rro_overlays/FrameworksResOverlayStone/AndroidManifest.xml
index a681bd4..0893244 100644
--- a/rro_overlays/FrameworksResOverlay/AndroidManifest.xml
+++ b/rro_overlays/FrameworksResOverlayStone/AndroidManifest.xml
@@ -11,7 +11,7 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.frameworksres.overlay">
+    package="com.android.frameworksres.overlay.stone">
 
     <application android:hasCode="false" />
     <overlay
diff --git a/rro_overlays/FrameworksResOverlay/res/values/config.xml b/rro_overlays/FrameworksResOverlayStone/res/values/config.xml
similarity index 100%
rename from rro_overlays/FrameworksResOverlay/res/values/config.xml
rename to rro_overlays/FrameworksResOverlayStone/res/values/config.xml
diff --git a/rro_overlays/FrameworksResOverlay/res/values/dimens.xml b/rro_overlays/FrameworksResOverlayStone/res/values/dimens.xml
similarity index 100%
rename from rro_overlays/FrameworksResOverlay/res/values/dimens.xml
rename to rro_overlays/FrameworksResOverlayStone/res/values/dimens.xml
diff --git a/rro_overlays/FrameworksResOverlay/res/xml/power_profile.xml b/rro_overlays/FrameworksResOverlayStone/res/xml/power_profile.xml
similarity index 100%
rename from rro_overlays/FrameworksResOverlay/res/xml/power_profile.xml
rename to rro_overlays/FrameworksResOverlayStone/res/xml/power_profile.xml
diff --git a/rro_overlays/TelephonyOverlay/Android.bp b/rro_overlays/SettingsOverlayStone/Android.bp
similarity index 75%
rename from rro_overlays/TelephonyOverlay/Android.bp
rename to rro_overlays/SettingsOverlayStone/Android.bp
index 334cfe6..7e1b9fb 100644
--- a/rro_overlays/TelephonyOverlay/Android.bp
+++ b/rro_overlays/SettingsOverlayStone/Android.bp
@@ -1,5 +1,5 @@
 runtime_resource_overlay {
-    name: "TelephonyOverlay",
+    name: "SettingsOverlayStone",
     sdk_version: "current",
     resource_dirs: ["res"],
     vendor: true,
diff --git a/rro_overlays/SettingsOverlay/AndroidManifest.xml b/rro_overlays/SettingsOverlayStone/AndroidManifest.xml
similarity index 94%
rename from rro_overlays/SettingsOverlay/AndroidManifest.xml
rename to rro_overlays/SettingsOverlayStone/AndroidManifest.xml
index 0037d5f..ed88a24 100644
--- a/rro_overlays/SettingsOverlay/AndroidManifest.xml
+++ b/rro_overlays/SettingsOverlayStone/AndroidManifest.xml
@@ -11,7 +11,7 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.settings.overlay">
+    package="com.android.settings.overlay.stone">
     <application android:hasCode="false" />
     <overlay
       android:targetPackage="com.android.settings"
diff --git a/rro_overlays/SettingsOverlay/res/values/config.xml b/rro_overlays/SettingsOverlayStone/res/values/config.xml
similarity index 100%
rename from rro_overlays/SettingsOverlay/res/values/config.xml
rename to rro_overlays/SettingsOverlayStone/res/values/config.xml
diff --git a/rro_overlays/SettingsProviderOverlay/Android.bp b/rro_overlays/SettingsProviderOverlayStone/Android.bp
similarity index 52%
rename from rro_overlays/SettingsProviderOverlay/Android.bp
rename to rro_overlays/SettingsProviderOverlayStone/Android.bp
index edc3e7f..077685a 100644
--- a/rro_overlays/SettingsProviderOverlay/Android.bp
+++ b/rro_overlays/SettingsProviderOverlayStone/Android.bp
@@ -1,4 +1,4 @@
 runtime_resource_overlay {
-    name: "SettingsProviderOverlay",
+    name: "SettingsProviderOverlayStone",
     vendor: true
 }
diff --git a/rro_overlays/SettingsProviderOverlay/AndroidManifest.xml b/rro_overlays/SettingsProviderOverlayStone/AndroidManifest.xml
similarity index 85%
rename from rro_overlays/SettingsProviderOverlay/AndroidManifest.xml
rename to rro_overlays/SettingsProviderOverlayStone/AndroidManifest.xml
index 57ba339..6a8f01e 100644
--- a/rro_overlays/SettingsProviderOverlay/AndroidManifest.xml
+++ b/rro_overlays/SettingsProviderOverlayStone/AndroidManifest.xml
@@ -4,7 +4,7 @@
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.settingsproviders.overlay">
+    package="com.android.settingsproviders.overlay.stone">
 
     <overlay
         android:isStatic="true"
diff --git a/rro_overlays/SettingsProviderOverlay/res/values/defaults.xml b/rro_overlays/SettingsProviderOverlayStone/res/values/defaults.xml
similarity index 100%
rename from rro_overlays/SettingsProviderOverlay/res/values/defaults.xml
rename to rro_overlays/SettingsProviderOverlayStone/res/values/defaults.xml
diff --git a/rro_overlays/SettingsOverlay/Android.bp b/rro_overlays/SystemUIOverlayStone/Android.bp
similarity index 75%
rename from rro_overlays/SettingsOverlay/Android.bp
rename to rro_overlays/SystemUIOverlayStone/Android.bp
index 487f776..9e668f9 100644
--- a/rro_overlays/SettingsOverlay/Android.bp
+++ b/rro_overlays/SystemUIOverlayStone/Android.bp
@@ -1,5 +1,5 @@
 runtime_resource_overlay {
-    name: "SettingsOverlay",
+    name: "SystemUIOverlayStone",
     sdk_version: "current",
     resource_dirs: ["res"],
     vendor: true,
diff --git a/rro_overlays/SystemUIOverlay/AndroidManifest.xml b/rro_overlays/SystemUIOverlayStone/AndroidManifest.xml
similarity index 94%
rename from rro_overlays/SystemUIOverlay/AndroidManifest.xml
rename to rro_overlays/SystemUIOverlayStone/AndroidManifest.xml
index 1f99bd4..49efdf5 100644
--- a/rro_overlays/SystemUIOverlay/AndroidManifest.xml
+++ b/rro_overlays/SystemUIOverlayStone/AndroidManifest.xml
@@ -11,7 +11,7 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.overlay">
+    package="com.android.systemui.overlay.stone">
     <application android:hasCode="false" />
     <overlay
       android:targetPackage="com.android.systemui"
diff --git a/rro_overlays/SystemUIOverlay/res/values/config.xml b/rro_overlays/SystemUIOverlayStone/res/values/config.xml
similarity index 100%
rename from rro_overlays/SystemUIOverlay/res/values/config.xml
rename to rro_overlays/SystemUIOverlayStone/res/values/config.xml
diff --git a/rro_overlays/SystemUIOverlay/res/values/dimens.xml b/rro_overlays/SystemUIOverlayStone/res/values/dimens.xml
similarity index 100%
rename from rro_overlays/SystemUIOverlay/res/values/dimens.xml
rename to rro_overlays/SystemUIOverlayStone/res/values/dimens.xml
diff --git a/rro_overlays/FrameworksResOverlay/Android.bp b/rro_overlays/TelephonyOverlayStone/Android.bp
similarity index 74%
rename from rro_overlays/FrameworksResOverlay/Android.bp
rename to rro_overlays/TelephonyOverlayStone/Android.bp
index 72c09a1..fcfa013 100644
--- a/rro_overlays/FrameworksResOverlay/Android.bp
+++ b/rro_overlays/TelephonyOverlayStone/Android.bp
@@ -1,5 +1,5 @@
 runtime_resource_overlay {
-    name: "FrameworksResOverlay",
+    name: "TelephonyOverlayStone",
     sdk_version: "current",
     resource_dirs: ["res"],
     vendor: true,
diff --git a/rro_overlays/TelephonyOverlay/AndroidManifest.xml b/rro_overlays/TelephonyOverlayStone/AndroidManifest.xml
similarity index 94%
rename from rro_overlays/TelephonyOverlay/AndroidManifest.xml
rename to rro_overlays/TelephonyOverlayStone/AndroidManifest.xml
index fe0557a..ba18c72 100644
--- a/rro_overlays/TelephonyOverlay/AndroidManifest.xml
+++ b/rro_overlays/TelephonyOverlayStone/AndroidManifest.xml
@@ -11,7 +11,7 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.telephony.overlay">
+    package="com.android.telephony.overlay.stone">
     <application android:hasCode="false" />
     <overlay
       android:targetPackage="com.android.phone"
diff --git a/rro_overlays/TelephonyOverlay/res/values/config.xml b/rro_overlays/TelephonyOverlayStone/res/values/config.xml
similarity index 100%
rename from rro_overlays/TelephonyOverlay/res/values/config.xml
rename to rro_overlays/TelephonyOverlayStone/res/values/config.xml
diff --git a/rro_overlays/WifiOverlay/Android.bp b/rro_overlays/WifiOverlayStone/Android.bp
similarity index 82%
rename from rro_overlays/WifiOverlay/Android.bp
rename to rro_overlays/WifiOverlayStone/Android.bp
index 5407765..be5c7a7 100644
--- a/rro_overlays/WifiOverlay/Android.bp
+++ b/rro_overlays/WifiOverlayStone/Android.bp
@@ -1,5 +1,5 @@
 runtime_resource_overlay {
-    name: "WifiOverlay",
+    name: "WifiOverlayStone",
     theme: "WifiOverlay",
     certificate: "platform",
     sdk_version: "current",
diff --git a/rro_overlays/WifiOverlay/AndroidManifest.xml b/rro_overlays/WifiOverlayStone/AndroidManifest.xml
similarity index 95%
rename from rro_overlays/WifiOverlay/AndroidManifest.xml
rename to rro_overlays/WifiOverlayStone/AndroidManifest.xml
index 7524fae..69ab752 100644
--- a/rro_overlays/WifiOverlay/AndroidManifest.xml
+++ b/rro_overlays/WifiOverlayStone/AndroidManifest.xml
@@ -15,7 +15,7 @@
 -->
 <!-- Pixel specific wifi overlays -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.wifi.resources.xiaomi_sm6375"
+    package="com.android.wifi.resources.stone"
     android:versionCode="1"
     android:versionName="1.0">
     <application android:hasCode="false" />
diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlayStone/res/values/config.xml
similarity index 100%
rename from rro_overlays/WifiOverlay/res/values/config.xml
rename to rro_overlays/WifiOverlayStone/res/values/config.xml