diff --git a/device.mk b/device.mk
index 1a77712..4889e10 100644
--- a/device.mk
+++ b/device.mk
@@ -23,12 +23,12 @@ $(call inherit-product, device/motorola/sm6375-common/common.mk)
 
 # Overlays
 PRODUCT_PACKAGES += \
-    FrameworksResBangkk \
-    LineageSystemUIBangkk \
-    ProductFrameworksResBangkk \
-    SettingsResBangkk \
-    SystemUIResBangkk \
-    WifiResBangkk
+    FrameworksResDevice \
+    LineageSystemUIDevice \
+    ProductFrameworksResDevice \
+    SettingsResDevice \
+    SystemUIResDevice \
+    WifiResDevice
 
 # Audio
 PRODUCT_COPY_FILES += \
diff --git a/resource-overlay/device/Frameworks/Android.bp b/resource-overlay/device/Frameworks/Android.bp
index 8e2e24d..1258a9f 100644
--- a/resource-overlay/device/Frameworks/Android.bp
+++ b/resource-overlay/device/Frameworks/Android.bp
@@ -4,6 +4,6 @@
 //
 
 runtime_resource_overlay {
-    name: "FrameworksResBangkk",
+    name: "FrameworksResDevice",
     vendor: true,
 }
diff --git a/resource-overlay/device/Frameworks/AndroidManifest.xml b/resource-overlay/device/Frameworks/AndroidManifest.xml
index 1428122..cf4866e 100644
--- a/resource-overlay/device/Frameworks/AndroidManifest.xml
+++ b/resource-overlay/device/Frameworks/AndroidManifest.xml
@@ -4,7 +4,7 @@
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="android.overlay.bangkk">
+    package="android.overlay.device">
 
     <overlay
         android:isStatic="true"
diff --git a/resource-overlay/device/LineageSystemUI/Android.bp b/resource-overlay/device/LineageSystemUI/Android.bp
index 93661cb..50e50d0 100644
--- a/resource-overlay/device/LineageSystemUI/Android.bp
+++ b/resource-overlay/device/LineageSystemUI/Android.bp
@@ -4,6 +4,6 @@
 //
 
 runtime_resource_overlay {
-    name: "LineageSystemUIBangkk",
+    name: "LineageSystemUIDevice",
     vendor: true,
 }
diff --git a/resource-overlay/device/LineageSystemUI/AndroidManifest.xml b/resource-overlay/device/LineageSystemUI/AndroidManifest.xml
index 8b95d65..1cdcb60 100644
--- a/resource-overlay/device/LineageSystemUI/AndroidManifest.xml
+++ b/resource-overlay/device/LineageSystemUI/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.systemui.bangkk.lineage">
+    package="com.android.systemui.device.lineage">
 
     <overlay
         android:isStatic="true"
diff --git a/resource-overlay/device/ProductFrameworks/Android.bp b/resource-overlay/device/ProductFrameworks/Android.bp
index 721520b..6962cff 100644
--- a/resource-overlay/device/ProductFrameworks/Android.bp
+++ b/resource-overlay/device/ProductFrameworks/Android.bp
@@ -4,6 +4,6 @@
 //
 
 runtime_resource_overlay {
-    name: "ProductFrameworksResBangkk",
+    name: "ProductFrameworksResDevice",
     product_specific: true,
 }
diff --git a/resource-overlay/device/ProductFrameworks/AndroidManifest.xml b/resource-overlay/device/ProductFrameworks/AndroidManifest.xml
index 7575836..508822b 100644
--- a/resource-overlay/device/ProductFrameworks/AndroidManifest.xml
+++ b/resource-overlay/device/ProductFrameworks/AndroidManifest.xml
@@ -4,7 +4,7 @@
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="android.overlay.product.bangkk">
+    package="android.overlay.product.device">
 
     <overlay
         android:isStatic="true"
diff --git a/resource-overlay/device/Settings/Android.bp b/resource-overlay/device/Settings/Android.bp
index 3e9d3e3..3fd9f54 100644
--- a/resource-overlay/device/Settings/Android.bp
+++ b/resource-overlay/device/Settings/Android.bp
@@ -4,6 +4,6 @@
 //
 
 runtime_resource_overlay {
-    name: "SettingsResBangkk",
+    name: "SettingsResDevice",
     vendor: true,
 }
diff --git a/resource-overlay/device/Settings/AndroidManifest.xml b/resource-overlay/device/Settings/AndroidManifest.xml
index 3880363..9e0553c 100644
--- a/resource-overlay/device/Settings/AndroidManifest.xml
+++ b/resource-overlay/device/Settings/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.settings.overlay.bangkk">
+    package="com.android.settings.overlay.device">
 
     <overlay
         android:isStatic="true"
diff --git a/resource-overlay/device/SystemUI/Android.bp b/resource-overlay/device/SystemUI/Android.bp
index 0d69e57..c46a037 100644
--- a/resource-overlay/device/SystemUI/Android.bp
+++ b/resource-overlay/device/SystemUI/Android.bp
@@ -4,6 +4,6 @@
 //
 
 runtime_resource_overlay {
-    name: "SystemUIResBangkk",
+    name: "SystemUIResDevice",
     vendor: true,
 }
diff --git a/resource-overlay/device/SystemUI/AndroidManifest.xml b/resource-overlay/device/SystemUI/AndroidManifest.xml
index 0d21910..dad72bf 100644
--- a/resource-overlay/device/SystemUI/AndroidManifest.xml
+++ b/resource-overlay/device/SystemUI/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.systemui.overlay.bangkk">
+    package="com.android.systemui.overlay.device">
 
     <overlay
         android:isStatic="true"
diff --git a/resource-overlay/device/Wifi/Android.bp b/resource-overlay/device/Wifi/Android.bp
index 5ace21c..b48b47f 100644
--- a/resource-overlay/device/Wifi/Android.bp
+++ b/resource-overlay/device/Wifi/Android.bp
@@ -4,6 +4,6 @@
 //
 
 runtime_resource_overlay {
-    name: "WifiResBangkk",
+    name: "WifiResDevice",
     vendor: true,
 }
diff --git a/resource-overlay/device/Wifi/AndroidManifest.xml b/resource-overlay/device/Wifi/AndroidManifest.xml
index 2b114b5..bff11c5 100644
--- a/resource-overlay/device/Wifi/AndroidManifest.xml
+++ b/resource-overlay/device/Wifi/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.wifi.resources.overlay.bangkk">
+    package="com.android.wifi.resources.overlay.device">
 
     <overlay
         android:isStatic="true"