diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -325,7 +325,7 @@
 device		xhci			# XHCI PCI->USB interface (USB 3.0)
 device		usb			# USB Bus (required)
 device		usbhid			# USB HID Transport
-device		ukbd			# Keyboard
+device		hkbd			# Keyboard
 device		umass			# Disks/Mass storage - Requires scbus and da
 
 # Sound support
diff --git a/sys/arm/conf/GENERIC b/sys/arm/conf/GENERIC
--- a/sys/arm/conf/GENERIC
+++ b/sys/arm/conf/GENERIC
@@ -192,8 +192,7 @@
 device		axe			# USB-Ethernet
 device		umass			# Disks/Mass storage - Requires scbus and da
 device		usbhid			# USB HID Transport
-device		uhid			# "Human Interface Devices"
-device		ukbd			# Allow keyboard like HIDs to control console
+device		hkbd			# Allow keyboard like HIDs to control console
 
 # Device mode support
 device		usb_template    	# Control of the gadget
@@ -226,7 +225,7 @@
 # Framebuffer support
 device		vt
 device		kbdmux
-device		ums
+device		hms
 device		videomode
 device		vchiq
 
diff --git a/sys/arm/conf/RPI-B b/sys/arm/conf/RPI-B
--- a/sys/arm/conf/RPI-B
+++ b/sys/arm/conf/RPI-B
@@ -57,7 +57,7 @@
 # Comment following lines for boot console on serial port
 device		vt
 device		kbdmux
-device		ukbd
+device		hkbd
 
 device		sdhci
 device		mmc
diff --git a/sys/arm/conf/TEGRA124 b/sys/arm/conf/TEGRA124
--- a/sys/arm/conf/TEGRA124
+++ b/sys/arm/conf/TEGRA124
@@ -89,8 +89,6 @@
 device		umass			# Disks/Mass storage - Requires scbus and da
 device		uhid			# "Human Interface Devices"
 #device		u3g			# USB modems
-device		ukbd			# Allow keyboard like HIDs to control console
-device		ums			# USB mouse
 
 # USB Ethernet, requires miibus
 #device		aue			# ADMtek USB Ethernet
@@ -131,6 +129,8 @@
 # HID support
 device		hid			# Generic HID support
 device		hidbus			# Generic HID Bus
+device		hkbd			# Allow keyboard like HIDs to control console
+device		hms			# USB mouse
 
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
diff --git a/sys/arm64/conf/std.dev b/sys/arm64/conf/std.dev
--- a/sys/arm64/conf/std.dev
+++ b/sys/arm64/conf/std.dev
@@ -100,7 +100,7 @@
 device		xhci			# XHCI USB interface (USB 3.0)
 device		usb			# USB Bus (required)
 device		usbhid			# USB HID Transport
-device		ukbd			# Keyboard
+device		hkbd			# Keyboard
 device		umass			# Disks/Mass storage - Requires scbus and da
 
 # Sound support
diff --git a/sys/dev/usb/input/usbhid.c b/sys/dev/usb/input/usbhid.c
--- a/sys/dev/usb/input/usbhid.c
+++ b/sys/dev/usb/input/usbhid.c
@@ -77,9 +77,9 @@
 #include "hid_if.h"
 
 static SYSCTL_NODE(_hw_usb, OID_AUTO, usbhid, CTLFLAG_RW, 0, "USB usbhid");
