diff --git a/Android.bp b/Android.bp
index 399f02d..1656bb9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,7 @@
 soong_namespace {
     imports: [
+        "hardware/google/interfaces",
+        "hardware/google/pixel",
         "hardware/xiaomi",
     ],
 }
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 2207a95..483ebfa 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+BOARD_VENDOR := xiaomi
+
 COMMON_PATH := device/xiaomi/sm6150-common
 
 # Inherit from proprietary files
diff --git a/power/power-mode.cpp b/power/power-mode.cpp
index 7a13c56..ed93ef9 100644
--- a/power/power-mode.cpp
+++ b/power/power-mode.cpp
@@ -55,10 +55,11 @@ int open_ts_input() {
 }  // anonymous namespace
 
 namespace aidl {
-namespace android {
+namespace google {
 namespace hardware {
 namespace power {
 namespace impl {
+namespace pixel {
 
 static constexpr int kInputEventWakeupModeOff = 4;
 static constexpr int kInputEventWakeupModeOn = 5;
@@ -97,8 +98,9 @@ bool setDeviceSpecificMode(Mode type, bool enabled) {
     }
 }
 
+}  // namespace pixel
 }  // namespace impl
 }  // namespace power
 }  // namespace hardware
-}  // namespace android
+}  // namespace google
 }  // namespace aidl
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index 7ca89f3..a8a6020 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -19,6 +19,7 @@
 /(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-service\.xiaomi_sm6150 u:object_r:hal_fingerprint_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-service\.xiaomi_sm6150-ext u:object_r:hal_fingerprint_default_exec:s0
 /vendor/bin/hw/android\.hardware\.light@2\.0-service\.xiaomi_sm6150        u:object_r:hal_light_default_exec:s0
+/vendor/bin/hw/android\.hardware\.power-service\.xiaomi-libperfmgr         u:object_r:hal_power_default_exec:s0
 /vendor/bin/hw/vendor\.lineage\.livedisplay@2\.1-service\.xiaomi_sm6150    u:object_r:hal_lineage_livedisplay_qti_exec:s0
 
 # Remosaic
diff --git a/sm6150.mk b/sm6150.mk
index ebc7117..326bc11 100644
--- a/sm6150.mk
+++ b/sm6150.mk
@@ -245,7 +245,7 @@ PRODUCT_ENFORCE_RRO_TARGETS += *
 
 # Power
 PRODUCT_PACKAGES += \
-    android.hardware.power-service-qti
+    android.hardware.power-service.xiaomi-libperfmgr
 
 # QTI
 PRODUCT_PACKAGES += \
@@ -283,6 +283,8 @@ PRODUCT_COPY_FILES += \
 # Soong namespaces
 PRODUCT_SOONG_NAMESPACES += \
     $(LOCAL_PATH) \
+    hardware/google/interfaces \
+    hardware/google/pixel \
     hardware/xiaomi
 
 # Telephony