diff --git a/aosp_rpi4.mk b/aosp_rpi4.mk
index 606e3a7..9c179bf 100644
--- a/aosp_rpi4.mk
+++ b/aosp_rpi4.mk
@@ -28,6 +28,5 @@ PRODUCT_COPY_FILES += \
 PRODUCT_DEVICE := rpi4
 PRODUCT_NAME := aosp_rpi4
 PRODUCT_BRAND := Raspberry
-PRODUCT_MODEL := Raspberry Pi 4
+PRODUCT_MODEL := Pi 4
 PRODUCT_MANUFACTURER := Raspberry
-PRODUCT_RELEASE_NAME := Raspberry Pi 4
diff --git a/aosp_rpi4_car.mk b/aosp_rpi4_car.mk
index 483d13f..70cc802 100644
--- a/aosp_rpi4_car.mk
+++ b/aosp_rpi4_car.mk
@@ -103,6 +103,5 @@ PRODUCT_PACKAGES += \
 PRODUCT_DEVICE := rpi4
 PRODUCT_NAME := aosp_rpi4_car
 PRODUCT_BRAND := Raspberry
-PRODUCT_MODEL := Raspberry Pi 4
+PRODUCT_MODEL := Pi 4
 PRODUCT_MANUFACTURER := Raspberry
-PRODUCT_RELEASE_NAME := Raspberry Pi 4
diff --git a/aosp_rpi4_tv.mk b/aosp_rpi4_tv.mk
index 83503d2..c5d487c 100644
--- a/aosp_rpi4_tv.mk
+++ b/aosp_rpi4_tv.mk
@@ -37,6 +37,5 @@ PRODUCT_PACKAGES += \
 PRODUCT_DEVICE := rpi4
 PRODUCT_NAME := aosp_rpi4_tv
 PRODUCT_BRAND := Raspberry
-PRODUCT_MODEL := Raspberry Pi 4
+PRODUCT_MODEL := Pi 4
 PRODUCT_MANUFACTURER := Raspberry
-PRODUCT_RELEASE_NAME := Raspberry Pi 4