diff --git a/sensors/Android.bp b/sensors/Android.bp
index d48b3e5..839a9ad 100644
--- a/sensors/Android.bp
+++ b/sensors/Android.bp
@@ -22,7 +22,7 @@ cc_library_static {
 }
 
 cc_library_shared {
-    name: "android.hardware.sensors@1.0-impl",
+    name: "android.hardware.sensors@1.0-impl.samsung8974",
     defaults: ["hidl_defaults"],
     proprietary: true,
     relative_install_path: "hw",
@@ -39,16 +39,16 @@ cc_library_shared {
     ],
     static_libs: [
         "android.hardware.sensors@1.0-convert",
-        "multihal",
+        "multihal-samsung8974",
     ],
     local_include_dirs: ["include/sensors"],
 }
 
 cc_binary {
-    name: "android.hardware.sensors@1.0-service",
+    name: "android.hardware.sensors@1.0-service.samsung8974",
     relative_install_path: "hw",
     vendor: true,
-    init_rc: ["android.hardware.sensors@1.0-service.rc"],
+    init_rc: ["android.hardware.sensors@1.0-service.samsung8974.rc"],
     srcs: ["service.cpp"],
 
     shared_libs: [
diff --git a/sensors/android.hardware.sensors@1.0-service.rc b/sensors/android.hardware.sensors@1.0-service.samsung8974.rc
similarity index 84%
rename from sensors/android.hardware.sensors@1.0-service.rc
rename to sensors/android.hardware.sensors@1.0-service.samsung8974.rc
index b54842d..a9b0498 100644
--- a/sensors/android.hardware.sensors@1.0-service.rc
+++ b/sensors/android.hardware.sensors@1.0-service.samsung8974.rc
@@ -1,4 +1,4 @@
-service vendor.sensors-hal-1-0 /vendor/bin/hw/android.hardware.sensors@1.0-service
+service vendor.sensors-hal-1-0 /vendor/bin/hw/android.hardware.sensors@1.0-service.samsung8974
     class hal
     user system
     group system wakelock