diff --git a/Moto/G6Play-jeter_sprint/Android.mk b/Moto/G6Play/Android.mk
similarity index 78%
rename from Moto/G6Play-jeter_sprint/Android.mk
rename to Moto/G6Play/Android.mk
index 66e61b4..e825ca7 100644
--- a/Moto/G6Play-jeter_sprint/Android.mk
+++ b/Moto/G6Play/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := treble-overlay-moto-g6play-jeter_sprint
+LOCAL_PACKAGE_NAME := treble-overlay-moto-g6play
 LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
 LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/Moto/G6Play-jeter_sprint/AndroidManifest.xml b/Moto/G6Play/AndroidManifest.xml
similarity index 80%
rename from Moto/G6Play-jeter_sprint/AndroidManifest.xml
rename to Moto/G6Play/AndroidManifest.xml
index 175db0f..ef1616f 100644
--- a/Moto/G6Play-jeter_sprint/AndroidManifest.xml
+++ b/Moto/G6Play/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="me.phh.treble.overlay.moto.g6playjetersprint"
+        package="me.phh.treble.overlay.moto.g6play"
         android:versionCode="1"
         android:versionName="1.0">
 	<!--
@@ -8,7 +8,7 @@
 	-->
         <overlay android:targetPackage="android"
                 android:requiredSystemPropertyName="ro.vendor.product.name"
-                android:requiredSystemPropertyValue="+jeter_sprint"
+                android:requiredSystemPropertyValue="+*jeter*"
 		android:priority="78"
 		android:isStatic="true" />
 </manifest>
diff --git a/Moto/G6Play-jeter_sprint/res/values/config.xml b/Moto/G6Play/res/values/config.xml
similarity index 100%
rename from Moto/G6Play-jeter_sprint/res/values/config.xml
rename to Moto/G6Play/res/values/config.xml
diff --git a/Moto/G6Play-jeter_sprint/res/xml/power_profile.xml b/Moto/G6Play/res/xml/power_profile.xml
similarity index 100%
rename from Moto/G6Play-jeter_sprint/res/xml/power_profile.xml
rename to Moto/G6Play/res/xml/power_profile.xml
diff --git a/overlay.mk b/overlay.mk
index a4cb6c1..f08a592 100644
--- a/overlay.mk
+++ b/overlay.mk
@@ -35,7 +35,7 @@ PRODUCT_PACKAGES += \
 	treble-overlay-lg-g7 \
 	treble-overlay-lg-v40 \
 	treble-overlay-moto-g6 \
-	treble-overlay-moto-g6play-jeter_sprint \
+	treble-overlay-moto-g6play \
 	treble-overlay-moto-g6plus \
 	treble-overlay-moto-g7power \
 	treble-overlay-nokia-b2n \