diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 4c43fd47159..5c1f8546ff0 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -303,7 +303,7 @@ 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/hv_util.c				optional	hyperv
+dev/hyperv/utilities/vmbus_ic.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 a8db1156019..b8fcc5633b9 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -259,7 +259,7 @@ 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/hv_util.c				optional	hyperv
+dev/hyperv/utilities/vmbus_ic.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_util.c b/sys/dev/hyperv/utilities/vmbus_ic.c
similarity index 100%
rename from sys/dev/hyperv/utilities/hv_util.c
rename to sys/dev/hyperv/utilities/vmbus_ic.c
diff --git a/sys/modules/hyperv/utilities/Makefile b/sys/modules/hyperv/utilities/Makefile
index 28125fd2867..5d39e0b1181 100644
--- a/sys/modules/hyperv/utilities/Makefile
+++ b/sys/modules/hyperv/utilities/Makefile
@@ -3,7 +3,12 @@
 .PATH:	${.CURDIR}/../../../dev/hyperv/utilities
 
 KMOD=	hv_utils
-SRCS=	hv_util.c hv_kvp.c hv_snapshot.c hv_timesync.c hv_shutdown.c hv_heartbeat.c hv_snapshot.c
+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+=	bus_if.h device_if.h vmbus_if.h
 
 CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/include \