diff --git a/BoardConfig.mk b/BoardConfig.mk
index f980014..94103e1 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -24,7 +24,7 @@
 # inherit from msm8996-common
 -include device/leeco/msm8996-common/BoardConfigCommon.mk

-TARGET_OTA_ASSERT_DEVICE := le_x2,LeMax2_CN,LeMax2_NA
+TARGET_OTA_ASSERT_DEVICE := cm_x2,LeMax2_CN,LeMax2_NA

 DEVICE_PATH := device/leeco/x2

diff --git a/configs/Android.mk b/configs/Android.mk
index a1ecd99..ae6e1d7 100644
--- a/configs/Android.mk
+++ b/configs/Android.mk
@@ -27,18 +27,18 @@ LOCAL_MODULE_PATH  := $(TARGET_OUT_ETC)/data
 include $(BUILD_PREBUILT)

 include $(CLEAR_VARS)
-LOCAL_MODULE       := qdcm_calib_data_le_x2_mdss_dsi_sharp_qhd_dualdsi_cmd.xml
+LOCAL_MODULE       := qdcm_calib_data_cm_x2_mdss_dsi_sharp_qhd_dualdsi_cmd.xml
 LOCAL_MODULE_TAGS  := optional eng
 LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := qdcm/qdcm_calib_data_le_x2_mdss_dsi_sharp_qhd_dualdsi_cmd.xml
+LOCAL_SRC_FILES    := qdcm/qdcm_calib_data_cm_x2_mdss_dsi_sharp_qhd_dualdsi_cmd.xml
 LOCAL_MODULE_PATH  := $(TARGET_OUT_ETC)
 include $(BUILD_PREBUILT)

 include $(CLEAR_VARS)
-LOCAL_MODULE       := qdcm_calib_data_le_x2_mdss_dsi_truly_qhd_dualdsi_cmd_pvt.xml
+LOCAL_MODULE       := qdcm_calib_data_cm_x2_mdss_dsi_truly_qhd_dualdsi_cmd_pvt.xml
 LOCAL_MODULE_TAGS  := optional eng
 LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := qdcm/qdcm_calib_data_le_x2_mdss_dsi_truly_qhd_dualdsi_cmd_pvt.xml
+LOCAL_SRC_FILES    := qdcm/qdcm_calib_data_cm_x2_mdss_dsi_truly_qhd_dualdsi_cmd_pvt.xml
 LOCAL_MODULE_PATH  := $(TARGET_OUT_ETC)
 include $(BUILD_PREBUILT)

diff --git a/device.mk b/device.mk
index dcd35ec..f96a420 100644
--- a/device.mk
+++ b/device.mk
@@ -52,8 +52,8 @@ PRODUCT_COPY_FILES += \

 # Display xml
 PRODUCT_PACKAGES += \
-    qdcm_calib_data_le_x2_mdss_dsi_sharp_qhd_dualdsi_cmd.xml \
-    qdcm_calib_data_le_x2_mdss_dsi_truly_qhd_dualdsi_cmd_pvt.xml \
+    qdcm_calib_data_cm_x2_mdss_dsi_sharp_qhd_dualdsi_cmd.xml \
+    qdcm_calib_data_cm_x2_mdss_dsi_truly_qhd_dualdsi_cmd_pvt.xml \
     qdcm_calib_data_mdss_dsi_sharp_qhd_dualdsi_cmd.xml

 # QMI
diff --git a/lineage.mk b/lineage.mk
index 76c34bc..3a30875 100644
--- a/lineage.mk
+++ b/lineage.mk
@@ -30,12 +30,12 @@ PRODUCT_BRAND := LeEco
 PRODUCT_GMS_CLIENTID_BASE := android-letv

 TARGET_VENDOR_PRODUCT_NAME := LeMax2
-TARGET_VENDOR_DEVICE_NAME := le_x2
-PRODUCT_BUILD_PROP_OVERRIDES += TARGET_DEVICE=le_x2 PRODUCT_NAME=LeMax2
+TARGET_VENDOR_DEVICE_NAME := cm_x2
+PRODUCT_BUILD_PROP_OVERRIDES += TARGET_DEVICE=cm_x2 PRODUCT_NAME=LeMax2

 PRODUCT_BUILD_PROP_OVERRIDES += \
-    BUILD_FINGERPRINT=LeEco/LeMax2_NA/le_x2_na:6.0.1/FIXNAOP5801607182S/letv07181411:user/release-keys \
-    PRIVATE_BUILD_DESC="le_x2_na-user 6.0.1 FIXNAOP5801607182S eng.letv.20160718.140847 release-keys"
+    BUILD_FINGERPRINT=LeEco/LeMax2_NA/cm_x2_na:6.0.1/FIXNAOP5801607182S/letv07181411:user/release-keys \
+    PRIVATE_BUILD_DESC="cm_x2_na-user 6.0.1 FIXNAOP5801607182S eng.letv.20160718.140847 release-keys"

 PRODUCT_SYSTEM_PROPERTY_BLACKLIST += ro.product.model