Properly format NAME subsection of zfs/zpool subcommands

Use proper names (i.e. zfs-allow and zpool-add) in NAME subsections
of zfs/zpool subcommands instead of current "pretty-printed" ones as
makewhatis utilities (or some implementations of it, namely the one
from mandoc suite used in FreeBSD) look not only at the document title
but also in NAME subsection, adding zfs(8)/zpool(8) to search results
which is not correct. (Common sense and other utilities splitting
subcommands in multiple man pages, e.g. git, do the same.)

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: xtouqh <[email protected]>
Closes #11086 

53 files changed, 251 insertions, 250 deletions

diff --git a/man/man8/zfs-allow.8 b/man/man8/zfs-allow.8
index f32b29a72..ac4bf658b 100644
--- a/man/man8/zfs-allow.8
+++ b/man/man8/zfs-allow.8
@@ -34,57 +34,57 @@
 .Dt ZFS-ALLOW 8
 .Os
 .Sh NAME
-.Nm zfs Ns Pf - Cm allow
+.Nm zfs-allow
 .Nd Delegates ZFS administration permission for the file systems to non-privileged users.
 .Sh SYNOPSIS
-.Nm
+.Nm zfs
 .Cm allow
 .Op Fl dglu
 .Ar user Ns | Ns Ar group Ns Oo , Ns Ar user Ns | Ns Ar group Oc Ns ...
 .Ar perm Ns | Ns @ Ns Ar setname Ns Oo , Ns Ar perm Ns | Ns @ Ns
 .Ar setname Oc Ns ...
 .Ar filesystem Ns | Ns Ar volume
-.Nm
+.Nm zfs
 .Cm allow
 .Op Fl dl
 .Fl e Ns | Ns Sy everyone
 .Ar perm Ns | Ns @ Ns Ar setname Ns Oo , Ns Ar perm Ns | Ns @ Ns
 .Ar setname Oc Ns ...
 .Ar filesystem Ns | Ns Ar volume
-.Nm
+.Nm zfs
 .Cm allow
 .Fl c
 .Ar perm Ns | Ns @ Ns Ar setname Ns Oo , Ns Ar perm Ns | Ns @ Ns
 .Ar setname Oc Ns ...
 .Ar filesystem Ns | Ns Ar volume
-.Nm
+.Nm zfs
 .Cm allow
 .Fl s No @ Ns Ar setname
 .Ar perm Ns | Ns @ Ns Ar setname Ns Oo , Ns Ar perm Ns | Ns @ Ns
 .Ar setname Oc Ns ...
 .Ar filesystem Ns | Ns Ar volume
-.Nm
+.Nm zfs
 .Cm unallow
 .Op Fl dglru
 .Ar user Ns | Ns Ar group Ns Oo , Ns Ar user Ns | Ns Ar group Oc Ns ...
 .Oo Ar perm Ns | Ns @ Ns Ar setname Ns Oo , Ns Ar perm Ns | Ns @ Ns
 .Ar setname Oc Ns ... Oc
 .Ar filesystem Ns | Ns Ar volume
-.Nm
+.Nm zfs
 .Cm unallow
 .Op Fl dlr
 .Fl e Ns | Ns Sy everyone
 .Oo Ar perm Ns | Ns @ Ns Ar setname Ns Oo , Ns Ar perm Ns | Ns @ Ns
 .Ar setname Oc Ns ... Oc
 .Ar filesystem Ns | Ns Ar volume
-.Nm
+.Nm zfs
 .Cm unallow
 .Op Fl r
 .Fl c
 .Oo Ar perm Ns | Ns @ Ns Ar setname Ns Oo , Ns Ar perm Ns | Ns @ Ns
 .Ar setname Oc Ns ... Oc
 .Ar filesystem Ns | Ns Ar volume
-.Nm
+.Nm zfs
 .Cm unallow
 .Op Fl r
 .Fl s No @ Ns Ar setname
@@ -94,7 +94,7 @@
 .Sh DESCRIPTION
 .Bl -tag -width ""
 .It Xo
-.Nm
+.Nm zfs
 .Cm allow
 .Ar filesystem Ns | Ns Ar volume
 .Xc
@@ -116,7 +116,7 @@ These permissions cannot be delegated because the Linux
 .Xr mount 8
 command restricts modifications of the global namespace to the root user.
 .It Xo
-.Nm
+.Nm zfs
 .Cm allow
 .Op Fl dglu
 .Ar user Ns | Ns Ar group Ns Oo , Ns Ar user Ns | Ns Ar group Oc Ns ...
@@ -125,7 +125,7 @@ command restricts modifications of the global namespace to the root user.
 .Ar filesystem Ns | Ns Ar volume
 .Xc
 .It Xo
-.Nm
+.Nm zfs
 .Cm allow
 .Op Fl dl
 .Fl e Ns | Ns Sy everyone
@@ -271,7 +271,7 @@ xattr            property
 zoned            property
 .Ed
 .It Xo
-.Nm
+.Nm zfs
 .Cm allow
 .Fl c
 .Ar perm Ns | Ns @ Ns Ar setname Ns Oo , Ns Ar perm Ns | Ns @ Ns
@@ -285,7 +285,7 @@ These permissions are granted
 .Pq locally
 to the creator of any newly-created descendent file system.
 .It Xo
-.Nm
+.Nm zfs
 .Cm allow
 .Fl s No @ Ns Ar setname
 .Ar perm Ns | Ns @ Ns Ar setname Ns Oo , Ns Ar perm Ns | Ns @ Ns
@@ -302,7 +302,7 @@ name must begin with
 .Sy @ ,
 and can be no more than 64 characters long.
 .It Xo
-.Nm
+.Nm zfs
 .Cm unallow
 .Op Fl dglru
 .Ar user Ns | Ns Ar group Ns Oo , Ns Ar user Ns | Ns Ar group Oc Ns ...
@@ -311,7 +311,7 @@ and can be no more than 64 characters long.
 .Ar filesystem Ns | Ns Ar volume
 .Xc
 .It Xo
-.Nm
+.Nm zfs
 .Cm unallow
 .Op Fl dlr
 .Fl e Ns | Ns Sy everyone
@@ -320,7 +320,7 @@ and can be no more than 64 characters long.
 .Ar filesystem Ns | Ns Ar volume
 .Xc
 .It Xo
-.Nm
+.Nm zfs
 .Cm unallow
 .Op Fl r
 .Fl c
@@ -358,7 +358,7 @@ options.
 Recursively remove the permissions from this file system and all descendents.
 .El
 .It Xo
-.Nm
+.Nm zfs
 .Cm unallow
 .Op Fl r
 .Fl s No @ Ns Ar setname
diff --git a/man/man8/zfs-bookmark.8 b/man/man8/zfs-bookmark.8
index 3b2af8159..042ddf504 100644
--- a/man/man8/zfs-bookmark.8
+++ b/man/man8/zfs-bookmark.8
@@ -35,13 +35,13 @@
 .Dt ZFS-BOOKMARK 8 SMM
 .Os
 .Sh NAME
-.Nm zfs Ns Pf - Cm bookmark
+.Nm zfs-bookmark
 .Nd Creates a bookmark of the given snapshot.
 .Sh SYNOPSIS
 .Sh DESCRIPTION
 .Bl -tag -width ""
 .It Xo
-.Nm
+.Nm zfs
 .Cm bookmark
 .Ar snapshot Ns | Ns Ar bookmark newbookmark
 .Xc
diff --git a/man/man8/zfs-clone.8 b/man/man8/zfs-clone.8
index 352a2392f..9cb84d3c5 100644
--- a/man/man8/zfs-clone.8
+++ b/man/man8/zfs-clone.8
@@ -34,10 +34,10 @@
 .Dt ZFS-CLONE 8
 .Os
 .Sh NAME
-.Nm zfs Ns Pf - Cm clone
+.Nm zfs-clone
 .Nd Creates a clone of the given snapshot.
 .Sh SYNOPSIS
-.Nm
+.Nm zfs
 .Cm clone
 .Op Fl p
 .Oo Fl o Ar property Ns = Ns Ar value Oc Ns ...
@@ -45,7 +45,7 @@
 .Sh DESCRIPTION
 .Bl -tag -width ""
 .It Xo
-.Nm
+.Nm zfs
 .Cm clone
 .Op Fl p
 .Oo Fl o Ar property Ns = Ns Ar value Oc Ns ...
diff --git a/man/man8/zfs-create.8 b/man/man8/zfs-create.8
index c37d63305..9c5c959b3 100644
--- a/man/man8/zfs-create.8
+++ b/man/man8/zfs-create.8
@@ -34,7 +34,7 @@
 .Dt ZFS-CREATE 8
 .Os
 .Sh NAME
-.Nm zfs Ns Pf - Cm create
+.Nm zfs-create
 .Nd Creates a new ZFS file system.
 .Sh SYNOPSIS
 .Nm zfs
@@ -42,7 +42,7 @@
 .Op Fl Pnpv
 .Oo Fl o Ar property Ns = Ns Ar value Oc Ns ...
 .Ar filesystem
