diff --git a/doc/manual/rl-next/nix-config-show.md b/doc/manual/rl-next/nix-config-show.md
index 08ad207cb..b2ad3c666 100644
--- a/doc/manual/rl-next/nix-config-show.md
+++ b/doc/manual/rl-next/nix-config-show.md
@@ -3,6 +3,6 @@ issues: #7672
 prs: #9477
 description: {
 
-`nix show-config` was renamed to `nix config show` to be more consistent with the rest of the command-line interface.
+`nix show-config` was renamed to `nix config show`, and `nix doctor` was renamed to `nix config check`, to be more consistent with the rest of the command-line interface.
 
 }
diff --git a/doc/manual/src/contributing/cli-guideline.md b/doc/manual/src/contributing/cli-guideline.md
index f7e24d96b..e90d6de8d 100644
--- a/doc/manual/src/contributing/cli-guideline.md
+++ b/doc/manual/src/contributing/cli-guideline.md
@@ -87,7 +87,7 @@ impacted the most by bad user experience.
       and [aligning of text](#text-alignment).
     - [Autocomplete](#shell-completion) of options.
 
-  Examples of such commands: `nix doctor`, `nix edit`, `nix eval`, ...
+  Examples of such commands: `nix edit`, `nix eval`, ...
 
 - **Utility and scripting commands**
 
diff --git a/src/nix/doctor.cc b/src/nix/config-check.cc
similarity index 97%
rename from src/nix/doctor.cc
rename to src/nix/config-check.cc
index 59f9e3e5d..410feca2f 100644
--- a/src/nix/doctor.cc
+++ b/src/nix/config-check.cc
@@ -38,7 +38,7 @@ void checkInfo(const std::string & msg) {
 
 }
 
-struct CmdDoctor : StoreCommand
+struct CmdConfigCheck : StoreCommand
 {
     bool success = true;
 
@@ -152,4 +152,4 @@ struct CmdDoctor : StoreCommand
     }
 };
 
-static auto rCmdDoctor = registerCommand<CmdDoctor>("doctor");
+static auto rCmdConfigCheck = registerCommand2<CmdConfigCheck>({ "config", "check" });
diff --git a/src/nix/main.cc b/src/nix/main.cc
index 49e637fb0..3d44e4a9d 100644
--- a/src/nix/main.cc
+++ b/src/nix/main.cc
@@ -139,6 +139,7 @@ struct NixArgs : virtual MultiCommand, virtual MixCommonArgs, virtual RootArgs
         {"to-base32", {"hash", "to-base32"}},
         {"to-base64", {"hash", "to-base64"}},
         {"verify", {"store", "verify"}},
+        {"doctor", {"config", "check"}},
     };
 
     bool aliasUsed = false;