diff --git a/share/man/man4/ahc.4 b/share/man/man4/ahc.4
index 4308f8fd5247..e19df1d996e4 100644
--- a/share/man/man4/ahc.4
+++ b/share/man/man4/ahc.4
@@ -34,18 +34,18 @@
 .Nd Adaptec VL/EISA/PCI SCSI host adapter driver
 .Sh SYNOPSIS
 For one or more VL/EISA cards:
-.Cd controller eisa0
-.Cd controller ahc0
+.Cd device eisa0
+.Cd device ahc0
 .Pp
 For one or more PCI cards:
-.Cd controller pci0
-.Cd controller ahc0
+.Cd device pci0
+.Cd device ahc0
 .Pp
 To allow PCI adapters to use memory mapped I/O if enabled:
 .Cd options AHC_ALLOW_MEMIO
 .Pp
 For one or more SCSI busses:
-.Cd controller scbus0 at ahc0
+.Cd device scbus0 at ahc0
 .Sh DESCRIPTION
 This driver provides access to the
 .Tn SCSI
diff --git a/share/man/man4/alpm.4 b/share/man/man4/alpm.4
index 76f61507f5be..9a4c85b43ec5 100644
--- a/share/man/man4/alpm.4
+++ b/share/man/man4/alpm.4
@@ -36,8 +36,8 @@
 .Nm alpm
 .Nd Aladdin IV/V/Pro2 SMBus controller
 .Sh SYNOPSIS
-.Cd controller smbus0
-.Cd controller alpm0
+.Cd device smbus0
+.Cd device alpm0
 
 .Sh DESCRIPTION
 This driver provides access to 
diff --git a/share/man/man4/atkbdc.4 b/share/man/man4/atkbdc.4
index ed3d6de2fb0d..76d098df485c 100644
--- a/share/man/man4/atkbdc.4
+++ b/share/man/man4/atkbdc.4
@@ -37,7 +37,7 @@ the AT keyboard controller interface
 .Cd "options" \&"KBD_RESETDELAY=N\&"
 .Cd "options" \&"KBD_MAXWAIT=N\&"
 .Cd "options" \&"KBDIO_DEBUG=N\&"
-.Cd "controller atkbdc0 at isa? port IO_KBD"
+.Cd "device atkbdc0 at isa? port IO_KBD"
 .Sh DESCRIPTION
 The keyboard controller
 .Nm
diff --git a/share/man/man4/fdc.4 b/share/man/man4/fdc.4
index f837eb0d8e49..a159754f0bff 100644
--- a/share/man/man4/fdc.4
+++ b/share/man/man4/fdc.4
@@ -34,9 +34,9 @@
 .Nd
 PC architecture floppy disk controller driver
 .Sh SYNOPSIS
-.Cd "controller fdc0 at isa? port" \&"IO_FD1\&" "bio flags 0x1 irq 6 drq 2"
-.Cd "disk fd0 at fdc0 drive 0
-.Cd "disk fd1 at fdc0 drive 1
+.Cd "device fdc0 at isa? port" \&"IO_FD1\&" "bio flags 0x1 irq 6 drq 2"
+.Cd "device fd0 at fdc0 drive 0
+.Cd "device fd1 at fdc0 drive 1
 .Sh DESCRIPTION
 This driver provides access to floppy disk drives and QIC40/80 tapedrives.
 In /dev for each floppy device a number of minor devices are present. The
diff --git a/share/man/man4/iicbb.4 b/share/man/man4/iicbb.4
index 1bf49d091bde..e01cbf64de2b 100644
--- a/share/man/man4/iicbb.4
+++ b/share/man/man4/iicbb.4
@@ -32,12 +32,12 @@
 .Nd
 I2C generic bit-banging driver
 .Sh SYNOPSIS
-.Cd "controller iicbb0"
+.Cd "device iicbb0"
 .Pp
 .Cd "device lpbb at ppbus?"
 .Pp
 For one or more iicbus busses:
-.Cd "controller iicbus0"
+.Cd "device iicbus0"
 .Sh DESCRIPTION
 The
 .Em iicbb
diff --git a/share/man/man4/iicbus.4 b/share/man/man4/iicbus.4
index 8f98bfd722cb..b6639a30877f 100644
--- a/share/man/man4/iicbus.4
+++ b/share/man/man4/iicbus.4
@@ -32,8 +32,8 @@
 .Nd
 I2C bus system
 .Sh SYNOPSIS
-.Cd "controller iicbus0"
-.Cd "controller iicbb0"
+.Cd "device iicbus0"
+.Cd "device iicbb0"
 .Pp
 .Cd "device iic0 at iicbus?"
 .Cd "device ic0 at iicbus?"
diff --git a/share/man/man4/iicsmb.4 b/share/man/man4/iicsmb.4
index f26c6f26cd00..6e8a01170a58 100644
--- a/share/man/man4/iicsmb.4
+++ b/share/man/man4/iicsmb.4
@@ -35,7 +35,7 @@ I2C to SMB bridge
 .Cd "device iicsmb0 at iicbus?"
 .Pp
 For one or more smbus busses:
