diff --git a/usr.bin/basename/basename.1 b/usr.bin/basename/basename.1
index ba95e761270d..8d0a78620792 100644
--- a/usr.bin/basename/basename.1
+++ b/usr.bin/basename/basename.1
@@ -79,18 +79,18 @@ to
 .Pa /usr/bin .
 .Pp
 .Dl FOO=`dirname /usr/bin/trail`
-.Pp
+.Sh  DIAGNOSTICS
 Both the
-.Nm basename
+.Nm
 and
 .Nm dirname
-exit 0 on success, and >0 if an error occurs.
+utilities exit 0 on success, and >0 if an error occurs.
 .Sh SEE ALSO
 .Xr csh 1 ,
 .Xr sh 1
 .Sh STANDARDS
 The
-.Nm basename
+.Nm
 and
 .Nm dirname
 functions are expected to be POSIX 1003.2 compatible.
diff --git a/usr.bin/column/column.1 b/usr.bin/column/column.1
index 4b8ec9ba5234..22bfea873eae 100644
--- a/usr.bin/column/column.1
+++ b/usr.bin/column/column.1
@@ -46,7 +46,7 @@
 .Op Ar
 .Sh DESCRIPTION
 The
-.Nm column
+.Nm
 utility formats its input into multiple columns.
 Rows are filled before columns.
 Input is taken from
@@ -55,7 +55,7 @@ operands, or, by default, from the standard input.
 Empty lines are ignored.
 .Pp
 The options are as follows:
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl c
 Output is formatted for a display
 .Ar columns
@@ -74,9 +74,10 @@ Useful for pretty-printing displays.
 .It Fl x
 Fill columns before filling rows.
 .El
-.Pp
-.Nm Column
-exits 0 on success, >0 if an error occurred.
+.Sh DIAGNOSTICS
+The
+.Nm
+utility exits 0 on success, and >0 if an error occurs.
 .Sh ENVIRONMENT
 .Bl -tag -width COLUMNS
 .It Ev COLUMNS
diff --git a/usr.bin/logname/logname.1 b/usr.bin/logname/logname.1
index e75afcb925ec..a4883f3a509f 100644
--- a/usr.bin/logname/logname.1
+++ b/usr.bin/logname/logname.1
@@ -57,7 +57,7 @@ and
 .Ev USER
 environment variables
 because the environment cannot be trusted.
-.Pp
+.Sh DIAGNOSTICS
 The
 .Nm
 utility exits 0 on success, and >0 if an error occurs.
diff --git a/usr.bin/mkfifo/mkfifo.1 b/usr.bin/mkfifo/mkfifo.1
index a7443c57664f..511d90a69a22 100644
--- a/usr.bin/mkfifo/mkfifo.1
+++ b/usr.bin/mkfifo/mkfifo.1
@@ -79,10 +79,10 @@ of the calling process.
 The
 .Nm
 command requires write permission in the parent directory.
-.Pp
+.Sh DIAGNOSTICS
 The
 .Nm
-command exits 0 if successful, and >0 if an error occurred.
+utility exits 0 on success, and >0 if an error occurs.
 .Sh STANDARDS
 The
 .Nm