diff --git a/config/common.mk b/config/common.mk
index 2b1e0cd..01392cf 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -10,15 +10,15 @@
 endif
 
 ifeq ($(PRODUCT_GMS_CLIENTID_BASE),)
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.com.google.clientidbase=android-google
 else
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.com.google.clientidbase=$(PRODUCT_GMS_CLIENTID_BASE)
 endif
 
 # general properties
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.url.legal=http://www.google.com/intl/%s/mobile/android/basic/phone-legal.html \
     ro.com.android.wifi-watchlist=GoogleGuest \
     ro.setupwizard.enterprise_mode=1 \
@@ -27,7 +27,7 @@
 
 # Tethering - allow without requiring a provisioning app
 # (for devices that check this)
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     net.tethering.noprovisioning=true
 
 # enable ADB authentication if not on eng build
@@ -36,7 +36,7 @@
 endif
 
 # Enforce privapp-permissions whitelist
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.control_privapp_permissions=enforce
 
 PRODUCT_COPY_FILES += \
@@ -74,7 +74,7 @@
     vendor/omni/prebuilt/etc/permissions/privapp-permissions-elgoog.xml:system/etc/permissions/privapp-permissions-elgoog.xml
 
 # custom omni sounds
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.config.ringtone=omni_ringtone1.ogg \
     ro.config.notification_sound=omni_notification1.ogg \
     ro.config.alarm_alert=omni_alarm1.ogg
@@ -99,7 +99,7 @@
     vendor/omni/prebuilt/etc/mkshrc:system/etc/mkshrc
 
 # whitelist packages for location providers not in system
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.services.whitelist.packagelist=com.google.android.gms
 
 # Additional packages
diff --git a/config/phone-xxhdpi-2048-dalvik-heap.mk b/config/phone-xxhdpi-2048-dalvik-heap.mk
index 9489593..c79c250 100644
--- a/config/phone-xxhdpi-2048-dalvik-heap.mk
+++ b/config/phone-xxhdpi-2048-dalvik-heap.mk
@@ -17,7 +17,7 @@
 # Provides overrides to configure the Dalvik heap for a 2G phone
 # 192m of RAM gives enough space for 5 8 megapixel camera bitmaps in RAM.
 
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     dalvik.vm.heapstartsize=16m \
     dalvik.vm.heapgrowthlimit=192m \
     dalvik.vm.heapsize=512m \
diff --git a/config/phone-xxhdpi-2048-hwui-memory.mk b/config/phone-xxhdpi-2048-hwui-memory.mk
index b4226bc..22e5343 100644
--- a/config/phone-xxhdpi-2048-hwui-memory.mk
+++ b/config/phone-xxhdpi-2048-hwui-memory.mk
@@ -16,7 +16,7 @@
 
 # Provides overrides to configure the HWUI memory limits
 
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.hwui.texture_cache_size=72 \
     ro.hwui.layer_cache_size=48 \
     ro.hwui.r_buffer_cache_size=8 \
diff --git a/config/phone-xxhdpi-4096-dalvik-heap.mk b/config/phone-xxhdpi-4096-dalvik-heap.mk
index 469c278..c865ddb 100644
--- a/config/phone-xxhdpi-4096-dalvik-heap.mk
+++ b/config/phone-xxhdpi-4096-dalvik-heap.mk
@@ -16,7 +16,7 @@
 
 # Provides overrides to configure the Dalvik heap for a 3G phone
 
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     dalvik.vm.heapstartsize=16m \
     dalvik.vm.heapgrowthlimit=256m \
     dalvik.vm.heapsize=512m \
diff --git a/config/phone-xxxhdpi-3072-dalvik-heap.mk b/config/phone-xxxhdpi-3072-dalvik-heap.mk
index 7127ff4..3d4ed79 100644
--- a/config/phone-xxxhdpi-3072-dalvik-heap.mk
+++ b/config/phone-xxxhdpi-3072-dalvik-heap.mk
@@ -16,7 +16,7 @@
 
 # Provides overrides to configure the Dalvik heap for a 3G phone
 
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     dalvik.vm.heapstartsize=16m \
     dalvik.vm.heapgrowthlimit=256m \
     dalvik.vm.heapsize=512m \
diff --git a/config/phone-xxxhdpi-3072-hwui-memory.mk b/config/phone-xxxhdpi-3072-hwui-memory.mk
index 8123fa0..fbe8df5 100644
--- a/config/phone-xxxhdpi-3072-hwui-memory.mk
+++ b/config/phone-xxxhdpi-3072-hwui-memory.mk
@@ -16,7 +16,7 @@
 
 # Provides overrides to configure the HWUI memory limits
 
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.hwui.texture_cache_size=88 \
     ro.hwui.layer_cache_size=58 \
     ro.hwui.path_cache_size=32 \
diff --git a/config/version.mk b/config/version.mk
index 62cba49..97e5de9 100644
--- a/config/version.mk
+++ b/config/version.mk
@@ -19,10 +19,10 @@
 endif
 
 # Apply it to build.prop
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.modversion=OmniROM-$(ROM_VERSION) \
     ro.omni.version=$(ROM_VERSION)
 
 ROM_FINGERPRINT := OmniROM/$(PLATFORM_VERSION)/$(TARGET_PRODUCT_SHORT)/$(shell date +%Y%m%d.%H:%M)
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.omni.fingerprint=$(ROM_FINGERPRINT)
diff --git a/utils/emulator/common.mk b/utils/emulator/common.mk
index 4cf6b10..be92bcb 100644
--- a/utils/emulator/common.mk
+++ b/utils/emulator/common.mk
@@ -10,15 +10,15 @@
 endif
 
 ifeq ($(PRODUCT_GMS_CLIENTID_BASE),)
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.com.google.clientidbase=android-google
 else
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.com.google.clientidbase=$(PRODUCT_GMS_CLIENTID_BASE)
 endif
 
 # general properties
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.url.legal=http://www.google.com/intl/%s/mobile/android/basic/phone-legal.html \
     ro.com.android.wifi-watchlist=GoogleGuest \
     ro.setupwizard.enterprise_mode=1 \
@@ -44,7 +44,7 @@
     frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml
 
 # custom omni sounds
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.config.ringtone=omni_ringtone1.ogg \
     ro.config.notification_sound=omni_notification1.ogg \
     ro.config.alarm_alert=omni_alarm1.ogg