-.Nm
+.Nm zfs
 .Cm create
 .Op Fl ps
 .Op Fl b Ar blocksize
@@ -51,7 +51,7 @@
 .Sh DESCRIPTION
 .Bl -tag -width ""
 .It Xo
-.Nm
+.Nm zfs
 .Cm create
 .Op Fl Pnpv
 .Oo Fl o Ar property Ns = Ns Ar value Oc Ns ...
@@ -126,7 +126,7 @@ option.
 Print verbose information about the created dataset.
 .El
 .It Xo
-.Nm
+.Nm zfs
 .Cm create
 .Op Fl ps
 .Op Fl b Ar blocksize
diff --git a/man/man8/zfs-destroy.8 b/man/man8/zfs-destroy.8
index 99ae33d5e..b0365cc82 100644
--- a/man/man8/zfs-destroy.8
+++ b/man/man8/zfs-destroy.8
@@ -34,25 +34,25 @@
 .Dt ZFS-DESTROY 8
 .Os
 .Sh NAME
-.Nm zfs Ns Pf - Cm destroy
+.Nm zfs-destroy
 .Nd Destroys the given dataset(s), snapshot(s), or bookmark.
 .Sh SYNOPSIS
-.Nm
+.Nm zfs
 .Cm destroy
 .Op Fl Rfnprv
 .Ar filesystem Ns | Ns Ar volume
-.Nm
+.Nm zfs
 .Cm destroy
 .Op Fl Rdnprv
 .Ar filesystem Ns | Ns Ar volume Ns @ Ns Ar snap Ns
 .Oo % Ns Ar snap Ns Oo , Ns Ar snap Ns Oo % Ns Ar snap Oc Oc Oc Ns ...
-.Nm
+.Nm zfs
 .Cm destroy
 .Ar filesystem Ns | Ns Ar volume Ns # Ns Ar bookmark
 .Sh DESCRIPTION
 .Bl -tag -width ""
 .It Xo
-.Nm
+.Nm zfs
 .Cm destroy
 .Op Fl Rfnprv
 .Ar filesystem Ns | Ns Ar volume
@@ -96,7 +96,7 @@ or the
 options, as they can destroy large portions of a pool and cause unexpected
 behavior for mounted file systems in use.
 .It Xo
-.Nm
+.Nm zfs
 .Cm destroy
 .Op Fl Rdnprv
 .Ar filesystem Ns | Ns Ar volume Ns @ Ns Ar snap Ns
@@ -167,7 +167,7 @@ options, as they can destroy large portions of a pool and cause unexpected
 behavior for mounted file systems in use.
 .El
 .It Xo
-.Nm
+.Nm zfs
 .Cm destroy
 .Ar filesystem Ns | Ns Ar volume Ns # Ns Ar bookmark
 .Xc
diff --git a/man/man8/zfs-diff.8 b/man/man8/zfs-diff.8
index bcc12f7cb..2ae66cd21 100644
--- a/man/man8/zfs-diff.8
+++ b/man/man8/zfs-diff.8
@@ -34,17 +34,17 @@
 .Dt ZFS-DIFF 8
 .Os
 .Sh NAME
-.Nm zfs Ns Pf - Cm diff
+.Nm zfs-diff
 .Nd Display the difference between two snapshots of a given filesystem.
 .Sh SYNOPSIS
-.Nm
+.Nm zfs
 .Cm diff
 .Op Fl FHt
 .Ar snapshot Ar snapshot Ns | Ns Ar filesystem
 .Sh DESCRIPTION
 .Bl -tag -width ""
 .It Xo
-.Nm
+.Nm zfs
 .Cm diff
 .Op Fl FHt
 .Ar snapshot Ar snapshot Ns | Ns Ar filesystem
diff --git a/man/man8/zfs-hold.8 b/man/man8/zfs-hold.8
index de30caab1..ac56fc4a4 100644
--- a/man/man8/zfs-hold.8
+++ b/man/man8/zfs-hold.8
@@ -34,25 +34,25 @@
 .Dt ZFS-HOLD 8
 .Os
 .Sh NAME
-.Nm zfs Ns Pf - Cm hold
+.Nm zfs-hold
 .Nd Hold a snapshot to prevent it being removed with the zfs destroy command.
 .Sh SYNOPSIS
-.Nm
+.Nm zfs
 .Cm hold
 .Op Fl r
 .Ar tag Ar snapshot Ns ...
-.Nm
+.Nm zfs
 .Cm holds
 .Op Fl rH
 .Ar snapshot Ns ...
-.Nm
+.Nm zfs
 .Cm release
 .Op Fl r
 .Ar tag Ar snapshot Ns ...
 .Sh DESCRIPTION
 .Bl -tag -width ""
 .It Xo
-.Nm
+.Nm zfs
 .Cm hold
 .Op Fl r
 .Ar tag Ar snapshot Ns ...
@@ -73,7 +73,7 @@ Specifies that a hold with the given tag is applied recursively to the snapshots
 of all descendent file systems.
 .El
 .It Xo
-.Nm
+.Nm zfs
 .Cm holds
 .Op Fl rH
 .Ar snapshot Ns ...
@@ -87,7 +87,7 @@ listing the holds on the named snapshot.
 Do not print headers, use tab-delimited output.
 .El
 .It Xo
-.Nm
+.Nm zfs
 .Cm release
 .Op Fl r
 .Ar tag Ar snapshot Ns ...
diff --git a/man/man8/zfs-jail.8 b/man/man8/zfs-jail.8
index 8274179bb..4c439d53f 100644
--- a/man/man8/zfs-jail.8
+++ b/man/man8/zfs-jail.8
@@ -41,7 +41,7 @@
 .Dt ZFS-JAIL 8
 .Os FreeBSD
 .Sh NAME
-.Nm zfs Ns Pf - Cm jail
+.Nm zfs-jail
 .Nd Attaches and detaches ZFS filesystems from FreeBSD jails.
 .No A Tn ZFS
 dataset can be attached to a jail by using the
@@ -72,16 +72,16 @@ After a dataset is attached to a jail and the jailed property is set, a jailed
 file system cannot be mounted outside the jail, since the jail administrator
 might have set the mount point to an unacceptable value.
 .Sh SYNOPSIS
-.Nm
+.Nm zfs
 .Cm jail
 .Ar jailid Ns | Ns Ar jailname filesystem
-.Nm
+.Nm zfs
 .Cm unjail
 .Ar jailid Ns | Ns Ar jailname filesystem
 .Sh DESCRIPTION
 .Bl -tag -width ""
 .It Xo
-.Nm
+.Nm zfs
 .Cm jail
 .Ar jailid filesystem
 .Xc
@@ -104,7 +104,7 @@ See
 .Xr jail 8
 for more information on managing jails and configuring the parameters above.
 .It Xo
-.Nm
+.Nm zfs
 .Cm unjail
 .Ar jailid filesystem
 .Xc
diff --git a/man/man8/zfs-list.8 b/man/man8/zfs-list.8
index ad2b57e6d..e6db73631 100644
--- a/man/man8/zfs-list.8
+++ b/man/man8/zfs-list.8
@@ -34,10 +34,10 @@
 .Dt ZFS-LIST 8
 .Os
 .Sh NAME
-.Nm zfs Ns Pf - Cm list
+.Nm zfs-list
 .Nd Lists the property information for the given datasets in tabular form.
 .Sh SYNOPSIS
-.Nm
+.Nm zfs
 .Cm list
 .Op Fl r Ns | Ns Fl d Ar depth
 .Op Fl Hp
@@ -49,7 +49,7 @@
 .Sh DESCRIPTION
 .Bl -tag -width ""
 .It Xo
-.Nm
+.Nm zfs
 .Cm list
 .Op Fl r Ns | Ns Fl d Ar depth
 .Op Fl Hp
diff --git a/man/man8/zfs-load-key.8 b/man/man8/zfs-load-key.8
index 72248b696..7d273ddd5 100644
--- a/man/man8/zfs-load-key.8
+++ b/man/man8/zfs-load-key.8
@@ -34,26 +34,26 @@
 .Dt ZFS-LOAD-KEY 8
 .Os
 .Sh NAME
-.Nm zfs Ns Pf - Cm load-key
+.Nm zfs-load-key
 .Nd Load, unload, or change the encryption key used to access a dataset.
 .Sh SYNOPSIS
-.Nm
+.Nm zfs
 .Cm load-key
 .Op Fl nr
 .Op Fl L Ar keylocation
 .Fl a | Ar filesystem
-.Nm
+.Nm zfs
 .Cm unload-key
 .Op Fl r
 .Fl a | Ar filesystem
-.Nm
+.Nm zfs
 .Cm change-key
 .Op Fl l
 .Op Fl o Ar keylocation Ns = Ns Ar value
 .Op Fl o Ar keyformat Ns = Ns Ar value
 .Op Fl o Ar pbkdf2iters Ns = Ns Ar value
 .Ar filesystem
