diff --git a/config/common.mk b/config/common.mk
index 21bb7812..f6617c0b 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -113,7 +113,7 @@ PRODUCT_RESTRICT_VENDOR_FILES := false
 
 ifneq ($(TARGET_DISABLE_EPPE),true)
 # Require all requested packages to exist
-$(call enforce-product-packages-exist-internal,$(wildcard device/*/$(LINEAGE_BUILD)/$(TARGET_PRODUCT).mk),product_manifest.xml rild Calendar Launcher3 Launcher3Go Launcher3QuickStep Launcher3QuickStepGo android.hidl.memory@1.0-impl.vendor vndk_apex_snapshot_package)
+$(call enforce-product-packages-exist-internal,$(wildcard device/*/$(LINEAGE_BUILD)/$(TARGET_PRODUCT).mk),product_manifest.xml rild Calendar android.hidl.memory@1.0-impl.vendor vndk_apex_snapshot_package)
 endif
 
 # Bootanimation
diff --git a/config/common_mobile.mk b/config/common_mobile.mk
index 08619d9d..758a5b43 100644
--- a/config/common_mobile.mk
+++ b/config/common_mobile.mk
@@ -22,20 +22,20 @@ PRODUCT_PACKAGES += \
 
 ifeq ($(PRODUCT_TYPE), go)
 PRODUCT_PACKAGES += \
-    TrebuchetQuickStepGo
+    Launcher3QuickStepGo
 
 PRODUCT_DEXPREOPT_SPEED_APPS += \
-    TrebuchetQuickStepGo
+    Launcher3QuickStepGo
 else
 PRODUCT_PACKAGES += \
-    TrebuchetQuickStep
+    Launcher3QuickStep
 
 PRODUCT_DEXPREOPT_SPEED_APPS += \
-    TrebuchetQuickStep
+    Launcher3QuickStep
 endif
 
 PRODUCT_PACKAGES += \
-    TrebuchetOverlay
+    Launcher3Overlay
 
 # Charger
 PRODUCT_PACKAGES += \
diff --git a/overlay/rro_packages/TrebuchetOverlay/Android.bp b/overlay/rro_packages/Launcher3Overlay/Android.bp
similarity index 83%
rename from overlay/rro_packages/TrebuchetOverlay/Android.bp
rename to overlay/rro_packages/Launcher3Overlay/Android.bp
index 833e0d8f..8043464f 100644
--- a/overlay/rro_packages/TrebuchetOverlay/Android.bp
+++ b/overlay/rro_packages/Launcher3Overlay/Android.bp
@@ -4,6 +4,6 @@
 //
 
 runtime_resource_overlay {
-    name: "TrebuchetOverlay",
+    name: "Launcher3Overlay",
     product_specific: true,
 }
diff --git a/overlay/rro_packages/TrebuchetOverlay/AndroidManifest.xml b/overlay/rro_packages/Launcher3Overlay/AndroidManifest.xml
similarity index 100%
rename from overlay/rro_packages/TrebuchetOverlay/AndroidManifest.xml
rename to overlay/rro_packages/Launcher3Overlay/AndroidManifest.xml
diff --git a/overlay/rro_packages/TrebuchetOverlay/res/values/config.xml b/overlay/rro_packages/Launcher3Overlay/res/values/config.xml
similarity index 100%
rename from overlay/rro_packages/TrebuchetOverlay/res/values/config.xml
rename to overlay/rro_packages/Launcher3Overlay/res/values/config.xml