diff --git a/BoardConfig.mk b/BoardConfig.mk
index 5c1f000..7b52436 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -20,7 +20,7 @@
 #
 DEVICE_PATH := device/asus/zenfone6
 
-BOARD_VENDOR := oneplus
+BOARD_VENDOR := asus
 
 # Architecture
 TARGET_ARCH := arm64
@@ -106,7 +106,7 @@
 TARGET_KERNEL_CROSS_COMPILE_PREFIX := aarch64-linux-android-
 BOARD_KERNEL_IMAGE_NAME := Image.gz-dtb
 TARGET_COMPILE_WITH_MSM_KERNEL := true
-TARGET_KERNEL_SOURCE := kernel/asus/zenfone6
+TARGET_KERNEL_SOURCE := kernel/asus/sm8150
 TARGET_KERNEL_CONFIG := vendor/zs630kl_defconfig
 BOARD_KERNEL_SEPARATED_DTBO := true
 TARGET_KERNEL_CLANG_COMPILE := true
diff --git a/bootctrl/Android.mk b/bootctrl/Android.mk
index 8d0912e..6f12e6e 100644
--- a/bootctrl/Android.mk
+++ b/bootctrl/Android.mk
@@ -7,5 +7,5 @@
 LOCAL_SHARED_LIBRARIES += liblog libgptutils libcutils
 LOCAL_HEADER_LIBRARIES := libhardware_headers libsystem_headers
 LOCAL_SRC_FILES := boot_control.cpp
-LOCAL_MODULE := bootctrl.sm8150
+LOCAL_MODULE := bootctrl.msmnile
 include $(BUILD_STATIC_LIBRARY)
diff --git a/device.mk b/device.mk
index 95a8964..c754320 100755
--- a/device.mk
+++ b/device.mk
@@ -57,7 +57,7 @@
     bootctl
 
 PRODUCT_STATIC_BOOT_CONTROL_HAL := \
-    bootctrl.sm8150 \
+    bootctrl.msmnile \
     libcutils \
     libgptutils \
     libz
diff --git a/omni.dependencies b/omni.dependencies
index 974e53b..d755923 100644
--- a/omni.dependencies
+++ b/omni.dependencies
@@ -7,8 +7,8 @@
   },
   {
     "remote": "github",
-    "repository": "android_kernel_asus_zenfone6",
-    "target_path": "kernel/asus/zenfon6",
+    "repository": "android_kernel_asus_sm8150",
+    "target_path": "kernel/asus/sm8150",
     "revision": "android-9.0"
   },
   {
diff --git a/omni_zenfone6.mk b/omni_zenfone6.mk
index 420ecdd..fff821b 100644
--- a/omni_zenfone6.mk
+++ b/omni_zenfone6.mk
@@ -41,9 +41,9 @@
 # Discard inherited values and use our own instead.
 PRODUCT_DEVICE := zenfone6
 PRODUCT_NAME := omni_zenfone6
-PRODUCT_BRAND := Asus
+PRODUCT_BRAND := asus
 PRODUCT_MODEL := ASUS_I01WD
-PRODUCT_MANUFACTURER := Asus
+PRODUCT_MANUFACTURER := asus
 
 PRODUCT_BUILD_PROP_OVERRIDES += TARGET_DEVICE=ASUS_I01WD PRODUCT_NAME=WW_I01WD