-.Nm
+.Nm zfs
 .Cm change-key
 .Fl i
 .Op Fl l
@@ -61,7 +61,7 @@
 .Sh DESCRIPTION
 .Bl -tag -width ""
 .It Xo
-.Nm
+.Nm zfs
 .Cm load-key
 .Op Fl nr
 .Op Fl L Ar keylocation
@@ -118,7 +118,7 @@ may only be given as
 .Sy prompt .
 .El
 .It Xo
-.Nm
+.Nm zfs
 .Cm unload-key
 .Op Fl r
 .Fl a | Ar filesystem
@@ -139,7 +139,7 @@ encryption roots.
 Unloads the keys for all encryption roots in all imported pools.
 .El
 .It Xo
-.Nm
+.Nm zfs
 .Cm change-key
 .Op Fl l
 .Op Fl o Ar keylocation Ns = Ns Ar value
@@ -148,7 +148,7 @@ Unloads the keys for all encryption roots in all imported pools.
 .Ar filesystem
 .Xc
 .It Xo
-.Nm
+.Nm zfs
 .Cm change-key
 .Fl i
 .Op Fl l
diff --git a/man/man8/zfs-mount.8 b/man/man8/zfs-mount.8
index feddafb28..00fb37c78 100644
--- a/man/man8/zfs-mount.8
+++ b/man/man8/zfs-mount.8
@@ -34,29 +34,29 @@
 .Dt ZFS-MOUNT 8
 .Os
 .Sh NAME
-.Nm zfs Ns Pf - Cm mount
+.Nm zfs-mount
 .Nd Manage mount state of ZFS file systems.
 .Sh SYNOPSIS
-.Nm
+.Nm zfs
 .Cm mount
-.Nm
+.Nm zfs
 .Cm mount
 .Op Fl Oflv
 .Op Fl o Ar options
 .Fl a | Ar filesystem
-.Nm
+.Nm zfs
 .Cm unmount
 .Op Fl fu
 .Fl a | Ar filesystem Ns | Ns Ar mountpoint
 .Sh DESCRIPTION
 .Bl -tag -width ""
 .It Xo
-.Nm
+.Nm zfs
 .Cm mount
 .Xc
 Displays all ZFS file systems currently mounted.
 .It Xo
-.Nm
+.Nm zfs
 .Cm mount
 .Op Fl Oflv
 .Op Fl o Ar options
@@ -105,7 +105,7 @@ Report mount progress.
 Attempt to force mounting of all filesystems, even those that couldn't normally be mounted (e.g. redacted datasets).
 .El
 .It Xo
-.Nm
+.Nm zfs
 .Cm unmount
 .Op Fl fu
 .Fl a | Ar filesystem Ns | Ns Ar mountpoint
diff --git a/man/man8/zfs-program.8 b/man/man8/zfs-program.8
index 41d38587e..b08c94916 100644
--- a/man/man8/zfs-program.8
+++ b/man/man8/zfs-program.8
@@ -16,10 +16,11 @@
 .Dt ZFS-PROGRAM 8
 .Os
 .Sh NAME
-.Nm zfs program
+.Nm zfs-program
 .Nd executes ZFS channel programs
 .Sh SYNOPSIS
-.Cm "zfs program"
+.Nm zfs
+.Cm program
 .Op Fl jn
 .Op Fl t Ar instruction-limit
 .Op Fl m Ar memory-limit
diff --git a/man/man8/zfs-project.8 b/man/man8/zfs-project.8
index d3171c05c..21c300f83 100644
--- a/man/man8/zfs-project.8
+++ b/man/man8/zfs-project.8
@@ -34,26 +34,26 @@
 .Dt ZFS-PROJECT 8
 .Os
 .Sh NAME
-.Nm zfs Ns Pf - Cm project
+.Nm zfs-project
 .Nd List, set, or clear project ID and/or inherit flag on the file(s) or directories.
 .Sh SYNOPSIS
-.Nm
+.Nm zfs
 .Cm project
 .Oo Fl d Ns | Ns Fl r Ns Oc
 .Ar file Ns | Ns Ar directory Ns ...
-.Nm
+.Nm zfs
 .Cm project
 .Fl C
 .Oo Fl kr Ns Oc
 .Ar file Ns | Ns Ar directory Ns ...
-.Nm
+.Nm zfs
 .Cm project
 .Fl c
 .Oo Fl 0 Ns Oc
 .Oo Fl d Ns | Ns Fl r Ns Oc
 .Op Fl p Ar id
 .Ar file Ns | Ns Ar directory Ns ...
-.Nm
+.Nm zfs
 .Cm project
 .Op Fl p Ar id
 .Oo Fl rs Ns Oc
@@ -61,7 +61,7 @@
 .Sh DESCRIPTION
 .Bl -tag -width ""
 .It Xo
-.Nm
+.Nm zfs
 .Cm project
 .Oo Fl d Ns | Ns Fl r Ns Oc
 .Ar file Ns | Ns Ar directory Ns ...
@@ -79,7 +79,7 @@ Show on subdirectories recursively. It will overwrite the former specified
 option.
 .El
 .It Xo
-.Nm
+.Nm zfs
 .Cm project
 .Fl C
 .Oo Fl kr Ns Oc
@@ -94,7 +94,7 @@ as zero.
 Clear on subdirectories recursively.
 .El
 .It Xo
-.Nm
+.Nm zfs
 .Cm project
 .Fl c
 .Oo Fl 0 Ns Oc
@@ -126,7 +126,7 @@ Check on subdirectories recursively. It will overwrite the former specified
 option.
 .El
 .It Xo
-.Nm
+.Nm zfs
 .Cm project
 .Op Fl p Ar id
 .Oo Fl rs Ns Oc
diff --git a/man/man8/zfs-promote.8 b/man/man8/zfs-promote.8
index 08cd8b2b9..64c124c11 100644
--- a/man/man8/zfs-promote.8
+++ b/man/man8/zfs-promote.8
@@ -34,16 +34,16 @@
 .Dt ZFS-PROMOTE 8
 .Os
 .Sh NAME
-.Nm zfs Ns Pf - Cm promote
+.Nm zfs-promote
 .Nd Promotes a clone file system to no longer be dependent on its origin snapshot.
 .Sh SYNOPSIS
-.Nm
+.Nm zfs
 .Cm promote
 .Ar clone-filesystem
 .Sh DESCRIPTION
 .Bl -tag -width ""
 .It Xo
-.Nm
+.Nm zfs
 .Cm promote
 .Ar clone-filesystem
 .Xc
diff --git a/man/man8/zfs-receive.8 b/man/man8/zfs-receive.8
index 3cd17fea4..ed5cbbdf0 100644
--- a/man/man8/zfs-receive.8
+++ b/man/man8/zfs-receive.8
@@ -34,17 +34,17 @@
 .Dt ZFS-RECEIVE 8
 .Os
 .Sh NAME
-.Nm zfs Ns Pf - Cm receive
+.Nm zfs-receive
 .Nd Creates a snapshot whose contents are as specified in the stream provided on standard input.
 .Sh SYNOPSIS
-.Nm
+.Nm zfs
 .Cm receive
 .Op Fl FhMnsuv
 .Op Fl o Sy origin Ns = Ns Ar snapshot
 .Op Fl o Ar property Ns = Ns Ar value
 .Op Fl x Ar property
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
-.Nm
+.Nm zfs
 .Cm receive
 .Op Fl FhMnsuv
 .Op Fl d Ns | Ns Fl e
@@ -52,14 +52,14 @@
 .Op Fl o Ar property Ns = Ns Ar value
 .Op Fl x Ar property
 .Ar filesystem
-.Nm
+.Nm zfs
 .Cm receive
 .Fl A
 .Ar filesystem Ns | Ns Ar volume
 .Sh DESCRIPTION
 .Bl -tag -width ""
 .It Xo
-.Nm
+.Nm zfs
 .Cm receive
 .Op Fl FhMnsuv
 .Op Fl o Sy origin Ns = Ns Ar snapshot
@@ -68,7 +68,7 @@
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
 .Xc
 .It Xo
-.Nm
+.Nm zfs
 .Cm receive
 .Op Fl FhMnsuv
 .Op Fl d Ns | Ns Fl e
@@ -290,7 +290,7 @@ receive. This allows unencrypted streams to be received as encrypted datasets.
 To cause the received dataset (or root dataset of a recursive stream) to be
 received as an encryption root, specify encryption properties in the same
 manner as is required for
-.Nm
+.Nm zfs
 .Cm create .
 For instance:
 .Bd -literal
@@ -301,7 +301,7 @@ Note that
 .Op Fl o Ar keylocation Ns = Ns Ar prompt
 may not be specified here, since stdin is already being utilized for the send
 stream. Once the receive has completed, you can use
-.Nm
+.Nm zfs
 .Cm set
 to change this setting after the fact. Similarly, you can receive a dataset as
 an encrypted child by specifying
@@ -361,7 +361,7 @@ restrictions (e.g. set-once) apply equally to
 .Fl x .
 .El
 .It Xo
