diff --git a/aosp_rpi5.mk b/aosp_rpi5.mk
index e83588c..08bdfcb 100644
--- a/aosp_rpi5.mk
+++ b/aosp_rpi5.mk
@@ -28,6 +28,5 @@ PRODUCT_COPY_FILES += \
 PRODUCT_DEVICE := rpi5
 PRODUCT_NAME := aosp_rpi5
 PRODUCT_BRAND := Raspberry
-PRODUCT_MODEL := Raspberry Pi 5
+PRODUCT_MODEL := Pi 5
 PRODUCT_MANUFACTURER := Raspberry
-PRODUCT_RELEASE_NAME := Raspberry Pi 5
diff --git a/aosp_rpi5_car.mk b/aosp_rpi5_car.mk
index e31b841..99c36ff 100644
--- a/aosp_rpi5_car.mk
+++ b/aosp_rpi5_car.mk
@@ -103,6 +103,5 @@ PRODUCT_PACKAGES += \
 PRODUCT_DEVICE := rpi5
 PRODUCT_NAME := aosp_rpi5_car
 PRODUCT_BRAND := Raspberry
-PRODUCT_MODEL := Raspberry Pi 5
+PRODUCT_MODEL := Pi 5
 PRODUCT_MANUFACTURER := Raspberry
-PRODUCT_RELEASE_NAME := Raspberry Pi 5
diff --git a/aosp_rpi5_tv.mk b/aosp_rpi5_tv.mk
index d3c4112..feb0b60 100644
--- a/aosp_rpi5_tv.mk
+++ b/aosp_rpi5_tv.mk
@@ -37,6 +37,5 @@ PRODUCT_PACKAGES += \
 PRODUCT_DEVICE := rpi5
 PRODUCT_NAME := aosp_rpi5_tv
 PRODUCT_BRAND := Raspberry
-PRODUCT_MODEL := Raspberry Pi 5
+PRODUCT_MODEL := Pi 5
 PRODUCT_MANUFACTURER := Raspberry
-PRODUCT_RELEASE_NAME := Raspberry Pi 5