diff --git a/doc/man1/fipsinstall.pod b/doc/man1/openssl-fipsinstall.pod
similarity index 100%
rename from doc/man1/fipsinstall.pod
rename to doc/man1/openssl-fipsinstall.pod
diff --git a/doc/man1/provider.pod b/doc/man1/openssl-provider.pod
similarity index 100%
rename from doc/man1/provider.pod
rename to doc/man1/openssl-provider.pod
diff --git a/util/find-doc-nits b/util/find-doc-nits
index 03b88ea767..11dcfcbac3 100755
--- a/util/find-doc-nits
+++ b/util/find-doc-nits
@@ -667,6 +667,14 @@ if ( $opt_n ) {
             check($_);
         }
     }
+
+    # If not given args, check that all man1 commands are named properly.
+    if ( scalar @ARGV == 0 ) {
+        foreach (glob('doc/man1/*.pod')) {
+            next if /CA.pl/ || /openssl.pod/;
+            err("$_ doesn't start with openssl-") unless /openssl-/;
+        }
+    }
 }
 
 if ( $opt_u || $opt_v) {