diff --git a/system_prop.mk b/product_prop.mk
similarity index 71%
rename from system_prop.mk
rename to product_prop.mk
index c0b1332..55d5ef0 100644
--- a/system_prop.mk
+++ b/product_prop.mk
@@ -1,31 +1,31 @@
 # Audio
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
+PRODUCT_PRODUCT_PROPERTIES += \
    ro.config.vc_call_vol_steps=7 \
    ro.config.media_vol_steps=25
 
 # Bluetooth
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
+PRODUCT_PRODUCT_PROPERTIES += \
    vendor.bluetooth.soc=cherokee
 
 # Data Modules
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
+PRODUCT_PRODUCT_PROPERTIES += \
     persist.vendor.data.mode=concurrent
 
 # Graphics
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
+PRODUCT_PRODUCT_PROPERTIES += \
     debug.sf.enable_hwc_vds=1 \
     debug.sf.enable_gl_backpressure=1
 
 # Media
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
+PRODUCT_PRODUCT_PROPERTIES += \
     media.settings.xml=/system/etc/media_profiles_vendor.xml
 
 # Netflix
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
+PRODUCT_PRODUCT_PROPERTIES += \
     ro.netflix.bsp_rev=Q670-14477-1
 
 # RIL
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
+PRODUCT_PRODUCT_PROPERTIES += \
     ro.telephony.default_network=22,20 \
     persist.radio.add_power_save=1 \
     persist.vendor.radio.lte_vrte_ltd=1 \
@@ -37,5 +37,5 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     persist.vendor.radio.poweron_opt=0
 
 # UI
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
+PRODUCT_PRODUCT_PROPERTIES += \
     sys.use_fifo_ui=1
diff --git a/sdm710.mk b/sdm710.mk
index 11b84b1..2920266 100644
--- a/sdm710.mk
+++ b/sdm710.mk
@@ -88,7 +88,7 @@ PRODUCT_SOONG_NAMESPACES += \
     $(LOCAL_PATH)
 
 # System properties
--include $(LOCAL_PATH)/system_prop.mk
+-include $(LOCAL_PATH)/product_prop.mk
 
 # Sensors
 PRODUCT_COPY_FILES += \