-static int usbhid_enable = 0;
+static int usbhid_enable = 1;
 SYSCTL_INT(_hw_usb_usbhid, OID_AUTO, enable, CTLFLAG_RWTUN,
-    &usbhid_enable, 0, "Enable usbhid and prefer it to other USB HID drivers");
+    &usbhid_enable, 1, "Enable usbhid and prefer it to other USB HID drivers");
 #ifdef USB_DEBUG
 static int usbhid_debug = 0;
 SYSCTL_INT(_hw_usb_usbhid, OID_AUTO, debug, CTLFLAG_RWTUN,
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -290,7 +290,7 @@
 device		xhci			# XHCI PCI->USB interface (USB 3.0)
 device		usb			# USB Bus (required)
 device		usbhid			# USB HID Transport
-device		ukbd			# Keyboard
+device		hkbd			# Keyboard
 device		umass			# Disks/Mass storage - Requires scbus and da
 
 # Sound support
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -175,12 +175,11 @@
 device		ehci		# EHCI PCI->USB interface
 device		usb		# USB Bus (required)
 device		usbhid		# USB HID Transport
-device		uhid		# "Human Interface Devices"
-device		ukbd		# Keyboard
+device		hkbd		# Keyboard
 options 	KBD_INSTALL_CDEV # install a CDEV entry in /dev
 device		ulpt		# Printer
 device		umass		# Disks/Mass storage - Requires scbus and da0
-device		ums		# Mouse
+device		hms		# Mouse
 device		atp		# Apple USB touchpad
 device		urio		# Diamond Rio 500 MP3 player
 # USB Ethernet
diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64
--- a/sys/powerpc/conf/GENERIC64
+++ b/sys/powerpc/conf/GENERIC64
@@ -214,11 +214,10 @@
 device		xhci		# XHCI PCI->USB interface
 device		usb		# USB Bus (required)
 device		usbhid		# USB HID Transport
-device		uhid		# "Human Interface Devices"
-device		ukbd		# Keyboard
+device		hkbd		# Keyboard
 options 	KBD_INSTALL_CDEV # install a CDEV entry in /dev
 device		umass		# Disks/Mass storage - Requires scbus and da0
-device		ums		# Mouse
+device		hms		# Mouse
 # USB Ethernet
 device		aue		# ADMtek USB Ethernet
 device		axe		# ASIX Electronics USB Ethernet
diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE
--- a/sys/powerpc/conf/GENERIC64LE
+++ b/sys/powerpc/conf/GENERIC64LE
@@ -210,11 +210,10 @@
 device		xhci		# XHCI PCI->USB interface
 device		usb		# USB Bus (required)
 device		usbhid		# USB HID Transport
-device		uhid		# "Human Interface Devices"
-device		ukbd		# Keyboard
+device		hkbd		# Keyboard
 options 	KBD_INSTALL_CDEV # install a CDEV entry in /dev
 device		umass		# Disks/Mass storage - Requires scbus and da0
-device		ums		# Mouse
+device		hms		# Mouse
 # USB Ethernet
 device		aue		# ADMtek USB Ethernet
 device		axe		# ASIX Electronics USB Ethernet
diff --git a/sys/powerpc/conf/MPC85XX b/sys/powerpc/conf/MPC85XX
--- a/sys/powerpc/conf/MPC85XX
+++ b/sys/powerpc/conf/MPC85XX
@@ -109,8 +109,8 @@
 options 	USB_DEBUG	# enable debug msgs
 #device		uhci
 device		ehci
-device  	ukbd
-device  	ums
+device  	hkbd
+device  	hms
 device		umass
 device		usb
 device		usbhid
diff --git a/sys/powerpc/conf/MPC85XXSPE b/sys/powerpc/conf/MPC85XXSPE
--- a/sys/powerpc/conf/MPC85XXSPE
+++ b/sys/powerpc/conf/MPC85XXSPE
@@ -116,8 +116,8 @@
 options 	USB_DEBUG	# enable debug msgs
 #device		uhci
 device		ehci
-device  	ukbd
-device  	ums
+device  	hkbd
+device  	hms
 device		umass
 device		usb
 device		usbhid
diff --git a/sys/powerpc/conf/QORIQ64 b/sys/powerpc/conf/QORIQ64
--- a/sys/powerpc/conf/QORIQ64
+++ b/sys/powerpc/conf/QORIQ64
@@ -119,8 +119,8 @@
 device  	vt
 device  	fbd
 options 	KBD_INSTALL_CDEV
-device  	ukbd
-device  	ums
+device  	hkbd
+device  	hms
 
 # HID support
 options 	HID_DEBUG	# enable debug msgs
diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC
--- a/sys/riscv/conf/GENERIC
+++ b/sys/riscv/conf/GENERIC
@@ -119,7 +119,7 @@
 device		xhci			# XHCI USB interface (USB 3.0)
 device		usb			# USB Bus (required)
 device		usbhid			# USB HID Transport
-device		ukbd			# Keyboard
+device		hkbd			# Keyboard
 device		umass			# Disks/Mass storage - Requires scbus and da
 
 # HID support