diff --git a/Android.mk b/Android.mk
index 04667b1b816a851db9ae529d177f6c7cda93c0aa..5bcd39b4a0ca802a0c5aa62a137c456252ed3e1f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,7 +6,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifneq ($(filter curtana excalibur gram joyeuse miatoll,$(TARGET_DEVICE)),)
+ifneq ($(filter venus,$(TARGET_DEVICE)),)
 include $(call all-makefiles-under,$(LOCAL_PATH))
 
 include $(CLEAR_VARS)
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index aee7448d912dc7f094c341c5cff2a4118cb0a846..c9c489c9bb45564b270224193e043cd5c47a6360 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-COMMON_PATH := device/xiaomi/sm6250-common
+COMMON_PATH := device/xiaomi/sm8350-common
 
 BUILD_BROKEN_DUP_RULES := true
 
@@ -86,7 +86,7 @@ KERNEL_LD := LD=ld.lld
 TARGET_KERNEL_ARCH := arm64
 TARGET_KERNEL_CLANG_COMPILE := true
 TARGET_KERNEL_CONFIG := cust_defconfig
-TARGET_KERNEL_SOURCE := kernel/xiaomi/sm6250
+TARGET_KERNEL_SOURCE := kernel/xiaomi/sm8350
 
 BOARD_KERNEL_CMDLINE += androidboot.console=ttyMSM0
 BOARD_KERNEL_CMDLINE += androidboot.hardware=qcom
@@ -109,8 +109,8 @@ DEVICE_MANIFEST_FILE := $(COMMON_PATH)/manifest.xml
 DEVICE_MATRIX_FILE := $(COMMON_PATH)/compatibility_matrix.xml
 
 # Init
-TARGET_INIT_VENDOR_LIB := //$(COMMON_PATH):libinit_xiaomi_sm6250
-TARGET_RECOVERY_DEVICE_MODULES := libinit_xiaomi_sm6250
+TARGET_INIT_VENDOR_LIB := //$(COMMON_PATH):libinit_xiaomi_sm8350
+TARGET_RECOVERY_DEVICE_MODULES := libinit_xiaomi_sm8350
 
 # Media
 TARGET_USES_ION := true
@@ -226,4 +226,4 @@ WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true
 WPA_SUPPLICANT_VERSION := VER_0_8_X
 
 # Inherit proprietary blobs
--include vendor/xiaomi/sm6250-common/BoardConfigVendor.mk
+-include vendor/xiaomi/sm8350-common/BoardConfigVendor.mk
diff --git a/README.md b/README.md
index 288c67b4649bf05f017d276cf68d056f4655fdc1..91c9cef1b464a447e35d8fabc564f6970c2b4f60 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
 Copyright (C) 2020 - The LineageOS Project
 
-Common device tree for Xiaomi SM6250 based devices
+Common device tree for Xiaomi SM8350 based devices
 ==============
diff --git a/common.mk b/common.mk
index 70c85e19f6a487414681c804ac1c12d2816f1c9c..76a92b476f6a92db5ce819f59f6391797d6f9b5a 100644
--- a/common.mk
+++ b/common.mk
@@ -8,7 +8,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 
 # Inherit proprietary targets
-$(call inherit-product-if-exists, vendor/xiaomi/sm6250-common/sm6250-common-vendor.mk)
+$(call inherit-product-if-exists, vendor/xiaomi/sm8350-common/sm8350-common-vendor.mk)
 
 # Enable updating of APEXes
 $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
@@ -152,7 +152,7 @@ PRODUCT_PACKAGES += \
 
 # Fingerprint
 PRODUCT_PACKAGES += \
-    android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm6250
+    android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm8350
 
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml
@@ -231,7 +231,7 @@ PRODUCT_COPY_FILES += \
 
 # Light
 PRODUCT_PACKAGES += \
-    android.hardware.light@2.0-service.xiaomi_sm6250
+    android.hardware.light@2.0-service.xiaomi_sm8350
 
 # LiveDisplay
 PRODUCT_PACKAGES += \
@@ -278,7 +278,7 @@ PRODUCT_USE_DYNAMIC_PARTITIONS := true
 
 # Power
 PRODUCT_PACKAGES += \
-    android.hardware.power@1.3-service.xiaomi_sm6250
+    android.hardware.power@1.3-service.xiaomi_sm8350
 
 # RCS
 PRODUCT_PACKAGES += \
