diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf
index e18c161a1369..bb86b1a231e9 100644
--- a/sys/boot/forth/loader.conf
+++ b/sys/boot/forth/loader.conf
@@ -162,15 +162,10 @@ xl_load="NO"			# 3Com Etherlink XL (3c900, 3c905, 3c905B)
 ##############################################################
 
 ugen_load="NO"
-ugen_name="ugen_mod"
 uhid_load="NO"
-uhid_name="uhid_mod"
 ukbd_load="NO"
-ukbd_name="ukbd_mod"
 ulpt_load="NO"
-ulpt_name="ulpt_mod"
 ums_load="NO"
-ums_name="ums_mod"
 
 ##############################################################
 ###  Other modules  ##########################################
diff --git a/sys/modules/ugen/Makefile b/sys/modules/ugen/Makefile
index 787d9ca7faa9..b66c96f7928f 100644
--- a/sys/modules/ugen/Makefile
+++ b/sys/modules/ugen/Makefile
@@ -4,7 +4,7 @@ MAINTAINER	 = n_hibma@freebsd.org
 SOURCE		 = ${.CURDIR}/../../dev/usb
 
 .PATH:  ${SOURCE}
-KMOD		 = ugen_mod
+KMOD		 = ugen
 SRCS		 = bus_if.h device_if.h vnode_if.h opt_usb.h ugen.c
 NOMAN		 =
 CFLAGS		+= -g
diff --git a/sys/modules/uhid/Makefile b/sys/modules/uhid/Makefile
index c8235117d7ea..4158de448e05 100644
--- a/sys/modules/uhid/Makefile
+++ b/sys/modules/uhid/Makefile
@@ -4,7 +4,7 @@ MAINTAINER	 = n_hibma@freebsd.org
 SOURCE		 = ${.CURDIR}/../../dev/usb
 
 .PATH:  ${SOURCE}
-KMOD		 = uhid_mod
+KMOD		 = uhid
 SRCS		 = bus_if.h device_if.h vnode_if.h opt_usb.h uhid.c
 NOMAN		 =
 CFLAGS		+= -g
diff --git a/sys/modules/ukbd/Makefile b/sys/modules/ukbd/Makefile
index 7871080835be..dd6cc7f487fd 100644
--- a/sys/modules/ukbd/Makefile
+++ b/sys/modules/ukbd/Makefile
@@ -4,7 +4,7 @@ MAINTAINER	 = n_hibma@freebsd.org
 SOURCE		 = ${.CURDIR}/../../dev/usb
 
 .PATH:  ${SOURCE}
-KMOD		 = ukbd_mod
+KMOD		 = ukbd
 SRCS		 = bus_if.h device_if.h vnode_if.h \
 		   opt_usb.h ukbd.h opt_kbd.h \
 		   ukbd.c
diff --git a/sys/modules/ulpt/Makefile b/sys/modules/ulpt/Makefile
index c903780e5d12..76fa4bb10a28 100644
--- a/sys/modules/ulpt/Makefile
+++ b/sys/modules/ulpt/Makefile
@@ -4,7 +4,7 @@ MAINTAINER	 = n_hibma@freebsd.org
 SOURCE		 = ${.CURDIR}/../../dev/usb
 
 .PATH:  ${SOURCE}
-KMOD		 = ulpt_mod
+KMOD		 = ulpt
 SRCS		 = bus_if.h device_if.h vnode_if.h opt_usb.h ulpt.c
 NOMAN		 =
 CFLAGS		+= -g
diff --git a/sys/modules/umass/Makefile b/sys/modules/umass/Makefile
index 1fb09e1671fa..c73a798f5405 100644
--- a/sys/modules/umass/Makefile
+++ b/sys/modules/umass/Makefile
@@ -4,7 +4,7 @@ MAINTAINER	 = n_hibma@freebsd.org
 SOURCE		 = ${.CURDIR}/../../dev/usb
 
 .PATH:  ${SOURCE}
-KMOD		 = umass_mod
+KMOD		 = umass
 SRCS		 = bus_if.h device_if.h vnode_if.h \
 		   opt_usb.h opt_cam.h opt_scsi.h \
 		   umass.c
diff --git a/sys/modules/umodem/Makefile b/sys/modules/umodem/Makefile
index 627d3f00af07..21388c05a00d 100644
--- a/sys/modules/umodem/Makefile
+++ b/sys/modules/umodem/Makefile
@@ -4,7 +4,7 @@ MAINTAINER	 = n_hibma@freebsd.org
 SOURCE		 = ${.CURDIR}/../../dev/usb
 
 .PATH:  ${SOURCE}
-KMOD		 = umodem_mod
+KMOD		 = umodem
 SRCS		 = bus_if.h device_if.h vnode_if.h opt_usb.h umodem.c
 NOMAN		 =
 CFLAGS		+= -g
diff --git a/sys/modules/ums/Makefile b/sys/modules/ums/Makefile
index e114198bbc1f..0f68eebfe221 100644
--- a/sys/modules/ums/Makefile
+++ b/sys/modules/ums/Makefile
@@ -4,7 +4,7 @@ MAINTAINER	 = n_hibma@freebsd.org
 SOURCE		 = ${.CURDIR}/../../dev/usb
 
 .PATH:  ${SOURCE}
-KMOD		 = ums_mod
+KMOD		 = ums
 SRCS		 = bus_if.h device_if.h vnode_if.h opt_usb.h ums.c
 NOMAN		 =
 CFLAGS		+= -g