diff --git a/audio/impl/Android.bp b/audio/impl/Android.bp
index 3413147..7c8b4b7 100644
--- a/audio/impl/Android.bp
+++ b/audio/impl/Android.bp
@@ -1,5 +1,5 @@
 filegroup {
-    name: "android.hardware.audio-impl_srcs",
+    name: "android.hardware.audio-impl_samsung-sm8550_srcs",
     srcs: [
         "Device.cpp",
         "DevicesFactory.cpp",
@@ -12,18 +12,18 @@ filegroup {
 }
 
 cc_library_headers {
-    name: "android.hardware.audio-impl_headers",
+    name: "android.hardware.audio-impl_samsung-sm8550_headers",
     proprietary: true,
     vendor: true,
     export_include_dirs: ["include"],
 }
 
 cc_defaults {
-    name: "android.hardware.audio-impl_default",
+    name: "android.hardware.audio-impl_samsung-sm8550",
     relative_install_path: "hw",
     proprietary: true,
     vendor: true,
-    srcs: [":android.hardware.audio-impl_srcs"],
+    srcs: [":android.hardware.audio-impl_samsung-sm8550_srcs"],
 
     defaults: ["hidl_defaults"],
 
@@ -46,7 +46,7 @@ cc_defaults {
     ],
 
     header_libs: [
-        "android.hardware.audio-impl_headers",
+        "android.hardware.audio-impl_samsung-sm8550_headers",
         "android.hardware.audio.common.util@all-versions",
         "libaudioutils_headers",
         "libaudio_system_headers",
@@ -56,13 +56,13 @@ cc_defaults {
     ],
 
     export_header_lib_headers: [
-        "android.hardware.audio-impl_headers",
+        "android.hardware.audio-impl_samsung-sm8550_headers",
     ],
 }
 
 cc_library_shared {
-    name: "android.hardware.audio@2.0-impl",
-    defaults: ["android.hardware.audio-impl_default"],
+    name: "android.hardware.audio@2.0-impl.samsung-smsm8550",
+    defaults: ["android.hardware.audio-impl_samsung-sm8550"],
     shared_libs: [
         "android.hardware.audio@2.0",
         "android.hardware.audio@2.0-util",
@@ -77,8 +77,8 @@ cc_library_shared {
 }
 
 cc_library_shared {
-    name: "android.hardware.audio@4.0-impl",
-    defaults: ["android.hardware.audio-impl_default"],
+    name: "android.hardware.audio@4.0-impl.samsung-smsm8550",
+    defaults: ["android.hardware.audio-impl_samsung-sm8550"],
 
     shared_libs: [
         "android.hardware.audio@4.0",
@@ -94,8 +94,8 @@ cc_library_shared {
 }
 
 cc_library_shared {
-    name: "android.hardware.audio@5.0-impl",
-    defaults: ["android.hardware.audio-impl_default"],
+    name: "android.hardware.audio@5.0-impl.samsung-smsm8550",
+    defaults: ["android.hardware.audio-impl_samsung-sm8550"],
     shared_libs: [
         "android.hardware.audio@5.0",
         "android.hardware.audio@5.0-util",
@@ -110,8 +110,8 @@ cc_library_shared {
 }
 
 cc_library_shared {
-    name: "android.hardware.audio@6.0-impl_default",
-    defaults: ["android.hardware.audio-impl_default"],
+    name: "android.hardware.audio@6.0-impl.samsung-sm8550",
+    defaults: ["android.hardware.audio-impl_samsung-sm8550"],
     shared_libs: [
         "android.hardware.audio@6.0",
         "android.hardware.audio@6.0-util",
@@ -126,8 +126,8 @@ cc_library_shared {
 }
 
 cc_library_shared {
-    name: "android.hardware.audio@7.0-impl_default",
-    defaults: ["android.hardware.audio-impl_default"],
+    name: "android.hardware.audio@7.0-impl.samsung-sm8550",
+    defaults: ["android.hardware.audio-impl_samsung-sm8550"],
     shared_libs: [
         "android.hardware.audio@7.0",
         "android.hardware.audio@7.0-util",
@@ -144,8 +144,8 @@ cc_library_shared {
 }
 
 cc_library_shared {
-    name: "android.hardware.audio@7.1-impl_default",
-    defaults: ["android.hardware.audio-impl_default"],
+    name: "android.hardware.audio@7.1-impl.samsung-sm8550",
+    defaults: ["android.hardware.audio-impl_samsung-sm8550"],
     shared_libs: [
         "android.hardware.audio@7.0",
         "android.hardware.audio@7.1",
diff --git a/common.mk b/common.mk
index 6ec28bd..79946bd 100644
--- a/common.mk
+++ b/common.mk
@@ -20,7 +20,7 @@ SOONG_CONFIG_android_hardware_audio += \
 SOONG_CONFIG_android_hardware_audio_run_64bit := true
 
 PRODUCT_PACKAGES += \
-    android.hardware.audio@7.1-impl \
+    android.hardware.audio@7.1-impl.samsung-sm8550 \
     android.hardware.audio.effect@7.0-impl \
     android.hardware.audio.service \
     android.hardware.bluetooth.audio-impl \