-.Nm
+.Nm zfs
 .Cm receive
 .Fl A
 .Ar filesystem Ns | Ns Ar volume
diff --git a/man/man8/zfs-rename.8 b/man/man8/zfs-rename.8
index 78bd8934a..f57bcd844 100644
--- a/man/man8/zfs-rename.8
+++ b/man/man8/zfs-rename.8
@@ -34,40 +34,40 @@
 .Dt ZFS-RENAME 8
 .Os
 .Sh NAME
-.Nm zfs Ns Pf - Cm rename
+.Nm zfs-rename
 .Nd Renames the given dataset (filesystem or snapshot).
 .Sh SYNOPSIS
-.Nm
+.Nm zfs
 .Cm rename
 .Op Fl f
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
-.Nm
+.Nm zfs
 .Cm rename
 .Fl p
 .Op Fl f
 .Ar filesystem Ns | Ns Ar volume
 .Ar filesystem Ns | Ns Ar volume
-.Nm
+.Nm zfs
 .Cm rename
 .Fl u
 .Op Fl f
 .Ar filesystem Ar filesystem
-.Nm
+.Nm zfs
 .Cm rename
 .Fl r
 .Ar snapshot Ar snapshot
 .Sh DESCRIPTION
 .Bl -tag -width ""
 .It Xo
-.Nm
+.Nm zfs
 .Cm rename
 .Op Fl f
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
 .Xc
 .It Xo
-.Nm
+.Nm zfs
 .Cm rename
 .Fl p
 .Op Fl f
@@ -75,7 +75,7 @@
 .Ar filesystem Ns | Ns Ar volume
 .Xc
 .It Xo
-.Nm
+.Nm zfs
 .Cm rename
 .Fl u
 .Op Fl f
@@ -112,7 +112,7 @@ or
 the file system is not unmounted even if this option is not given.
 .El
 .It Xo
-.Nm
+.Nm zfs
 .Cm rename
 .Fl r
 .Ar snapshot Ar snapshot
diff --git a/man/man8/zfs-rollback.8 b/man/man8/zfs-rollback.8
index 1078efd8a..8a7cb6621 100644
--- a/man/man8/zfs-rollback.8
+++ b/man/man8/zfs-rollback.8
@@ -34,17 +34,17 @@
 .Dt ZFS-ROLLBACK 8
 .Os
 .Sh NAME
-.Nm zfs Ns Pf - Cm rollback
+.Nm zfs-rollback
 .Nd Roll back the given dataset to a previous snapshot.
 .Sh SYNOPSIS
-.Nm
+.Nm zfs
 .Cm rollback
 .Op Fl Rfr
 .Ar snapshot
 .Sh DESCRIPTION
 .Bl -tag -width ""
 .It Xo
-.Nm
+.Nm zfs
 .Cm rollback
 .Op Fl Rfr
 .Ar snapshot
diff --git a/man/man8/zfs-send.8 b/man/man8/zfs-send.8
index 8b7f940eb..1a241a52d 100644
--- a/man/man8/zfs-send.8
+++ b/man/man8/zfs-send.8
@@ -34,43 +34,43 @@
 .Dt ZFS-SEND 8
 .Os
 .Sh NAME
-.Nm zfs Ns Pf - Cm send
+.Nm zfs-send
 .Nd Generate a send stream, which may be of a filesystem, and may be incremental from a bookmark.
 .Sh SYNOPSIS
-.Nm
+.Nm zfs
 .Cm send
 .Op Fl DLPRbcehnpvw
 .Op Oo Fl I Ns | Ns Fl i Oc Ar snapshot
 .Ar snapshot
-.Nm
+.Nm zfs
 .Cm send
 .Op Fl DLPRcenpvw
 .Op Fl i Ar snapshot Ns | Ns Ar bookmark
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
-.Nm
+.Nm zfs
 .Cm send
 .Fl -redact Ar redaction_bookmark
 .Op Fl DLPcenpv
 .br
 .Op Fl i Ar snapshot Ns | Ns Ar bookmark
 .Ar snapshot
-.Nm
+.Nm zfs
 .Cm send
 .Op Fl Penv
 .Fl t
 .Ar receive_resume_token
-.Nm
+.Nm zfs
 .Cm send
 .Op Fl Pnv
 .Fl S Ar filesystem
-.Nm
+.Nm zfs
 .Cm redact
 .Ar snapshot redaction_bookmark
 .Ar redaction_snapshot Ns ...
 .Sh DESCRIPTION
 .Bl -tag -width ""
 .It Xo
-.Nm
+.Nm zfs
 .Cm send
 .Op Fl DLPRbcehnpvw
 .Op Oo Fl I Ns | Ns Fl i Oc Ar snapshot
@@ -266,7 +266,7 @@ The format of the stream is committed.
 You will be able to receive your streams on future versions of ZFS.
 .El
 .It Xo
-.Nm
+.Nm zfs
 .Cm send
 .Op Fl DLPRcenpvw
 .Op Fl i Ar snapshot Ns | Ns Ar bookmark
@@ -391,7 +391,7 @@ Print verbose information about the stream package generated.
 This information includes a per-second report of how much data has been sent.
 .El
 .It Xo
-.Nm
+.Nm zfs
 .Cm send
 .Fl -redact Ar redaction_bookmark
 .Op Fl DLPcenpv
@@ -482,7 +482,7 @@ These are stored with the redacted snapshot, and are used to detect and
 correctly handle the cases above.  Note that for technical reasons, raw sends
 and redacted sends cannot be combined at this time.
 .It Xo
-.Nm
+.Nm zfs
 .Cm send
 .Op Fl Penv
 .Fl t
@@ -497,7 +497,7 @@ See the documentation for
 .Sy zfs receive -s
 for more details.
 .It Xo
-.Nm
+.Nm zfs
 .Cm send
 .Op Fl Pnv
 .Op Fl i Ar snapshot Ns | Ns Ar bookmark
@@ -514,7 +514,7 @@ always use the last fully received snapshot as the incremental source if it
 exists.
 .El
 .It Xo
-.Nm
+.Nm zfs
 .Cm redact
 .Ar snapshot redaction_bookmark
 .Ar redaction_snapshot Ns ...
diff --git a/man/man8/zfs-set.8 b/man/man8/zfs-set.8
index 5b4348ba9..74a7a61d0 100644
--- a/man/man8/zfs-set.8
+++ b/man/man8/zfs-set.8
@@ -34,14 +34,14 @@
 .Dt ZFS-SET 8
 .Os
 .Sh NAME
-.Nm zfs Ns Pf - Cm set
+.Nm zfs-set
 .Nd Sets the property or list of properties to the given value(s) for each dataset.
 .Sh SYNOPSIS
-.Nm
+.Nm zfs
 .Cm set
 .Ar property Ns = Ns Ar value Oo Ar property Ns = Ns Ar value Oc Ns ...
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot Ns ...
-.Nm
+.Nm zfs
 .Cm get
 .Op Fl r Ns | Ns Fl d Ar depth
 .Op Fl Hp
@@ -50,14 +50,14 @@
 .Oo Fl t Ar type Ns Oo , Ns Ar type Oc Ns ... Oc
 .Cm all | Ar property Ns Oo , Ns Ar property Oc Ns ...
 .Oo Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot Ns | Ns Ar bookmark Oc Ns ...
-.Nm
+.Nm zfs
 .Cm inherit
 .Op Fl rS
 .Ar property Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot Ns ...
 .Sh DESCRIPTION
 .Bl -tag -width ""
 .It Xo
-.Nm
+.Nm zfs
 .Cm set
 .Ar property Ns = Ns Ar value Oo Ar property Ns = Ns Ar value Oc Ns ...
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot Ns ...
@@ -79,7 +79,7 @@ For more information, see the
 section of
 .Xr zfsprops 8 .
 .It Xo
-.Nm
+.Nm zfs
 .Cm get
 .Op Fl r Ns | Ns Fl d Ar depth
 .Op Fl Hp
@@ -160,7 +160,7 @@ or
 .Sy all .
 .El
 .It Xo
-.Nm
+.Nm zfs
 .Cm inherit
 .Op Fl rS
 .Ar property Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot Ns ...
diff --git a/man/man8/zfs-share.8 b/man/man8/zfs-share.8
index cb0131033..ce35accdb 100644
--- a/man/man8/zfs-share.8
+++ b/man/man8/zfs-share.8
@@ -34,19 +34,19 @@
 .Dt ZFS-SHARE 8
 .Os
 .Sh NAME
-.Nm zfs Ns Pf - Cm share
+.Nm zfs-share
 .Nd Shares and unshares available ZFS filesystems.
 .Sh SYNOPSIS
-.Nm
+.Nm zfs
 .Cm share
 .Fl a | Ar filesystem
-.Nm
+.Nm zfs
 .Cm unshare
 .Fl a | Ar filesystem Ns | Ns Ar mountpoint
 .Sh DESCRIPTION
 .Bl -tag -width ""
 .It Xo
