diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 6a600769cd59..ecad22673565 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.1136 2019/05/17 13:44:55 nakayama Exp $
+#	$NetBSD: bsd.own.mk,v 1.1137 2019/05/17 13:51:36 nakayama Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -374,7 +374,7 @@ TOOL_CTFCONVERT=	${TOOLDIR}/bin/${_TOOL_PREFIX}ctfconvert
 TOOL_CTFMERGE=		${TOOLDIR}/bin/${_TOOL_PREFIX}ctfmerge
 TOOL_CVSLATEST=		${TOOLDIR}/bin/${_TOOL_PREFIX}cvslatest
 TOOL_DB=		${TOOLDIR}/bin/${_TOOL_PREFIX}db
-TOOL_DISKLABEL=		${TOOLDIR}/bin/nbdisklabel
+TOOL_DISKLABEL=		${TOOLDIR}/bin/${_TOOL_PREFIX}disklabel
 TOOL_DTC=		${TOOLDIR}/bin/${_TOOL_PREFIX}dtc
 TOOL_EQN=		${TOOLDIR}/bin/${_TOOL_PREFIX}eqn
 TOOL_FDISK=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-fdisk
diff --git a/tools/disklabel/Makefile b/tools/disklabel/Makefile
index ab1665ed8cd8..ac433342dc01 100644
--- a/tools/disklabel/Makefile
+++ b/tools/disklabel/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.7 2018/05/01 12:38:39 christos Exp $
+#	$NetBSD: Makefile,v 1.8 2019/05/17 13:51:36 nakayama Exp $
 
-HOSTPROGNAME=	nbdisklabel
+HOSTPROGNAME=	${_TOOL_PREFIX}disklabel
 HOST_SRCDIR=	sbin/disklabel
 HOST_SRCS=	disklabel.c
 
diff --git a/tools/gpt/Makefile b/tools/gpt/Makefile
index c47bdb708513..29d0dc83a39c 100644
--- a/tools/gpt/Makefile
+++ b/tools/gpt/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.4 2018/05/01 12:38:39 christos Exp $
+#	$NetBSD: Makefile,v 1.5 2019/05/17 13:51:36 nakayama Exp $
 
-HOSTPROGNAME=	nbgpt
+HOSTPROGNAME=	${_TOOL_PREFIX}gpt
 HOST_SRCDIR=	sbin/gpt
 HOST_CPPFLAGS+=	-I${.CURDIR}
 
diff --git a/tools/vgrind/Makefile b/tools/vgrind/Makefile
index 21ecb71e02d8..cf514ebd970b 100644
--- a/tools/vgrind/Makefile
+++ b/tools/vgrind/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.2 2014/07/15 16:04:35 christos Exp $
+#	$NetBSD: Makefile,v 1.3 2019/05/17 13:51:36 nakayama Exp $
 
-HOSTPROGNAME=	nbvfontedpr
+HOSTPROGNAME=	${_TOOL_PREFIX}vfontedpr
 HOST_BINDIR=	${TOOLDIR}/libexec
 HOST_SRCDIR=	usr.bin/vgrind
 HOST_FILESDIR=	${TOOLDIR}/share/misc