diff --git a/share/man/man4/bcma.4 b/share/man/man4/bcma.4
index 2f28ed487f0b..b0f13f6983e6 100644
--- a/share/man/man4/bcma.4
+++ b/share/man/man4/bcma.4
@@ -64,7 +64,6 @@ The IP cores used in
 devices were adapted by Broadcom for compatibility with the new
 interconnect.
 .Sh SEE ALSO
-.Xr bcma 4 ,
 .Xr bhnd 4
 .Sh HISTORY
 The
diff --git a/share/man/man4/dcons.4 b/share/man/man4/dcons.4
index 3f33dd214ef9..d228ad5c16b9 100644
--- a/share/man/man4/dcons.4
+++ b/share/man/man4/dcons.4
@@ -100,7 +100,7 @@ See
 for more details.
 .Pp
 If you want to use
-.Xr dcons 4
+.Nm
 as a
 .Xr gdb 1
 port, add the following line into
diff --git a/share/man/man4/ip.4 b/share/man/man4/ip.4
index 101993f0804f..27a7d8ea33e2 100644
--- a/share/man/man4/ip.4
+++ b/share/man/man4/ip.4
@@ -122,7 +122,7 @@ may be used to set the Don't Fragment flag on IP packets.
 Currently this option is respected only on
 .Xr udp 4
 and raw
-.Xr ip 4
+.Nm
 sockets, unless the
 .Dv IP_HDRINCL
 option has been set.
diff --git a/share/man/man4/ng_tag.4 b/share/man/man4/ng_tag.4
index 6aac9fa97edf..25bb7c3437b3 100644
--- a/share/man/man4/ng_tag.4
+++ b/share/man/man4/ng_tag.4
@@ -230,7 +230,7 @@ node which will check for the specified string and return non-matching
 packets to
 .Xr ipfw 8 .
 Matching packets are passed to
-.Xr ng_tag 4
+.Nm
 node, which will set a tag and pass them back to
 .Xr ng_bpf 4
 node on a hook programmed to accept all packets and pass them back to
@@ -246,7 +246,7 @@ expressions must be altered accordingly.
 Thus, there will be expression
 .Dq Li "ether[40:2]=0x244c && ether[42:4]=0x6f636b20"
 on incoming hook and empty expression to match all packets from
-.Xr ng_tag 4 .
+.Nm .
 .Pp
 So, this is
 .Xr ngctl 8
diff --git a/share/man/man4/pass.4 b/share/man/man4/pass.4
index 618b64340c35..3a2e1e72bc16 100644
--- a/share/man/man4/pass.4
+++ b/share/man/man4/pass.4
@@ -98,7 +98,7 @@ It is probably more useful to issue this ioctl through the
 device.
 .It CAMIOQUEUE union ccb *
 Queue a CCB to the
-.Xr pass 4
+.Nm
 driver to be executed asynchronously.
 The caller may use
 .Xr select 2 ,
@@ -167,7 +167,7 @@ ioctl.
 An error will only be returned from the
 .Dv CAMIOGET
 ioctl if the
-.Xr pass 4
+.Nm
 driver fails to copy data to the user process or if there are no completed
 CCBs available to retrieve.
 If no CCBs are available to retrieve,
diff --git a/share/man/man4/puc.4 b/share/man/man4/puc.4
index 34880cd9d301..eb76c36f4aff 100644
--- a/share/man/man4/puc.4
+++ b/share/man/man4/puc.4
@@ -53,5 +53,5 @@ Support for new cards should be added there.
 .Sh HISTORY
 This driver took the idea from the
 .Nx
-.Xr puc 4
+.Nm
 driver.
diff --git a/share/man/man4/random.4 b/share/man/man4/random.4
index 5e5388f0ba3e..23578d015bc0 100644
--- a/share/man/man4/random.4
+++ b/share/man/man4/random.4
@@ -48,7 +48,7 @@ it is seeded for the first time.
 This may cause trouble at system boot
 when keys and the like
 are generated from
-.Xr random 4
+.Nm
 so steps should be taken to ensure a
 seeding as soon as possible.
 .Pp
@@ -63,7 +63,7 @@ this could be done by
 This sysctl will not return
 random bytes unless
 the
-.Xr random 4
+.Nm
 device is seeded.
 .Pp
 This initial seeding
diff --git a/share/man/man4/witness.4 b/share/man/man4/witness.4
index 86e3ad3b4bf0..fc745d5c2847 100644
--- a/share/man/man4/witness.4
+++ b/share/man/man4/witness.4
@@ -62,7 +62,7 @@ If any of these checks fail, then the kernel will panic.
 The
 .Dv WITNESS_COUNT
 kernel option controls the maximum number of
