diff --git a/hidl/sensors/2.1/Android.bp b/hidl/sensors/2.1/Android.bp
index ac55d952..a643d479 100644
--- a/hidl/sensors/2.1/Android.bp
+++ b/hidl/sensors/2.1/Android.bp
@@ -14,7 +14,7 @@
 // limitations under the License.
 
 cc_binary {
-    name: "android.hardware.sensors@2.1-service.multihal",
+    name: "android.hardware.sensors@2.1-service.samsung-multihal",
     defaults: [
         "hidl_defaults",
     ],
@@ -25,8 +25,8 @@ cc_binary {
 	"HalProxyCallback.cpp",
         "service.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.samsung-multihal.rc"],
+    vintf_fragments: ["android.hardware.sensors@2.1-samsung-multihal.xml"],
     header_libs: [
         "android.hardware.sensors@2.X-shared-utils",
     ],
diff --git a/hidl/sensors/2.1/android.hardware.sensors@2.1-multihal.xml b/hidl/sensors/2.1/android.hardware.sensors@2.1-samsung-multihal.xml
similarity index 100%
rename from hidl/sensors/2.1/android.hardware.sensors@2.1-multihal.xml
rename to hidl/sensors/2.1/android.hardware.sensors@2.1-samsung-multihal.xml
diff --git a/hidl/sensors/2.1/android.hardware.sensors@2.1-service-multihal.rc b/hidl/sensors/2.1/android.hardware.sensors@2.1-service.samsung-multihal.rc
similarity index 83%
rename from hidl/sensors/2.1/android.hardware.sensors@2.1-service-multihal.rc
rename to hidl/sensors/2.1/android.hardware.sensors@2.1-service.samsung-multihal.rc
index fc99ee7a..86742bf9 100644
--- a/hidl/sensors/2.1/android.hardware.sensors@2.1-service-multihal.rc
+++ b/hidl/sensors/2.1/android.hardware.sensors@2.1-service.samsung-multihal.rc
@@ -1,4 +1,4 @@
-service vendor.sensors-hal-2-1-multihal /vendor/bin/hw/android.hardware.sensors@2.1-service.multihal
+service vendor.sensors-hal-2-1-multihal /vendor/bin/hw/android.hardware.sensors@2.1-service.samsung-multihal
     class hal
     user system
     group system wakelock context_hub