diff --git a/hypervisor/Makefile b/hypervisor/Makefile
index d223a81f4..cf76e50cc 100644
--- a/hypervisor/Makefile
+++ b/hypervisor/Makefile
@@ -222,11 +222,11 @@ ifeq ($(CONFIG_PARTITION_MODE),y)
 C_SRCS += dm/vmptable.c
 endif
 C_SRCS += dm/vpci/partition_mode.c
-C_SRCS += dm/vpci/hostbridge.c
+C_SRCS += dm/vpci/vhostbridge.c
 C_SRCS += dm/vpci/pci_pt.c
 C_SRCS += dm/vpci/sharing_mode.c
-C_SRCS += dm/vpci/msi.c
-C_SRCS += dm/vpci/msix.c
+C_SRCS += dm/vpci/vmsi.c
+C_SRCS += dm/vpci/vmsix.c
 
 C_SRCS += bsp/firmware_wrapper.c
 C_SRCS += bsp/firmware_sbl.c
diff --git a/hypervisor/dm/vpci/hostbridge.c b/hypervisor/dm/vpci/vhostbridge.c
similarity index 100%
rename from hypervisor/dm/vpci/hostbridge.c
rename to hypervisor/dm/vpci/vhostbridge.c
diff --git a/hypervisor/dm/vpci/msi.c b/hypervisor/dm/vpci/vmsi.c
similarity index 100%
rename from hypervisor/dm/vpci/msi.c
rename to hypervisor/dm/vpci/vmsi.c
diff --git a/hypervisor/dm/vpci/msix.c b/hypervisor/dm/vpci/vmsix.c
similarity index 100%
rename from hypervisor/dm/vpci/msix.c
rename to hypervisor/dm/vpci/vmsix.c