-.Nm
+.Nm zfs
 .Cm share
 .Fl a | Ar filesystem
 .Xc
@@ -68,7 +68,7 @@ or
 property is set.
 .El
 .It Xo
-.Nm
+.Nm zfs
 .Cm unshare
 .Fl a | Ar filesystem Ns | Ns Ar mountpoint
 .Xc
diff --git a/man/man8/zfs-snapshot.8 b/man/man8/zfs-snapshot.8
index 618d41d22..b677bc73d 100644
--- a/man/man8/zfs-snapshot.8
+++ b/man/man8/zfs-snapshot.8
@@ -34,10 +34,10 @@
 .Dt ZFS-SNAPSHOT 8
 .Os
 .Sh NAME
-.Nm zfs Ns Pf - Cm snapshot
+.Nm zfs-snapshot
 .Nd Creates snapshots with the given names.
 .Sh SYNOPSIS
-.Nm
+.Nm zfs
 .Cm snapshot
 .Op Fl r
 .Oo Fl o Ar property Ns = Ns Ar value Oc Ns ...
@@ -45,7 +45,7 @@
 .Sh DESCRIPTION
 .Bl -tag -width ""
 .It Xo
-.Nm
+.Nm zfs
 .Cm snapshot
 .Op Fl r
 .Oo Fl o Ar property Ns = Ns Ar value Oc Ns ...
diff --git a/man/man8/zfs-upgrade.8 b/man/man8/zfs-upgrade.8
index 742d5d7bd..6a79f3ea7 100644
--- a/man/man8/zfs-upgrade.8
+++ b/man/man8/zfs-upgrade.8
@@ -34,15 +34,15 @@
 .Dt ZFS-UPGRADE 8
 .Os
 .Sh NAME
-.Nm zfs Ns Pf - Cm upgrade
+.Nm zfs-upgrade
 .Nd Manage upgrading the on-disk version of filesystems.
 .Sh SYNOPSIS
-.Nm
+.Nm zfs
 .Cm upgrade
-.Nm
+.Nm zfs
 .Cm upgrade
 .Fl v
-.Nm
+.Nm zfs
 .Cm upgrade
 .Op Fl r
 .Op Fl V Ar version
@@ -50,18 +50,18 @@
 .Sh DESCRIPTION
 .Bl -tag -width ""
 .It Xo
-.Nm
+.Nm zfs
 .Cm upgrade
 .Xc
 Displays a list of file systems that are not the most recent version.
 .It Xo
-.Nm
+.Nm zfs
 .Cm upgrade
 .Fl v
 .Xc
 Displays a list of currently supported file system versions.
 .It Xo
-.Nm
+.Nm zfs
 .Cm upgrade
 .Op Fl r
 .Op Fl V Ar version
diff --git a/man/man8/zfs-userspace.8 b/man/man8/zfs-userspace.8
index 9c103bf48..0a9977a61 100644
--- a/man/man8/zfs-userspace.8
+++ b/man/man8/zfs-userspace.8
@@ -34,10 +34,10 @@
 .Dt ZFS-USERSPACE 8
 .Os
 .Sh NAME
-.Nm zfs Ns Pf - Cm userspace
+.Nm zfs-userspace
 .Nd Displays space consumed by, and quotas on, each user or group in the specified filesystem or snapshot.
 .Sh SYNOPSIS
-.Nm
+.Nm zfs
 .Cm userspace
 .Op Fl Hinp
 .Oo Fl o Ar field Ns Oo , Ns Ar field Oc Ns ... Oc
@@ -45,7 +45,7 @@
 .Oo Fl S Ar field Oc Ns ...
 .Oo Fl t Ar type Ns Oo , Ns Ar type Oc Ns ... Oc
 .Ar filesystem Ns | Ns Ar snapshot Ns | Ns Ar path
-.Nm
+.Nm zfs
 .Cm groupspace
 .Op Fl Hinp
 .Oo Fl o Ar field Ns Oo , Ns Ar field Oc Ns ... Oc
@@ -53,7 +53,7 @@
 .Oo Fl S Ar field Oc Ns ...
 .Oo Fl t Ar type Ns Oo , Ns Ar type Oc Ns ... Oc
 .Ar filesystem Ns | Ns Ar snapshot Ns | Ns Ar path
-.Nm
+.Nm zfs
 .Cm projectspace
 .Op Fl Hp
 .Oo Fl o Ar field Ns Oo , Ns Ar field Oc Ns ... Oc
@@ -63,7 +63,7 @@
 .Sh DESCRIPTION
 .Bl -tag -width ""
 .It Xo
-.Nm
+.Nm zfs
 .Cm userspace
 .Op Fl Hinp
 .Oo Fl o Ar field Ns Oo , Ns Ar field Oc Ns ... Oc
@@ -146,7 +146,7 @@ The default is
 The default can be changed to include group types.
 .El
 .It Xo
-.Nm
+.Nm zfs
 .Cm groupspace
 .Op Fl Hinp
 .Oo Fl o Ar field Ns Oo , Ns Ar field Oc Ns ... Oc
@@ -162,7 +162,7 @@ This subcommand is identical to
 except that the default types to display are
 .Fl t Sy posixgroup Ns \&, Ns Sy smbgroup .
 .It Xo
-.Nm
+.Nm zfs
 .Cm projectspace
 .Op Fl Hp
 .Oo Fl o Ar field Ns Oo , Ns Ar field Oc Ns ... Oc
diff --git a/man/man8/zfs-wait.8 b/man/man8/zfs-wait.8
index e7e3decb9..c3a85e29c 100644
--- a/man/man8/zfs-wait.8
+++ b/man/man8/zfs-wait.8
@@ -31,17 +31,17 @@
 .Dt ZFS-WAIT 8
 .Os
 .Sh NAME
-.Nm zfs Ns Pf - Cm wait
+.Nm zfs-wait
 .Nd Wait for background activity to stop in a ZFS filesystem
 .Sh SYNOPSIS
-.Nm
+.Nm zfs
 .Cm wait
 .Op Fl t Ar activity Ns Oo , Ns Ar activity Ns Oc Ns ...
 .Ar fs
 .Sh DESCRIPTION
 .Bl -tag -width Ds
 .It Xo
-.Nm
+.Nm zfs
 .Cm wait
 .Op Fl t Ar activity Ns Oo , Ns Ar activity Ns Oc Ns ...
 .Ar fs
diff --git a/man/man8/zpool-add.8 b/man/man8/zpool-add.8
index e8adc353a..cf1630435 100644
--- a/man/man8/zpool-add.8
+++ b/man/man8/zpool-add.8
@@ -30,10 +30,10 @@
 .Dt ZPOOL-ADD 8
 .Os
 .Sh NAME
-.Nm zpool Ns Pf - Cm add
+.Nm zpool-add
 .Nd Adds specified virtual devices to a ZFS storage pool
 .Sh SYNOPSIS
-.Nm
+.Nm zpool
 .Cm add
 .Op Fl fgLnP
 .Oo Fl o Ar property Ns = Ns Ar value Oc
@@ -41,7 +41,7 @@
 .Sh DESCRIPTION
 .Bl -tag -width Ds
 .It Xo
-.Nm
+.Nm zpool
 .Cm add
 .Op Fl fgLnP
 .Oo Fl o Ar property Ns = Ns Ar value Oc
diff --git a/man/man8/zpool-attach.8 b/man/man8/zpool-attach.8
index 03e04436d..41b6a6b61 100644
--- a/man/man8/zpool-attach.8
+++ b/man/man8/zpool-attach.8
@@ -31,10 +31,10 @@
 .Dt ZPOOL-ATTACH 8
 .Os
 .Sh NAME
-.Nm zpool Ns Pf - Cm attach
+.Nm zpool-attach
 .Nd Attach a new device to an existing ZFS virtual device (vdev).
 .Sh SYNOPSIS
-.Nm
+.Nm zpool
 .Cm attach
 .Op Fl fsw
 .Oo Fl o Ar property Ns = Ns Ar value Oc
@@ -42,7 +42,7 @@
 .Sh DESCRIPTION
 .Bl -tag -width Ds
 .It Xo
-.Nm
+.Nm zpool
 .Cm attach
 .Op Fl fsw
 .Oo Fl o Ar property Ns = Ns Ar value Oc
diff --git a/man/man8/zpool-checkpoint.8 b/man/man8/zpool-checkpoint.8
index df04c8819..128970ee6 100644
--- a/man/man8/zpool-checkpoint.8
+++ b/man/man8/zpool-checkpoint.8
@@ -31,17 +31,17 @@
 .Dt ZPOOL-CHECKPOINT 8
 .Os
 .Sh NAME
-.Nm zpool Ns Pf - Cm checkpoint
+.Nm zpool-checkpoint
 .Nd Checkpoints the current state of a ZFS storage pool
 .Sh SYNOPSIS
-.Nm
+.Nm zpool
 .Cm checkpoint
 .Op Fl d, -discard Oo Fl w, -wait Oc
 .Ar pool
 .Sh DESCRIPTION
 .Bl -tag -width Ds
 .It Xo
-.Nm
+.Nm zpool
 .Cm checkpoint
 .Op Fl d, -discard Oo Fl w, -wait Oc
 .Ar pool
diff --git a/man/man8/zpool-clear.8 b/man/man8/zpool-clear.8
index ee7a6a255..e00eb760a 100644
--- a/man/man8/zpool-clear.8
+++ b/man/man8/zpool-clear.8
@@ -31,17 +31,17 @@
 .Dt ZPOOL-CLEAR 8
 .Os
 .Sh NAME
-.Nm zpool Ns Pf - Cm clear
+.Nm zpool-clear
 .Nd Clears device errors in a ZFS storage pool.
 .Sh SYNOPSIS
-.Nm
+.Nm zpool
 .Cm clear
 .Ar pool
 .Op Ar device
 .Sh DESCRIPTION
 .Bl -tag -width Ds
 .It Xo
-.Nm
+.Nm zpool
 .Cm clear
 .Ar pool
 .Op Ar device
diff --git a/man/man8/zpool-create.8 b/man/man8/zpool-create.8
index 0676a67f9..7f3f27b9b 100644
--- a/man/man8/zpool-create.8
+++ b/man/man8/zpool-create.8
@@ -31,10 +31,10 @@
 .Dt ZPOOL-CREATE 8
 .Os
 .Sh NAME
-.Nm zpool Ns Pf - Cm create
+.Nm zpool-create
 .Nd Creates a new ZFS storage pool
 .Sh SYNOPSIS
-.Nm
+.Nm zpool
 .Cm create
 .Op Fl dfn
 .Op Fl m Ar mountpoint
@@ -46,7 +46,7 @@
 .Sh DESCRIPTION
 .Bl -tag -width Ds
 .It Xo
-.Nm
+.Nm zpool
 .Cm create
 .Op Fl dfn
 .Op Fl m Ar mountpoint
diff --git a/man/man8/zpool-destroy.8 b/man/man8/zpool-destroy.8
index 9eace1983..d4fc21eae 100644
--- a/man/man8/zpool-destroy.8
+++ b/man/man8/zpool-destroy.8
@@ -31,17 +31,17 @@
 .Dt ZPOOL-DESTROY 8
 .Os
 .Sh NAME
-.Nm zpool Ns Pf - Cm destroy
+.Nm zpool-destroy
 .Nd Destroys the given ZFS storage pool, freeing up any devices for other use
 .Sh SYNOPSIS
-.Nm
+.Nm zpool
 .Cm destroy
 .Op Fl f
 .Ar pool
 .Sh DESCRIPTION
 .Bl -tag -width Ds
 .It Xo
-.Nm
+.Nm zpool
 .Cm destroy
 .Op Fl f
 .Ar pool
diff --git a/man/man8/zpool-detach.8 b/man/man8/zpool-detach.8
index dab8871ce..75a5786d5 100644
--- a/man/man8/zpool-detach.8
+++ b/man/man8/zpool-detach.8
@@ -31,16 +31,16 @@
 .Dt ZPOOL-DETACH 8
 .Os
 .Sh NAME
-.Nm zpool Ns Pf - Cm detach
+.Nm zpool-detach
 .Nd Detaches a device from a ZFS mirror vdev (virtual device)
 .Sh SYNOPSIS
-.Nm
+.Nm zpool
 .Cm detach
 .Ar pool device
 .Sh DESCRIPTION
 .Bl -tag -width Ds
 .It Xo
-.Nm
+.Nm zpool
 .Cm detach
 .Ar pool device
 .Xc
diff --git a/man/man8/zpool-events.8 b/man/man8/zpool-events.8
index e5887a1d8..3a6ff8840 100644
--- a/man/man8/zpool-events.8
+++ b/man/man8/zpool-events.8
@@ -31,16 +31,16 @@
 .Dt ZPOOL-EVENTS 8
 .Os
 .Sh NAME
-.Nm zpool Ns Pf - Cm events
+.Nm zpool-events
 .Nd Lists all recent events generated by the ZFS kernel modules
 .Sh SYNOPSIS
-.Nm
+.Nm zpool
 .Cm events
 .Op Fl vHf Oo Ar pool Oc | Fl c
 .Sh DESCRIPTION
 .Bl -tag -width Ds
 .It Xo
-.Nm
+.Nm zpool
 .Cm events
 .Op Fl vHf Oo Ar pool Oc | Fl c
 .Xc
diff --git a/man/man8/zpool-export.8 b/man/man8/zpool-export.8
index afe185c98..1b8077ba1 100644
--- a/man/man8/zpool-export.8
+++ b/man/man8/zpool-export.8
@@ -31,10 +31,10 @@
 .Dt ZPOOL-EXPORT 8
 .Os
 .Sh NAME
-.Nm zpool Ns Pf - Cm export
+.Nm zpool-export
 .Nd Exports the given ZFS storage pools from the system
 .Sh SYNOPSIS
-.Nm
+.Nm zpool
 .Cm export
 .Op Fl a
 .Op Fl f
@@ -42,7 +42,7 @@
 .Sh DESCRIPTION
 .Bl -tag -width Ds
 .It Xo
-.Nm
+.Nm zpool
 .Cm export
 .Op Fl a
 .Op Fl f
@@ -60,7 +60,7 @@ A pool can not be exported if it has a shared spare that is currently being
 used.
 .Pp
 For pools to be portable, you must give the
-.Nm
+.Nm zpool
 command whole disks, not just partitions, so that ZFS can label the disks with
 portable EFI labels.
 Otherwise, disk drivers on platforms of different endianness will not recognize
diff --git a/man/man8/zpool-get.8 b/man/man8/zpool-get.8
index fbe341a8c..c514bb0c5 100644
--- a/man/man8/zpool-get.8
+++ b/man/man8/zpool-get.8
@@ -31,23 +31,23 @@
 .Dt ZPOOL-GET 8
 .Os
 .Sh NAME
-.Nm zpool Ns Pf - Cm get
+.Nm zpool-get
 .Nd Retrieves properties for the specified ZFS storage pool(s)
 .Sh SYNOPSIS
-.Nm
+.Nm zpool
 .Cm get
 .Op Fl Hp
 .Op Fl o Ar field Ns Oo , Ns Ar field Oc Ns ...
 .Sy all Ns | Ns Ar property Ns Oo , Ns Ar property Oc Ns ...
 .Oo Ar pool Oc Ns ...
-.Nm
+.Nm zpool
 .Cm set
 .Ar property Ns = Ns Ar value
 .Ar pool
 .Sh DESCRIPTION
 .Bl -tag -width Ds
 .It Xo
-.Nm
+.Nm zpool
 .Cm get
 .Op Fl Hp
 .Op Fl o Ar field Ns Oo , Ns Ar field Oc Ns ...
@@ -85,7 +85,7 @@ is the default value.
 Display numbers in parsable (exact) values.
 .El
 .It Xo
-.Nm
+.Nm zpool
 .Cm set
 .Ar property Ns = Ns Ar value
 .Ar pool
diff --git a/man/man8/zpool-history.8 b/man/man8/zpool-history.8
index 73fb27449..5b0a102f3 100644
--- a/man/man8/zpool-history.8
+++ b/man/man8/zpool-history.8
@@ -31,17 +31,17 @@
 .Dt ZPOOL-HISTORY 8
 .Os
 .Sh NAME
-.Nm zpool Ns Pf - Cm history
+.Nm zpool-history
 .Nd Displays the command history of the specified ZFS storage pool(s)
 .Sh SYNOPSIS
-.Nm
+.Nm zpool
 .Cm history
 .Op Fl il
 .Oo Ar pool Oc Ns ...
 .Sh DESCRIPTION
 .Bl -tag -width Ds
 .It Xo
-.Nm
+.Nm zpool
 .Cm history
 .Op Fl il
 .Oo Ar pool Oc Ns ...
diff --git a/man/man8/zpool-import.8 b/man/man8/zpool-import.8
index e63db9363..ac3495743 100644
--- a/man/man8/zpool-import.8
+++ b/man/man8/zpool-import.8
@@ -31,14 +31,14 @@
 .Dt ZPOOL-IMPORT 8
 .Os
 .Sh NAME
-.Nm zpool Ns Pf - Cm import
+.Nm zpool-import
 .Nd Lists ZFS storage pools available to import or import the specified pools
 .Sh SYNOPSIS
-.Nm
+.Nm zpool
 .Cm import
 .Op Fl D
 .Op Fl d Ar dir Ns | Ns device
-.Nm
+.Nm zpool
 .Cm import
 .Fl a
 .Op Fl DflmN
@@ -48,7 +48,7 @@
 .Op Fl o Ar mntopts
 .Oo Fl o Ar property Ns = Ns Ar value Oc Ns ...
 .Op Fl R Ar root
