diff --git a/Android.bp b/Android.bp
index a025549..ad192d8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -5353,8 +5353,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-	name: "liba2dpoffload_vendor",
-	stem: "liba2dpoffload",
+	name: "liba2dpoffload",
 	owner: "samsung",
 	strip: {
 		none: true,
@@ -5439,8 +5438,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-	name: "libbatterylistener_vendor",
-	stem: "libbatterylistener",
+	name: "libbatterylistener",
 	owner: "samsung",
 	strip: {
 		none: true,
@@ -5576,8 +5574,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-	name: "libcirrusspkrprot_vendor",
-	stem: "libcirrusspkrprot",
+	name: "libcirrusspkrprot",
 	owner: "samsung",
 	strip: {
 		none: true,
@@ -5611,8 +5608,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-	name: "libcomprcapture_vendor",
-	stem: "libcomprcapture",
+	name: "libcomprcapture",
 	owner: "samsung",
 	strip: {
 		none: true,
@@ -5697,8 +5693,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-	name: "libexthwplugin_vendor",
-	stem: "libexthwplugin",
+	name: "libexthwplugin",
 	owner: "samsung",
 	strip: {
 		none: true,
@@ -5715,8 +5710,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-	name: "libhdmiedid_vendor",
-	stem: "libhdmiedid",
+	name: "libhdmiedid",
 	owner: "samsung",
 	strip: {
 		none: true,
@@ -5733,8 +5727,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-	name: "libhdmipassthru_vendor",
-	stem: "libhdmipassthru",
+	name: "libhdmipassthru",
 	owner: "samsung",
 	strip: {
 		none: true,
@@ -5751,8 +5744,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-	name: "libhfp_vendor",
-	stem: "libhfp",
+	name: "libhfp",
 	owner: "samsung",
 	strip: {
 		none: true,
@@ -6041,8 +6033,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-	name: "libsndmonitor_vendor",
-	stem: "libsndmonitor",
+	name: "libsndmonitor",
 	owner: "samsung",
 	strip: {
 		none: true,
@@ -6076,8 +6067,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-	name: "libspkrprot_vendor",
-	stem: "libspkrprot",
+	name: "libspkrprot",
 	owner: "samsung",
 	strip: {
 		none: true,
diff --git a/sm7125-common-vendor.mk b/sm7125-common-vendor.mk
index b11700e..c16b6e2 100644
--- a/sm7125-common-vendor.mk
+++ b/sm7125-common-vendor.mk
@@ -413,12 +413,12 @@ PRODUCT_PACKAGES += \
     lib_SamsungRec_07010 \
     lib_SoundAlive_SRC384_ver320 \
     lib_soundaliveresampler \
-    liba2dpoffload_vendor \
+    liba2dpoffload \
     libadm \
     libaudio_log_utils \
     libaudio_soundtrigger \
     libaudioparsers \
-    libbatterylistener_vendor \
+    libbatterylistener \
     libcamera_nn_stub \
     libcamxfdalgov7 \
     libcamxfdalgov8 \
@@ -426,17 +426,17 @@ PRODUCT_PACKAGES += \
     libcamxstatscore \
     libcamxswprocessalgo \
     libcamxtintlessalgo \
-    libcirrusspkrprot_vendor \
+    libcirrusspkrprot \
     libcom.qti.chinodeutils \
-    libcomprcapture_vendor \
+    libcomprcapture \
     libdrc \
     libdualcam_optical_zoom \
     libdualcam_optical_zoom_control \
     libdualcapture \
-    libexthwplugin_vendor \
-    libhdmiedid_vendor \
-    libhdmipassthru_vendor \
-    libhfp_vendor \
+    libexthwplugin \
+    libhdmiedid \
+    libhdmipassthru \
+    libhfp \
     libmpbase \
     libprofileparamstorage \
     libqcodec2 \
@@ -453,9 +453,9 @@ PRODUCT_PACKAGES += \
     libsecaudioinfo \
     libsensorlistener \
     libsensorndkbridge \
-    libsndmonitor_vendor \
+    libsndmonitor \
     libspatializerparamstorage \
-    libspkrprot_vendor \
+    libspkrprot \
     libsurround_3mic_proc \
     libswregistrationalgo \
     libuniplugin \