diff --git a/Samsung/x1q-SystemUI/Android.mk b/Samsung/S20-SystemUI/Android.mk
similarity index 80%
rename from Samsung/x1q-SystemUI/Android.mk
rename to Samsung/S20-SystemUI/Android.mk
index 1e0c0e0..9f2c12a 100644
--- a/Samsung/x1q-SystemUI/Android.mk
+++ b/Samsung/S20-SystemUI/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := treble-overlay-samsung-x1q-systemui
+LOCAL_PACKAGE_NAME := treble-overlay-samsung-S20-systemui
 LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
 LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/Samsung/x1q-SystemUI/AndroidManifest.xml b/Samsung/S20-SystemUI/AndroidManifest.xml
similarity index 85%
rename from Samsung/x1q-SystemUI/AndroidManifest.xml
rename to Samsung/S20-SystemUI/AndroidManifest.xml
index 9fee5c1..dce9c33 100644
--- a/Samsung/x1q-SystemUI/AndroidManifest.xml
+++ b/Samsung/S20-SystemUI/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="me.phh.treble.overlay.samsung.x1q.systemui"
+          package="me.phh.treble.overlay.samsung.S20.systemui"
           android:versionCode="1"
           android:versionName="1.0">
     <overlay android:targetPackage="com.android.systemui"
diff --git a/Samsung/x1q-SystemUI/res/values-land/config.xml b/Samsung/S20-SystemUI/res/values-land/config.xml
similarity index 100%
rename from Samsung/x1q-SystemUI/res/values-land/config.xml
rename to Samsung/S20-SystemUI/res/values-land/config.xml
diff --git a/Samsung/x1q-SystemUI/res/values/config.xml b/Samsung/S20-SystemUI/res/values/config.xml
similarity index 100%
rename from Samsung/x1q-SystemUI/res/values/config.xml
rename to Samsung/S20-SystemUI/res/values/config.xml
diff --git a/Samsung/x1q/Android.mk b/Samsung/S20/Android.mk
similarity index 82%
rename from Samsung/x1q/Android.mk
rename to Samsung/S20/Android.mk
index 390c0a7..e248166 100644
--- a/Samsung/x1q/Android.mk
+++ b/Samsung/S20/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := treble-overlay-samsung-x1q
+LOCAL_PACKAGE_NAME := treble-overlay-samsung-S20
 LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
 LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/Samsung/x1q/AndroidManifest.xml b/Samsung/S20/AndroidManifest.xml
similarity index 86%
rename from Samsung/x1q/AndroidManifest.xml
rename to Samsung/S20/AndroidManifest.xml
index 56fa929..8c85a4b 100644
--- a/Samsung/x1q/AndroidManifest.xml
+++ b/Samsung/S20/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="me.phh.treble.overlay.samsung.x1q"
+          package="me.phh.treble.overlay.samsung.S20"
           android:versionCode="1"
           android:versionName="1.0">
     <overlay android:targetPackage="android"
diff --git a/Samsung/x1q/res/values/config.xml b/Samsung/S20/res/values/config.xml
similarity index 100%
rename from Samsung/x1q/res/values/config.xml
rename to Samsung/S20/res/values/config.xml
diff --git a/Samsung/x1q/res/xml/power_profile.xml b/Samsung/S20/res/xml/power_profile.xml
similarity index 100%
rename from Samsung/x1q/res/xml/power_profile.xml
rename to Samsung/S20/res/xml/power_profile.xml
diff --git a/overlay.mk b/overlay.mk
index 2d67175..d56f06b 100644
--- a/overlay.mk
+++ b/overlay.mk
@@ -230,13 +230,13 @@ PRODUCT_PACKAGES += \
 	treble-overlay-samsung-r9q \
 	treble-overlay-samsung-r9s \
 	treble-overlay-samsung-s10e \
+	treble-overlay-samsung-S20 \
+	treble-overlay-samsung-S20-systemui \
 	treble-overlay-samsung-s9pq \
 	treble-overlay-samsung-s9q \
 	treble-overlay-samsung-starqltekdi \
 	treble-overlay-samsung-starqltekdi-systemui \
 	treble-overlay-samsung-t2s \
-	treble-overlay-samsung-x1q \
-	treble-overlay-samsung-x1q-systemui \
 	treble-overlay-samsung-z3q \
 	treble-overlay-sec-ims \
 	treble-overlay-sharp-s2 \