-.Cd "controller smbus0"
+.Cd "device smbus0"
 .Sh DESCRIPTION
 The
 .Em iicsmb
diff --git a/share/man/man4/intpm.4 b/share/man/man4/intpm.4
index 0b973b7b34b9..0a1383c922e7 100644
--- a/share/man/man4/intpm.4
+++ b/share/man/man4/intpm.4
@@ -36,8 +36,8 @@
 .Nm intpm
 .Nd Intel PIIX4 Power management controller driver.
 .Sh SYNOPSIS
-.Cd controller smbus0
-.Cd controller intpm0
+.Cd device smbus0
+.Cd device intpm0
 
 .Sh DESCRIPTION
 This driver provides access to 
diff --git a/share/man/man4/lp.4 b/share/man/man4/lp.4
index dba34cea8a0f..2fdb71dc5820 100644
--- a/share/man/man4/lp.4
+++ b/share/man/man4/lp.4
@@ -45,9 +45,9 @@
 .Ar myaddress hisaddress
 .Op Fl link0
 .Pp
-.Cd "controller ppbus0"
+.Cd "device ppbus0"
 .Cd "device plip0 at ppbus?"
-.Cd "controller ppc0 at isa? port? net irq 7
+.Cd "device ppc0 at isa? port? net irq 7
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/lpbb.4 b/share/man/man4/lpbb.4
index 406409b4b9df..40d4a49e8e5d 100644
--- a/share/man/man4/lpbb.4
+++ b/share/man/man4/lpbb.4
@@ -32,8 +32,8 @@
 .Nd
 Parallel port I2C bit-banging interface
 .Sh SYNOPSIS
-.Cd "controller iicbus"
-.Cd "controller iicbb0"
+.Cd "device iicbus"
+.Cd "device iicbb0"
 .Pp
 .Cd "device lpbb0 at ppbus?"
 .Cd "device iic0 at iicbus?"
diff --git a/share/man/man4/lpt.4 b/share/man/man4/lpt.4
index 462e01075025..b9ef694d0d79 100644
--- a/share/man/man4/lpt.4
+++ b/share/man/man4/lpt.4
@@ -35,22 +35,22 @@
 .Nd
 Generic printer device driver
 .Sh SYNOPSIS
-.Cd "controller ppbus0"
+.Cd "device ppbus0"
 .Cd "device lpt0 at ppbus?"
 .Pp
-.Cd "controller	ppc0	at isa? port" \&"IO_LPT1\&" tty irq 7
-.Cd "controller	ppc1	at isa? port" \&"IO_LPT2\&" tty irq 7
-.Cd "controller	ppc2	at isa? port" \&"IO_LPT3\&" tty irq 7
+.Cd "device	ppc0	at isa? port" \&"IO_LPT1\&" tty irq 7
+.Cd "device	ppc1	at isa? port" \&"IO_LPT2\&" tty irq 7
+.Cd "device	ppc2	at isa? port" \&"IO_LPT3\&" tty irq 7
 .Pp
 For BIOS-probed ports:
-.Cd "controller ppc0 at isa? port? tty irq 7"
+.Cd "device ppc0 at isa? port? tty irq 7"
 .Pp
 For polled ports:
-.Cd "controller ppc0 at isa? port? tty"
-.Cd "controller ppc1 at isa? port" \&"IO_LPT2\&" tty
+.Cd "device ppc0 at isa? port? tty"
+.Cd "device ppc1 at isa? port" \&"IO_LPT2\&" tty
 .Pp
 For DMA capable parallel port:
-.Cd "controller ppc0 at isa? port? tty irq 7 drq 1"
+.Cd "device ppc0 at isa? port? tty irq 7 drq 1"
 .Sh DESCRIPTION
 The current
 .Em lpt
diff --git a/share/man/man4/ohci.4 b/share/man/man4/ohci.4
index 55884a2817e0..d163415d773f 100644
--- a/share/man/man4/ohci.4
+++ b/share/man/man4/ohci.4
@@ -37,7 +37,7 @@
 .Nm ohci
 .Nd OHCI USB Host Controller Driver
 .Sh SYNOPSIS
-.Cd "controller ohci0"
+.Cd "device ohci0"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/pci.4 b/share/man/man4/pci.4
index 8f5ceed79a9f..ea7a8c7fbfd2 100644
--- a/share/man/man4/pci.4
+++ b/share/man/man4/pci.4
@@ -31,7 +31,7 @@
 .Nm pci
 .Nd Generic PCI driver
 .Sh SYNOPSYIS
-.Cd controller pci0
+.Cd device pci0
 .Sh DESCRIPTION
 The
 .Nm pci
diff --git a/share/man/man4/ppbus.4 b/share/man/man4/ppbus.4
index 422b909b9a63..ebc8b1144237 100644
--- a/share/man/man4/ppbus.4
+++ b/share/man/man4/ppbus.4
@@ -32,9 +32,9 @@
 .Nd
 Parallel port bus system
 .Sh SYNOPSIS
