diff --git a/sensors/Android.bp b/sensors/Android.bp
index ebb6b4e..3a77f7a 100644
--- a/sensors/Android.bp
+++ b/sensors/Android.bp
@@ -25,8 +25,8 @@ cc_binary {
         "HalProxy.cpp",
         "HalProxyCallback.cpp",
     ],
-    init_rc: ["android.hardware.sensors@2.1-service-multihal.rc"],
-    vintf_fragments: ["android.hardware.sensors@2.1-multihal.xml"],
+    init_rc: ["android.hardware.sensors@2.1-service.xiaomi_sm8350-multihal.rc"],
+    vintf_fragments: ["android.hardware.sensors@2.1-xiaomi_sm8350-multihal.xml"],
     header_libs: [
         "android.hardware.sensors@2.X-shared-utils",
     ],
diff --git a/sensors/android.hardware.sensors@2.1-service-multihal.rc b/sensors/android.hardware.sensors@2.1-service.xiaomi_sm8350-multihal.rc
similarity index 100%
rename from sensors/android.hardware.sensors@2.1-service-multihal.rc
rename to sensors/android.hardware.sensors@2.1-service.xiaomi_sm8350-multihal.rc
diff --git a/sensors/android.hardware.sensors@2.1-multihal.xml b/sensors/android.hardware.sensors@2.1-xiaomi_sm8350-multihal.xml
similarity index 100%
rename from sensors/android.hardware.sensors@2.1-multihal.xml
rename to sensors/android.hardware.sensors@2.1-xiaomi_sm8350-multihal.xml
diff --git a/vibrator/aidl/Android.bp b/vibrator/aidl/Android.bp
index 637bd4b..f2b515a 100644
--- a/vibrator/aidl/Android.bp
+++ b/vibrator/aidl/Android.bp
@@ -48,9 +48,9 @@ cc_binary {
     name: "vendor.qti.hardware.vibrator.service.xiaomi_sm8350",
     vendor: true,
     relative_install_path: "hw",
-    init_rc: ["vendor.qti.hardware.vibrator.service.rc"],
+    init_rc: ["vendor.qti.hardware.vibrator.service.xiaomi_sm8350.rc"],
     vintf_fragments: [
-        "vendor.qti.hardware.vibrator.service.xml",
+        "vendor.qti.hardware.vibrator.service.xiaomi_sm8350.xml",
     ],
     cflags: Common_CFlags,
     srcs: [
diff --git a/vibrator/aidl/vendor.qti.hardware.vibrator.service.rc b/vibrator/aidl/vendor.qti.hardware.vibrator.service.xiaomi_sm8350.rc
similarity index 100%
rename from vibrator/aidl/vendor.qti.hardware.vibrator.service.rc
rename to vibrator/aidl/vendor.qti.hardware.vibrator.service.xiaomi_sm8350.rc
diff --git a/vibrator/aidl/vendor.qti.hardware.vibrator.service.xml b/vibrator/aidl/vendor.qti.hardware.vibrator.service.xiaomi_sm8350.xml
similarity index 100%
rename from vibrator/aidl/vendor.qti.hardware.vibrator.service.xml
rename to vibrator/aidl/vendor.qti.hardware.vibrator.service.xiaomi_sm8350.xml