diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index f0337fe..33b2644 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -21,8 +21,8 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/redroid_arm64_only.mk \
 
 COMMON_LUNCH_CHOICES := \
-    redroid_x86_64-userdebug \
-    redroid_x86_64_only-userdebug \
-    redroid_arm64-userdebug \
-    redroid_arm64_only-userdebug \
+    redroid_x86_64-trunk_staging-userdebug \
+    redroid_x86_64_only-trunk_staging-userdebug \
+    redroid_arm64-trunk_staging-userdebug \
+    redroid_arm64_only-trunk_staging-userdebug \
 
diff --git a/redroid_arm64.mk b/redroid_arm64.mk
index d0438c3..52ddaf0 100644
--- a/redroid_arm64.mk
+++ b/redroid_arm64.mk
@@ -22,6 +22,6 @@ $(call inherit-product, $(LOCAL_PATH)/redroid_arm64/device.mk)
 PRODUCT_NAME := redroid_arm64
 PRODUCT_DEVICE := redroid_arm64
 PRODUCT_BRAND := redroid
-PRODUCT_MODEL := redroid15_arm64
+PRODUCT_MODEL := redroid16_arm64
 
 DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay
diff --git a/redroid_arm64_only.mk b/redroid_arm64_only.mk
index 20a10c9..5a3adb2 100644
--- a/redroid_arm64_only.mk
+++ b/redroid_arm64_only.mk
@@ -24,7 +24,7 @@ $(call inherit-product, $(LOCAL_PATH)/redroid_arm64_only/device.mk)
 PRODUCT_NAME := redroid_arm64_only
 PRODUCT_DEVICE := redroid_arm64_only
 PRODUCT_BRAND := redroid
-PRODUCT_MODEL := redroid15_arm64_only
+PRODUCT_MODEL := redroid16_arm64_only
 
 DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay
 
diff --git a/redroid_x86_64.mk b/redroid_x86_64.mk
index 31a8604..95089e3 100644
--- a/redroid_x86_64.mk
+++ b/redroid_x86_64.mk
@@ -21,6 +21,6 @@ $(call inherit-product, $(LOCAL_PATH)/redroid_x86_64/device.mk)
 PRODUCT_NAME := redroid_x86_64
 PRODUCT_DEVICE := redroid_x86_64
 PRODUCT_BRAND := redroid
-PRODUCT_MODEL := redroid15_x86_64
+PRODUCT_MODEL := redroid16_x86_64
 
 DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay
diff --git a/redroid_x86_64_only.mk b/redroid_x86_64_only.mk
index 75f6e51..e7d7852 100644
--- a/redroid_x86_64_only.mk
+++ b/redroid_x86_64_only.mk
@@ -23,7 +23,7 @@ $(call inherit-product, $(LOCAL_PATH)/redroid_x86_64_only/device.mk)
 PRODUCT_NAME := redroid_x86_64_only
 PRODUCT_DEVICE := redroid_x86_64_only
 PRODUCT_BRAND := redroid
-PRODUCT_MODEL := redroid15_x86_64_only
+PRODUCT_MODEL := redroid16_x86_64_only
 
 DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay