diff --git a/bin/cat/cat.1 b/bin/cat/cat.1
index f0e6b09832e1..ee446ae4084b 100644
--- a/bin/cat/cat.1
+++ b/bin/cat/cat.1
@@ -42,7 +42,7 @@
 .Nm cat
 .Nd concatenate and print files
 .Sh SYNOPSIS
-.Nm cat
+.Nm
 .Op Fl benstuv
 .Op Ar
 .Sh DESCRIPTION
diff --git a/bin/chmod/chmod.1 b/bin/chmod/chmod.1
index 58d5f4467851..edcf3a4af4c1 100644
--- a/bin/chmod/chmod.1
+++ b/bin/chmod/chmod.1
@@ -42,7 +42,7 @@
 .Nm chmod
 .Nd change file modes
 .Sh SYNOPSIS
-.Nm chmod
+.Nm
 .Oo
 .Fl f
 .Fl R
diff --git a/bin/cp/cp.1 b/bin/cp/cp.1
index 54e050a50cef..5fa5116a496b 100644
--- a/bin/cp/cp.1
+++ b/bin/cp/cp.1
@@ -42,7 +42,7 @@
 .Nm cp
 .Nd copy files
 .Sh SYNOPSIS
-.Nm cp
+.Nm
 .Oo
 .Fl R
 .Op Fl H | Fl L | Fl P
@@ -50,7 +50,7 @@
 .Op Fl f | i
 .Op Fl pv
 .Ar source_file target_file
-.Nm cp
+.Nm
 .Oo
 .Fl R
 .Op Fl H | Fl L | Fl P
diff --git a/bin/date/date.1 b/bin/date/date.1
index f47312290b0a..5904a3bc6887 100644
--- a/bin/date/date.1
+++ b/bin/date/date.1
@@ -42,7 +42,7 @@
 .Nm date
 .Nd display or set date and time
 .Sh SYNOPSIS
-.Nm date
+.Nm
 .Op Fl jnu
 .Op Fl d Ar dst
 .Op Fl r Ar seconds
@@ -315,7 +315,7 @@ sets the time to
 without modifying the date.
 .Sh ENVIRONMENT
 The following environment variables affect the execution of
-.Nm Ns :
+.Nm :
 .Bl -tag -width Ds
 .It Ev TZ
 The timezone to use when displaying dates.
diff --git a/bin/dd/dd.1 b/bin/dd/dd.1
index 24149f4c483e..f2a4a4a56dea 100644
--- a/bin/dd/dd.1
+++ b/bin/dd/dd.1
@@ -42,7 +42,7 @@
 .Nm dd
 .Nd convert and copy a file
 .Sh SYNOPSIS
-.Nm dd
+.Nm
 .Op operands ...
 .Sh DESCRIPTION
 The
@@ -251,7 +251,7 @@ will be positioned past the block in which the error occurred using
 Do not truncate the output file.
 This will preserve any blocks in the output file not explicitly written
 by
-.Nm Ns .
+.Nm .
 The
 .Cm notrunc
 value is not supported for tapes.
diff --git a/bin/df/df.1 b/bin/df/df.1
index 9660183b033e..7cf8f84713ad 100644
--- a/bin/df/df.1
+++ b/bin/df/df.1
@@ -39,7 +39,7 @@
 .Nm df
 .Nd display free disk space
 .Sh SYNOPSIS
-.Nm df
+.Nm
 .Oo
 .Fl b | h | H | k |
 .Fl m | P
diff --git a/bin/domainname/domainname.1 b/bin/domainname/domainname.1
index 7829238a9abe..9254c765a85b 100644
--- a/bin/domainname/domainname.1
+++ b/bin/domainname/domainname.1
@@ -39,7 +39,7 @@
 .Nm domainname
 .Nd set or print name of current YP/NIS domain
 .Sh SYNOPSIS
-.Nm domainname
+.Nm
 .Op Ar ypdomain
 .Sh DESCRIPTION
 .Nm Domainname
diff --git a/bin/echo/echo.1 b/bin/echo/echo.1
index 0f43f9955377..a5a16742125d 100644
--- a/bin/echo/echo.1
+++ b/bin/echo/echo.1
@@ -42,7 +42,7 @@
 .Nm echo
 .Nd write arguments to the standard output
 .Sh SYNOPSIS
