diff --git a/aosp_rpi4.mk b/aosp_rpi4.mk
index 3a4d2b4..fe849c9 100644
--- a/aosp_rpi4.mk
+++ b/aosp_rpi4.mk
@@ -29,6 +29,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 c414887..87da9d2 100644
--- a/aosp_rpi4_car.mk
+++ b/aosp_rpi4_car.mk
@@ -102,6 +102,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 f9b177d..cb3f5f9 100644
--- a/aosp_rpi4_tv.mk
+++ b/aosp_rpi4_tv.mk
@@ -38,6 +38,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