diff --git a/Android.bp b/Android.bp
index d7de328..d944380 100644
--- a/Android.bp
+++ b/Android.bp
@@ -7463,11 +7463,11 @@ cc_prebuilt_library_shared {
                 "librcc",
                 "libion",
                 "libhidlbase",
-                "vendor.qti.imsrtpservice@3.0",
-                "vendor.qti.imsrtpservice@3.1",
+                "vendor.qti.imsrtpservice@3.0_vendor",
+                "vendor.qti.imsrtpservice@3.1_vendor",
                 "vendor.qti.ImsRtpService-aidl-Impl",
                 "libbinder_ndk",
-                "vendor.qti.ImsRtpService-V1-ndk",
+                "vendor.qti.ImsRtpService-V1-ndk_vendor",
                 "libdiag",
                 "libcutils",
                 "libutils",
@@ -28117,7 +28117,8 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-    name: "vendor.qti.ImsRtpService-V1-ndk",
+    name: "vendor.qti.ImsRtpService-V1-ndk_vendor",
+    stem: "vendor.qti.ImsRtpService-V1-ndk",
     owner: "xiaomi",
     strip: {
         none: true,
@@ -28163,7 +28164,7 @@ cc_prebuilt_library_shared {
                 "libdiag",
                 "libbinder_ndk",
                 "libbinder",
-                "vendor.qti.ImsRtpService-V1-ndk",
+                "vendor.qti.ImsRtpService-V1-ndk_vendor",
                 "libc++",
                 "libc",
                 "libm",
@@ -31802,7 +31803,8 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-    name: "vendor.qti.imsrtpservice@3.0",
+    name: "vendor.qti.imsrtpservice@3.0_vendor",
+    stem: "vendor.qti.imsrtpservice@3.0",
     owner: "xiaomi",
     strip: {
         none: true,
@@ -31830,7 +31832,8 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-    name: "vendor.qti.imsrtpservice@3.1",
+    name: "vendor.qti.imsrtpservice@3.1_vendor",
+    stem: "vendor.qti.imsrtpservice@3.1",
     owner: "xiaomi",
     strip: {
         none: true,
@@ -31841,7 +31844,7 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib64/vendor.qti.imsrtpservice@3.1.so",
             ],
             shared_libs: [
-                "vendor.qti.imsrtpservice@3.0",
+                "vendor.qti.imsrtpservice@3.0_vendor",
                 "libhidlbase",
                 "liblog",
                 "libutils",
@@ -41369,10 +41372,10 @@ cc_prebuilt_binary {
                 "libqmiservices",
                 "libqmi_csi",
                 "libqmi_cci",
-                "vendor.qti.imsrtpservice@3.1",
-                "vendor.qti.imsrtpservice@3.0",
+                "vendor.qti.imsrtpservice@3.1_vendor",
+                "vendor.qti.imsrtpservice@3.0_vendor",
                 "vendor.qti.ImsRtpService-aidl-Impl",
-                "vendor.qti.ImsRtpService-V1-ndk",
+                "vendor.qti.ImsRtpService-V1-ndk_vendor",
                 "libbinder_ndk",
                 "libutils",
                 "libhidlbase",
diff --git a/peridot-vendor.mk b/peridot-vendor.mk
index 9bfd4e5..dfab98d 100644
--- a/peridot-vendor.mk
+++ b/peridot-vendor.mk
@@ -2230,7 +2230,7 @@ PRODUCT_PACKAGES += \
     vendor.libdpmtcm \
     vendor.libmwqemiptablemgr \
     vendor.nxp.hardware.nfc@2.0 \
-    vendor.qti.ImsRtpService-V1-ndk \
+    vendor.qti.ImsRtpService-V1-ndk_vendor \
     vendor.qti.ImsRtpService-aidl-Impl \
     vendor.qti.data.factoryservice-V1-ndk \
     vendor.qti.data.mwqem@1.0 \
@@ -2358,8 +2358,8 @@ PRODUCT_PACKAGES += \
     vendor.qti.ims.rcsconfig@2.1 \
     vendor.qti.ims.rcssipaidlservice-V1-ndk \
     vendor.qti.ims.rcsuceaidlservice-V1-ndk \
-    vendor.qti.imsrtpservice@3.0 \
-    vendor.qti.imsrtpservice@3.1 \
+    vendor.qti.imsrtpservice@3.0_vendor \
+    vendor.qti.imsrtpservice@3.1_vendor \
     vendor.qti.latency@2.0 \
     vendor.qti.latency@2.1 \
     vendor.qti.latency@2.2 \