-.Nm
+.Nm zpool
 .Cm import
 .Op Fl Dflm
 .Op Fl F Oo Fl n Oc Oo Fl T Oc Oo Fl X Oc
@@ -63,7 +63,7 @@
 .Sh DESCRIPTION
 .Bl -tag -width Ds
 .It Xo
-.Nm
+.Nm zpool
 .Cm import
 .Op Fl D
 .Op Fl d Ar dir Ns | Ns device
@@ -110,7 +110,7 @@ option can be specified multiple times.
 Lists destroyed pools only.
 .El
 .It Xo
-.Nm
+.Nm zpool
 .Cm import
 .Fl a
 .Op Fl DflmN
@@ -244,7 +244,7 @@ option, above. WARNING: This option can be extremely hazardous to the
 health of your pool and should only be used as a last resort.
 .El
 .It Xo
-.Nm
+.Nm zpool
 .Cm import
 .Op Fl Dflm
 .Op Fl F Oo Fl n Oc Oo Fl t Oc Oo Fl T Oc Oo Fl X Oc
diff --git a/man/man8/zpool-initialize.8 b/man/man8/zpool-initialize.8
index e8bf656e4..2734c1b34 100644
--- a/man/man8/zpool-initialize.8
+++ b/man/man8/zpool-initialize.8
@@ -31,10 +31,10 @@
 .Dt ZPOOL-INITIALIZE 8
 .Os
 .Sh NAME
-.Nm zpool Ns Pf - Cm initialize
+.Nm zpool-initialize
 .Nd Write to all unallocated regions of eligible devices in a ZFS storage pool
 .Sh SYNOPSIS
-.Nm
+.Nm zpool
 .Cm initialize
 .Op Fl c | Fl s
 .Op Fl w
@@ -43,7 +43,7 @@
 .Sh DESCRIPTION
 .Bl -tag -width Ds
 .It Xo
-.Nm
+.Nm zpool
 .Cm initialize
 .Op Fl c | Fl s
 .Op Fl w
diff --git a/man/man8/zpool-iostat.8 b/man/man8/zpool-iostat.8
index f91e55c3b..e457eb142 100644
--- a/man/man8/zpool-iostat.8
+++ b/man/man8/zpool-iostat.8
@@ -31,10 +31,10 @@
 .Dt ZPOOL-IOSTAT 8
 .Os
 .Sh NAME
-.Nm zpool Ns Pf - Cm iostat
+.Nm zpool-iostat
 .Nd Display logical I/O statistics for the given ZFS storage pools/vdevs
 .Sh SYNOPSIS
-.Nm
+.Nm zpool
 .Cm iostat
 .Op Oo Oo Fl c Ar SCRIPT Oc Oo Fl lq Oc Oc Ns | Ns Fl rw
 .Op Fl T Sy u Ns | Ns Sy d
@@ -44,7 +44,7 @@
 .Sh DESCRIPTION
 .Bl -tag -width Ds
 .It Xo
-.Nm
+.Nm zpool
 .Cm iostat
 .Op Oo Oo Fl c Ar SCRIPT Oc Oo Fl lq Oc Oc Ns | Ns Fl rw
 .Op Fl T Sy u Ns | Ns Sy d
diff --git a/man/man8/zpool-labelclear.8 b/man/man8/zpool-labelclear.8
index 52c800561..576eee21c 100644
--- a/man/man8/zpool-labelclear.8
+++ b/man/man8/zpool-labelclear.8
@@ -31,17 +31,17 @@
 .Dt ZPOOL-LABELCLEAR 8
 .Os
 .Sh NAME
-.Nm zpool Ns Pf - Cm labelclear
+.Nm zpool-labelclear
 .Nd Removes ZFS label information from the specified physical device
 .Sh SYNOPSIS
-.Nm
+.Nm zpool
 .Cm labelclear
 .Op Fl f
 .Ar device
 .Sh DESCRIPTION
 .Bl -tag -width Ds
 .It Xo
-.Nm
+.Nm zpool
 .Cm labelclear
 .Op Fl f
 .Ar device
diff --git a/man/man8/zpool-list.8 b/man/man8/zpool-list.8
index 5e8c6fe5c..a38430c8f 100644
--- a/man/man8/zpool-list.8
+++ b/man/man8/zpool-list.8
@@ -31,10 +31,10 @@
 .Dt ZPOOL-LIST 8
 .Os
 .Sh NAME
-.Nm zpool Ns Pf - Cm list
+.Nm zpool-list
 .Nd Lists ZFS storage pools along with a health status and space usage
 .Sh SYNOPSIS
-.Nm
+.Nm zpool
 .Cm list
 .Op Fl HgLpPv
 .Op Fl o Ar property Ns Oo , Ns Ar property Oc Ns ...
@@ -44,7 +44,7 @@
 .Sh DESCRIPTION
 .Bl -tag -width Ds
 .It Xo
-.Nm
+.Nm zpool
 .Cm list
 .Op Fl HgLpPv
 .Op Fl o Ar property Ns Oo , Ns Ar property Oc Ns ...
diff --git a/man/man8/zpool-offline.8 b/man/man8/zpool-offline.8
index cdcda141f..3bf3bae72 100644
--- a/man/man8/zpool-offline.8
+++ b/man/man8/zpool-offline.8
@@ -31,22 +31,22 @@
 .Dt ZPOOL-OFFLINE 8
 .Os
 .Sh NAME
-.Nm zpool Ns Pf - Cm offline
+.Nm zpool-offline
 .Nd Take a physical device in a ZFS storage pool offline
 .Sh SYNOPSIS
-.Nm
+.Nm zpool
 .Cm offline
 .Op Fl f
 .Op Fl t
 .Ar pool Ar device Ns ...
-.Nm
+.Nm zpool
 .Cm online
 .Op Fl e
 .Ar pool Ar device Ns ...
 .Sh DESCRIPTION
 .Bl -tag -width Ds
 .It Xo
-.Nm
+.Nm zpool
 .Cm offline
 .Op Fl f
 .Op Fl t
@@ -68,7 +68,7 @@ Temporary.
 Upon reboot, the specified physical device reverts to its previous state.
 .El
 .It Xo
-.Nm
+.Nm zpool
 .Cm online
 .Op Fl e
 .Ar pool Ar device Ns ...
diff --git a/man/man8/zpool-reguid.8 b/man/man8/zpool-reguid.8
index e73f421ad..f5c4a33f6 100644
--- a/man/man8/zpool-reguid.8
+++ b/man/man8/zpool-reguid.8
@@ -31,16 +31,16 @@
 .Dt ZPOOL-REGUID 8
 .Os
 .Sh NAME
-.Nm zpool Ns Pf - Cm reguid
+.Nm zpool-reguid
 .Nd Generate a new unique identifier for a ZFS storage pool
 .Sh SYNOPSIS
-.Nm
+.Nm zpool
 .Cm reguid
 .Ar pool
 .Sh DESCRIPTION
 .Bl -tag -width Ds
 .It Xo
-.Nm
+.Nm zpool
 .Cm reguid
 .Ar pool
 .Xc
diff --git a/man/man8/zpool-remove.8 b/man/man8/zpool-remove.8
index cd394f107..f491cd40a 100644
--- a/man/man8/zpool-remove.8
+++ b/man/man8/zpool-remove.8
@@ -31,21 +31,21 @@
 .Dt ZPOOL-REMOVE 8
 .Os
 .Sh NAME
-.Nm zpool Ns Pf - Cm remove
+.Nm zpool-remove
 .Nd Remove a device from a ZFS storage pool
 .Sh SYNOPSIS
-.Nm
+.Nm zpool
 .Cm remove
 .Op Fl npw
 .Ar pool Ar device Ns ...
-.Nm
+.Nm zpool
 .Cm remove
 .Fl s
 .Ar pool
 .Sh DESCRIPTION
 .Bl -tag -width Ds
 .It Xo
-.Nm
+.Nm zpool
 .Cm remove
 .Op Fl npw
 .Ar pool Ar device Ns ...
@@ -95,7 +95,7 @@ flag, displays numbers as parsable (exact) values.
 Waits until the removal has completed before returning.
 .El
 .It Xo
-.Nm
+.Nm zpool
 .Cm remove
 .Fl s
 .Ar pool
diff --git a/man/man8/zpool-reopen.8 b/man/man8/zpool-reopen.8
index 206fedcc5..6f804cc7e 100644
--- a/man/man8/zpool-reopen.8
+++ b/man/man8/zpool-reopen.8
@@ -31,17 +31,17 @@
 .Dt ZPOOL-REOPEN 8
 .Os
 .Sh NAME
-.Nm zpool Ns Pf - Cm reopen
+.Nm zpool-reopen
 .Nd Reopen all virtual devices (vdevs) associated with a ZFS storage pool
 .Sh SYNOPSIS
-.Nm
+.Nm zpool
 .Cm reopen
 .Op Fl n
 .Ar pool
 .Sh DESCRIPTION
 .Bl -tag -width Ds
 .It Xo
-.Nm
+.Nm zpool
 .Cm reopen
 .Op Fl n
 .Ar pool
