diff --git a/sbin/mdconfig/mdconfig.c b/sbin/mdconfig/mdconfig.c
index f95223d6a102..53d04807936e 100644
--- a/sbin/mdconfig/mdconfig.c
+++ b/sbin/mdconfig/mdconfig.c
@@ -282,9 +282,10 @@ mdmaybeload(void)
 {
         struct module_stat mstat;
         int fileid, modid;
-        const char *name = "md";
+        const char *name;
 	char *cp;
 
+	name = MD_NAME;
         /* scan files in kernel */
         mstat.version = sizeof(struct module_stat);
         for (fileid = kldnext(0); fileid > 0; fileid = kldnext(fileid)) {
diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c
index f8e6a18b6ea4..79c9587aeb43 100644
--- a/sys/dev/md/md.c
+++ b/sys/dev/md/md.c
@@ -898,7 +898,8 @@ md_drvinit(void *unused)
 		   mdunits, name, len, ptr);
 		md_preloaded(ptr, len);
 	} 
-	status_dev = make_dev(&mdctl_cdevsw, 0xffff00ff, UID_ROOT, GID_WHEEL, 0600, "mdctl");
+	status_dev = make_dev(&mdctl_cdevsw, 0xffff00ff, UID_ROOT, GID_WHEEL,
+	    0600, MDCTL_NAME);
 }
 
 static int
@@ -922,7 +923,7 @@ md_modevent(module_t mod, int type, void *data)
 }
 
 static moduledata_t md_mod = {
-        "md",
+        MD_NAME,
         md_modevent,
         NULL
 };