-.Cd "controller ppbus0"
+.Cd "device ppbus0"
 .Pp
-.Cd "controller vpo0 at ppbus?"
+.Cd "device vpo0 at ppbus?"
 .Pp
 .Cd "device nlpt0 at ppbus?"
 .Cd "device plip0 at ppbus?"
diff --git a/share/man/man4/scsi.4 b/share/man/man4/scsi.4
index 41a508c43fde..53e859ed0e4b 100644
--- a/share/man/man4/scsi.4
+++ b/share/man/man4/scsi.4
@@ -32,10 +32,10 @@
 .Nm CAM
 .Nd CAM SCSI subsystem
 .Sh SYNOPSIS
-.Cd "controller scbus0"
-.Cd "controller scbus1 at ahc0"
-.Cd "controller scbus3 at ahc1 bus 0"
-.Cd "controller scbus2 at ahc1 bus 1"
+.Cd "device scbus0"
+.Cd "device scbus1 at ahc0"
+.Cd "device scbus3 at ahc1 bus 0"
+.Cd "device scbus2 at ahc1 bus 1"
 .Cd "device cd0"
 .Cd "device ch0"
 .Cd "device da0"
@@ -157,11 +157,11 @@ to assign changer 1 as the changer with SCSI ID 4,
 SCSI logical unit 0 on SCSI bus 0.
 Individual scbuses can be wired down to specific controllers with
 a config line similar to
-.Cd "controller scbus0 at ahc0"
+.Cd "device scbus0 at ahc0"
 which assigns scsi bus 0 to the first unit using the ahc driver.
 For controllers supporting more than one bus,
 the particular bus can be specified as in
-.Cd "controller scbus3 at ahc1 bus 1"
+.Cd "device scbus3 at ahc1 bus 1"
 which assigns scbus 1 to the second bus probed on the ahc1 device.
 .Pp
 When you have a mixture of wired down and counted devices then the
diff --git a/share/man/man4/smbus.4 b/share/man/man4/smbus.4
index fd60a1620d00..c91aa73c38ab 100644
--- a/share/man/man4/smbus.4
+++ b/share/man/man4/smbus.4
@@ -32,7 +32,7 @@
 .Nd
 System Management Bus
 .Sh SYNOPSIS
-.Cd "controller smbus0"
+.Cd "device smbus0"
 .Pp
 .Cd "device iicsmb0 at iicbus?"
 .Cd "device bktr0"
diff --git a/share/man/man4/uhci.4 b/share/man/man4/uhci.4
index 77444b4871d3..9b1defb75f7d 100644
--- a/share/man/man4/uhci.4
+++ b/share/man/man4/uhci.4
@@ -39,7 +39,7 @@
 .Nd
 UHCI USB Host Controller Driver
 .Sh SYNOPSIS
-.Cd "controller uhci0"
+.Cd "device uhci0"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/umass.4 b/share/man/man4/umass.4
index 7eefdc2c342d..15079821bff0 100644
--- a/share/man/man4/umass.4
+++ b/share/man/man4/umass.4
@@ -37,7 +37,7 @@
 .Nm umass
 .Nd USB Mass Storage Devices Driver
 .Sh SYNOPSIS
-.Cd "controller umass0"
+.Cd "device umass0"
 .Sh DESCRIPTION
 The
 .Nm
@@ -55,8 +55,8 @@ must be configured in the kernel as well. Last but not least, support for
 SCSI drives,
 .Nm da
 .Sh EXAMPLE
-.Dl controller umass0
-.Dl controller scbus0
+.Dl device umass0
+.Dl device scbus0
 .Dl device da0
 .Dl device pass0
 .Pp
diff --git a/share/man/man4/usb.4 b/share/man/man4/usb.4
index 2a9a7f891a41..46576348ae5e 100644
--- a/share/man/man4/usb.4
+++ b/share/man/man4/usb.4
@@ -37,7 +37,7 @@
 .Nm usb
 .Nd Universal Serial Bus
 .Sh SYNOPSIS
-.Cd "controller usb0"
+.Cd "device usb0"
 .Sh DESCRIPTION
 .Fx
 provides machine-independent bus support and drivers for
diff --git a/share/man/man4/vpo.4 b/share/man/man4/vpo.4
index 6b5e8661e2fd..c91bf5320d01 100644
--- a/share/man/man4/vpo.4
+++ b/share/man/man4/vpo.4
@@ -32,10 +32,10 @@
 .Nd
 Parallel to SCSI interface driver
 .Sh SYNOPSIS
-.Cd "controller vpo at ppbus?"
+.Cd "device vpo at ppbus?"
 .Pp
 For one or more SCSI busses:
-.Cd "controller scbus0 at vpo0"
+.Cd "device scbus0 at vpo0"
 .Sh DESCRIPTION
 The primary purpose of the
 .Em vpo