diff --git a/omni_zenfone6.mk b/omni_zenfone6.mk
index 670815d..a01c846 100644
--- a/omni_zenfone6.mk
+++ b/omni_zenfone6.mk
@@ -45,10 +45,10 @@
 PRODUCT_MODEL := ASUS_I01WD
 PRODUCT_MANUFACTURER := asus
 
-PRODUCT_BUILD_PROP_OVERRIDES += TARGET_DEVICE=WW_I01WD PRODUCT_NAME=WW_I01WD
+TARGET_DEVICE := WW_I01WD
+PRODUCT_SYSTEM_NAME := WW_I01WD
 
-PRODUCT_BUILD_PROP_OVERRIDES += \
-    BUILD_FINGERPRINT=asus/WW_I01WD/ASUS_I01WD:9/PPR2.181005.003/16.1220.1908.191-0:user/release-keys \
-    PRIVATE_BUILD_DESC="WW_Phone-user 9 PPR2.181005.003 16.1220.1908.191-0 release-keys"
+OMNI_BUILD_FINGERPRINT := asus/WW_I01WD/ASUS_I01WD:9/PPR2.181005.003/16.1220.1908.191-0:user/release-keys
+OMNI_PRIVATE_BUILD_DESC := WW_Phone-user 9 PPR2.181005.003 16.1220.1908.191-0 release-keys
 
 PLATFORM_SECURITY_PATCH_OVERRIDE := 2019-08-01
\ No newline at end of file