diff --git a/audio_properties.mk b/audio_properties.mk
index 6e034d8..b696b9b 100644
--- a/audio_properties.mk
+++ b/audio_properties.mk
@@ -5,142 +5,142 @@
 #
 
 # Reduce client buffer size for fast audio output tracks
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	af.fast_track_multiplier=1
 
 #Low latency audio buffer size in frames
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	vendor.audio_hal.period_size=192
 
 ##fluencetype can be "fluence" or "fluencepro" or "none"
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	ro.vendor.audio.sdk.fluencetype=none\
 	persist.vendor.audio.fluence.voicecall=true\
 	persist.vendor.audio.fluence.voicerec=false\
 	persist.vendor.audio.fluence.speaker=true
 
 #disable tunnel encoding
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	vendor.audio.tunnel.encode=false
 
 #Buffer size in kbytes for compress offload playback
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	vendor.audio.offload.buffer.size.kb=64
 
 #Minimum duration for offload playback in secs
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	audio.offload.min.duration.secs=30
 
 #Enable offload audio video playback by default
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	audio.offload.video=true
 
 #Enable audio track offload by default
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	vendor.audio.offload.track.enable=true
 
 #Enable music through deep buffer
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	audio.deep_buffer.media=true
 
 #enable voice path for PCM VoIP by default
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	vendor.voice.path.for.pcm.voip=true
 
 #Enable multi channel aac through offload
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	vendor.audio.offload.multiaac.enable=true
 
 #Enable DS2, Hardbypass feature for Dolby
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	vendor.audio.dolby.ds2.enabled=false\
 	vendor.audio.dolby.ds2.hardbypass=false
 
 #Disable Multiple offload sesison
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	vendor.audio.offload.multiple.enabled=false
 
 #Disable Compress passthrough playback
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	vendor.audio.offload.passthrough=false
 
 #Disable surround sound recording
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	ro.vendor.audio.sdk.ssr=false
 
 #enable dsp gapless mode by default
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	vendor.audio.offload.gapless.enabled=true
 
 #enable pbe effects
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	vendor.audio.safx.pbe.enabled=true
 
 #parser input buffer size(256kb) in byte stream mode
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	vendor.audio.parser.ip.buffer.size=262144
 
 #enable downsampling for multi-channel content > 48Khz
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	vendor.audio.playback.mch.downsample=true
 
 #enable software decoders for ALAC and APE.
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	vendor.audio.use.sw.alac.decoder=false\
 	vendor.audio.use.sw.ape.decoder=true
 
 #property for AudioSphere Post processing
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	vendor.audio.pp.asphere.enabled=false
 
 #Audio voice concurrency related flags
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	vendor.voice.playback.conc.disabled=true\
 	vendor.voice.record.conc.disabled=false\
 	vendor.voice.voip.conc.disabled=true
 
 #Decides the audio fallback path during voice call,
 #deep-buffer and fast are the two allowed fallback paths now.
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	vendor.voice.conc.fallbackpath=deep-buffer
 
 #Disable speaker protection by default
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	persist.vendor.audio.speaker.prot.enable=false
 
 #Enable HW AAC Encoder by default
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	vendor.audio.hw.aac.encoder=true
 
 #flac sw decoder 24 bit decode capability
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	vendor.audio.flac.sw.decoder.24bit=true
 
 #timeout crash duration set to 20sec before system is ready.
 #timeout duration updates to default timeout of 5sec once the system is ready.
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	vendor.audio.hal.boot.timeout.ms=20000
 
 #read wsatz name from thermal zone type
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	vendor.audio.read.wsatz.type=true
 
 #Set AudioFlinger client heap size
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	ro.af.client_heap_size_kbyte=7168
 
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	persist.vendor.audio.hw.binder.size_kbyte=1024
 
 #Set speaker protection cal tx path sampling rate to 48k
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	vendor.audio.spkr_prot.tx.sampling_rate=48000
 
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	ro.config.vc_call_vol_steps=7
 
 # add dynamic feature flags here
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_VENDOR_PROPERTIES += \
 	vendor.audio.feature.snd_mon.enable=true \
 	vendor.audio.feature.compr_cap.enable=false \
 	vendor.audio.feature.hifi_audio.enable=true \
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 \