diff --git a/sbin/ccdconfig/ccdconfig.8 b/sbin/ccdconfig/ccdconfig.8
index cc29f717528b..99a1762451ec 100644
--- a/sbin/ccdconfig/ccdconfig.8
+++ b/sbin/ccdconfig/ccdconfig.8
@@ -234,14 +234,14 @@ RAID controllers (see GENERIC),
 or software RAID systems such as
 .Xr geom 8
 and
-.Xr vinum 8 .
+.Xr gvinum 8 .
 .Sh SEE ALSO
 .Xr dd 1 ,
 .Xr ccd 4 ,
 .Xr disklabel 8 ,
 .Xr fdisk 8 ,
-.Xr rc 8 ,
-.Xr vinum 8
+.Xr gvinum 8 ,
+.Xr rc 8
 .Sh HISTORY
 The
 .Nm
diff --git a/sbin/ffsinfo/ffsinfo.8 b/sbin/ffsinfo/ffsinfo.8
index aacf4280bf13..9753cf7c0cf8 100644
--- a/sbin/ffsinfo/ffsinfo.8
+++ b/sbin/ffsinfo/ffsinfo.8
@@ -125,9 +125,9 @@ with all available information.
 .Xr dumpfs 8 ,
 .Xr fsck 8 ,
 .Xr growfs 8 ,
+.Xr gvinum 8 ,
 .Xr newfs 8 ,
-.Xr tunefs 8 ,
-.Xr vinum 8
+.Xr tunefs 8
 .Sh HISTORY
 The
 .Nm
diff --git a/sbin/geom/class/concat/gconcat.8 b/sbin/geom/class/concat/gconcat.8
index 2e1b79dadd1a..b797a1c24dc2 100644
--- a/sbin/geom/class/concat/gconcat.8
+++ b/sbin/geom/class/concat/gconcat.8
@@ -183,11 +183,11 @@ growfs /dev/concat/data
 .Xr loader.conf 5 ,
 .Xr geom 8 ,
 .Xr growfs 8 ,
+.Xr gvinum 8 ,
 .Xr mount 8 ,
 .Xr newfs 8 ,
 .Xr sysctl 8 ,
-.Xr umount 8 ,
-.Xr vinum 8
+.Xr umount 8
 .Sh HISTORY
 The
 .Nm
diff --git a/sbin/geom/class/mirror/gmirror.8 b/sbin/geom/class/mirror/gmirror.8
index baaa827daf20..58ff8afcbc4c 100644
--- a/sbin/geom/class/mirror/gmirror.8
+++ b/sbin/geom/class/mirror/gmirror.8
@@ -340,11 +340,11 @@ there.
 .Xr geom 4 ,
 .Xr dumpon 8 ,
 .Xr geom 8 ,
+.Xr gvinum 8 ,
 .Xr mount 8 ,
 .Xr newfs 8 ,
 .Xr savecore 8 ,
-.Xr umount 8 ,
-.Xr vinum 8
+.Xr umount 8
 .Sh HISTORY
 The
 .Nm
diff --git a/sbin/geom/class/raid/graid.8 b/sbin/geom/class/raid/graid.8
index 4af4125efb2c..22763bdba317 100644
--- a/sbin/geom/class/raid/graid.8
+++ b/sbin/geom/class/raid/graid.8
@@ -314,7 +314,7 @@ Exit status is 0 on success, and non-zero if the command fails.
 .Sh SEE ALSO
 .Xr geom 4 ,
 .Xr geom 8 ,
-.Xr vinum 8
+.Xr gvinum 8
 .Sh HISTORY
 The
 .Nm
diff --git a/sbin/geom/class/stripe/gstripe.8 b/sbin/geom/class/stripe/gstripe.8
index ee70184bdb3a..b53e83f673dc 100644
--- a/sbin/geom/class/stripe/gstripe.8
+++ b/sbin/geom/class/stripe/gstripe.8
@@ -232,11 +232,11 @@ for
 .Xr atacontrol 8 ,
 .Xr ccdconfig 8 ,
 .Xr geom 8 ,
+.Xr gvinum 8 ,
 .Xr mount 8 ,
 .Xr newfs 8 ,
 .Xr sysctl 8 ,
-.Xr umount 8 ,
-.Xr vinum 8
+.Xr umount 8
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/ccd.4 b/share/man/man4/ccd.4
index 8da0e360490a..4c95fb8ec890 100644
--- a/share/man/man4/ccd.4
+++ b/share/man/man4/ccd.4
@@ -279,9 +279,9 @@ device special files
 .Xr config 8 ,
 .Xr disklabel 8 ,
 .Xr fsck 8 ,
+.Xr gvinum 8 ,
 .Xr mount 8 ,
-.Xr newfs 8 ,
-.Xr vinum 8
+.Xr newfs 8
 .Sh HISTORY
 The concatenated disk driver was originally written at the University of
 Utah.