diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 5c1f8546ff00..bced97cff344 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -298,12 +298,12 @@ dev/hyperv/netvsc/hn_nvs.c				optional	hyperv
 dev/hyperv/netvsc/hn_rndis.c				optional	hyperv
 dev/hyperv/netvsc/if_hn.c				optional	hyperv
 dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c		optional	hyperv
-dev/hyperv/utilities/hv_heartbeat.c			optional	hyperv
 dev/hyperv/utilities/hv_kvp.c				optional	hyperv
 dev/hyperv/utilities/hv_snapshot.c			optional	hyperv
-dev/hyperv/utilities/hv_shutdown.c			optional	hyperv
-dev/hyperv/utilities/hv_timesync.c			optional	hyperv
+dev/hyperv/utilities/vmbus_heartbeat.c			optional	hyperv
 dev/hyperv/utilities/vmbus_ic.c				optional	hyperv
+dev/hyperv/utilities/vmbus_shutdown.c			optional	hyperv
+dev/hyperv/utilities/vmbus_timesync.c			optional	hyperv
 dev/hyperv/vmbus/hyperv.c				optional	hyperv
 dev/hyperv/vmbus/hyperv_busdma.c			optional	hyperv
 dev/hyperv/vmbus/vmbus.c				optional	hyperv pci
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index b8fcc5633b9a..2b9212265b43 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -254,12 +254,12 @@ dev/hyperv/netvsc/hn_nvs.c				optional	hyperv
 dev/hyperv/netvsc/hn_rndis.c				optional	hyperv
 dev/hyperv/netvsc/if_hn.c				optional	hyperv
 dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c		optional	hyperv
-dev/hyperv/utilities/hv_heartbeat.c			optional	hyperv
 dev/hyperv/utilities/hv_kvp.c				optional	hyperv
 dev/hyperv/utilities/hv_snapshot.c			optional	hyperv
-dev/hyperv/utilities/hv_shutdown.c			optional	hyperv
-dev/hyperv/utilities/hv_timesync.c			optional	hyperv
+dev/hyperv/utilities/vmbus_heartbeat.c			optional	hyperv
 dev/hyperv/utilities/vmbus_ic.c				optional	hyperv
+dev/hyperv/utilities/vmbus_shutdown.c			optional	hyperv
+dev/hyperv/utilities/vmbus_timesync.c			optional	hyperv
 dev/hyperv/vmbus/hyperv.c				optional	hyperv
 dev/hyperv/vmbus/hyperv_busdma.c			optional	hyperv
 dev/hyperv/vmbus/vmbus.c				optional	hyperv pci
diff --git a/sys/dev/hyperv/utilities/hv_heartbeat.c b/sys/dev/hyperv/utilities/vmbus_heartbeat.c
similarity index 100%
rename from sys/dev/hyperv/utilities/hv_heartbeat.c
rename to sys/dev/hyperv/utilities/vmbus_heartbeat.c
diff --git a/sys/dev/hyperv/utilities/hv_shutdown.c b/sys/dev/hyperv/utilities/vmbus_shutdown.c
similarity index 100%
rename from sys/dev/hyperv/utilities/hv_shutdown.c
rename to sys/dev/hyperv/utilities/vmbus_shutdown.c
diff --git a/sys/dev/hyperv/utilities/hv_timesync.c b/sys/dev/hyperv/utilities/vmbus_timesync.c
similarity index 100%
rename from sys/dev/hyperv/utilities/hv_timesync.c
rename to sys/dev/hyperv/utilities/vmbus_timesync.c
diff --git a/sys/modules/hyperv/utilities/Makefile b/sys/modules/hyperv/utilities/Makefile
index 5d39e0b1181e..deb2e8bc187e 100644
--- a/sys/modules/hyperv/utilities/Makefile
+++ b/sys/modules/hyperv/utilities/Makefile
@@ -4,11 +4,11 @@
 
 KMOD=	hv_utils
 SRCS=	vmbus_ic.c
-SRCS+=	hv_heartbeat.c
 SRCS+=	hv_kvp.c
-SRCS+=	hv_shutdown.c
 SRCS+=	hv_snapshot.c
-SRCS+=	hv_timesync.c
+SRCS+=	vmbus_heartbeat.c
+SRCS+=	vmbus_shutdown.c
+SRCS+=	vmbus_timesync.c
 SRCS+=	bus_if.h device_if.h vmbus_if.h
 
 CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/include \