diff --git a/cm.mk b/cm.mk
index b297f95..1f07d23 100644
--- a/cm.mk
+++ b/cm.mk
@@ -1,12 +1,11 @@
 $(call inherit-product, device/lge/d851/full_d851.mk)
 
-# Enhanced NFC
-$(call inherit-product, vendor/cm/config/nfc_enhanced.mk)
-
 # Inherit some common CM stuff.
 $(call inherit-product, vendor/cm/config/common_full_phone.mk)
 
-PRODUCT_DEVICE := d851
+# Enhanced NFC
+$(call inherit-product, vendor/cm/config/nfc_enhanced.mk)
+
 PRODUCT_NAME := cm_d851
 
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=d851 BUILD_FINGERPRINT=lge/g3_tmo_us/g3:4.4.2/KVT49L.D85110c/D85110c.1403267110:user/release-keys PRIVATE_BUILD_DESC="g3_tmo_us-user 4.4.2 KVT49L.D85110c D85110c.1403267110 release-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_DEVICE="g3" PRODUCT_NAME="g3_tmo_us" BUILD_FINGERPRINT="lge/g3_tmo_us/g3:4.4.2/KVT49L.D85110c/D85110c.1403267110:user/release-keys" PRIVATE_BUILD_DESC="g3_tmo_us-user 4.4.2 KVT49L.D85110c D85110c.1403267110 release-keys"
diff --git a/full_d851.mk b/full_d851.mk
index 42c28b6..4e0caa5 100644
--- a/full_d851.mk
+++ b/full_d851.mk
@@ -21,8 +21,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 $(call inherit-product, device/lge/d851/device.mk)
 
 # Set those variables here to overwrite the inherited values.
-PRODUCT_NAME := full_d851
 PRODUCT_DEVICE := d851
-PRODUCT_BRAND := Android
+PRODUCT_NAME := full_d851
+PRODUCT_BRAND := lge
+PRODUCT_MODEL := LG-D851
 PRODUCT_MANUFACTURER := LGE
-PRODUCT_MODEL := d851