diff --git a/aosp_rpi5.mk b/aosp_rpi5.mk
index ddf3370..efe42cb 100644
--- a/aosp_rpi5.mk
+++ b/aosp_rpi5.mk
@@ -29,6 +29,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 1a852b2..33f9a35 100644
--- a/aosp_rpi5_car.mk
+++ b/aosp_rpi5_car.mk
@@ -102,6 +102,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 a896dbb..70149e4 100644
--- a/aosp_rpi5_tv.mk
+++ b/aosp_rpi5_tv.mk
@@ -38,6 +38,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