diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index d30929933509..7cf29cfcd64e 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.517 2019/02/23 03:10:06 kamil Exp $
+# $NetBSD: GENERIC,v 1.518 2019/03/01 08:17:51 nonaka Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/amd64/conf/std.amd64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.517 $"
+#ident		"GENERIC-$Revision: 1.518 $"
 
 maxusers	64		# estimated number of users
 
@@ -1089,9 +1089,10 @@ vioscsi* at virtio?			# Virtio SCSI device
 vmbus*		at acpi?		# Hyper-V VMBus
 hvn*		at vmbus?		# Hyper-V NetVSC
 hvs*		at vmbus?		# Hyper-V StorVSC
-hvheartbeat*	at vmbus?		# Hyper-V Heartbeat
-hvshutdown*	at vmbus?		# Hyper-V Shutdown
-hvtimesync*	at vmbus?		# Hyper-V Timesync
+hvheartbeat*	at vmbus?		# Hyper-V Heartbeat Service
+hvshutdown*	at vmbus?		# Hyper-V Geust Shutdown Service
+hvtimesync*	at vmbus?		# Hyper-V Time Synchronization Service
+hvkvp*		at vmbus?		# Hyper-V Data Exchange Service
 
 # Pull in optional local configuration
 cinclude "arch/amd64/conf/GENERIC.local"
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 5d2dedb21f1e..fc45cdb9be96 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1202 2019/02/23 12:28:22 kamil Exp $
+# $NetBSD: GENERIC,v 1.1203 2019/03/01 08:17:51 nonaka Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.1202 $"
+#ident		"GENERIC-$Revision: 1.1203 $"
 
 maxusers	64		# estimated number of users
 
@@ -1430,9 +1430,10 @@ vioscsi* at virtio?			# Virtio SCSI device
 vmbus*		at acpi?		# Hyper-V VMBus
 hvn*		at vmbus?		# Hyper-V NetVSC
 hvs*		at vmbus?		# Hyper-V StorVSC
-hvheartbeat*	at vmbus?		# Hyper-V Heartbeat
-hvshutdown*	at vmbus?		# Hyper-V Shutdown
-hvtimesync*	at vmbus?		# Hyper-V Timesync
+hvheartbeat*	at vmbus?		# Hyper-V Heartbeat Service
+hvshutdown*	at vmbus?		# Hyper-V Guest Shutdown Service
+hvtimesync*	at vmbus?		# Hyper-V Time Synchronization Service
+hvkvp*		at vmbus?		# Hyper-V Data Exchange Service
 
 
 # Pull in optional local configuration
diff --git a/sys/dev/hyperv/hvheartbeat.c b/sys/dev/hyperv/hvheartbeat.c
index 3b9c26201904..0e1f57e5e08f 100644
--- a/sys/dev/hyperv/hvheartbeat.c
+++ b/sys/dev/hyperv/hvheartbeat.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hvheartbeat.c,v 1.1 2019/02/15 08:54:01 nonaka Exp $	*/
+/*	$NetBSD: hvheartbeat.c,v 1.2 2019/03/01 08:17:51 nonaka Exp $	*/
 
 /*-
  * Copyright (c) 2014,2016 Microsoft Corp.
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 #ifdef __KERNEL_RCSID
-__KERNEL_RCSID(0, "$NetBSD: hvheartbeat.c,v 1.1 2019/02/15 08:54:01 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hvheartbeat.c,v 1.2 2019/03/01 08:17:51 nonaka Exp $");
 #endif
 #ifdef __FBSDID
 __FBSDID("$FreeBSD: head/sys/dev/hyperv/utilities/vmbus_heartbeat.c 310324 2016-12-20 09:46:14Z sephe $");
@@ -80,7 +80,7 @@ hvheartbeat_attach(device_t parent, device_t self, void *aux)
 	int error;
 
 	aprint_naive("\n");
-	aprint_normal(": Hyper-V Heartbeat\n");
+	aprint_normal(": Hyper-V Heartbeat Service\n");
 
 	error = vmbusic_attach(self, aa, hvheartbeat_channel_cb);
 	if (error)
diff --git a/sys/dev/hyperv/hvshutdown.c b/sys/dev/hyperv/hvshutdown.c
index 3f05d5aea20d..e526295544db 100644
--- a/sys/dev/hyperv/hvshutdown.c
+++ b/sys/dev/hyperv/hvshutdown.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hvshutdown.c,v 1.1 2019/02/15 08:54:01 nonaka Exp $	*/
+/*	$NetBSD: hvshutdown.c,v 1.2 2019/03/01 08:17:51 nonaka Exp $	*/
 
 /*-
  * Copyright (c) 2014,2016 Microsoft Corp.
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 #ifdef __KERNEL_RCSID
-__KERNEL_RCSID(0, "$NetBSD: hvshutdown.c,v 1.1 2019/02/15 08:54:01 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hvshutdown.c,v 1.2 2019/03/01 08:17:51 nonaka Exp $");
 #endif
 #ifdef __FBSDID
 __FBSDID("$FreeBSD: head/sys/dev/hyperv/utilities/vmbus_shutdown.c 310324 2016-12-20 09:46:14Z sephe $");
@@ -86,7 +86,7 @@ hvshutdown_attach(device_t parent, device_t self, void *aux)
 	int error;
 
 	aprint_naive("\n");
-	aprint_normal(": Hyper-V Shutdown\n");
+	aprint_normal(": Hyper-V Guest Shutdown Service\n");
 
 	error = vmbusic_attach(self, aa, hvshutdown_channel_cb);
 	if (error)
diff --git a/sys/dev/hyperv/hvtimesync.c b/sys/dev/hyperv/hvtimesync.c
index ca3dc7c64701..f89e9a2b4471 100644
--- a/sys/dev/hyperv/hvtimesync.c
+++ b/sys/dev/hyperv/hvtimesync.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hvtimesync.c,v 1.1 2019/02/15 08:54:01 nonaka Exp $	*/
+/*	$NetBSD: hvtimesync.c,v 1.2 2019/03/01 08:17:51 nonaka Exp $	*/
 
 /*-
  * Copyright (c) 2014,2016-2017 Microsoft Corp.
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 #ifdef __KERNEL_RCSID
-__KERNEL_RCSID(0, "$NetBSD: hvtimesync.c,v 1.1 2019/02/15 08:54:01 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hvtimesync.c,v 1.2 2019/03/01 08:17:51 nonaka Exp $");
 #endif
 #ifdef __FBSDID
 __FBSDID("$FreeBSD: head/sys/dev/hyperv/utilities/vmbus_timesync.c 322488 2017-08-14 06:00:50Z sephe $");
@@ -93,7 +93,7 @@ hvtimesync_attach(device_t parent, device_t self, void *aux)
 	int error;
 
 	aprint_naive("\n");
-	aprint_normal(": Hyper-V Timesync\n");
+	aprint_normal(": Hyper-V Time Synchronization Service\n");
 
 	error = vmbusic_attach(self, aa, hvtimesync_channel_cb);
 	if (error)