diff --git a/stand/common/md.c b/stand/common/md.c
index 61db56ece7a..9f95d3cdfd2 100644
--- a/stand/common/md.c
+++ b/stand/common/md.c
@@ -75,6 +75,7 @@ struct devsw md_dev = {
 	.dv_ioctl = noioctl,
 	.dv_print = md_print,
 	.dv_cleanup = nullsys,
+	.dv_fmtdev = disk_fmtdev,
 };
 
 static int
diff --git a/stand/common/vdisk.c b/stand/common/vdisk.c
index c904613a8e9..c4220787b1a 100644
--- a/stand/common/vdisk.c
+++ b/stand/common/vdisk.c
@@ -53,6 +53,7 @@ struct devsw vdisk_dev = {
 	.dv_ioctl = vdisk_ioctl,
 	.dv_print = vdisk_print,
 	.dv_cleanup = nullsys,
+	.dv_fmtdev = disk_fmtdev,
 };
 
 typedef STAILQ_HEAD(vdisk_info_list, vdisk_info) vdisk_info_list_t;
diff --git a/stand/efi/libefi/efipart.c b/stand/efi/libefi/efipart.c
index e5c9c88234b..88587192a1b 100644
--- a/stand/efi/libefi/efipart.c
+++ b/stand/efi/libefi/efipart.c
@@ -103,6 +103,7 @@ struct devsw efipart_hddev = {
 	.dv_ioctl = efipart_ioctl,
 	.dv_print = efipart_printhd,
 	.dv_cleanup = nullsys,
+	.dv_fmtdev = disk_fmtdev,
 };
 
 static pdinfo_list_t fdinfo = STAILQ_HEAD_INITIALIZER(fdinfo);
diff --git a/stand/i386/libi386/biosdisk.c b/stand/i386/libi386/biosdisk.c
index 4f07343344f..3539d206d01 100644
--- a/stand/i386/libi386/biosdisk.c
+++ b/stand/i386/libi386/biosdisk.c
@@ -190,6 +190,7 @@ struct devsw bioshd = {
 	.dv_ioctl = bd_ioctl,
 	.dv_print = bd_print,
 	.dv_cleanup = nullsys,
+	.dv_fmtdev = disk_fmtdev,
 };
 
 static bdinfo_list_t *
diff --git a/stand/kboot/hostdisk.c b/stand/kboot/hostdisk.c
index cd125350ce9..00f133274f1 100644
--- a/stand/kboot/hostdisk.c
+++ b/stand/kboot/hostdisk.c
@@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$");
 #include <stdarg.h>
 #include "bootstrap.h"
 #include "host_syscall.h"
+#include "disk.h"
 
 static int hostdisk_init(void);
 static int hostdisk_strategy(void *devdata, int flag, daddr_t dblk,
@@ -49,6 +50,7 @@ struct devsw hostdisk = {
 	.dv_ioctl = hostdisk_ioctl,
 	.dv_print = hostdisk_print,
 	.dv_cleanup = nullsys,
+	.dv_fmtdev = disk_fmtdev,
 };
 
 static int
diff --git a/stand/libofw/ofw_disk.c b/stand/libofw/ofw_disk.c
index 086b16a9ecd..5585b463c73 100644
--- a/stand/libofw/ofw_disk.c
+++ b/stand/libofw/ofw_disk.c
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
 #include <stand.h>
 #include <sys/disk.h>
 
-#include "bootstrap.h"
+#include "disk.h"
 #include "libofw.h"
 
 static int	ofwd_init(void);
@@ -60,6 +60,7 @@ struct devsw ofwdisk = {
 	.dv_ioctl = ofwd_ioctl,
 	.dv_print = ofwd_print,
 	.dv_cleanup = nullsys,
+	.dv_fmtdev = disk_fmtdev,
 };
 
 /*
diff --git a/stand/libsa/geli/gelidev.c b/stand/libsa/geli/gelidev.c
index 5dd122a4a68..5f1143399fb 100644
--- a/stand/libsa/geli/gelidev.c
+++ b/stand/libsa/geli/gelidev.c
@@ -62,6 +62,7 @@ static struct devsw geli_devsw = {
 	.dv_ioctl    = geli_dev_ioctl,
 	.dv_print    = geli_dev_print,
 	.dv_cleanup  = geli_dev_cleanup,
+	.dv_fmtdev   = disk_fmtdev,
 };
 
 /*
@@ -305,7 +306,7 @@ geli_probe_and_attach(struct open_file *f)
 	hlastblk = (hmediasize / DEV_BSIZE) - 1;
 
 	/* Taste the host provider.  If it's not geli-encrypted just return. */
-	gdev = geli_taste(diskdev_read, hdesc, hlastblk, disk_fmtdev(&hdesc->dd));
+	gdev = geli_taste(diskdev_read, hdesc, hlastblk, devformat(&hdesc->dd));
 	if (gdev == NULL)
 		return;
 
diff --git a/stand/uboot/uboot_disk.c b/stand/uboot/uboot_disk.c
index 236a118b915..2a41d118199 100644
--- a/stand/uboot/uboot_disk.c
+++ b/stand/uboot/uboot_disk.c
@@ -90,6 +90,7 @@ struct devsw uboot_storage = {
 	.dv_ioctl = stor_ioctl,
 	.dv_print = stor_print,
 	.dv_cleanup = stor_cleanup,
+	.dv_fmtdev = disk_fmtdev,
 };
 
 static int
diff --git a/stand/usb/storage/umass_loader.c b/stand/usb/storage/umass_loader.c
index 1c12f05c276..cc1f6b68e27 100644
--- a/stand/usb/storage/umass_loader.c
+++ b/stand/usb/storage/umass_loader.c
@@ -61,6 +61,7 @@ struct devsw umass_disk = {
 	.dv_ioctl = umass_disk_ioctl,
 	.dv_print = umass_disk_print,
 	.dv_cleanup = umass_disk_cleanup,
+	.dv_fmtdev = disk_fmtdev,
 };
 
 static int
diff --git a/stand/userboot/userboot/userboot_disk.c b/stand/userboot/userboot/userboot_disk.c
index ed8a6dbdbbf..d5b0f36e5e5 100644
--- a/stand/userboot/userboot/userboot_disk.c
+++ b/stand/userboot/userboot/userboot_disk.c
@@ -72,6 +72,7 @@ struct devsw userboot_disk = {
 	.dv_ioctl = userdisk_ioctl,
 	.dv_print = userdisk_print,
 	.dv_cleanup = userdisk_cleanup,
+	.dv_fmtdev = disk_fmtdev,
 };
 
 /*