-.Xr witness 4
+.Nm
 entries that are tracked in the kernel.
 The maximum number of entries can be queried via the
 .Va debug.witness.count
@@ -76,7 +76,7 @@ environment variable.
 The
 .Dv WITNESS_NO_VNODE
 kernel option tells
-.Xr witness 4
+.Nm
 to ignore locking issues between
 .Xr vnode 9
 objects.
diff --git a/share/man/man5/ar.5 b/share/man/man5/ar.5
index 1c1d79bc26cd..ca9f96d9c107 100644
--- a/share/man/man5/ar.5
+++ b/share/man/man5/ar.5
@@ -70,7 +70,7 @@ file attributes associated with the member.
 An archive header describes the file attributes for the archive member that
 follows it.
 The
-.Xr ar 5
+.Nm
 format only supports a limited number of attributes: the file name,
 the file creation time stamp, the uid and gid of the creator, the file
 mode and the file size.
diff --git a/share/man/man5/elf.5 b/share/man/man5/elf.5
index a72eed6a1f97..42e6b2c81323 100644
--- a/share/man/man5/elf.5
+++ b/share/man/man5/elf.5
@@ -1308,5 +1308,5 @@ This manual page was written by
 .An Jeroen Ruigrok van der Werven Aq Mt asmodai@FreeBSD.org
 with inspiration from BSDi's
 .Bsx
-.Xr elf 5
+.Nm
 manpage.
diff --git a/share/man/man5/nsswitch.conf.5 b/share/man/man5/nsswitch.conf.5
index abeb24d5c2f7..ec5d94c313f0 100644
--- a/share/man/man5/nsswitch.conf.5
+++ b/share/man/man5/nsswitch.conf.5
@@ -223,7 +223,7 @@ and continue on anything else (i.e,
 You can enable caching for the particular database by specifying
 .Dq cache
 as the first source in the
-.Xr nsswitch.conf 5
+.Nm
 file.
 You should also enable caching for this database in
 .Xr nscd.conf 5 .
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index c97f453f4069..2ce3a0e55d31 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -1207,12 +1207,12 @@ Note that the maximum number of the generated addresses from a range
 specification is limited to an integer value specified in
 .Va netif_ipexpand_max
 in
-.Xr rc.conf 5
+.Nm
 because a small typo can unexpectedly generate a large number of addresses.
 The default value is
 .Li 2048 .
 It can be increased by adding the following line into
-.Xr rc.conf 5 :
+.Nm :
 .Bd -literal
 netif_ipexpand_max="4096"
 .Ed
@@ -3900,7 +3900,7 @@ all configured jails in
 are stopped in reverse order.
 .It Va jail_* variables
 Note that older releases supported per-jail configuration via
-.Xr rc.conf 5
+.Nm
 variables.
 For example,
 hostname of a jail named
diff --git a/share/man/man9/BUS_NEW_PASS.9 b/share/man/man9/BUS_NEW_PASS.9
index 1da2f6706291..e647f8f6cbda 100644
--- a/share/man/man9/BUS_NEW_PASS.9
+++ b/share/man/man9/BUS_NEW_PASS.9
@@ -44,7 +44,7 @@ The
 method is called on each bus device to rescan the device tree when the pass
 level has been changed.
 This method is responsible for invoking
-.Xr BUS_NEW_PASS 9
+.Nm
 on child bus devices to propagate the rescan to child devices.
 It is also responsible for reprobing any unattached child devices and
 allowing drivers for the current pass to identify new children.
diff --git a/share/man/man9/pmap.9 b/share/man/man9/pmap.9
index f7edc33b1513..231749c16499 100644
--- a/share/man/man9/pmap.9
+++ b/share/man/man9/pmap.9
@@ -87,7 +87,6 @@ and it must be updated by the implementation after each relevant
 .Nm
 operation.
 .Sh SEE ALSO
-.Xr pmap 9 ,
 .Xr pmap_activate 9 ,
 .Xr pmap_clear_modify 9 ,
 .Xr pmap_copy 9 ,
diff --git a/share/man/man9/stack.9 b/share/man/man9/stack.9
index 85640dfa1d66..06065bde31ae 100644
--- a/share/man/man9/stack.9
+++ b/share/man/man9/stack.9
@@ -171,10 +171,10 @@ is returned if the operation is not implemented.
 .Sh AUTHORS
 .An -nosplit
 The
-.Xr stack 9
+.Nm
 function suite was created by
 .An Antoine Brodin .
-.Xr stack 9
+.Nm
 was extended by
 .An Robert Watson
 for general-purpose use outside of