diff --git a/device.mk b/device.mk
index 3ba00a1..75cf507 100644
--- a/device.mk
+++ b/device.mk
@@ -16,7 +16,7 @@
 FP_PATH := device/fairphone/FP3
 
 # Disable data roaming by default
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	ro.com.android.dataroaming=false
 
 # Call the vendor setup
@@ -145,7 +145,7 @@
 
 
 # OEM Unlock reporting
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	ro.oem_unlock_supported=1
 
 
@@ -412,10 +412,10 @@
 	librmnetctl
 
 # IPV4
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	persist.vendor.data.profile_update=true
 
-PRODUCT_PROPERTY_OVERRIDES += ro.telephony.iwlan_operation_mode=legacy
+PRODUCT_VENDOR_PROPERTIES += ro.telephony.iwlan_operation_mode=legacy
 
 
 # Display
@@ -442,11 +442,11 @@
 
 # Vendor Display
 # Disable skip validate
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	vendor.display.disable_skip_validate=1
 
-PRODUCT_PROPERTY_OVERRIDES += ro.hardware.vulkan=adreno
-PRODUCT_PROPERTY_OVERRIDES += ro.hardware.egl=adreno
+PRODUCT_VENDOR_PROPERTIES += ro.hardware.vulkan=adreno
+PRODUCT_VENDOR_PROPERTIES += ro.hardware.egl=adreno
 
 
 # Display Properties
@@ -477,8 +477,8 @@
 
 
 # Encryption
-PRODUCT_PROPERTY_OVERRIDES += ro.crypto.allow_encrypt_override=true
-PRODUCT_PROPERTY_OVERRIDES += ro.crypto.volume.filenames_mode=aes-256-cts
+PRODUCT_VENDOR_PROPERTIES += ro.crypto.allow_encrypt_override=true
+PRODUCT_VENDOR_PROPERTIES += ro.crypto.volume.filenames_mode=aes-256-cts
 
 
 # E2fsck
@@ -541,7 +541,7 @@
 	vndservicemanager
 
 # FRP
-PRODUCT_PROPERTY_OVERRIDES += ro.frp.pst=/dev/block/bootdevice/by-name/config
+PRODUCT_VENDOR_PROPERTIES += ro.frp.pst=/dev/block/bootdevice/by-name/config
 
 
 # HIDL
@@ -579,7 +579,7 @@
 PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.hardware.location.gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.location.gps.xml
 
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	persist.backup.ntpServer=0.pool.ntp.org
 
 
@@ -691,7 +691,7 @@
 
 
 # Keystore
-PRODUCT_PROPERTY_OVERRIDES += ro.hardware.keystore_desede=true
+PRODUCT_VENDOR_PROPERTIES += ro.hardware.keystore_desede=true
 
 
 # LED packages
@@ -702,7 +702,7 @@
 
 
 # Media / StagefrightCodec 2.0
-PRODUCT_PROPERTY_OVERRIDES += debug.stagefright.omx_default_rank=0
+PRODUCT_VENDOR_PROPERTIES += debug.stagefright.omx_default_rank=0
 
 # Enable features in video HAL that can compile only on this platform
 MSM_VIDC_TARGET_LIST := msm8953
@@ -793,7 +793,7 @@
 # 196608 is decimal for 0x30000 to report major/minor versions as 3/0
 # 196609 is decimal for 0x30001 to report major/minor versions as 3/1
 # 196610 is decimal for 0x30002 to report major/minor versions as 3/2
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	ro.opengles.version=196610
 
 
@@ -822,7 +822,7 @@
 PRODUCT_COPY_FILES += \
 	$(FP_PATH)/configs/powerhint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.xml
 
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	persist.vendor.qcomsysd.enabled=1 \
 	ro.vendor.extension_library=libqti-perfd-client.so \
 	sys.vendor.shutdown.waittime=500
@@ -836,7 +836,7 @@
 
 
 # privapp-permissions whitelisting
-PRODUCT_PROPERTY_OVERRIDES += ro.control_privapp_permissions=enforce
+PRODUCT_VENDOR_PROPERTIES += ro.control_privapp_permissions=enforce
 
 
 # Protobuf
@@ -850,15 +850,15 @@
 include $(FP_PATH)/utils.mk
 
 # RIL properties
-PRODUCT_PROPERTY_OVERRIDES += vendor.rild.libpath=/vendor/lib64/libril-qc-qmi-1.so
+PRODUCT_VENDOR_PROPERTIES += vendor.rild.libpath=/vendor/lib64/libril-qc-qmi-1.so
 #vendor prop to disable advanced network scanning
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.radio.enableadvancedscan=false
 
 # Enable Dual SIM by default
-PRODUCT_PROPERTY_OVERRIDES += persist.radio.multisim.config=dsds
+PRODUCT_VENDOR_PROPERTIES += persist.radio.multisim.config=dsds
 
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	persist.vendor.radio.apm_sim_not_pwdn=1 \
 	persist.vendor.radio.sib16_support=1 \
 	persist.vendor.radio.custom_ecc=1 \