diff --git a/device-felix.mk b/device-felix.mk
index 61c5a99..b0ecd7f 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -185,7 +185,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # PowerStats HAL
 PRODUCT_SOONG_NAMESPACES += \
-    device/google/felix/powerstats/felix
+    device/google/felix/powerstats/felix \
+    device/google/felix
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
@@ -242,7 +243,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # SKU specific RROs
 PRODUCT_PACKAGES += \
-    SettingsOverlayGPQ72
+    SettingsOverlayG0B96
 
 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts
diff --git a/felix/overlay_packages/SettingsOverlayGPQ72/Android.bp b/felix/overlay_packages/SettingsOverlayG0B96/Android.bp
similarity index 78%
rename from felix/overlay_packages/SettingsOverlayGPQ72/Android.bp
rename to felix/overlay_packages/SettingsOverlayG0B96/Android.bp
index 93a1620..f39ee73 100644
--- a/felix/overlay_packages/SettingsOverlayGPQ72/Android.bp
+++ b/felix/overlay_packages/SettingsOverlayG0B96/Android.bp
@@ -3,6 +3,6 @@ package {
 }
 
 runtime_resource_overlay {
-    name: "SettingsOverlayGPQ72",
+    name: "SettingsOverlayG0B96",
     product_specific: true,
 }
diff --git a/felix/overlay_packages/SettingsOverlayGPQ72/AndroidManifest.xml b/felix/overlay_packages/SettingsOverlayG0B96/AndroidManifest.xml
similarity index 75%
rename from felix/overlay_packages/SettingsOverlayGPQ72/AndroidManifest.xml
rename to felix/overlay_packages/SettingsOverlayG0B96/AndroidManifest.xml
index 10bf5a3..bd79323 100644
--- a/felix/overlay_packages/SettingsOverlayGPQ72/AndroidManifest.xml
+++ b/felix/overlay_packages/SettingsOverlayG0B96/AndroidManifest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.settings.overlay.gpq72">
+    package="com.android.settings.overlay.g0b96">
     <application android:hasCode="false" />
     <overlay android:targetPackage="com.android.settings"
              android:requiredSystemPropertyName="ro.boot.hardware.sku"
-             android:requiredSystemPropertyValue="GPQ72"
+             android:requiredSystemPropertyValue="G0B96"
              android:isStatic="true" />
 </manifest>
diff --git a/felix/overlay_packages/SettingsOverlayG0B96/res/drawable/regulatory_info.png b/felix/overlay_packages/SettingsOverlayG0B96/res/drawable/regulatory_info.png
new file mode 100644
index 0000000..1d04e6e
Binary files /dev/null and b/felix/overlay_packages/SettingsOverlayG0B96/res/drawable/regulatory_info.png differ
diff --git a/felix/overlay_packages/SettingsOverlayGPQ72/res/drawable/regulatory_info.png b/felix/overlay_packages/SettingsOverlayGPQ72/res/drawable/regulatory_info.png
deleted file mode 100644
index f2b2358..0000000
Binary files a/felix/overlay_packages/SettingsOverlayGPQ72/res/drawable/regulatory_info.png and /dev/null differ