diff --git a/docs/content/commands/npm-access.md b/docs/content/commands/npm-access.md
index e3ef24ae28e3e..ed9c7775745ce 100644
--- a/docs/content/commands/npm-access.md
+++ b/docs/content/commands/npm-access.md
@@ -84,7 +84,7 @@ Management of teams and team memberships is done with the `npm team` command.
 ### See Also
 
 * [`libnpmaccess`](https://npm.im/libnpmaccess)
-* [npm team](/commands/team)
-* [npm publish](/commands/publish)
-* [npm config](/commands/config)
+* [npm team](/commands/npm-team)
+* [npm publish](/commands/npm-publish)
+* [npm config](/commands/npm-config)
 * [npm registry](/using-npm/registry)
diff --git a/docs/content/commands/npm-adduser.md b/docs/content/commands/npm-adduser.md
index e4f8e31367540..7960869ad33cc 100644
--- a/docs/content/commands/npm-adduser.md
+++ b/docs/content/commands/npm-adduser.md
@@ -85,7 +85,7 @@ username/password entry in legacy npm.
 ### See Also
 
 * [npm registry](/using-npm/registry)
-* [npm config](/commands/config)
+* [npm config](/commands/npm-config)
 * [npmrc](/configuring-npm/npmrc)
-* [npm owner](/commands/owner)
-* [npm whoami](/commands/whoami)
+* [npm owner](/commands/npm-owner)
+* [npm whoami](/commands/npm-whoami)
diff --git a/docs/content/commands/npm-audit.md b/docs/content/commands/npm-audit.md
index d8981f7322393..645ab87b157e1 100644
--- a/docs/content/commands/npm-audit.md
+++ b/docs/content/commands/npm-audit.md
@@ -189,6 +189,6 @@ $ npm audit --audit-level=moderate
 
 ### See Also
 
-* [npm install](/commands/install)
+* [npm install](/commands/npm-install)
 * [package-locks](/configuring-npm/package-locks)
 * [config](/using-npm/config)
diff --git a/docs/content/commands/npm-bin.md b/docs/content/commands/npm-bin.md
index c72a6a2fc4aba..4303040e78dac 100644
--- a/docs/content/commands/npm-bin.md
+++ b/docs/content/commands/npm-bin.md
@@ -16,8 +16,8 @@ Print the folder where npm will install executables.
 
 ### See Also
 
-* [npm prefix](/commands/prefix)
-* [npm root](/commands/root)
+* [npm prefix](/commands/npm-prefix)
+* [npm root](/commands/npm-root)
 * [npm folders](/configuring-npm/folders)
-* [npm config](/commands/config)
+* [npm config](/commands/npm-config)
 * [npmrc](/configuring-npm/npmrc)
diff --git a/docs/content/commands/npm-bugs.md b/docs/content/commands/npm-bugs.md
index 6dfbe70f51a57..dd1ab299f9c55 100644
--- a/docs/content/commands/npm-bugs.md
+++ b/docs/content/commands/npm-bugs.md
@@ -42,10 +42,10 @@ The base URL of the npm package registry.
 
 ### See Also
 
-* [npm docs](/commands/docs)
-* [npm view](/commands/view)
-* [npm publish](/commands/publish)
+* [npm docs](/commands/npm-docs)
+* [npm view](/commands/npm-view)
+* [npm publish](/commands/npm-publish)
 * [npm registry](/using-npm/registry)
-* [npm config](/commands/config)
+* [npm config](/commands/npm-config)
 * [npmrc](/configuring-npm/npmrc)
 * [package.json](/configuring-npm/package-json)
diff --git a/docs/content/commands/npm-cache.md b/docs/content/commands/npm-cache.md
index 6a4e6a1229dfa..13386f2c4a439 100644
--- a/docs/content/commands/npm-cache.md
+++ b/docs/content/commands/npm-cache.md
@@ -82,11 +82,11 @@ The root cache folder.
 ### See Also
 
 * [npm folders](/configuring-npm/folders)
-* [npm config](/commands/config)
+* [npm config](/commands/npm-config)
 * [npmrc](/configuring-npm/npmrc)
-* [npm install](/commands/install)
-* [npm publish](/commands/publish)
-* [npm pack](/commands/pack)
+* [npm install](/commands/npm-install)
+* [npm publish](/commands/npm-publish)
+* [npm pack](/commands/npm-pack)
 * https://npm.im/cacache
 * https://npm.im/pacote
 * https://npm.im/@npmcli/arborist
diff --git a/docs/content/commands/npm-ci.md b/docs/content/commands/npm-ci.md
index 1c7cc2b24c6a8..0d874f4f27a50 100644
--- a/docs/content/commands/npm-ci.md
+++ b/docs/content/commands/npm-ci.md
@@ -67,5 +67,5 @@ cache:
 
 ### See Also
 
-* [npm install](/commands/install)
+* [npm install](/commands/npm-install)
 * [package-locks](/configuring-npm/package-locks)
diff --git a/docs/content/commands/npm-config.md b/docs/content/commands/npm-config.md
index acd706b37be6f..ebff540eedfb9 100644
--- a/docs/content/commands/npm-config.md
+++ b/docs/content/commands/npm-config.md
@@ -83,7 +83,7 @@ global config.
 ### See Also
 
 * [npm folders](/configuring-npm/folders)
-* [npm config](/commands/config)
+* [npm config](/commands/npm-config)
 * [package.json](/configuring-npm/package-json)
 * [npmrc](/configuring-npm/npmrc)
 * [npm](/commands/npm)
diff --git a/docs/content/commands/npm-deprecate.md b/docs/content/commands/npm-deprecate.md
index 93aa56b9ea66b..d0440efe89021 100644
--- a/docs/content/commands/npm-deprecate.md
+++ b/docs/content/commands/npm-deprecate.md
@@ -31,7 +31,7 @@ format an empty string.
 
 ### See Also
 
-* [npm publish](/commands/publish)
+* [npm publish](/commands/npm-publish)
 * [npm registry](/using-npm/registry)
 * [npm owner](/cli-commands/owner)
 * [npm owner](/cli-commands/adduser)
diff --git a/docs/content/commands/npm-dist-tag.md b/docs/content/commands/npm-dist-tag.md
index 9c347ea938067..65ce22a179fc7 100644
--- a/docs/content/commands/npm-dist-tag.md
+++ b/docs/content/commands/npm-dist-tag.md
@@ -90,9 +90,9 @@ not begin with a number or the letter `v`.
 
 ### See Also
 
-* [npm publish](/commands/publish)
-* [npm install](/commands/install)
-* [npm dedupe](/commands/dedupe)
+* [npm publish](/commands/npm-publish)
+* [npm install](/commands/npm-install)
+* [npm dedupe](/commands/npm-dedupe)
 * [npm registry](/using-npm/registry)
-* [npm config](/commands/config)
+* [npm config](/commands/npm-config)
 * [npmrc](/configuring-npm/npmrc)
diff --git a/docs/content/commands/npm-docs.md b/docs/content/commands/npm-docs.md
index fd7c7a7f7d53e..c66e5fc627d66 100644
--- a/docs/content/commands/npm-docs.md
+++ b/docs/content/commands/npm-docs.md
@@ -43,9 +43,9 @@ The base URL of the npm package registry.
 
 ### See Also
 
-* [npm view](/commands/view)
-* [npm publish](/commands/publish)
+* [npm view](/commands/npm-view)
+* [npm publish](/commands/npm-publish)
 * [npm registry](/using-npm/registry)
-* [npm config](/commands/config)
+* [npm config](/commands/npm-config)
 * [npmrc](/configuring-npm/npmrc)
 * [package.json](/configuring-npm/package-json)
diff --git a/docs/content/commands/npm-doctor.md b/docs/content/commands/npm-doctor.md
index f69bfc4576585..2aceee2390331 100644
--- a/docs/content/commands/npm-doctor.md
+++ b/docs/content/commands/npm-doctor.md
@@ -102,6 +102,6 @@ reset the cache.
 
 ### See Also
 
-* [npm bugs](/commands/bugs)
-* [npm help](/commands/help)
-* [npm ping](/commands/ping)
+* [npm bugs](/commands/npm-bugs)
+* [npm help](/commands/npm-help)
+* [npm ping](/commands/npm-ping)
diff --git a/docs/content/commands/npm-edit.md b/docs/content/commands/npm-edit.md
index 53cb61f82c87c..40fac0408529a 100644
--- a/docs/content/commands/npm-edit.md
+++ b/docs/content/commands/npm-edit.md
@@ -36,7 +36,7 @@ The command to run for `npm edit` or `npm config edit`.
 ### See Also
 
 * [npm folders](/configuring-npm/folders)
-* [npm explore](/commands/explore)
-* [npm install](/commands/install)
-* [npm config](/commands/config)
+* [npm explore](/commands/npm-explore)
+* [npm install](/commands/npm-install)
+* [npm config](/commands/npm-config)
 * [npmrc](/configuring-npm/npmrc)
diff --git a/docs/content/commands/npm-exec.md b/docs/content/commands/npm-exec.md
index 69c679d9636c5..e966b0bcd18b2 100644
--- a/docs/content/commands/npm-exec.md
+++ b/docs/content/commands/npm-exec.md
@@ -167,10 +167,10 @@ This resulted in some shifts in its functionality:
 
 ### See Also
 
-* [npm run-script](/commands/run-script)
+* [npm run-script](/commands/npm-run-script)
 * [npm scripts](/using-npm/scripts)
-* [npm test](/commands/test)
-* [npm start](/commands/start)
-* [npm restart](/commands/restart)
-* [npm stop](/commands/stop)
-* [npm config](/commands/config)
+* [npm test](/commands/npm-test)
+* [npm start](/commands/npm-start)
+* [npm restart](/commands/npm-restart)
+* [npm stop](/commands/npm-stop)
+* [npm config](/commands/npm-config)
diff --git a/docs/content/commands/npm-explain.md b/docs/content/commands/npm-explain.md
index b9b683a2dad40..a68bd7d1c252f 100644
--- a/docs/content/commands/npm-explain.md
+++ b/docs/content/commands/npm-explain.md
@@ -62,12 +62,12 @@ Show information in JSON format.
 
 ### See Also
 
-* [npm config](/commands/config)
+* [npm config](/commands/npm-config)
 * [npmrc](/configuring-npm/npmrc)
 * [npm folders](/configuring-npm/folders)
-* [npm ls](/commands/ls)
-* [npm install](/commands/install)
-* [npm link](/commands/link)
-* [npm prune](/commands/prune)
-* [npm outdated](/commands/outdated)
-* [npm update](/commands/update)
+* [npm ls](/commands/npm-ls)
+* [npm install](/commands/npm-install)
+* [npm link](/commands/npm-link)
+* [npm prune](/commands/npm-prune)
+* [npm outdated](/commands/npm-outdated)
+* [npm update](/commands/npm-update)
diff --git a/docs/content/commands/npm-explore.md b/docs/content/commands/npm-explore.md
index 762cc1a7509e9..e467a755753b4 100644
--- a/docs/content/commands/npm-explore.md
+++ b/docs/content/commands/npm-explore.md
@@ -40,7 +40,7 @@ The shell to run for the `npm explore` command.
 ### See Also
 
 * [npm folders](/configuring-npm/folders)
-* [npm edit](/commands/edit)
-* [npm rebuild](/commands/rebuild)
-* [npm build](/commands/build)
-* [npm install](/commands/install)
+* [npm edit](/commands/npm-edit)
+* [npm rebuild](/commands/npm-rebuild)
+* [npm build](/commands/npm-build)
+* [npm install](/commands/npm-install)
diff --git a/docs/content/commands/npm-fund.md b/docs/content/commands/npm-fund.md
index 162878aab5b31..aa1b26b9a8971 100644
--- a/docs/content/commands/npm-fund.md
+++ b/docs/content/commands/npm-fund.md
@@ -57,7 +57,7 @@ If there are multiple funding sources, which 1-indexed source URL to open.
 
 ## See Also
 
-* [npm install](/commands/install)
-* [npm docs](/commands/docs)
-* [npm ls](/commands/ls)
-* [npm config](/commands/config)
+* [npm install](/commands/npm-install)
+* [npm docs](/commands/npm-docs)
+* [npm ls](/commands/npm-ls)
+* [npm config](/commands/npm-config)
diff --git a/docs/content/commands/npm-help-search.md b/docs/content/commands/npm-help-search.md
index 92dfc1eff793f..e10638efa07d9 100644
--- a/docs/content/commands/npm-help-search.md
+++ b/docs/content/commands/npm-help-search.md
@@ -36,4 +36,4 @@ If false, then help-search will just list out the help topics found.
 ### See Also
 
 * [npm](/commands/npm)
-* [npm help](/commands/help)
+* [npm help](/commands/npm-help)
diff --git a/docs/content/commands/npm-help.md b/docs/content/commands/npm-help.md
index 2d7997638554a..56e46645522ba 100644
--- a/docs/content/commands/npm-help.md
+++ b/docs/content/commands/npm-help.md
@@ -34,7 +34,7 @@ Set to `"browser"` to view html help content in the default web browser.
 
 * [npm](/commands/npm)
 * [npm folders](/configuring-npm/folders)
-* [npm config](/commands/config)
+* [npm config](/commands/npm-config)
 * [npmrc](/configuring-npm/npmrc)
 * [package.json](/configuring-npm/package-json)
-* [npm help-search](/commands/help-search)
+* [npm help-search](/commands/npm-help-search)
diff --git a/docs/content/commands/npm-init.md b/docs/content/commands/npm-init.md
index b8cc4ed2e3d92..3eac923175b5a 100644
--- a/docs/content/commands/npm-init.md
+++ b/docs/content/commands/npm-init.md
@@ -75,5 +75,5 @@ $ npm init -y
 
 * [init-package-json module](http://npm.im/init-package-json)
 * [package.json](/configuring-npm/package-json)
-* [npm version](/commands/version)
+* [npm version](/commands/npm-version)
 * [npm scope](/using-npm/scope)
diff --git a/docs/content/commands/npm-install-ci-test.md b/docs/content/commands/npm-install-ci-test.md
index 5ff3bd6d39a8b..568d174cf44c5 100644
--- a/docs/content/commands/npm-install-ci-test.md
+++ b/docs/content/commands/npm-install-ci-test.md
@@ -18,6 +18,6 @@ This command runs `npm ci` followed immediately by `npm test`.
 
 ### See Also
 
-* [npm install-test](/commands/install-test)
-* [npm ci](/commands/ci)
-* [npm test](/commands/test)
+* [npm install-test](/commands/npm-install-test)
+* [npm ci](/commands/npm-ci)
+* [npm test](/commands/npm-test)
diff --git a/docs/content/commands/npm-install-test.md b/docs/content/commands/npm-install-test.md
index 058afe5b77e5f..6350c5d01ad70 100644
--- a/docs/content/commands/npm-install-test.md
+++ b/docs/content/commands/npm-install-test.md
@@ -27,6 +27,6 @@ takes exactly the same arguments as `npm install`.
 
 ### See Also
 
-* [npm install](/commands/install)
-* [npm install-ci-test](/commands/install-ci-test)
-* [npm test](/commands/test)
+* [npm install](/commands/npm-install)
+* [npm install-ci-test](/commands/npm-install-ci-test)
+* [npm test](/commands/npm-test)
diff --git a/docs/content/commands/npm-install.md b/docs/content/commands/npm-install.md
index 7cd0288859250..9597d5d99cdfe 100644
--- a/docs/content/commands/npm-install.md
+++ b/docs/content/commands/npm-install.md
@@ -35,7 +35,7 @@ following order of precedence:
 * `yarn.lock`
 
 See [package-lock.json](/configuring-npm/package-lock-json) and [`npm
-shrinkwrap`](/commands/shrinkwrap).
+shrinkwrap`](/commands/npm-shrinkwrap).
 
 A `package` is:
 
@@ -43,9 +43,7 @@ A `package` is:
   [`package.json`](/configuring-npm/package-json) file
 * b) a gzipped tarball containing (a)
 * c) a url that resolves to (b)
-* d) a `<name>@<version>` that is published on the registry (see
-  [`registry`](/using-npm/registry)) with (c)
-* e) a `<name>@<tag>` (see [`npm dist-tag`](/commands/dist-tag)) that
+* e) a `<name>@<tag>` (see [`npm dist-tag`](/commands/npm-dist-tag)) that
   points to (d)
 * f) a `<name>` that has a "latest" tag satisfying (e)
 * g) a `<git remote url>` that resolves to (a)
@@ -532,18 +530,18 @@ the specific folder structures that npm creates.
 ### See Also
 
 * [npm folders](/configuring-npm/folders)
-* [npm update](/commands/update)
-* [npm audit](/commands/audit)
-* [npm fund](/commands/fund)
-* [npm link](/commands/link)
-* [npm rebuild](/commands/rebuild)
+* [npm update](/commands/npm-update)
+* [npm audit](/commands/npm-audit)
+* [npm fund](/commands/npm-fund)
+* [npm link](/commands/npm-link)
+* [npm rebuild](/commands/npm-rebuild)
 * [npm scripts](/using-npm/scripts)
-* [npm build](/commands/build)
-* [npm config](/commands/config)
+* [npm build](/commands/npm-build)
+* [npm config](/commands/npm-config)
 * [npmrc](/configuring-npm/npmrc)
 * [npm registry](/using-npm/registry)
-* [npm dist-tag](/commands/dist-tag)
-* [npm uninstall](/commands/uninstall)
-* [npm shrinkwrap](/commands/shrinkwrap)
+* [npm dist-tag](/commands/npm-dist-tag)
+* [npm uninstall](/commands/npm-uninstall)
+* [npm shrinkwrap](/commands/npm-shrinkwrap)
 * [package.json](/configuring-npm/package-json)
 * [workspaces](/using-npm/workspaces)
diff --git a/docs/content/commands/npm-link.md b/docs/content/commands/npm-link.md
index 1a5925f3bd467..2ff6e5c5e582b 100644
--- a/docs/content/commands/npm-link.md
+++ b/docs/content/commands/npm-link.md
@@ -82,7 +82,7 @@ npm link @myorg/privatepackage
 
 * [npm developers](/using-npm/developers)
 * [package.json](/configuring-npm/package-json)
-* [npm- nstall](/commands/install)
+* [npm- nstall](/commands/npm-install)
 * [npm folders](/configuring-npm/folders)
-* [npm config](/commands/config)
+* [npm config](/commands/npm-config)
 * [npmrc](/configuring-npm/npmrc)
diff --git a/docs/content/commands/npm-logout.md b/docs/content/commands/npm-logout.md
index 4f6f0c31bf500..69779e601f1a6 100644
--- a/docs/content/commands/npm-logout.md
+++ b/docs/content/commands/npm-logout.md
@@ -44,7 +44,7 @@ npm logout --scope=@myco
 
 ### See Also
 
-* [npm adduser](/commands/adduser)
+* [npm adduser](/commands/npm-adduser)
 * [npm registry](/using-npm/registry)
-* [npm config](/commands/config)
-* [npm whoami](/commands/whoami)
+* [npm config](/commands/npm-config)
+* [npm whoami](/commands/npm-whoami)
diff --git a/docs/content/commands/npm-ls.md b/docs/content/commands/npm-ls.md
index 3f5c17c94559a..c6e2af3314bfb 100644
--- a/docs/content/commands/npm-ls.md
+++ b/docs/content/commands/npm-ls.md
@@ -115,12 +115,12 @@ Set it to false in order to use all-ansi output.
 
 ### See Also
 
-* [npm config](/commands/config)
+* [npm config](/commands/npm-config)
 * [npmrc](/configuring-npm/npmrc)
 * [npm folders](/configuring-npm/folders)
-* [npm explain](/commands/explain)
-* [npm install](/commands/install)
-* [npm link](/commands/link)
-* [npm prune](/commands/prune)
-* [npm outdated](/commands/outdated)
-* [npm update](/commands/update)
+* [npm explain](/commands/npm-explain)
+* [npm install](/commands/npm-install)
+* [npm link](/commands/npm-link)
+* [npm prune](/commands/npm-prune)
+* [npm outdated](/commands/npm-outdated)
+* [npm update](/commands/npm-update)
diff --git a/docs/content/commands/npm-outdated.md b/docs/content/commands/npm-outdated.md
index 396737fddd166..01ad780867d05 100644
--- a/docs/content/commands/npm-outdated.md
+++ b/docs/content/commands/npm-outdated.md
@@ -113,7 +113,7 @@ Display all outdated dependencies on the tree.
 
 ### See Also
 
-* [npm update](/commands/update)
-* [npm dist-tag](/commands/dist-tag)
+* [npm update](/commands/npm-update)
+* [npm dist-tag](/commands/npm-dist-tag)
 * [npm registry](/using-npm/registry)
 * [npm folders](/configuring-npm/folders)
diff --git a/docs/content/commands/npm-owner.md b/docs/content/commands/npm-owner.md
index f600cc03e0fda..3c984ebd85620 100644
--- a/docs/content/commands/npm-owner.md
+++ b/docs/content/commands/npm-owner.md
@@ -38,7 +38,7 @@ with `--otp`.
 
 ### See Also
 
-* [npm publish](/commands/publish)
+* [npm publish](/commands/npm-publish)
 * [npm registry](/using-npm/registry)
-* [npm adduser](/commands/adduser)
+* [npm adduser](/commands/npm-adduser)
 * [npm disputes](/using-npm/disputes)
diff --git a/docs/content/commands/npm-pack.md b/docs/content/commands/npm-pack.md
index a5c6b01e36004..adb5d30832cb8 100644
--- a/docs/content/commands/npm-pack.md
+++ b/docs/content/commands/npm-pack.md
@@ -28,7 +28,7 @@ actually packing anything. Reports on what would have gone into the tarball.
 
 ### See Also
 
-* [npm cache](/commands/cache)
-* [npm publish](/commands/publish)
-* [npm config](/commands/config)
+* [npm cache](/commands/npm-cache)
+* [npm publish](/commands/npm-publish)
+* [npm config](/commands/npm-config)
 * [npmrc](/configuring-npm/npmrc)
diff --git a/docs/content/commands/npm-ping.md b/docs/content/commands/npm-ping.md
index 271ecbfdd3036..bc2233da74f0c 100644
--- a/docs/content/commands/npm-ping.md
+++ b/docs/content/commands/npm-ping.md
@@ -25,5 +25,5 @@ Ping error: {*Detail about error}
 
 ### See Also
 
-* [npm config](/commands/config)
+* [npm config](/commands/npm-config)
 * [npmrc](/configuring-npm/npmrc)
diff --git a/docs/content/commands/npm-prefix.md b/docs/content/commands/npm-prefix.md
index a8720b2002317..6894cb5c9298c 100644
--- a/docs/content/commands/npm-prefix.md
+++ b/docs/content/commands/npm-prefix.md
@@ -17,12 +17,12 @@ to contain a `package.json` file or `node_modules` directory, unless `-g` is
 also specified.
 
 If `-g` is specified, this will be the value of the global prefix. See
-[`npm config`](/commands/config) for more detail.
+[`npm config`](/commands/npm-config) for more detail.
 
 ### See Also
 
-* [npm root](/commands/root)
-* [npm bin](/commands/bin)
+* [npm root](/commands/npm-root)
+* [npm bin](/commands/npm-bin)
 * [npm folders](/configuring-npm/folders)
-* [npm config](/commands/config)
+* [npm config](/commands/npm-config)
 * [npmrc](/configuring-npm/npmrc)
diff --git a/docs/content/commands/npm-profile.md b/docs/content/commands/npm-profile.md
index 1050ccbc07207..d44c994167f05 100644
--- a/docs/content/commands/npm-profile.md
+++ b/docs/content/commands/npm-profile.md
@@ -76,4 +76,4 @@ available on non npmjs.com registries.
 
 ### See Also
 
-* [npm config](/commands/config)
+* [npm config](/commands/npm-config)
diff --git a/docs/content/commands/npm-prune.md b/docs/content/commands/npm-prune.md
index b948aa4459133..1a100e9d88ad7 100644
--- a/docs/content/commands/npm-prune.md
+++ b/docs/content/commands/npm-prune.md
@@ -38,6 +38,6 @@ and it's up to you to run `npm prune` from time-to-time to remove them.
 
 ### See Also
 
-* [npm uninstall](/commands/uninstall)
+* [npm uninstall](/commands/npm-uninstall)
 * [npm folders](/configuring-npm/folders)
-* [npm ls](/commands/ls)
+* [npm ls](/commands/npm-ls)
diff --git a/docs/content/commands/npm-publish.md b/docs/content/commands/npm-publish.md
index 5579bf9593e16..14eff5a5f2019 100644
--- a/docs/content/commands/npm-publish.md
+++ b/docs/content/commands/npm-publish.md
@@ -57,22 +57,22 @@ the specified registry.
 
 Once a package is published with a given name and version, that
 specific name and version combination can never be used again, even if
-it is removed with [`npm unpublish`](/commands/unpublish).
+it is removed with [`npm unpublish`](/commands/npm-unpublish).
 
 As of `npm@5`, both a sha1sum and an integrity field with a sha512sum of the
 tarball will be submitted to the registry during publication. Subsequent
 installs will use the strongest supported algorithm to verify downloads.
 
-Similar to `--dry-run` see [`npm pack`](/commands/pack), which figures out the files to be
+Similar to `--dry-run` see [`npm pack`](/commands/npm-pack), which figures out the files to be
 included and packs them into a tarball to be uploaded to the registry.
 
 ### See Also
 
 * [npm registry](/using-npm/registry)
 * [npm scope](/using-npm/scope)
-* [npm adduser](/commands/adduser)
-* [npm owner](/commands/owner)
-* [npm deprecate](/commands/deprecate)
-* [npm dist-tag](/commands/dist-tag)
-* [npm pack](/commands/pack)
-* [npm profile](/commands/profile)
+* [npm adduser](/commands/npm-adduser)
+* [npm owner](/commands/npm-owner)
+* [npm deprecate](/commands/npm-deprecate)
+* [npm dist-tag](/commands/npm-dist-tag)
+* [npm pack](/commands/npm-pack)
+* [npm profile](/commands/npm-profile)
diff --git a/docs/content/commands/npm-rebuild.md b/docs/content/commands/npm-rebuild.md
index cc03504c06ec8..5b6b816f68bd9 100644
--- a/docs/content/commands/npm-rebuild.md
+++ b/docs/content/commands/npm-rebuild.md
@@ -18,5 +18,5 @@ This command runs the `npm build` command on the matched folders.  This is usefu
 
 ### See Also
 
-* [npm build](/commands/build)
-* [npm install](/commands/install)
+* [npm build](/commands/npm-build)
+* [npm install](/commands/npm-install)
diff --git a/docs/content/commands/npm-repo.md b/docs/content/commands/npm-repo.md
index 7f60ee829ccbd..c6fdf36f1d0c4 100644
--- a/docs/content/commands/npm-repo.md
+++ b/docs/content/commands/npm-repo.md
@@ -33,5 +33,5 @@ Set to `true` to use default system URL opener.
 
 ### See Also
 
-* [npm docs](/commands/docs)
-* [npm config](/commands/config)
+* [npm docs](/commands/npm-docs)
+* [npm config](/commands/npm-config)
diff --git a/docs/content/commands/npm-restart.md b/docs/content/commands/npm-restart.md
index 427c4c5bea061..a80c54273df97 100644
--- a/docs/content/commands/npm-restart.md
+++ b/docs/content/commands/npm-restart.md
@@ -37,9 +37,9 @@ behavior will be accompanied by an increase in major version number
 
 ### See Also
 
-* [npm run-script](/commands/run-script)
+* [npm run-script](/commands/npm-run-script)
 * [npm scripts](/using-npm/scripts)
-* [npm test](/commands/test)
-* [npm start](/commands/start)
-* [npm stop](/commands/stop)
-* [npm restart](/commands/restart)
+* [npm test](/commands/npm-test)
+* [npm start](/commands/npm-start)
+* [npm stop](/commands/npm-stop)
+* [npm restart](/commands/npm-restart)
diff --git a/docs/content/commands/npm-root.md b/docs/content/commands/npm-root.md
index 6760768cdad58..317ef9d85a506 100644
--- a/docs/content/commands/npm-root.md
+++ b/docs/content/commands/npm-root.md
@@ -15,8 +15,8 @@ Print the effective `node_modules` folder to standard out.
 
 ### See Also
 
-* [npm prefix](/commands/prefix)
-* [npm bin](/commands/bin)
+* [npm prefix](/commands/npm-prefix)
+* [npm bin](/commands/npm-bin)
 * [npm folders](/configuring-npm/folders)
-* [npm config](/commands/config)
+* [npm config](/commands/npm-config)
 * [npmrc](/configuring-npm/npmrc)
diff --git a/docs/content/commands/npm-run-script.md b/docs/content/commands/npm-run-script.md
index 971089dae7ade..06b6e9383e7fe 100644
--- a/docs/content/commands/npm-run-script.md
+++ b/docs/content/commands/npm-run-script.md
@@ -86,8 +86,8 @@ without breaking the execution chain.
 ### See Also
 
 * [npm scripts](/using-npm/scripts)
-* [npm test](/commands/test)
-* [npm start](/commands/start)
-* [npm restart](/commands/restart)
-* [npm stop](/commands/stop)
-* [npm config](/commands/config)
+* [npm test](/commands/npm-test)
+* [npm start](/commands/npm-start)
+* [npm restart](/commands/npm-restart)
+* [npm stop](/commands/npm-stop)
+* [npm config](/commands/npm-config)
diff --git a/docs/content/commands/npm-search.md b/docs/content/commands/npm-search.md
index 2d5d3ac9b5bc9..991bfe9e131f2 100644
--- a/docs/content/commands/npm-search.md
+++ b/docs/content/commands/npm-search.md
@@ -105,6 +105,6 @@ setting.
 ### See Also
 
 * [npm registry](/using-npm/registry)
-* [npm config](/commands/config)
+* [npm config](/commands/npm-config)
 * [npmrc](/configuring-npm/npmrc)
-* [npm view](/commands/view)
+* [npm view](/commands/npm-view)
diff --git a/docs/content/commands/npm-shrinkwrap.md b/docs/content/commands/npm-shrinkwrap.md
index 898d7adc9a453..05d5706b9f9f1 100644
--- a/docs/content/commands/npm-shrinkwrap.md
+++ b/docs/content/commands/npm-shrinkwrap.md
@@ -20,11 +20,11 @@ of package locks in npm, see [package-locks](/configuring-npm/package-locks).
 
 ### See Also
 
-* [npm install](/commands/install)
-* [npm run-script](/commands/run-script)
+* [npm install](/commands/npm-install)
+* [npm run-script](/commands/npm-run-script)
 * [npm scripts](/using-npm/scripts)
 * [package.js](/configuring-npm/package-json)
 * [package-locks](/configuring-npm/package-locks)
 * [package-lock.json](/configuring-npm/package-lock-json)
 * [shrinkwrap.json](/configuring-npm/shrinkwrap-json)
-* [npm ls](/commands/ls)
+* [npm ls](/commands/npm-ls)
diff --git a/docs/content/commands/npm-star.md b/docs/content/commands/npm-star.md
index 5b8298caf5d06..c68a057aa08d2 100644
--- a/docs/content/commands/npm-star.md
+++ b/docs/content/commands/npm-star.md
@@ -22,6 +22,6 @@ It's a boolean thing.  Starring repeatedly has no additional effect.
 
 ### See Also
 
-* [npm view](/commands/view)
-* [npm whoami](/commands/whoami)
-* [npm adduser](/commands/adduser)
+* [npm view](/commands/npm-view)
+* [npm whoami](/commands/npm-whoami)
+* [npm adduser](/commands/npm-adduser)
diff --git a/docs/content/commands/npm-stars.md b/docs/content/commands/npm-stars.md
index 96d6cd5ef429f..706134398f3b1 100644
--- a/docs/content/commands/npm-stars.md
+++ b/docs/content/commands/npm-stars.md
@@ -19,7 +19,7 @@ you will most certainly enjoy this command.
 
 ### See Also
 
-* [npm star](/commands/star)
-* [npm view](/commands/view)
-* [npm whoami](/commands/whoami)
-* [npm adduser](/commands/adduser)
+* [npm star](/commands/npm-star)
+* [npm view](/commands/npm-view)
+* [npm whoami](/commands/npm-whoami)
+* [npm adduser](/commands/npm-adduser)
diff --git a/docs/content/commands/npm-start.md b/docs/content/commands/npm-start.md
index 1ee85846a2af4..8083bf8b7818e 100644
--- a/docs/content/commands/npm-start.md
+++ b/docs/content/commands/npm-start.md
@@ -17,12 +17,12 @@ its `"scripts"` object. If no `"start"` property is specified on the
 `"scripts"` object, it will run `node server.js`.
 
 As of [`npm@2.0.0`](https://blog.npmjs.org/post/98131109725/npm-2-0-0), you can
-use custom arguments when executing scripts. Refer to [`npm run-script`](/commands/run-script) for more details.
+use custom arguments when executing scripts. Refer to [`npm run-script`](/commands/npm-run-script) for more details.
 
 ### See Also
 
-* [npm run-script](/commands/run-script)
+* [npm run-script](/commands/npm-run-script)
 * [npm scripts](/using-npm/scripts)
-* [npm test](/commands/test)
-* [npm restart](/commands/restart)
-* [npm stop](/commands/stop)
+* [npm test](/commands/npm-test)
+* [npm restart](/commands/npm-restart)
+* [npm stop](/commands/npm-stop)
diff --git a/docs/content/commands/npm-stop.md b/docs/content/commands/npm-stop.md
index d81fa32eaf619..17156c97c4043 100644
--- a/docs/content/commands/npm-stop.md
+++ b/docs/content/commands/npm-stop.md
@@ -16,8 +16,8 @@ This runs a package's "stop" script, if one was provided.
 
 ### See Also
 
-* [npm run-script](/commands/run-script)
+* [npm run-script](/commands/npm-run-script)
 * [npm scripts](/using-npm/scripts)
-* [npm test](/commands/test)
-* [npm start](/commands/start)
-* [npm restart](/commands/restart)
+* [npm test](/commands/npm-test)
+* [npm start](/commands/npm-start)
+* [npm restart](/commands/npm-restart)
diff --git a/docs/content/commands/npm-team.md b/docs/content/commands/npm-team.md
index b3ac93e75ca22..4901ae1680a54 100644
--- a/docs/content/commands/npm-team.md
+++ b/docs/content/commands/npm-team.md
@@ -58,5 +58,5 @@ use the `npm access` command to grant or revoke the appropriate permissions.
 
 ### See Also
 
-* [npm access](/commands/access)
+* [npm access](/commands/npm-access)
 * [npm registry](/using-npm/registry)
diff --git a/docs/content/commands/npm-test.md b/docs/content/commands/npm-test.md
index a866009b0ae22..b8f25d520c821 100644
--- a/docs/content/commands/npm-test.md
+++ b/docs/content/commands/npm-test.md
@@ -18,8 +18,8 @@ This runs a package's "test" script, if one was provided.
 
 ### See Also
 
-* [npm run-script](/commands/run-script)
+* [npm run-script](/commands/npm-run-script)
 * [npm scripts](/using-npm/scripts)
-* [npm start](/commands/start)
-* [npm restart](/commands/restart)
-* [npm stop](/commands/stop)
+* [npm start](/commands/npm-start)
+* [npm restart](/commands/npm-restart)
+* [npm stop](/commands/npm-stop)
diff --git a/docs/content/commands/npm-uninstall.md b/docs/content/commands/npm-uninstall.md
index 42769263f7cd8..fe3c871138c19 100644
--- a/docs/content/commands/npm-uninstall.md
+++ b/docs/content/commands/npm-uninstall.md
@@ -53,8 +53,8 @@ npm uninstall lodash --no-save
 
 ### See Also
 
-* [npm prune](/commands/prune)
-* [npm install](/commands/install)
+* [npm prune](/commands/npm-prune)
+* [npm install](/commands/npm-install)
 * [npm folders](/configuring-npm/folders)
-* [npm config](/commands/config)
+* [npm config](/commands/npm-config)
 * [npmrc](/configuring-npm/npmrc)
diff --git a/docs/content/commands/npm-unpublish.md b/docs/content/commands/npm-unpublish.md
index efb22098e25cb..b39a7c09eb6e4 100644
--- a/docs/content/commands/npm-unpublish.md
+++ b/docs/content/commands/npm-unpublish.md
@@ -39,8 +39,8 @@ To learn more about how unpublish is treated on the npm registry, see our <a hre
 
 ### See Also
 
-* [npm deprecate](/commands/deprecate)
-* [npm publish](/commands/publish)
+* [npm deprecate](/commands/npm-deprecate)
+* [npm publish](/commands/npm-publish)
 * [npm registry](/using-npm/registry)
-* [npm adduser](/commands/adduser)
-* [npm owner](/commands/owner)
+* [npm adduser](/commands/npm-adduser)
+* [npm owner](/commands/npm-owner)
diff --git a/docs/content/commands/npm-update.md b/docs/content/commands/npm-update.md
index 1a4c163faec18..424d686189dca 100644
--- a/docs/content/commands/npm-update.md
+++ b/docs/content/commands/npm-update.md
@@ -128,9 +128,9 @@ be _downgraded_.
 
 ### See Also
 
-* [npm install](/commands/install)
-* [npm outdated](/commands/outdated)
-* [npm shrinkwrap](/commands/shrinkwrap)
+* [npm install](/commands/npm-install)
+* [npm outdated](/commands/npm-outdated)
+* [npm shrinkwrap](/commands/npm-shrinkwrap)
 * [npm registry](/using-npm/registry)
 * [npm folders](/configuring-npm/folders)
-* [npm ls](/commands/ls)
+* [npm ls](/commands/npm-ls)
diff --git a/docs/content/commands/npm-version.md b/docs/content/commands/npm-version.md
index 9ece5e39c3108..5f93ef44ae5dd 100644
--- a/docs/content/commands/npm-version.md
+++ b/docs/content/commands/npm-version.md
@@ -122,8 +122,8 @@ Note that you must have a default GPG key set up in your git config for this to
 
 ### See Also
 
-* [npm init](/commands/init)
-* [npm run-script](/commands/run-script)
+* [npm init](/commands/npm-init)
+* [npm run-script](/commands/npm-run-script)
 * [npm scripts](/using-npm/scripts)
 * [package.json](/configuring-npm/package-json)
 * [semver](/using-npm/semver)
diff --git a/docs/content/commands/npm-view.md b/docs/content/commands/npm-view.md
index 938a527821c32..3404c0314335b 100644
--- a/docs/content/commands/npm-view.md
+++ b/docs/content/commands/npm-view.md
@@ -113,8 +113,8 @@ the field name.
 
 ### See Also
 
-* [npm search](/commands/search)
+* [npm search](/commands/npm-search)
 * [npm registry](/using-npm/registry)
-* [npm config](/commands/config)
+* [npm config](/commands/npm-config)
 * [npmrc](/configuring-npm/npmrc)
-* [npm docs](/commands/docs)
+* [npm docs](/commands/npm-docs)
diff --git a/docs/content/commands/npm-whoami.md b/docs/content/commands/npm-whoami.md
index 1f7e13f22b4af..43b301c51707a 100644
--- a/docs/content/commands/npm-whoami.md
+++ b/docs/content/commands/npm-whoami.md
@@ -16,6 +16,6 @@ Print the `username` config to standard output.
 
 ### See Also
 
-* [npm config](/commands/config)
+* [npm config](/commands/npm-config)
 * [npmrc](/configuring-npm/npmrc)
-* [npm adduser](/commands/adduser)
+* [npm adduser](/commands/npm-adduser)
diff --git a/docs/content/commands/npx.md b/docs/content/commands/npx.md
index ece8638436645..a5522c66e85aa 100644
--- a/docs/content/commands/npx.md
+++ b/docs/content/commands/npx.md
@@ -166,10 +166,10 @@ This resulted in some shifts in its functionality:
 
 ### See Also
 
-* [npm run-script](/commands/run-script)
+* [npm run-script](/commands/npm-run-script)
 * [npm scripts](/using-npm/scripts)
-* [npm test](/commands/test)
-* [npm start](/commands/start)
-* [npm restart](/commands/restart)
-* [npm stop](/commands/stop)
-* [npm config](/commands/config)
+* [npm test](/commands/npm-test)
+* [npm start](/commands/npm-start)
+* [npm restart](/commands/npm-restart)
+* [npm stop](/commands/npm-stop)
+* [npm config](/commands/npm-config)
diff --git a/docs/content/configuring-npm/folders.md b/docs/content/configuring-npm/folders.md
index 959e7e4f70408..3ec716f2c67fd 100644
--- a/docs/content/configuring-npm/folders.md
+++ b/docs/content/configuring-npm/folders.md
@@ -69,7 +69,7 @@ Man pages are not installed on Windows systems.
 
 #### Cache
 
-See [`npm cache`](/commands/cache).  Cache files are stored in `~/.npm` on Posix, or
+See [`npm cache`](/commands/npm-cache).  Cache files are stored in `~/.npm` on Posix, or
 `%AppData%/npm-cache` on Windows.
 
 This is controlled by the `cache` configuration param.
@@ -210,10 +210,10 @@ cannot be found elsewhere.  See [`package.json`](/configuring-npm/package.json)
 ### See also
 
 * [package.json](/configuring-npm/package-json)
-* [npm install](/commands/install)
-* [npm pack](/commands/pack)
-* [npm cache](/commands/cache)
-* [npm config](/commands/config)
+* [npm install](/commands/npm-install)
+* [npm pack](/commands/npm-pack)
+* [npm cache](/commands/npm-cache)
+* [npm config](/commands/npm-config)
 * [npmrc](/configuring-npm/npmrc)
 * [config](/using-npm/config)
-* [npm publish](/commands/publish)
+* [npm publish](/commands/npm-publish)
diff --git a/docs/content/configuring-npm/npmrc.md b/docs/content/configuring-npm/npmrc.md
index ab241cf59c75c..f0edfda61c9a8 100644
--- a/docs/content/configuring-npm/npmrc.md
+++ b/docs/content/configuring-npm/npmrc.md
@@ -93,7 +93,7 @@ manner.
 ### See also
 
 * [npm folders](/configuring-npm/folders)
-* [npm config](/commands/config)
+* [npm config](/commands/npm-config)
 * [config](/using-npm/config)
 * [package.json](/configuring-npm/package-json)
 * [npm](/commands/npm)
diff --git a/docs/content/configuring-npm/package-json.md b/docs/content/configuring-npm/package-json.md
index f6d7985b0b98c..74e2cbd11eec3 100644
--- a/docs/content/configuring-npm/package-json.md
+++ b/docs/content/configuring-npm/package-json.md
@@ -529,7 +529,7 @@ See [semver](/using-npm/semver) for more details about specifying version ranges
 * `range1 || range2` Passes if either range1 or range2 are satisfied.
 * `git...` See 'Git URLs as Dependencies' below
 * `user/repo` See 'GitHub URLs' below
-* `tag` A specific version tagged and published as `tag`  See [`npm dist-tag`](/commands/dist-tag)
+* `tag` A specific version tagged and published as `tag`  See [`npm dist-tag`](/commands/npm-dist-tag)
 * `path/path/path` See [Local Paths](#local-paths) below
 
 For example, these are all valid:
@@ -932,10 +932,10 @@ npm will default some values based on package contents.
 
 * [semver](/using-npm/semver)
 * [workspaces](/using-npm/workspaces)
-* [npm init](/commands/init)
-* [npm version](/commands/version)
-* [npm config](/commands/config)
-* [npm help](/commands/help)
-* [npm install](/commands/install)
-* [npm publish](/commands/publish)
-* [npm uninstall](/commands/uninstall)
+* [npm init](/commands/npm-init)
+* [npm version](/commands/npm-version)
+* [npm config](/commands/npm-config)
+* [npm help](/commands/npm-help)
+* [npm install](/commands/npm-install)
+* [npm publish](/commands/npm-publish)
+* [npm uninstall](/commands/npm-uninstall)
diff --git a/docs/content/configuring-npm/package-lock-json.md b/docs/content/configuring-npm/package-lock-json.md
index 487aa6b4f82ea..a3083410f7e2a 100644
--- a/docs/content/configuring-npm/package-lock-json.md
+++ b/docs/content/configuring-npm/package-lock-json.md
@@ -138,8 +138,8 @@ The dependencies of this dependency, exactly as at the top level.
 
 ### See also
 
-* [npm shrinkwrap](/commands/shrinkwrap)
+* [npm shrinkwrap](/commands/npm-shrinkwrap)
 * [shrinkwrap.json](/configuring-npm/shrinkwrap-json)
 * [package-locks](/configuring-npm/package-locks)
 * [package.json](/configuring-npm/package-json)
-* [npm install](/commands/install)
+* [npm install](/commands/npm-install)
diff --git a/docs/content/configuring-npm/package-locks.md b/docs/content/configuring-npm/package-locks.md
index 4b8be38dff633..a456ef8936645 100644
--- a/docs/content/configuring-npm/package-locks.md
+++ b/docs/content/configuring-npm/package-locks.md
@@ -6,7 +6,7 @@ description: An explanation of npm lockfiles
 
 ### Description
 
-Conceptually, the "input" to [`npm install`](/commands/install) is a [package.json](/configuring-npm/package-json), while its
+Conceptually, the "input" to [`npm install`](/commands/npm-install) is a [package.json](/configuring-npm/package-json), while its
 "output" is a fully-formed `node_modules` tree: a representation of the
 dependencies you declared. In an ideal world, npm would work like a pure
 function: the same `package.json` should produce the exact same `node_modules`
@@ -175,4 +175,4 @@ pre-`npm@5.7.0` versions of npm 5, albeit a bit more noisily. Note that if
 * [package.json](/configuring-npm/package-json)
 * [package-lock.json](/configuring-npm/package-lock-json)
 * [shrinkwrap.json](/configuring-npm/shrinkwrap-json)
-* [npm shrinkwrap](/commands/shrinkwrap)
+* [npm shrinkwrap](/commands/npm-shrinkwrap)
diff --git a/docs/content/configuring-npm/shrinkwrap-json.md b/docs/content/configuring-npm/shrinkwrap-json.md
index 9409d21f8152a..7fd5baa67fb83 100644
--- a/docs/content/configuring-npm/shrinkwrap-json.md
+++ b/docs/content/configuring-npm/shrinkwrap-json.md
@@ -6,7 +6,7 @@ description: A publishable lockfile
 
 ### Description
 
-`npm-shrinkwrap.json` is a file created by [`npm shrinkwrap`](/commands/shrinkwrap). It is identical to
+`npm-shrinkwrap.json` is a file created by [`npm shrinkwrap`](/commands/npm-shrinkwrap). It is identical to
 `package-lock.json`, with one major caveat: Unlike `package-lock.json`,
 `npm-shrinkwrap.json` may be included when publishing a package.
 
@@ -24,7 +24,7 @@ to the manual page for [package-lock.json](/configuring-npm/package-lock-json).
 
 ### See also
 
-* [npm shrinkwrap](/commands/shrinkwrap)
+* [npm shrinkwrap](/commands/npm-shrinkwrap)
 * [package-lock.json](/configuring-npm/package-lock-json)
 * [package.json](/configuring-npm/package-json)
-* [npm install](/commands/install)
+* [npm install](/commands/npm-install)
diff --git a/docs/content/using-npm/config.md b/docs/content/using-npm/config.md
index 0fcd4afc119de..52aa07f170485 100644
--- a/docs/content/using-npm/config.md
+++ b/docs/content/using-npm/config.md
@@ -157,7 +157,7 @@ When "dev" or "development" and running local `npm shrinkwrap`,
 
 When "true" submit audit reports alongside `npm install` runs to the default
 registry and all registries configured for scopes.  See the documentation
-for [`npm audit`](/commands/audit) for details on what is submitted.
+for [`npm audit`](/commands/npm-audit) for details on what is submitted.
 
 #### audit-level
 
@@ -253,7 +253,7 @@ well as for the CA information to be stored in a file on disk.
 * Default: Windows: `%AppData%\npm-cache`, Posix: `~/.npm`
 * Type: path
 
-The location of npm's cache directory.  See [`npm cache`](/commands/cache)
+The location of npm's cache directory.  See [`npm cache`](/commands/npm-cache)
 
 #### cache-lock-stale
 
@@ -433,7 +433,7 @@ Format `package-lock.json` or `npm-shrinkwrap.json` as a human readable file.
 
 When "true" displays the message at the end of each `npm install`
 aknowledging the number of dependencies looking for funding.
-See [`npm fund`](/cli-commands/fund) for details.
+See [`npm fund`](/commands/npm-fund) for details.
 
 #### fetch-retries
 
@@ -580,7 +580,7 @@ Option that allows for defining which types of dependencies to install.
 A module that will be loaded by the `npm init` command.  See the
 documentation for the
 [init-package-json](https://github.com/npm/init-package-json) module
-for more information, or [npm init](/commands/init).
+for more information, or [npm init](/commands/npm-init).
 
 #### init-author-name
 
@@ -1247,7 +1247,7 @@ version of npm than the latest.
 * Type: Boolean
 
 Set to show short usage output (like the -H output)
-instead of complete help when doing [`npm help`](/commands/help).
+instead of complete help when doing [`npm help`](/commands/npm-help).
 
 #### userconfig
 
@@ -1305,7 +1305,7 @@ Set to `"browser"` to view html help content in the default web browser.
 
 ### See also
 
-* [npm config](/commands/config)
+* [npm config](/commands/npm-config)
 * [npmrc](/configuring-npm/npmrc)
 * [npm scripts](/using-npm/scripts)
 * [npm folders](/configuring-npm/folders)
diff --git a/docs/content/using-npm/developers.md b/docs/content/using-npm/developers.md
index fcaa2c5dcae30..d42c759d42cf1 100644
--- a/docs/content/using-npm/developers.md
+++ b/docs/content/using-npm/developers.md
@@ -96,8 +96,8 @@ least, you need:
   they'll get installed just like these ones.
 
 You can use `npm init` in the root of your package in order to get you
-started with a pretty basic package.json file.  See [`npm init`](/commands/npm-init) for
-more info.
+started with a pretty basic package.json file.  See
+[`npm init`](/commands/npm-init) for more info.
 
 ### Keeping files *out* of your package
 
diff --git a/docs/content/using-npm/disputes.md b/docs/content/using-npm/disputes.md
index ffa9015f341b7..04246651592a6 100644
--- a/docs/content/using-npm/disputes.md
+++ b/docs/content/using-npm/disputes.md
@@ -130,4 +130,4 @@ License.
 ### See also
 
 * [npm registry](/using-npm/registry)
-* [npm owner](/commands/owner)
+* [npm owner](/commands/npm-owner)
diff --git a/docs/content/using-npm/orgs.md b/docs/content/using-npm/orgs.md
index 268e14c9d2fb0..5fe9ac6de377f 100644
--- a/docs/content/using-npm/orgs.md
+++ b/docs/content/using-npm/orgs.md
@@ -20,8 +20,8 @@ The developer will be able to access packages based on the teams they are on. Ac
 
 There are two main commands:
 
-1. `npm team` see [npm team](/commands/team) for more details
-2. `npm access` see [npm access](/commands/access) for more details
+1. `npm team` see [npm team](/commands/npm-team) for more details
+2. `npm access` see [npm access](/commands/npm-access) for more details
 
 ### Team Admins create teams
 
@@ -88,6 +88,6 @@ npm access ls-collaborators <pkg>
 
 ### See also
 
-* [npm team](/commands/team)
-* [npm access](/commands/access)
+* [npm team](/commands/npm-team)
+* [npm access](/commands/npm-access)
 * [npm scope](/using-npm/scope)
diff --git a/docs/content/using-npm/registry.md b/docs/content/using-npm/registry.md
index b1a7513b74be2..b7a18712f8be8 100644
--- a/docs/content/using-npm/registry.md
+++ b/docs/content/using-npm/registry.md
@@ -29,7 +29,7 @@ available at <https://github.com/npm/npm-registry-couchapp>.
 
 The registry URL used is determined by the scope of the package (see
 [`scope`](/using-npm/scope). If no scope is specified, the default registry is used, which is
-supplied by the `registry` config parameter.  See [`npm config`](/commands/config),
+supplied by the `registry` config parameter.  See [`npm config`](/commands/npm-config),
 [`npmrc`](/configuring-npm/npmrc), and [`config`](/using-npm/config) for more on managing npm's configuration.
 
 ### Does npm send any information about me back to the registry?
@@ -96,7 +96,7 @@ Yes, head over to <https://www.npmjs.com/>
 
 ### See also
 
-* [npm config](/commands/config)
+* [npm config](/commands/npm-config)
 * [config](/using-npm/config)
 * [npmrc](/configuring-npm/npmrc)
 * [npm developers](/using-npm/developers)
diff --git a/docs/content/using-npm/removal.md b/docs/content/using-npm/removal.md
index 572bdb74a981b..7b35460b595e8 100644
--- a/docs/content/using-npm/removal.md
+++ b/docs/content/using-npm/removal.md
@@ -62,5 +62,5 @@ find /usr/local/{lib/node,bin} -exec grep -l npm \{\} \; ;
 
 ### See also
 
-* [npm uninstall](/commands/uninstall)
-* [npm prune](/commands/prune)
+* [npm uninstall](/commands/npm-uninstall)
+* [npm prune](/commands/npm-prune)
diff --git a/docs/content/using-npm/scope.md b/docs/content/using-npm/scope.md
index 0db1722a8d7f9..62b4a6851641a 100644
--- a/docs/content/using-npm/scope.md
+++ b/docs/content/using-npm/scope.md
@@ -52,7 +52,7 @@ Or in `package.json`:
 ```
 
 Note that if the `@` symbol is omitted, in either case, npm will instead attempt to
-install from GitHub; see [`npm install`](/commands/install).
+install from GitHub; see [`npm install`](/commands/npm-install).
 
 ### Requiring scoped packages
 
@@ -122,7 +122,7 @@ that registry instead.
 
 ### See also
 
-* [npm install](/commands/install)
-* [npm publish](/commands/publish)
-* [npm access](/commands/access)
+* [npm install](/commands/npm-install)
+* [npm publish](/commands/npm-publish)
+* [npm access](/commands/npm-access)
 * [npm registry](/using-npm/registry)
diff --git a/docs/content/using-npm/scripts.md b/docs/content/using-npm/scripts.md
index 8e0183ad6fbd3..0ef2d02a9a33a 100644
--- a/docs/content/using-npm/scripts.md
+++ b/docs/content/using-npm/scripts.md
@@ -74,7 +74,7 @@ The advantage of doing these things at `prepublish` time is that they can be don
 
 ### Life Cycle Operation Order
 
-#### [`npm publish`](/commands/publish)
+#### [`npm publish`](/commands/npm-publish)
 
 * `prepublishOnly`
 * `prepare`
@@ -82,12 +82,12 @@ The advantage of doing these things at `prepublish` time is that they can be don
 * `publish`
 * `postpublish`
 
-#### [`npm pack`](/commands/pack)
+#### [`npm pack`](/commands/npm-pack)
 
 * `prepack`
 * `postpack`
 
-#### [`npm install`](/commands/install)
+#### [`npm install`](/commands/npm-install)
 
 * `preinstall`
 * `install`
@@ -98,7 +98,7 @@ Also triggers
 * `prepublish` (when on local)
 * `prepare` (when on local or workspaces)
 
-#### [`npm start`](/commands/start)
+#### [`npm start`](/commands/npm-start)
 
 `npm run start` has an `npm start` shorthand.
 
@@ -300,7 +300,7 @@ above.
 
 ### See Also
 
-* [npm run-script](/commands/run-script)
+* [npm run-script](/commands/npm-run-script)
 * [package.json](/configuring-npm/package-json)
 * [npm developers](/using-npm/developers)
-* [npm install](/commands/install)
+* [npm install](/commands/npm-install)
diff --git a/docs/content/using-npm/workspaces.md b/docs/content/using-npm/workspaces.md
index 46320d391c0dc..0379bd1549062 100644
--- a/docs/content/using-npm/workspaces.md
+++ b/docs/content/using-npm/workspaces.md
@@ -85,11 +85,11 @@ When running it with:
 
 This demonstrates how the nature of `node_modules` resolution allows for
 **workspaces** to enable a portable workflow for requiring each **workspace**
-in such a way that is also easy to [publish](/cli-commands/publish) these
+in such a way that is also easy to [publish](/commands/npm-publish) these
 nested workspaces to be consumed elsewhere.
 
 ### See also
 
-* [npm install](/cli-commands/install)
-* [npm publish](/cli-commands/publish)
+* [npm install](/commands/npm-install)
+* [npm publish](/commands/npm-publish)