diff --git a/aidl/vibrator/Android.bp b/aidl/vibrator/Android.bp
index f88a983..608d541 100644
--- a/aidl/vibrator/Android.bp
+++ b/aidl/vibrator/Android.bp
@@ -2,7 +2,7 @@ Common_CFlags = ["-Wall"]
 Common_CFlags += ["-Werror"]
 
 cc_library_shared {
-    name: "vendor.qti.hardware.vibrator.impl",
+    name: "vendor.qti.hardware.vibrator.impl.oplus",
     vendor: true,
     cflags: Common_CFlags,
     srcs: [
@@ -20,12 +20,12 @@ cc_library_shared {
 }
 
 cc_binary {
-    name: "vendor.qti.hardware.vibrator.service",
+    name: "vendor.qti.hardware.vibrator.service.oplus",
     vendor: true,
     relative_install_path: "hw",
-    init_rc: ["vendor.qti.hardware.vibrator.service.rc"],
+    init_rc: ["vendor.qti.hardware.vibrator.service.oplus.rc"],
     vintf_fragments: [
-        "vendor.qti.hardware.vibrator.service.xml",
+        "vendor.qti.hardware.vibrator.service.oplus.xml",
     ],
     cflags: Common_CFlags,
     srcs: [
@@ -37,12 +37,12 @@ cc_binary {
         "libbase",
         "libbinder_ndk",
         "android.hardware.vibrator-V1-ndk_platform",
-        "vendor.qti.hardware.vibrator.impl",
+        "vendor.qti.hardware.vibrator.impl.oplus",
     ],
 }
 
 cc_library_shared {
-    name: "vendor.qti.hardware.vibrator.offload.impl",
+    name: "vendor.qti.hardware.vibrator.offload.impl.oplus",
     vendor: true,
     cflags: Common_CFlags + ["-DTARGET_SUPPORTS_OFFLOAD"],
     srcs: [
@@ -62,12 +62,12 @@ cc_library_shared {
 }
 
 cc_binary {
-    name: "vendor.qti.hardware.vibrator.offload.service",
+    name: "vendor.qti.hardware.vibrator.offload.service.oplus",
     vendor: true,
     relative_install_path: "hw",
-    init_rc: ["vendor.qti.hardware.vibrator.offload.service.rc"],
+    init_rc: ["vendor.qti.hardware.vibrator.offload.service.oplus.rc"],
     vintf_fragments: [
-        "vendor.qti.hardware.vibrator.offload.service.xml",
+        "vendor.qti.hardware.vibrator.offload.service.oplus.xml",
     ],
     cflags: Common_CFlags + ["-DTARGET_SUPPORTS_OFFLOAD"],
     srcs: [
@@ -79,6 +79,6 @@ cc_binary {
         "libbase",
         "libbinder_ndk",
         "android.hardware.vibrator-V1-ndk_platform",
-        "vendor.qti.hardware.vibrator.offload.impl",
+        "vendor.qti.hardware.vibrator.offload.impl.oplus",
     ],
 }
diff --git a/aidl/vibrator/vendor.qti.hardware.vibrator.offload.service.rc b/aidl/vibrator/vendor.qti.hardware.vibrator.offload.service.oplus.rc
similarity index 79%
rename from aidl/vibrator/vendor.qti.hardware.vibrator.offload.service.rc
rename to aidl/vibrator/vendor.qti.hardware.vibrator.offload.service.oplus.rc
index 8675c62..73938cc 100644
--- a/aidl/vibrator/vendor.qti.hardware.vibrator.offload.service.rc
+++ b/aidl/vibrator/vendor.qti.hardware.vibrator.offload.service.oplus.rc
@@ -1,4 +1,4 @@
-service vendor.qti.vibrator /vendor/bin/hw/vendor.qti.hardware.vibrator.offload.service
+service vendor.qti.vibrator /vendor/bin/hw/vendor.qti.hardware.vibrator.offload.service.oplus
     class hal
     user system
     group system input
diff --git a/aidl/vibrator/vendor.qti.hardware.vibrator.offload.service.xml b/aidl/vibrator/vendor.qti.hardware.vibrator.offload.service.oplus.xml
similarity index 100%
rename from aidl/vibrator/vendor.qti.hardware.vibrator.offload.service.xml
rename to aidl/vibrator/vendor.qti.hardware.vibrator.offload.service.oplus.xml
diff --git a/aidl/vibrator/vendor.qti.hardware.vibrator.service.rc b/aidl/vibrator/vendor.qti.hardware.vibrator.service.oplus.rc
similarity index 84%
rename from aidl/vibrator/vendor.qti.hardware.vibrator.service.rc
rename to aidl/vibrator/vendor.qti.hardware.vibrator.service.oplus.rc
index ffa8ce9..7cf713a 100644
--- a/aidl/vibrator/vendor.qti.hardware.vibrator.service.rc
+++ b/aidl/vibrator/vendor.qti.hardware.vibrator.service.oplus.rc
@@ -1,4 +1,4 @@
-service vendor.qti.vibrator /vendor/bin/hw/vendor.qti.hardware.vibrator.service
+service vendor.qti.vibrator /vendor/bin/hw/vendor.qti.hardware.vibrator.service.oplus
     class hal
     user system
     group system input
diff --git a/aidl/vibrator/vendor.qti.hardware.vibrator.service.xml b/aidl/vibrator/vendor.qti.hardware.vibrator.service.oplus.xml
similarity index 100%
rename from aidl/vibrator/vendor.qti.hardware.vibrator.service.xml
rename to aidl/vibrator/vendor.qti.hardware.vibrator.service.oplus.xml