diff --git a/fingerprint/Android.bp b/fingerprint/Android.bp
index bec9a2b7cc54e9edd0923757bf0903cb0454204d..3902e9404cbba96bfc5ed48a0d964d5904b6761d 100644
--- a/fingerprint/Android.bp
+++ b/fingerprint/Android.bp
@@ -14,10 +14,10 @@
 // limitations under the License.
 
 cc_binary {
-    name: "android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm6250",
+    name: "android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm8350",
     relative_install_path: "hw",
     defaults: ["hidl_defaults"],
-    init_rc: ["android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm6250.rc"],
+    init_rc: ["android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm8350.rc"],
     srcs: ["service.cpp", "BiometricsFingerprint.cpp"],
     shared_libs: [
         "libbase",
diff --git a/fingerprint/BiometricsFingerprint.h b/fingerprint/BiometricsFingerprint.h
index d8342a2b1ba2679cc7535352b7c0ea6911aabf3c..cbb9bb4d489105bd35c7c0a4d83d49c11af9af54 100644
--- a/fingerprint/BiometricsFingerprint.h
+++ b/fingerprint/BiometricsFingerprint.h
@@ -17,7 +17,7 @@
 #ifndef ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_1_BIOMETRICSFINGERPRINT_H
 #define ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_1_BIOMETRICSFINGERPRINT_H
 
-#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm6250"
+#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm8350"
 
 #include <android/log.h>
 #include <cutils/properties.h>
diff --git a/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm6250.rc b/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm8350.rc
similarity index 87%
rename from fingerprint/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm6250.rc
rename to fingerprint/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm8350.rc
index 045bfc2a8d9e8504b8a4a192f54d5b534a768901..cfae7293dd915bf49b8d50d6b20f3f08d00ec7da 100644
--- a/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm6250.rc
+++ b/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm8350.rc
@@ -1,4 +1,4 @@
-service vendor.fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm6250
+service vendor.fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm8350
     class late_start
     user system
     group system input uhid
diff --git a/init/Android.bp b/init/Android.bp
index 7b1c818b225b2f7c6e846dc39d02c8f8db36cbd9..a45081692785a1b20f91c6269ff3942baf9c3c42 100644
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -15,7 +15,7 @@
 //
 
 cc_library_static {
-    name: "libinit_xiaomi_sm6250_common",
+    name: "libinit_xiaomi_sm8350_common",
     recovery_available: true,
     srcs: [
         "init_common.cpp"
@@ -33,12 +33,12 @@ cc_library_static {
 }
 
 cc_library_static {
-    name: "libinit_xiaomi_sm6250",
+    name: "libinit_xiaomi_sm8350",
     recovery_available: true,
     srcs: [
         "init.cpp"
     ],
     whole_static_libs: [
-        "libinit_xiaomi_sm6250_common"
+        "libinit_xiaomi_sm8350_common"
     ]
 }
diff --git a/light/Android.bp b/light/Android.bp
index b6b662924003b330fdfd42e032691f82f44e7753..838078641e7b6800ed39728b64b34adf6e8c0aef 100644
--- a/light/Android.bp
+++ b/light/Android.bp
@@ -15,8 +15,8 @@
 cc_binary {
     relative_install_path: "hw",
     defaults: ["hidl_defaults"],
-    name: "android.hardware.light@2.0-service.xiaomi_sm6250",
-    init_rc: ["android.hardware.light@2.0-service.xiaomi_sm6250.rc"],
+    name: "android.hardware.light@2.0-service.xiaomi_sm8350",
+    init_rc: ["android.hardware.light@2.0-service.xiaomi_sm8350.rc"],
     srcs: ["service.cpp", "Light.cpp"],
     vendor: true,
     shared_libs: [
diff --git a/light/Light.cpp b/light/Light.cpp
index 9e38c690d95e3d8d9666d5945dbf7b88c1b316b4..e8f8fdf04d50eaf385af61e30883b9df486ed593 100644
--- a/light/Light.cpp
+++ b/light/Light.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "android.hardware.light@2.0-service.xiaomi_sm6250"
+#define LOG_TAG "android.hardware.light@2.0-service.xiaomi_sm8350"
 
 #include <log/log.h>
 
diff --git a/light/android.hardware.light@2.0-service.xiaomi_sm6250.rc b/light/android.hardware.light@2.0-service.xiaomi_sm8350.rc
similarity index 96%
rename from light/android.hardware.light@2.0-service.xiaomi_sm6250.rc
rename to light/android.hardware.light@2.0-service.xiaomi_sm8350.rc
index 8675f513fe453365667a6b015e08c86e24ea5270..a22610478507f998f1a591a215942d11b1fcfca9 100644
--- a/light/android.hardware.light@2.0-service.xiaomi_sm6250.rc
+++ b/light/android.hardware.light@2.0-service.xiaomi_sm8350.rc
@@ -8,7 +8,7 @@ on boot
     chmod 0644 /sys/class/leds/white/brightness
     chmod 0644 /sys/class/leds/white/breath
 
-service vendor.light-hal-2-0 /vendor/bin/hw/android.hardware.light@2.0-service.xiaomi_sm6250
+service vendor.light-hal-2-0 /vendor/bin/hw/android.hardware.light@2.0-service.xiaomi_sm8350
     interface android.hardware.light@2.0::ILight default
     class hal
     user system
diff --git a/light/service.cpp b/light/service.cpp
index 7e5cf5fbdebf62313d1537c9b3b4f100df49134f..34b2aa855deb31ecac26527ca70c5a955e3edc9c 100644
--- a/light/service.cpp
+++ b/light/service.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "android.hardware.light@2.0-service.xiaomi_sm6250"
+#define LOG_TAG "android.hardware.light@2.0-service.xiaomi_sm8350"
 
 #include <hidl/HidlTransportSupport.h>
 
diff --git a/power/Android.bp b/power/Android.bp
index a0c76ea319122f35e87862b41888b917c02969e9..ef291c8f142f123145ff2fe861751b0bb716492a 100644
--- a/power/Android.bp
+++ b/power/Android.bp
@@ -14,8 +14,8 @@
 // limitations under the License.
 
 cc_binary {
-    name: "android.hardware.power@1.3-service.xiaomi_sm6250",
-    init_rc: ["android.hardware.power@1.3-service.xiaomi_sm6250.rc"],
+    name: "android.hardware.power@1.3-service.xiaomi_sm8350",
+    init_rc: ["android.hardware.power@1.3-service.xiaomi_sm8350.rc"],
     relative_install_path: "hw",
     proprietary: true,
     srcs: [
diff --git a/power/Power.cpp b/power/Power.cpp
index 3f3c2c0d6bd5f1123746b8304f8a0a4a9c411c12..31b2f5c1621377ba11684fa0bf816773c4a21df0 100644
--- a/power/Power.cpp
+++ b/power/Power.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "android.hardware.power@1.3-service.xiaomi_sm6250"
+#define LOG_TAG "android.hardware.power@1.3-service.xiaomi_sm8350"
 
 #include <linux/input.h>
 
diff --git a/power/android.hardware.power@1.3-service.xiaomi_sm6250.rc b/power/android.hardware.power@1.3-service.xiaomi_sm8350.rc
similarity index 80%
rename from power/android.hardware.power@1.3-service.xiaomi_sm6250.rc
rename to power/android.hardware.power@1.3-service.xiaomi_sm8350.rc
index 4c6320985ed3eb6e45835a0e47014fdefc3ca832..6cae61dcf127b3c8241d80e48cff3e30a6a2d243 100644
--- a/power/android.hardware.power@1.3-service.xiaomi_sm6250.rc
+++ b/power/android.hardware.power@1.3-service.xiaomi_sm8350.rc
@@ -1,4 +1,4 @@
-service vendor.power-hal-1-0 /vendor/bin/hw/android.hardware.power@1.3-service.xiaomi_sm6250
+service vendor.power-hal-1-0 /vendor/bin/hw/android.hardware.power@1.3-service.xiaomi_sm8350
     class hal
     user system
     group system input
diff --git a/power/service.cpp b/power/service.cpp
index d5d1eb02d98a80d13e4c98a7d1b9fdebd4cd64b6..d3e2bf28674caeab8a4f883fde29add04a8b91ce 100644
--- a/power/service.cpp
+++ b/power/service.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "android.hardware.power@1.3-service.xiaomi_sm6250"
+#define LOG_TAG "android.hardware.power@1.3-service.xiaomi_sm8350"
 
 #include <hidl/HidlTransportSupport.h>
 
diff --git a/rro_overlays/TetheringOverlay/AndroidManifest.xml b/rro_overlays/TetheringOverlay/AndroidManifest.xml
index 2b220b64b6726603c5e737b1f27ffe78a9b5b080..f903fc9652a0051fd6bddf67e68ceedfc0b14b9e 100644
--- a/rro_overlays/TetheringOverlay/AndroidManifest.xml
+++ b/rro_overlays/TetheringOverlay/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.networkstack.tethering.xiaomi_sm6250"
+    package="com.android.networkstack.tethering.xiaomi_sm8350"
     android:versionCode="1"
     android:versionName="1.0">
     <application android:hasCode="false" />
diff --git a/rro_overlays/WifiOverlay/AndroidManifest.xml b/rro_overlays/WifiOverlay/AndroidManifest.xml
index f252d6b74fa4acb1c18a94f36e277994f86d2761..505609b72250347f8357b018ecc5628495d3f4b7 100644
--- a/rro_overlays/WifiOverlay/AndroidManifest.xml
+++ b/rro_overlays/WifiOverlay/AndroidManifest.xml
@@ -15,7 +15,7 @@
 -->
 <!-- Pixel specific wifi overlays -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.wifi.resources.xiaomi_sm6250"
+    package="com.android.wifi.resources.xiaomi_sm8350"
     android:versionCode="1"
     android:versionName="1.0">
     <application android:hasCode="false" />
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index 5dd05604399f9cb6e9fa4bb5d0a57321b8758d8d..305dfc99b743be909cda44cfdec90edb86e3d4d3 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -4,7 +4,7 @@
 /mnt/vendor/persist/subsys(/.*)?                u:object_r:persist_subsys_file:s0
 
 # Fingerprint
-/vendor/bin/hw/android\.hardware\.fingerprint@2\.1-service\.xiaomi_sm6250                               u:object_r:hal_fingerprint_default_exec:s0
+/vendor/bin/hw/android\.hardware\.fingerprint@2\.1-service\.xiaomi_sm8350                               u:object_r:hal_fingerprint_default_exec:s0
 
 # Power HAL
-/vendor/bin/hw/android\.hardware\.power@1\.3-service\.xiaomi_sm6250                                     u:object_r:hal_power_default_exec:s0
+/vendor/bin/hw/android\.hardware\.power@1\.3-service\.xiaomi_sm8350                                     u:object_r:hal_power_default_exec:s0