diff --git a/man/man8/zpool-replace.8 b/man/man8/zpool-replace.8
index 32eaf77c0..b8527a386 100644
--- a/man/man8/zpool-replace.8
+++ b/man/man8/zpool-replace.8
@@ -31,10 +31,10 @@
 .Dt ZPOOL-REPLACE 8
 .Os
 .Sh NAME
-.Nm zpool Ns Pf - Cm replace
+.Nm zpool-replace
 .Nd Replace one device with another in a ZFS storage pool
 .Sh SYNOPSIS
-.Nm
+.Nm zpool
 .Cm replace
 .Op Fl fsw
 .Oo Fl o Ar property Ns = Ns Ar value Oc
@@ -42,7 +42,7 @@
 .Sh DESCRIPTION
 .Bl -tag -width Ds
 .It Xo
-.Nm
+.Nm zpool
 .Cm replace
 .Op Fl fsw
 .Op Fl o Ar property Ns = Ns Ar value
diff --git a/man/man8/zpool-resilver.8 b/man/man8/zpool-resilver.8
index a804bea4a..602e296fe 100644
--- a/man/man8/zpool-resilver.8
+++ b/man/man8/zpool-resilver.8
@@ -31,16 +31,16 @@
 .Dt ZPOOL-RESILVER 8
 .Os
 .Sh NAME
-.Nm zpool Ns Pf - Cm resilver
+.Nm zpool-resilver
 .Nd Start a resilver of a device in a ZFS storage pool
 .Sh SYNOPSIS
-.Nm
+.Nm zpool
 .Cm resilver
 .Ar pool Ns ...
 .Sh DESCRIPTION
 .Bl -tag -width Ds
 .It Xo
-.Nm
+.Nm zpool
 .Cm resilver
 .Ar pool Ns ...
 .Xc
diff --git a/man/man8/zpool-scrub.8 b/man/man8/zpool-scrub.8
index a56247955..ede569978 100644
--- a/man/man8/zpool-scrub.8
+++ b/man/man8/zpool-scrub.8
@@ -31,10 +31,10 @@
 .Dt ZPOOL-SCRUB 8
 .Os
 .Sh NAME
-.Nm zpool Ns Pf - Cm scrub
+.Nm zpool-scrub
 .Nd Begin a scrub or resume a paused scrub of a ZFS storage pool
 .Sh SYNOPSIS
-.Nm
+.Nm zpool
 .Cm scrub
 .Op Fl s | Fl p
 .Op Fl w
@@ -42,7 +42,7 @@
 .Sh DESCRIPTION
 .Bl -tag -width Ds
 .It Xo
-.Nm
+.Nm zpool
 .Cm scrub
 .Op Fl s | Fl p
 .Op Fl w
diff --git a/man/man8/zpool-split.8 b/man/man8/zpool-split.8
index d2943e6e3..609cbe6ba 100644
--- a/man/man8/zpool-split.8
+++ b/man/man8/zpool-split.8
@@ -31,10 +31,10 @@
 .Dt ZPOOL-SPLIT 8
 .Os
 .Sh NAME
-.Nm zpool Ns Pf - Cm split
+.Nm zpool-split
 .Nd Split devices off a ZFS storage pool creating a new pool
 .Sh SYNOPSIS
-.Nm
+.Nm zpool
 .Cm split
 .Op Fl gLlnP
 .Oo Fl o Ar property Ns = Ns Ar value Oc Ns ...
@@ -44,7 +44,7 @@
 .Sh DESCRIPTION
 .Bl -tag -width Ds
 .It Xo
-.Nm
+.Nm zpool
 .Cm split
 .Op Fl gLlnP
 .Oo Fl o Ar property Ns = Ns Ar value Oc Ns ...
diff --git a/man/man8/zpool-status.8 b/man/man8/zpool-status.8
index c2fe76c03..54f0987b8 100644
--- a/man/man8/zpool-status.8
+++ b/man/man8/zpool-status.8
@@ -31,10 +31,10 @@
 .Dt ZPOOL-STATUS 8
 .Os
 .Sh NAME
-.Nm zpool Ns Pf - Cm status
+.Nm zpool-status
 .Nd Display detailed health status for the given ZFS storage pools
 .Sh SYNOPSIS
-.Nm
+.Nm zpool
 .Cm status
 .Oo Fl c Ar SCRIPT Oc
 .Op Fl DigLpPstvx
@@ -44,7 +44,7 @@
 .Sh DESCRIPTION
 .Bl -tag -width Ds
 .It Xo
-.Nm
+.Nm zpool
 .Cm status
 .Op Fl c Op Ar SCRIPT1 Ns Oo , Ns Ar SCRIPT2 Oc Ns ...
 .Op Fl DigLpPstvx
diff --git a/man/man8/zpool-sync.8 b/man/man8/zpool-sync.8
index 098fdde9e..027d129d1 100644
--- a/man/man8/zpool-sync.8
+++ b/man/man8/zpool-sync.8
@@ -31,16 +31,16 @@
 .Dt ZPOOL-SYNC 8
 .Os
 .Sh NAME
-.Nm zpool Ns Pf - Cm sync
+.Nm zpool-sync
 .Nd Force data to be written to primary storage of a ZFS storage pool and update reporting data
 .Sh SYNOPSIS
-.Nm
+.Nm zpool
 .Cm sync
 .Oo Ar pool Oc Ns ...
 .Sh DESCRIPTION
 .Bl -tag -width Ds
 .It Xo
-.Nm
+.Nm zpool
 .Cm sync
 .Op Ar pool ...
 .Xc
diff --git a/man/man8/zpool-trim.8 b/man/man8/zpool-trim.8
index eef58aae5..1d8bc6e44 100644
--- a/man/man8/zpool-trim.8
+++ b/man/man8/zpool-trim.8
@@ -31,10 +31,10 @@
 .Dt ZPOOL-TRIM 8
 .Os
 .Sh NAME
-.Nm zpool Ns Pf - Cm trim
+.Nm zpool-trim
 .Nd Initiate immediate TRIM operations for all free space in a ZFS storage pool
 .Sh SYNOPSIS
-.Nm
+.Nm zpool
 .Cm trim
 .Op Fl dw
 .Op Fl r Ar rate
@@ -44,7 +44,7 @@
 .Sh DESCRIPTION
 .Bl -tag -width Ds
 .It Xo
-.Nm
+.Nm zpool
 .Cm trim
 .Op Fl dw
 .Op Fl c | Fl s
diff --git a/man/man8/zpool-upgrade.8 b/man/man8/zpool-upgrade.8
index d23d0e0e6..b9d023b22 100644
--- a/man/man8/zpool-upgrade.8
+++ b/man/man8/zpool-upgrade.8
@@ -31,22 +31,22 @@
 .Dt ZPOOL-UPGRADE 8
 .Os
 .Sh NAME
-.Nm zpool Ns Pf - Cm upgrade
+.Nm zpool-upgrade
 .Nd Manage version and feature flags of ZFS storage pools
 .Sh SYNOPSIS
-.Nm
+.Nm zpool
 .Cm upgrade
-.Nm
+.Nm zpool
 .Cm upgrade
 .Fl v
-.Nm
+.Nm zpool
 .Cm upgrade
 .Op Fl V Ar version
 .Fl a Ns | Ns Ar pool Ns ...
 .Sh DESCRIPTION
 .Bl -tag -width Ds
 .It Xo
-.Nm
+.Nm zpool
 .Cm upgrade
 .Xc
 Displays pools which do not have all supported features enabled and pools
@@ -56,7 +56,7 @@ Use
 .Nm zpool Cm upgrade Fl a
 to enable all features on all pools.
 .It Xo
-.Nm
+.Nm zpool
 .Cm upgrade
 .Fl v
 .Xc
@@ -65,7 +65,7 @@ See
 .Xr zpool-features 5
 for a description of feature flags features supported by the current software.
 .It Xo
-.Nm
+.Nm zpool
 .Cm upgrade
 .Op Fl V Ar version
 .Fl a Ns | Ns Ar pool Ns ...
diff --git a/man/man8/zpool-wait.8 b/man/man8/zpool-wait.8
index a3bdba669..ff6d99224 100644
--- a/man/man8/zpool-wait.8
+++ b/man/man8/zpool-wait.8
@@ -31,10 +31,10 @@
 .Dt ZPOOL-WAIT 8
 .Os
 .Sh NAME
-.Nm zpool Ns Pf - Cm wait
+.Nm zpool-wait
 .Nd Wait for background activity to stop in a ZFS storage pool
 .Sh SYNOPSIS
-.Nm
+.Nm zpool
 .Cm wait
 .Op Fl Hp
 .Op Fl T Sy u Ns | Ns Sy d
@@ -44,7 +44,7 @@
 .Sh DESCRIPTION
 .Bl -tag -width Ds
 .It Xo
-.Nm
+.Nm zpool
 .Cm wait
 .Op Fl Hp
 .Op Fl T Sy u Ns | Ns Sy d