-.Nm echo
+.Nm
 .Op Fl n
 .Op "string ..."
 .Sh DESCRIPTION
diff --git a/bin/ed/ed.1 b/bin/ed/ed.1
index 7f5e1f518b91..5d2567e710b2 100644
--- a/bin/ed/ed.1
+++ b/bin/ed/ed.1
@@ -8,7 +8,7 @@
 .Nm red
 .Nd text editor
 .Sh SYNOPSIS
-.Nm ed
+.Nm
 .Op Fl
 .Op Fl sx
 .Op Fl p Ar string
@@ -35,7 +35,7 @@ Changes are made to this copy and not directly to
 .Ar file
 itself.
 Upon quitting
-.Nm Ns ,
+.Nm ,
 any changes not explicitly saved  with a
 .Em w
 command are lost.
@@ -605,7 +605,7 @@ Unless a prompt was specified by with command-line option
 the command prompt is by default turned off.
 .It q
 Quit
-.Nm Ns .
+.Nm .
 .It Q
 Quit
 .Nm
diff --git a/bin/expr/expr.1 b/bin/expr/expr.1
index 85a0c8ebf601..defd8a488d80 100644
--- a/bin/expr/expr.1
+++ b/bin/expr/expr.1
@@ -37,7 +37,7 @@
 .Nm expr
 .Nd evaluate expression
 .Sh SYNOPSIS
-.Nm expr
+.Nm
 .Ar expression
 .Sh DESCRIPTION
 The
diff --git a/bin/hostname/hostname.1 b/bin/hostname/hostname.1
index ebadd2e341d1..ed7f27c4d457 100644
--- a/bin/hostname/hostname.1
+++ b/bin/hostname/hostname.1
@@ -39,7 +39,7 @@
 .Nm hostname
 .Nd set or print name of current host system
 .Sh SYNOPSIS
-.Nm hostname
+.Nm
 .Op Fl s
 .Op Ar name-of-host
 .Sh DESCRIPTION
diff --git a/bin/kill/kill.1 b/bin/kill/kill.1
index 1a6d0f734f3c..6e3a1261672f 100644
--- a/bin/kill/kill.1
+++ b/bin/kill/kill.1
@@ -42,18 +42,18 @@
 .Nm kill
 .Nd terminate or signal a process
 .Sh SYNOPSIS
-.Nm kill
+.Nm
 .Op Fl s Ar signal_name
 .Ar pid
 \&...
-.Nm kill
+.Nm
 .Fl l
 .Op Ar exit_status
-.Nm kill
+.Nm
 .Fl signal_name
 .Ar pid
 \&...
-.Nm kill
+.Nm
 .Fl signal_number
 .Ar pid
 \&...
diff --git a/bin/ln/ln.1 b/bin/ln/ln.1
index 51d989280531..6eb4f60d0195 100644
--- a/bin/ln/ln.1
+++ b/bin/ln/ln.1
@@ -43,11 +43,11 @@
 .Nm link
 .Nd make links
 .Sh SYNOPSIS
-.Nm ln
+.Nm
 .Op Fl fisv
 .Ar source_file
 .Op target_file
-.Nm ln
+.Nm
 .Op Fl fisv
 .Ar source_file ...
 .Op target_dir
diff --git a/bin/ls/ls.1 b/bin/ls/ls.1
index 29a303fc0337..f0a05de97c14 100644
--- a/bin/ls/ls.1
+++ b/bin/ls/ls.1
@@ -42,7 +42,7 @@
 .Nm ls
 .Nd list directory contents
 .Sh SYNOPSIS
-.Nm ls
+.Nm
 .Op Fl ABCFGHLPRTWabcdfgiklnoqrstu1
 .Op Ar file ...
 .Sh DESCRIPTION
@@ -364,7 +364,7 @@ The
 utility exits 0 on success, and >0 if an error occurs.
 .Sh ENVIRONMENT
 The following environment variables affect the execution of
-.Nm Ns :
+.Nm :
 .Bl -tag -width BLOCKSIZE
 .It Ev BLOCKSIZE
 If the environment variable
