diff --git a/drivers/soc/qcom/mem-buf.c b/drivers/soc/qcom/mem-buf.c
index b921870babf8..36a2a78b727b 100644
--- a/drivers/soc/qcom/mem-buf.c
+++ b/drivers/soc/qcom/mem-buf.c
@@ -1101,8 +1101,8 @@ static int mem_buf_remove_mem(struct mem_buf_desc *membuf)
 
 static bool is_valid_mem_buf_vmid(u32 mem_buf_vmid)
 {
-	if ((mem_buf_vmid == MEM_BUF_VMID_HLOS) ||
-	    (mem_buf_vmid == MEM_BUF_VMID_TRUSTED_UI))
+	if ((mem_buf_vmid == MEM_BUF_VMID_PRIMARY_VM) ||
+	    (mem_buf_vmid == MEM_BUF_VMID_TRUSTED_VM))
 		return true;
 
 	return false;
@@ -1115,11 +1115,21 @@ static bool is_valid_mem_buf_perms(u32 mem_buf_perms)
 
 static int mem_buf_vmid_to_vmid(u32 mem_buf_vmid)
 {
-	if (mem_buf_vmid == MEM_BUF_VMID_HLOS)
-		return VMID_HLOS;
-	else if (mem_buf_vmid == MEM_BUF_VMID_TRUSTED_UI)
-		return VMID_TRUSTED_UI;
-	return -EINVAL;
+	int ret;
+	hh_vmid_t vmid;
+	enum hh_vm_names vm_name;
+
+	if (mem_buf_vmid == MEM_BUF_VMID_PRIMARY_VM)
+		vm_name = HH_PRIMARY_VM;
+	else if (mem_buf_vmid == MEM_BUF_VMID_TRUSTED_VM)
+		vm_name = HH_TRUSTED_VM;
+	else
+		return -EINVAL;
+
+	ret = hh_rm_get_vmid(vm_name, &vmid);
+	if (!ret)
+		return vmid;
+	return ret;
 }
 
 static int mem_buf_perms_to_perms(u32 mem_buf_perms)
diff --git a/drivers/soc/qcom/secure_buffer.c b/drivers/soc/qcom/secure_buffer.c
index 62f0f2beefbe..e19919583c4d 100644
--- a/drivers/soc/qcom/secure_buffer.c
+++ b/drivers/soc/qcom/secure_buffer.c
@@ -280,8 +280,6 @@ const char *msm_secure_vmid_to_string(int secure_vmid)
 		return "VMID_CP_SPSS_SP_SHARED";
 	case VMID_CP_SPSS_HLOS_SHARED:
 		return "VMID_CP_SPSS_HLOS_SHARED";
-	case VMID_TRUSTED_UI:
-		return "VMID_TRUSTED_UI";
 	case VMID_INVAL:
 		return "VMID_INVAL";
 	default:
diff --git a/drivers/staging/android/ion/heaps/ion_secure_util.c b/drivers/staging/android/ion/heaps/ion_secure_util.c
index 0ddd7edd9d6d..7f871cd768ad 100644
--- a/drivers/staging/android/ion/heaps/ion_secure_util.c
+++ b/drivers/staging/android/ion/heaps/ion_secure_util.c
@@ -60,7 +60,7 @@ int get_secure_vmid(unsigned long flags)
 		return VMID_CP_SPSS_HLOS_SHARED;
 	if (flags & ION_FLAG_CP_CDSP)
 		return VMID_CP_CDSP;
-	if (flags & ION_FLAG_CP_TRUSTED_UI) {
+	if (flags & ION_FLAG_CP_TRUSTED_VM) {
 		ret = hh_rm_get_vmid(HH_TRUSTED_VM, &vmid);
 		if (!ret)
 			return vmid;
@@ -103,7 +103,7 @@ int get_ion_flags(u32 vmid)
 
 	ret = hh_rm_get_vmid(HH_TRUSTED_VM, &trusted_vm_vmid);
 	if (!ret && vmid == trusted_vm_vmid)
-		return ION_FLAG_CP_TRUSTED_UI;
+		return ION_FLAG_CP_TRUSTED_VM;
 	return -EINVAL;
 }
 EXPORT_SYMBOL(get_ion_flags);
diff --git a/include/soc/qcom/secure_buffer.h b/include/soc/qcom/secure_buffer.h
index a063a8edc18a..c69a97783a3e 100644
--- a/include/soc/qcom/secure_buffer.h
+++ b/include/soc/qcom/secure_buffer.h
@@ -33,7 +33,6 @@ enum vmid {
 	VMID_CP_SPSS_SP_SHARED = 0x22,
 	VMID_CP_SPSS_HLOS_SHARED = 0x24,
 	VMID_CP_CDSP = 0x2A,
-	VMID_TRUSTED_UI = 0x31,
 	VMID_LAST,
 	VMID_INVAL = -1
 };
diff --git a/include/uapi/linux/mem-buf.h b/include/uapi/linux/mem-buf.h
index d6ae79982982..1567e2144018 100644
--- a/include/uapi/linux/mem-buf.h
+++ b/include/uapi/linux/mem-buf.h
@@ -21,8 +21,8 @@ enum mem_buf_mem_type {
 };
 
 /* The mem-buf values that represent VMIDs for an ACL. */
-#define MEM_BUF_VMID_HLOS 0
-#define	MEM_BUF_VMID_TRUSTED_UI 1
+#define MEM_BUF_VMID_PRIMARY_VM 0
+#define	MEM_BUF_VMID_TRUSTED_VM 1
 
 #define MEM_BUF_PERM_FLAG_READ (1U << 0)
 #define MEM_BUF_PERM_FLAG_WRITE (1U << 1)
diff --git a/include/uapi/linux/msm_ion.h b/include/uapi/linux/msm_ion.h
index 44ed10a462a0..4ec2c1d6eeda 100644
--- a/include/uapi/linux/msm_ion.h
+++ b/include/uapi/linux/msm_ion.h
@@ -27,7 +27,7 @@ enum msm_ion_heap_types {
  * Flags to be used when allocating from the secure heap for
  * content protection
  */
-#define ION_FLAG_CP_TRUSTED_UI		ION_BIT(15)
+#define ION_FLAG_CP_TRUSTED_VM		ION_BIT(15)
 /* ION_FLAG_POOL_FORCE_ALLOC uses ION_BIT(16) */
 #define ION_FLAG_CP_TOUCH		ION_BIT(17)
 #define ION_FLAG_CP_BITSTREAM		ION_BIT(18)