diff --git a/device.mk b/device.mk
index f3c8613..6d7f32d 100644
--- a/device.mk
+++ b/device.mk
@@ -343,12 +343,12 @@ PRODUCT_COPY_FILES += \
 # Overlays
 PRODUCT_PACKAGES += \
     CarrierConfigOverlay \
-	FrameworksResOverlay \
-	SettingsResOverlay \
+	FrameworksResOverlayLG8n \
 	SettingsProviderOverlayLG8n \
-	SystemUIOverlay \
-	WifiResOverlayLG8n \
-	TelephonyOverlay
+	SettingsResOverlayLG8n \
+	SystemUIOverlayLG8n \
+	TelephonyOverlayLG8n \
+	WifiResOverlayLG8n
 
 # Lineage-Specific Overlays
 PRODUCT_PACKAGES += \
diff --git a/overlay/SettingsResOverlay/Android.bp b/overlay/FrameworksResOverlayLG8n/Android.bp
similarity index 83%
rename from overlay/SettingsResOverlay/Android.bp
rename to overlay/FrameworksResOverlayLG8n/Android.bp
index 0fab5b1..69b0a5a 100644
--- a/overlay/SettingsResOverlay/Android.bp
+++ b/overlay/FrameworksResOverlayLG8n/Android.bp
@@ -5,7 +5,7 @@
 //
 
 runtime_resource_overlay {
-    name: "SettingsResOverlay",
+    name: "FrameworksResOverlayLG8n",
     sdk_version: "current",
     product_specific: true,
     resource_dirs: ["res"]
diff --git a/overlay/FrameworksResOverlay/AndroidManifest.xml b/overlay/FrameworksResOverlayLG8n/AndroidManifest.xml
similarity index 94%
rename from overlay/FrameworksResOverlay/AndroidManifest.xml
rename to overlay/FrameworksResOverlayLG8n/AndroidManifest.xml
index 08acd08..7cda02a 100644
--- a/overlay/FrameworksResOverlay/AndroidManifest.xml
+++ b/overlay/FrameworksResOverlayLG8n/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.lg8n.overlay">
 
     <application android:hasCode="false" />
     <overlay android:targetPackage="android" android:isStatic="true" android:priority="1" />
diff --git a/overlay/FrameworksResOverlay/res/values/config.xml b/overlay/FrameworksResOverlayLG8n/res/values/config.xml
similarity index 100%
rename from overlay/FrameworksResOverlay/res/values/config.xml
rename to overlay/FrameworksResOverlayLG8n/res/values/config.xml
diff --git a/overlay/FrameworksResOverlay/res/values/dimens.xml b/overlay/FrameworksResOverlayLG8n/res/values/dimens.xml
similarity index 100%
rename from overlay/FrameworksResOverlay/res/values/dimens.xml
rename to overlay/FrameworksResOverlayLG8n/res/values/dimens.xml
diff --git a/overlay/FrameworksResOverlay/res/xml/power_profile.xml b/overlay/FrameworksResOverlayLG8n/res/xml/power_profile.xml
similarity index 100%
rename from overlay/FrameworksResOverlay/res/xml/power_profile.xml
rename to overlay/FrameworksResOverlayLG8n/res/xml/power_profile.xml
diff --git a/overlay/FrameworksResOverlay/Android.bp b/overlay/SettingsResOverlayLG8n/Android.bp
similarity index 84%
rename from overlay/FrameworksResOverlay/Android.bp
rename to overlay/SettingsResOverlayLG8n/Android.bp
index 1f403c0..fddfeff 100644
--- a/overlay/FrameworksResOverlay/Android.bp
+++ b/overlay/SettingsResOverlayLG8n/Android.bp
@@ -5,7 +5,7 @@
 //
 
 runtime_resource_overlay {
-    name: "FrameworksResOverlay",
+    name: "SettingsResOverlayLG8n",
     sdk_version: "current",
     product_specific: true,
     resource_dirs: ["res"]
diff --git a/overlay/SettingsResOverlay/AndroidManifest.xml b/overlay/SettingsResOverlayLG8n/AndroidManifest.xml
similarity index 94%
rename from overlay/SettingsResOverlay/AndroidManifest.xml
rename to overlay/SettingsResOverlayLG8n/AndroidManifest.xml
index e9fab2a..9484609 100644
--- a/overlay/SettingsResOverlay/AndroidManifest.xml
+++ b/overlay/SettingsResOverlayLG8n/AndroidManifest.xml
@@ -11,7 +11,7 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.settingsres.overlay">
+    package="com.android.settingsres.lg8n.overlay">
 
     <application android:hasCode="false" />
     <overlay android:targetPackage="com.android.settings" android:isStatic="true" android:priority="2" />
diff --git a/overlay/SettingsResOverlay/res/values/config.xml b/overlay/SettingsResOverlayLG8n/res/values/config.xml
similarity index 100%
rename from overlay/SettingsResOverlay/res/values/config.xml
rename to overlay/SettingsResOverlayLG8n/res/values/config.xml
diff --git a/overlay/SystemUIOverlay/Android.bp b/overlay/SystemUIOverlayLG8n/Android.bp
similarity index 85%
rename from overlay/SystemUIOverlay/Android.bp
rename to overlay/SystemUIOverlayLG8n/Android.bp
index 313eccf..54c4a1b 100644
--- a/overlay/SystemUIOverlay/Android.bp
+++ b/overlay/SystemUIOverlayLG8n/Android.bp
@@ -5,7 +5,7 @@
 //
 
 runtime_resource_overlay {
-    name: "SystemUIOverlay",
+    name: "SystemUIOverlayLG8n",
     sdk_version: "current",
     product_specific: true,
     resource_dirs: ["res"]
diff --git a/overlay/SystemUIOverlay/AndroidManifest.xml b/overlay/SystemUIOverlayLG8n/AndroidManifest.xml
similarity index 94%
rename from overlay/SystemUIOverlay/AndroidManifest.xml
rename to overlay/SystemUIOverlayLG8n/AndroidManifest.xml
index 6aa2916..c2fef3b 100644
--- a/overlay/SystemUIOverlay/AndroidManifest.xml
+++ b/overlay/SystemUIOverlayLG8n/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.lg8n.overlay">
 
     <application android:hasCode="false" />
     <overlay android:targetPackage="com.android.systemui" android:isStatic="true" android:priority="1" />
diff --git a/overlay/SystemUIOverlay/res/values/config.xml b/overlay/SystemUIOverlayLG8n/res/values/config.xml
similarity index 100%
rename from overlay/SystemUIOverlay/res/values/config.xml
rename to overlay/SystemUIOverlayLG8n/res/values/config.xml
diff --git a/overlay/SystemUIOverlay/res/values/dimens.xml b/overlay/SystemUIOverlayLG8n/res/values/dimens.xml
similarity index 100%
rename from overlay/SystemUIOverlay/res/values/dimens.xml
rename to overlay/SystemUIOverlayLG8n/res/values/dimens.xml
diff --git a/overlay/TelephonyOverlay/Android.bp b/overlay/TelephonyOverlayLG8n/Android.bp
similarity index 85%
rename from overlay/TelephonyOverlay/Android.bp
rename to overlay/TelephonyOverlayLG8n/Android.bp
index 89a8cde..b437443 100644
--- a/overlay/TelephonyOverlay/Android.bp
+++ b/overlay/TelephonyOverlayLG8n/Android.bp
@@ -5,7 +5,7 @@
 //
 
 runtime_resource_overlay {
-    name: "TelephonyOverlay",
+    name: "TelephonyOverlayLG8n",
     sdk_version: "current",
     product_specific: true,
     resource_dirs: ["res"]
diff --git a/overlay/TelephonyOverlay/AndroidManifest.xml b/overlay/TelephonyOverlayLG8n/AndroidManifest.xml
similarity index 88%
rename from overlay/TelephonyOverlay/AndroidManifest.xml
rename to overlay/TelephonyOverlayLG8n/AndroidManifest.xml
index d9b7a43..27c62b5 100644
--- a/overlay/TelephonyOverlay/AndroidManifest.xml
+++ b/overlay/TelephonyOverlayLG8n/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.telephony.overlay">
+    package="com.android.telephony.lg8n.overlay">
 
     <application android:hasCode="false" />
     <overlay
diff --git a/overlay/TelephonyOverlay/res/values/config.xml b/overlay/TelephonyOverlayLG8n/res/values/config.xml
similarity index 100%
rename from overlay/TelephonyOverlay/res/values/config.xml
rename to overlay/TelephonyOverlayLG8n/res/values/config.xml