diff --git a/bin/mkdir/mkdir.1 b/bin/mkdir/mkdir.1
index 759382ecfe55..54d9faccbbf7 100644
--- a/bin/mkdir/mkdir.1
+++ b/bin/mkdir/mkdir.1
@@ -42,7 +42,7 @@
 .Nm mkdir
 .Nd make directories
 .Sh SYNOPSIS
-.Nm mkdir
+.Nm
 .Op Fl pv
 .Op Fl m Ar mode
 .Ar directory_name  ...
diff --git a/bin/mv/mv.1 b/bin/mv/mv.1
index 528eeaa1a8be..c76c69b5e1e5 100644
--- a/bin/mv/mv.1
+++ b/bin/mv/mv.1
@@ -42,11 +42,11 @@
 .Nm mv
 .Nd move files
 .Sh SYNOPSIS
-.Nm mv
+.Nm
 .Op Fl f | Fl i
 .Op Fl v
 .Ar source target
-.Nm mv
+.Nm
 .Op  Fl f | Fl i
 .Op Fl v
 .Ar source ... directory
diff --git a/bin/pax/pax.1 b/bin/pax/pax.1
index 43311b9f7756..84f408138d73 100644
--- a/bin/pax/pax.1
+++ b/bin/pax/pax.1
@@ -43,7 +43,7 @@
 .Nm pax
 .Nd read and write file archives and copy directory hierarchies
 .Sh SYNOPSIS
-.Nm pax
+.Nm
 .Op Fl cdnv
 .Bk -words
 .Op Fl f Ar archive
@@ -69,7 +69,7 @@
 .Ar ...
 .Ek
 .Op Ar pattern ...
-.Nm pax
+.Nm
 .Fl r
 .Op Fl cdiknuvDYZ
 .Bk -words
@@ -105,7 +105,7 @@
 .Ar ...
 .Ek
 .Op Ar pattern ...
-.Nm pax
+.Nm
 .Fl w
 .Op Fl dituvHLPX
 .Bk -words
@@ -147,7 +147,7 @@
 .Ar ...
 .Ek
 .Op Ar file ...
-.Nm pax
+.Nm
 .Fl r
 .Fl w
 .Op Fl diklntuvDHLPXYZ
@@ -640,7 +640,7 @@ are not selected and will be skipped.
 Reset the access times of any file or directory read or accessed by
 .Nm
 to be the same as they were before being read or accessed by
-.Nm Ns .
+.Nm .
 .It Fl u
 Ignore files that are older (having a less recent file modification time)
 than a pre-existing file or archive member with the same name.
diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index 6e81ab178902..b195746d8002 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -39,7 +39,7 @@
 .Nm ps
 .Nd process status
 .Sh SYNOPSIS
-.Nm ps
+.Nm
 .Op Fl aCcefhjlmrSTuvwx
 .Op Fl M Ar core
 .Op Fl N Ar system
@@ -51,7 +51,7 @@
 .Op , Ns Ar username Ns No ...
 .Oc
 .Op Fl W Ar swap
-.Nm ps
+.Nm
 .Op Fl L
 .Sh DESCRIPTION
 .Nm Ps
diff --git a/bin/pwd/pwd.1 b/bin/pwd/pwd.1
index 455f791be0a7..afbe03c753a0 100644
--- a/bin/pwd/pwd.1
+++ b/bin/pwd/pwd.1
@@ -42,7 +42,7 @@
 .Nm pwd
 .Nd return working directory name
 .Sh SYNOPSIS
-.Nm pwd
+.Nm
 .Sh DESCRIPTION
 .Nm Pwd
 writes the absolute pathname of the current working directory to
diff --git a/bin/rcp/rcp.1 b/bin/rcp/rcp.1
index 14995e9ba511..4f32bac37d58 100644
--- a/bin/rcp/rcp.1
+++ b/bin/rcp/rcp.1
@@ -39,11 +39,11 @@
 .Nm rcp
 .Nd remote file copy
 .Sh SYNOPSIS
-.Nm rcp
+.Nm
 .Op Fl Kpx
 .Op Fl k Ar realm
 .Ar file1 file2
-.Nm rcp
+.Nm
 .Op Fl Kprx
 .Op Fl k Ar realm
 .Ar file ...
@@ -93,7 +93,7 @@ the destination must be a directory.
 Turn on
 .Tn DES
 encryption for all data passed by
-.Nm Ns .
+.Nm .
 This may impact response time and
 .Tn CPU
 utilization, but provides
