diff --git a/docs/map.json b/docs/map.json
index 788d0f3012..da6477039f 100644
--- a/docs/map.json
+++ b/docs/map.json
@@ -114,7 +114,7 @@
           {
             "name": "Nx Plugins and Devkit",
             "id": "nx-devkit",
-            "file": "shared/devkit"
+            "file": "shared/devkit-and-nx-plugins"
           }
         ]
       },
@@ -910,7 +910,7 @@
           {
             "name": "Using Executors / Builders",
             "id": "using-builders",
-            "file": "shared/using-builders"
+            "file": "shared/using-executors"
           },
           {
             "name": "Running Custom Commands",
@@ -931,7 +931,7 @@
           {
             "name": "Using Generators",
             "id": "using-schematics",
-            "file": "shared/using-schematics"
+            "file": "shared/using-generators"
           },
           {
             "name": "Workspace Generators",
@@ -1213,7 +1213,7 @@
           {
             "name": "Nx Plugins and Devkit",
             "id": "nx-devkit",
-            "file": "shared/devkit"
+            "file": "shared/devkit-and-nx-plugins"
           }
         ]
       },
@@ -2011,7 +2011,7 @@
           {
             "name": "Using Executors / Builders",
             "id": "using-builders",
-            "file": "shared/using-builders"
+            "file": "shared/using-executors"
           },
           {
             "name": "Running Custom Commands",
@@ -2032,7 +2032,7 @@
           {
             "name": "Using Generators",
             "id": "using-schematics",
-            "file": "shared/using-schematics"
+            "file": "shared/using-generators"
           },
           {
             "name": "Workspace Generators",
@@ -2271,7 +2271,7 @@
           {
             "name": "Nx Plugins and Devkit",
             "id": "nx-devkit",
-            "file": "shared/devkit"
+            "file": "shared/devkit-and-nx-plugins"
           }
         ]
       },
@@ -3058,7 +3058,7 @@
           {
             "name": "Using Executors / Builders",
             "id": "using-builders",
-            "file": "shared/using-builders"
+            "file": "shared/using-executors"
           },
           {
             "name": "Running Custom Commands",
@@ -3079,7 +3079,7 @@
           {
             "name": "Using Generators",
             "id": "using-schematics",
-            "file": "shared/using-schematics"
+            "file": "shared/using-generators"
           },
           {
             "name": "Workspace Generators",
diff --git a/docs/shared/devkit.md b/docs/shared/devkit-and-nx-plugins.md
similarity index 100%
rename from docs/shared/devkit.md
rename to docs/shared/devkit-and-nx-plugins.md
diff --git a/docs/shared/using-builders.md b/docs/shared/using-executors.md
similarity index 100%
rename from docs/shared/using-builders.md
rename to docs/shared/using-executors.md
diff --git a/docs/shared/using-schematics.md b/docs/shared/using-generators.md
similarity index 100%
rename from docs/shared/using-schematics.md
rename to docs/shared/using-generators.md
diff --git a/nx-dev/ui/common/src/lib/header.tsx b/nx-dev/ui/common/src/lib/header.tsx
index 7397e98356..74b9565c7c 100644
--- a/nx-dev/ui/common/src/lib/header.tsx
+++ b/nx-dev/ui/common/src/lib/header.tsx
@@ -66,7 +66,7 @@ export function Header({ flavor, showSearch, version }: HeaderProps) {
               </a>
             </Link>
             <Link
-              href={`/${version.value}/${flavor.value}/core-concepts/plugins`}
+              href={`/${version.value}/${flavor.value}/core-concepts/nx-devkit`}
             >
               <a className="px-3 py-2 hidden md:inline-flex text-white leading-tight">
                 Plugins