@@ -160,4 +160,4 @@ The destination user and hostname may have to be specified as
 when the destination machine is running the
 .Bx 4.2
 version of
-.Nm Ns  .
+.Nm .
diff --git a/bin/rm/rm.1 b/bin/rm/rm.1
index a038392f6f14..d93a069a30fc 100644
--- a/bin/rm/rm.1
+++ b/bin/rm/rm.1
@@ -43,7 +43,7 @@
 .Nm unlink
 .Nd remove directory entries
 .Sh SYNOPSIS
-.Nm rm
+.Nm
 .Op Fl dfiPRrvW
 .Ar file ...
 .Nm unlink
@@ -195,7 +195,7 @@ command is almost
 compatible, except that
 .Tn POSIX
 requires
-.Nm rm
+.Nm
 to act like
 .Xr rmdir 1
 when the
diff --git a/bin/rmdir/rmdir.1 b/bin/rmdir/rmdir.1
index a6a247873b5b..018b793ae853 100644
--- a/bin/rmdir/rmdir.1
+++ b/bin/rmdir/rmdir.1
@@ -42,7 +42,7 @@
 .Nm rmdir
 .Nd remove directories
 .Sh SYNOPSIS
-.Nm rmdir
+.Nm
 .Op Fl p
 .Ar directory ...
 .Sh DESCRIPTION
diff --git a/bin/stty/stty.1 b/bin/stty/stty.1
index 28f3e1d799d3..7a4bed8a7947 100644
--- a/bin/stty/stty.1
+++ b/bin/stty/stty.1
@@ -42,7 +42,7 @@
 .Nm stty
 .Nd set the options for a terminal device interface
 .Sh SYNOPSIS
-.Nm stty
+.Nm
 .Op Fl a | Fl e | Fl g
 .Op Fl f Ar file
 .Op operands
diff --git a/bin/sync/sync.8 b/bin/sync/sync.8
index ea45b3d2ed14..896b763b3121 100644
--- a/bin/sync/sync.8
+++ b/bin/sync/sync.8
@@ -39,7 +39,7 @@
 .Nm sync
 .Nd force completion of pending disk writes (flush cache)
 .Sh SYNOPSIS
-.Nm sync
+.Nm
 .Sh DESCRIPTION
 .Nm Sync
 can be called to insure that all disk writes have been completed before the
@@ -55,7 +55,7 @@ to shut down the system,
 as they may perform additional actions
 such as resynchronizing the hardware clock
 and flushing internal caches before performing a final
-.Nm Ns .
+.Nm .
 .Pp
 .Nm Sync
 utilizes the
diff --git a/bin/test/test.1 b/bin/test/test.1
index d9599429711a..fde84341164d 100644
--- a/bin/test/test.1
+++ b/bin/test/test.1
@@ -43,13 +43,13 @@
 .Nm \&[
 .Nd condition evaluation utility
 .Sh SYNOPSIS
-.Nm test
+.Nm
 .Ar expression
 .Nm \&[
 .Ar expression Cm ]
 .Sh DESCRIPTION
 The
-.Nm test
+.Nm
 utility evaluates the expression and, if it evaluates
 to true, returns a zero (true) exit status; otherwise
 it returns 1 (false).
@@ -57,7 +57,7 @@ If there is no expression, test also
 returns 1 (false).
 .Pp
 All operators and flags are separate arguments to the
-.Nm test
+.Nm
 utility.
 .Pp
 The following primaries are used to construct expression:
@@ -288,7 +288,7 @@ operator has higher precedence than the
 operator.
 .Sh GRAMMAR AMBIGUITY
 The 
-.Nm test
+.Nm
 grammar is inherently ambiguous.  In order to assure a degree of consistency,
 the cases described in the 
 .St -p1003.2 , 
@@ -298,7 +298,7 @@ standards document.  All other cases are subject to the ambiguity in the
 command semantics.
 .Sh RETURN VALUES
 The
-.Nm test
+.Nm
 utility exits with one of the following values:
 .Bl -tag -width Ds
 .It 0
@@ -314,7 +314,7 @@ An error occurred.
 .Xr sh 1
 .Sh STANDARDS
 The
-.Nm test
+.Nm
 utility implements a superset of the
 .St -p1003.2
 specification.