From 92d8e7d2069c89eea1de5d77071e1cf18a68ce59 Mon Sep 17 00:00:00 2001
From: FrozenPandaz <jasonjean1993@gmail.com>
Date: Wed, 19 Apr 2023 20:53:46 -0400
Subject: [PATCH] feat(nx-plugin): rename @nx/nx-plugin to @nx/plugin

---
 CODEOWNERS                                    |  6 +-
 docs/generated/manifests/menus.json           | 32 +++----
 docs/generated/manifests/packages.json        | 90 +++++++++----------
 docs/generated/packages-metadata.json         | 66 +++++++-------
 .../documents/overview.md                     |  0
 .../{nx-plugin => plugin}/executors/e2e.json  |  4 +-
 .../generators/create-package.json            |  4 +-
 .../generators/e2e-project.json               |  4 +-
 .../generators/executor.json                  |  4 +-
 .../generators/generator.json                 |  4 +-
 .../generators/migration.json                 |  4 +-
 .../generators/plugin-lint-checks.json        |  4 +-
 .../generators/plugin.json                    |  4 +-
 .../generators/preset.json                    |  4 +-
 docs/map.json                                 |  6 +-
 docs/packages.json                            |  4 +-
 docs/shared/deprecated/workspace-executors.md |  2 +-
 .../shared/deprecated/workspace-generators.md |  2 +-
 .../nx-plugin.md => plugin/plugin.md}         |  0
 .../plugin-features/create-your-own-plugin.md |  6 +-
 e2e/{nx-plugin => plugin}/jest.config.ts      |  2 +-
 e2e/{nx-plugin => plugin}/project.json        |  4 +-
 .../src/nx-plugin.fixtures.ts                 |  0
 .../src/nx-plugin.test.ts                     |  0
 e2e/{nx-plugin => plugin}/tsconfig.json       |  0
 e2e/{nx-plugin => plugin}/tsconfig.spec.json  |  0
 nx-dev/nx-dev-e2e/src/e2e/packages.cy.ts      | 14 +--
 nx-dev/nx-dev/redirect-rules.config.js        | 22 +++--
 nx-dev/ui-references/src/lib/icons-map.ts     |  2 +-
 packages-legacy/nx-plugin/README.md           |  2 +-
 packages-legacy/nx-plugin/executors.json      |  8 +-
 packages-legacy/nx-plugin/generators.json     |  2 +-
 packages-legacy/nx-plugin/generators.ts       |  2 +-
 packages-legacy/nx-plugin/package.json        |  4 +-
 packages-legacy/nx-plugin/testing.ts          |  2 +-
 .../create-nx-plugin/bin/create-nx-plugin.ts  |  5 +-
 packages/create-nx-plugin/project.json        |  2 +-
 packages/nx/src/utils/plugins/core-plugins.ts |  2 +-
 packages/{nx-plugin => plugin}/.eslintrc.json |  0
 packages/{nx-plugin => plugin}/README.md      |  2 +-
 packages/{nx-plugin => plugin}/executors.json |  0
 .../{nx-plugin => plugin}/generators.json     |  0
 packages/{nx-plugin => plugin}/generators.ts  |  0
 packages/{nx-plugin => plugin}/index.ts       |  0
 packages/{nx-plugin => plugin}/jest.config.ts |  2 +-
 .../{nx-plugin => plugin}/migrations.json     |  2 +-
 packages/{nx-plugin => plugin}/package.json   |  2 +-
 packages/{nx-plugin => plugin}/project.json   | 20 ++---
 .../src/executors/e2e/compat.ts               |  0
 .../src/executors/e2e/e2e.impl.ts             |  0
 .../src/executors/e2e/schema.d.ts             |  0
 .../src/executors/e2e/schema.json             |  0
 .../create-package/create-package.spec.ts     |  0
 .../create-package/create-package.ts          |  0
 .../bin/index.ts__tmpl__                      |  0
 .../files/e2e/__name__.spec.ts__tmpl__        |  2 +-
 .../src/generators/create-package/schema.d.ts |  0
 .../src/generators/create-package/schema.json |  0
 .../create-package/utils/normalize-schema.ts  |  0
 .../src/generators/e2e-project/e2e.spec.ts    |  2 +-
 .../src/generators/e2e-project/e2e.ts         |  2 +-
 .../tests/__pluginName__.spec.ts__tmpl__      |  2 +-
 .../e2e-project/files/tsconfig.json__tmpl__   |  0
 .../src/generators/e2e-project/schema.d.ts    |  0
 .../src/generators/e2e-project/schema.json    |  0
 .../src/generators/executor/executor.spec.ts  |  0
 .../src/generators/executor/executor.ts       |  0
 .../__fileName__/executor.spec.ts__tmpl__     |  0
 .../executor/__fileName__/executor.ts__tmpl__ |  0
 .../executor/__fileName__/schema.d.ts__tmpl__ |  0
 .../executor/__fileName__/schema.json__tmpl__ |  0
 .../__fileName__/hasher.spec.ts__tmpl__       |  0
 .../hasher/__fileName__/hasher.ts__tmpl__     |  0
 .../src/generators/executor/schema.d.ts       |  0
 .../src/generators/executor/schema.json       |  0
 .../__fileName__/generator.spec.ts__tmpl__    |  0
 .../__fileName__/generator.ts__tmpl__         |  0
 .../__fileName__/schema.d.ts__tmpl__          |  0
 .../__fileName__/schema.json__tmpl__          |  0
 .../generators/generator/generator.spec.ts    |  0
 .../src/generators/generator/generator.ts     |  0
 .../src/generators/generator/schema.d.ts      |  0
 .../src/generators/generator/schema.json      |  0
 .../generators/lint-checks/generator.spec.ts  |  0
 .../src/generators/lint-checks/generator.ts   |  0
 .../src/generators/lint-checks/schema.d.ts    |  0
 .../src/generators/lint-checks/schema.json    |  0
 .../__name__/__name__.spec.ts__tmpl__         |  0
 .../migration/__name__/__name__.ts__tmpl__    |  0
 .../generators/migration/migration.spec.ts    |  0
 .../src/generators/migration/migration.ts     |  0
 .../src/generators/migration/schema.d.ts      |  0
 .../src/generators/migration/schema.json      |  0
 .../plugin/files/plugin/src/index.ts__tmpl__  |  0
 .../src/generators/plugin/plugin.spec.ts      |  0
 .../src/generators/plugin/plugin.ts           |  2 +-
 .../src/generators/plugin/schema.d.ts         |  0
 .../src/generators/plugin/schema.json         |  0
 .../plugin/utils/normalize-schema.ts          |  0
 .../src/generators/preset/generator.spec.ts   |  0
 .../src/generators/preset/generator.ts        |  6 +-
 .../src/generators/preset/schema.d.ts         |  0
 .../src/generators/preset/schema.json         |  0
 .../update-14-1-9/add-swc-deps-if-needed.ts   |  0
 .../specify-output-capture.spec.ts            |  0
 .../update-15-0-0/specify-output-capture.ts   |  0
 .../update-configs-jest-29.spec.ts.snap       |  0
 .../update-tests-jest-29.spec.ts.snap         |  0
 .../update-15-9-0/jest-29-configs.ts          |  0
 .../migrations/update-15-9-0/jest-29-tests.ts |  0
 .../update-configs-jest-29.spec.ts            |  0
 .../update-tests-jest-29.spec.ts              |  0
 .../update-16-0-0-add-nx-packages.spec.ts     |  6 +-
 .../update-16-0-0-add-nx-packages.ts          |  6 +-
 .../update-16-0-0/cli-in-schema-json.spec.ts  |  0
 .../update-16-0-0/cli-in-schema-json.ts       |  0
 .../src/utils/has-generator.ts                |  0
 .../src/utils/testing-utils/async-commands.ts |  0
 .../src/utils/testing-utils/commands.ts       |  0
 .../utils/testing-utils/create-package-cli.ts |  0
 .../src/utils/testing-utils/index.ts          |  0
 .../src/utils/testing-utils/nx-project.ts     |  0
 .../src/utils/testing-utils/paths.ts          |  0
 .../src/utils/testing-utils/utils.ts          |  0
 .../src/utils/versions.ts                     |  0
 packages/{nx-plugin => plugin}/testing.ts     |  0
 packages/{nx-plugin => plugin}/tsconfig.json  |  0
 .../{nx-plugin => plugin}/tsconfig.lib.json   |  0
 .../{nx-plugin => plugin}/tsconfig.spec.json  |  0
 .../configuration-v7.spec.ts.snap             |  2 +-
 .../test-configs/various-projects.json        |  2 +-
 .../workspace-generator.ts                    |  2 +-
 ...ve-workspace-generators-to-local-plugin.ts | 10 +--
 scripts/depcheck/missing.ts                   |  2 +-
 .../package-schemas/package-metadata.ts       |  3 +-
 tsconfig.base.json                            |  4 +-
 136 files changed, 203 insertions(+), 201 deletions(-)
 rename docs/generated/packages/{nx-plugin => plugin}/documents/overview.md (100%)
 rename docs/generated/packages/{nx-plugin => plugin}/executors/e2e.json (98%)
 rename docs/generated/packages/{nx-plugin => plugin}/generators/create-package.json (93%)
 rename docs/generated/packages/{nx-plugin => plugin}/generators/e2e-project.json (93%)
 rename docs/generated/packages/{nx-plugin => plugin}/generators/executor.json (93%)
 rename docs/generated/packages/{nx-plugin => plugin}/generators/generator.json (92%)
 rename docs/generated/packages/{nx-plugin => plugin}/generators/migration.json (92%)
 rename docs/generated/packages/{nx-plugin => plugin}/generators/plugin-lint-checks.json (86%)
 rename docs/generated/packages/{nx-plugin => plugin}/generators/plugin.json (95%)
 rename docs/generated/packages/{nx-plugin => plugin}/generators/preset.json (86%)
 rename docs/shared/packages/{nx-plugin/nx-plugin.md => plugin/plugin.md} (100%)
 rename e2e/{nx-plugin => plugin}/jest.config.ts (89%)
 rename e2e/{nx-plugin => plugin}/project.json (77%)
 rename e2e/{nx-plugin => plugin}/src/nx-plugin.fixtures.ts (100%)
 rename e2e/{nx-plugin => plugin}/src/nx-plugin.test.ts (100%)
 rename e2e/{nx-plugin => plugin}/tsconfig.json (100%)
 rename e2e/{nx-plugin => plugin}/tsconfig.spec.json (100%)
 rename packages/{nx-plugin => plugin}/.eslintrc.json (100%)
 rename packages/{nx-plugin => plugin}/README.md (81%)
 rename packages/{nx-plugin => plugin}/executors.json (100%)
 rename packages/{nx-plugin => plugin}/generators.json (100%)
 rename packages/{nx-plugin => plugin}/generators.ts (100%)
 rename packages/{nx-plugin => plugin}/index.ts (100%)
 rename packages/{nx-plugin => plugin}/jest.config.ts (90%)
 rename packages/{nx-plugin => plugin}/migrations.json (96%)
 rename packages/{nx-plugin => plugin}/package.json (97%)
 rename packages/{nx-plugin => plugin}/project.json (68%)
 rename packages/{nx-plugin => plugin}/src/executors/e2e/compat.ts (100%)
 rename packages/{nx-plugin => plugin}/src/executors/e2e/e2e.impl.ts (100%)
 rename packages/{nx-plugin => plugin}/src/executors/e2e/schema.d.ts (100%)
 rename packages/{nx-plugin => plugin}/src/executors/e2e/schema.json (100%)
 rename packages/{nx-plugin => plugin}/src/generators/create-package/create-package.spec.ts (100%)
 rename packages/{nx-plugin => plugin}/src/generators/create-package/create-package.ts (100%)
 rename packages/{nx-plugin => plugin}/src/generators/create-package/files/create-framework-package/bin/index.ts__tmpl__ (100%)
 rename packages/{nx-plugin => plugin}/src/generators/create-package/files/e2e/__name__.spec.ts__tmpl__ (95%)
 rename packages/{nx-plugin => plugin}/src/generators/create-package/schema.d.ts (100%)
 rename packages/{nx-plugin => plugin}/src/generators/create-package/schema.json (100%)
 rename packages/{nx-plugin => plugin}/src/generators/create-package/utils/normalize-schema.ts (100%)
 rename packages/{nx-plugin => plugin}/src/generators/e2e-project/e2e.spec.ts (99%)
 rename packages/{nx-plugin => plugin}/src/generators/e2e-project/e2e.ts (99%)
 rename packages/{nx-plugin => plugin}/src/generators/e2e-project/files/tests/__pluginName__.spec.ts__tmpl__ (97%)
 rename packages/{nx-plugin => plugin}/src/generators/e2e-project/files/tsconfig.json__tmpl__ (100%)
 rename packages/{nx-plugin => plugin}/src/generators/e2e-project/schema.d.ts (100%)
 rename packages/{nx-plugin => plugin}/src/generators/e2e-project/schema.json (100%)
 rename packages/{nx-plugin => plugin}/src/generators/executor/executor.spec.ts (100%)
 rename packages/{nx-plugin => plugin}/src/generators/executor/executor.ts (100%)
 rename packages/{nx-plugin => plugin}/src/generators/executor/files/executor/__fileName__/executor.spec.ts__tmpl__ (100%)
 rename packages/{nx-plugin => plugin}/src/generators/executor/files/executor/__fileName__/executor.ts__tmpl__ (100%)
 rename packages/{nx-plugin => plugin}/src/generators/executor/files/executor/__fileName__/schema.d.ts__tmpl__ (100%)
 rename packages/{nx-plugin => plugin}/src/generators/executor/files/executor/__fileName__/schema.json__tmpl__ (100%)
 rename packages/{nx-plugin => plugin}/src/generators/executor/files/hasher/__fileName__/hasher.spec.ts__tmpl__ (100%)
 rename packages/{nx-plugin => plugin}/src/generators/executor/files/hasher/__fileName__/hasher.ts__tmpl__ (100%)
 rename packages/{nx-plugin => plugin}/src/generators/executor/schema.d.ts (100%)
 rename packages/{nx-plugin => plugin}/src/generators/executor/schema.json (100%)
 rename packages/{nx-plugin => plugin}/src/generators/generator/files/generator/__fileName__/generator.spec.ts__tmpl__ (100%)
 rename packages/{nx-plugin => plugin}/src/generators/generator/files/generator/__fileName__/generator.ts__tmpl__ (100%)
 rename packages/{nx-plugin => plugin}/src/generators/generator/files/generator/__fileName__/schema.d.ts__tmpl__ (100%)
 rename packages/{nx-plugin => plugin}/src/generators/generator/files/generator/__fileName__/schema.json__tmpl__ (100%)
 rename packages/{nx-plugin => plugin}/src/generators/generator/generator.spec.ts (100%)
 rename packages/{nx-plugin => plugin}/src/generators/generator/generator.ts (100%)
 rename packages/{nx-plugin => plugin}/src/generators/generator/schema.d.ts (100%)
 rename packages/{nx-plugin => plugin}/src/generators/generator/schema.json (100%)
 rename packages/{nx-plugin => plugin}/src/generators/lint-checks/generator.spec.ts (100%)
 rename packages/{nx-plugin => plugin}/src/generators/lint-checks/generator.ts (100%)
 rename packages/{nx-plugin => plugin}/src/generators/lint-checks/schema.d.ts (100%)
 rename packages/{nx-plugin => plugin}/src/generators/lint-checks/schema.json (100%)
 rename packages/{nx-plugin => plugin}/src/generators/migration/files/migration/__name__/__name__.spec.ts__tmpl__ (100%)
 rename packages/{nx-plugin => plugin}/src/generators/migration/files/migration/__name__/__name__.ts__tmpl__ (100%)
 rename packages/{nx-plugin => plugin}/src/generators/migration/migration.spec.ts (100%)
 rename packages/{nx-plugin => plugin}/src/generators/migration/migration.ts (100%)
 rename packages/{nx-plugin => plugin}/src/generators/migration/schema.d.ts (100%)
 rename packages/{nx-plugin => plugin}/src/generators/migration/schema.json (100%)
 rename packages/{nx-plugin => plugin}/src/generators/plugin/files/plugin/src/index.ts__tmpl__ (100%)
 rename packages/{nx-plugin => plugin}/src/generators/plugin/plugin.spec.ts (100%)
 rename packages/{nx-plugin => plugin}/src/generators/plugin/plugin.ts (99%)
 rename packages/{nx-plugin => plugin}/src/generators/plugin/schema.d.ts (100%)
 rename packages/{nx-plugin => plugin}/src/generators/plugin/schema.json (100%)
 rename packages/{nx-plugin => plugin}/src/generators/plugin/utils/normalize-schema.ts (100%)
 rename packages/{nx-plugin => plugin}/src/generators/preset/generator.spec.ts (100%)
 rename packages/{nx-plugin => plugin}/src/generators/preset/generator.ts (90%)
 rename packages/{nx-plugin => plugin}/src/generators/preset/schema.d.ts (100%)
 rename packages/{nx-plugin => plugin}/src/generators/preset/schema.json (100%)
 rename packages/{nx-plugin => plugin}/src/migrations/update-14-1-9/add-swc-deps-if-needed.ts (100%)
 rename packages/{nx-plugin => plugin}/src/migrations/update-15-0-0/specify-output-capture.spec.ts (100%)
 rename packages/{nx-plugin => plugin}/src/migrations/update-15-0-0/specify-output-capture.ts (100%)
 rename packages/{nx-plugin => plugin}/src/migrations/update-15-9-0/__snapshots__/update-configs-jest-29.spec.ts.snap (100%)
 rename packages/{nx-plugin => plugin}/src/migrations/update-15-9-0/__snapshots__/update-tests-jest-29.spec.ts.snap (100%)
 rename packages/{nx-plugin => plugin}/src/migrations/update-15-9-0/jest-29-configs.ts (100%)
 rename packages/{nx-plugin => plugin}/src/migrations/update-15-9-0/jest-29-tests.ts (100%)
 rename packages/{nx-plugin => plugin}/src/migrations/update-15-9-0/update-configs-jest-29.spec.ts (100%)
 rename packages/{nx-plugin => plugin}/src/migrations/update-15-9-0/update-tests-jest-29.spec.ts (100%)
 rename packages/{nx-plugin => plugin}/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.spec.ts (85%)
 rename packages/{nx-plugin => plugin}/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.ts (70%)
 rename packages/{nx-plugin => plugin}/src/migrations/update-16-0-0/cli-in-schema-json.spec.ts (100%)
 rename packages/{nx-plugin => plugin}/src/migrations/update-16-0-0/cli-in-schema-json.ts (100%)
 rename packages/{nx-plugin => plugin}/src/utils/has-generator.ts (100%)
 rename packages/{nx-plugin => plugin}/src/utils/testing-utils/async-commands.ts (100%)
 rename packages/{nx-plugin => plugin}/src/utils/testing-utils/commands.ts (100%)
 rename packages/{nx-plugin => plugin}/src/utils/testing-utils/create-package-cli.ts (100%)
 rename packages/{nx-plugin => plugin}/src/utils/testing-utils/index.ts (100%)
 rename packages/{nx-plugin => plugin}/src/utils/testing-utils/nx-project.ts (100%)
 rename packages/{nx-plugin => plugin}/src/utils/testing-utils/paths.ts (100%)
 rename packages/{nx-plugin => plugin}/src/utils/testing-utils/utils.ts (100%)
 rename packages/{nx-plugin => plugin}/src/utils/versions.ts (100%)
 rename packages/{nx-plugin => plugin}/testing.ts (100%)
 rename packages/{nx-plugin => plugin}/tsconfig.json (100%)
 rename packages/{nx-plugin => plugin}/tsconfig.lib.json (100%)
 rename packages/{nx-plugin => plugin}/tsconfig.spec.json (100%)

diff --git a/CODEOWNERS b/CODEOWNERS
index 477cde669e9b0f..7d674e6df3e92b 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -125,9 +125,9 @@ yarn.lock @FrozenPandaz @vsavkin @AgentEnder @jaysoo @JamesHenry
 /packages/devkit/src/utils/module-federation @jaysoo @Coly010
 
 # Nx-Plugin
-/docs/generated/packages/nx-plugin/** @AgentEnder @FrozenPandaz
-/docs/shared/packages/nx-plugin/** @AgentEnder @FrozenPandaz @isaacplmann @juristr
-/packages/nx-plugin/** @AgentEnder @FrozenPandaz
+/docs/generated/packages/plugin/** @AgentEnder @FrozenPandaz
+/docs/shared/packages/plugin/** @AgentEnder @FrozenPandaz @isaacplmann @juristr
+/packages/plugin/** @AgentEnder @FrozenPandaz
 /e2e/nx-plugin/** @AgentEnder @FrozenPandaz
 
 ## Core
diff --git a/docs/generated/manifests/menus.json b/docs/generated/manifests/menus.json
index 98c2ac1614de14..580c792e48c14d 100644
--- a/docs/generated/manifests/menus.json
+++ b/docs/generated/manifests/menus.json
@@ -5528,18 +5528,18 @@
         "disableCollapsible": false
       },
       {
-        "id": "nx-plugin",
-        "path": "/packages/nx-plugin",
-        "name": "nx-plugin",
+        "id": "plugin",
+        "path": "/packages/plugin",
+        "name": "plugin",
         "children": [
           {
             "id": "documents",
-            "path": "/packages/nx-plugin/documents",
+            "path": "/packages/plugin/documents",
             "name": "documents",
             "children": [
               {
                 "name": "Overview",
-                "path": "/packages/nx-plugin/documents/overview",
+                "path": "/packages/plugin/documents/overview",
                 "id": "overview",
                 "isExternal": false,
                 "children": [],
@@ -5551,12 +5551,12 @@
           },
           {
             "id": "executors",
-            "path": "/packages/nx-plugin/executors",
+            "path": "/packages/plugin/executors",
             "name": "executors",
             "children": [
               {
                 "id": "e2e",
-                "path": "/packages/nx-plugin/executors/e2e",
+                "path": "/packages/plugin/executors/e2e",
                 "name": "e2e",
                 "children": [],
                 "isExternal": false,
@@ -5568,12 +5568,12 @@
           },
           {
             "id": "generators",
-            "path": "/packages/nx-plugin/generators",
+            "path": "/packages/plugin/generators",
             "name": "generators",
             "children": [
               {
                 "id": "plugin",
-                "path": "/packages/nx-plugin/generators/plugin",
+                "path": "/packages/plugin/generators/plugin",
                 "name": "plugin",
                 "children": [],
                 "isExternal": false,
@@ -5581,7 +5581,7 @@
               },
               {
                 "id": "create-package",
-                "path": "/packages/nx-plugin/generators/create-package",
+                "path": "/packages/plugin/generators/create-package",
                 "name": "create-package",
                 "children": [],
                 "isExternal": false,
@@ -5589,7 +5589,7 @@
               },
               {
                 "id": "e2e-project",
-                "path": "/packages/nx-plugin/generators/e2e-project",
+                "path": "/packages/plugin/generators/e2e-project",
                 "name": "e2e-project",
                 "children": [],
                 "isExternal": false,
@@ -5597,7 +5597,7 @@
               },
               {
                 "id": "migration",
-                "path": "/packages/nx-plugin/generators/migration",
+                "path": "/packages/plugin/generators/migration",
                 "name": "migration",
                 "children": [],
                 "isExternal": false,
@@ -5605,7 +5605,7 @@
               },
               {
                 "id": "generator",
-                "path": "/packages/nx-plugin/generators/generator",
+                "path": "/packages/plugin/generators/generator",
                 "name": "generator",
                 "children": [],
                 "isExternal": false,
@@ -5613,7 +5613,7 @@
               },
               {
                 "id": "executor",
-                "path": "/packages/nx-plugin/generators/executor",
+                "path": "/packages/plugin/generators/executor",
                 "name": "executor",
                 "children": [],
                 "isExternal": false,
@@ -5621,7 +5621,7 @@
               },
               {
                 "id": "plugin-lint-checks",
-                "path": "/packages/nx-plugin/generators/plugin-lint-checks",
+                "path": "/packages/plugin/generators/plugin-lint-checks",
                 "name": "plugin-lint-checks",
                 "children": [],
                 "isExternal": false,
@@ -5629,7 +5629,7 @@
               },
               {
                 "id": "preset",
-                "path": "/packages/nx-plugin/generators/preset",
+                "path": "/packages/plugin/generators/preset",
                 "name": "preset",
                 "children": [],
                 "isExternal": false,
diff --git a/docs/generated/manifests/packages.json b/docs/generated/manifests/packages.json
index c0591c0df2e8ba..70e0fe85b9a405 100644
--- a/docs/generated/manifests/packages.json
+++ b/docs/generated/manifests/packages.json
@@ -1769,112 +1769,112 @@
     "generators": {},
     "path": "/packages/nx"
   },
-  "nx-plugin": {
+  "plugin": {
     "githubRoot": "https://github.com/nrwl/nx/blob/master",
-    "name": "nx-plugin",
+    "name": "plugin",
     "packageName": "@nrwl/nx-plugin",
     "description": "This plugin is used to create Nx plugins! It contains generators for generating common plugin features like generators, executors, migrations and more.",
     "documents": {
-      "/packages/nx-plugin/documents/overview": {
+      "/packages/plugin/documents/overview": {
         "id": "overview",
         "name": "Overview",
         "description": "This plugin is used to create Nx plugins! It contains generators for generating common plugin features like generators, executors, migrations and more.",
-        "file": "generated/packages/nx-plugin/documents/overview",
+        "file": "generated/packages/plugin/documents/overview",
         "itemList": [],
         "isExternal": false,
-        "path": "/packages/nx-plugin/documents/overview",
+        "path": "/packages/plugin/documents/overview",
         "tags": [],
-        "originalFilePath": "shared/packages/nx-plugin/nx-plugin"
+        "originalFilePath": "shared/packages/plugin/plugin"
       }
     },
-    "root": "/packages/nx-plugin",
-    "source": "/packages/nx-plugin/src",
+    "root": "/packages/plugin",
+    "source": "/packages/plugin/src",
     "executors": {
-      "/packages/nx-plugin/executors/e2e": {
+      "/packages/plugin/executors/e2e": {
         "description": "Creates and runs the E2E tests for an Nx Plugin.",
-        "file": "generated/packages/nx-plugin/executors/e2e.json",
+        "file": "generated/packages/plugin/executors/e2e.json",
         "hidden": false,
         "name": "e2e",
-        "originalFilePath": "/packages/nx-plugin/src/executors/e2e/schema.json",
-        "path": "/packages/nx-plugin/executors/e2e",
+        "originalFilePath": "/packages/plugin/src/executors/e2e/schema.json",
+        "path": "/packages/plugin/executors/e2e",
         "type": "executor"
       }
     },
     "generators": {
-      "/packages/nx-plugin/generators/plugin": {
+      "/packages/plugin/generators/plugin": {
         "description": "Create a Nx Plugin.",
-        "file": "generated/packages/nx-plugin/generators/plugin.json",
+        "file": "generated/packages/plugin/generators/plugin.json",
         "hidden": false,
         "name": "plugin",
-        "originalFilePath": "/packages/nx-plugin/src/generators/plugin/schema.json",
-        "path": "/packages/nx-plugin/generators/plugin",
+        "originalFilePath": "/packages/plugin/src/generators/plugin/schema.json",
+        "path": "/packages/plugin/generators/plugin",
         "type": "generator"
       },
-      "/packages/nx-plugin/generators/create-package": {
+      "/packages/plugin/generators/create-package": {
         "description": "Create a package which can be used by npx to create a new workspace",
-        "file": "generated/packages/nx-plugin/generators/create-package.json",
+        "file": "generated/packages/plugin/generators/create-package.json",
         "hidden": false,
         "name": "create-package",
-        "originalFilePath": "/packages/nx-plugin/src/generators/create-package/schema.json",
-        "path": "/packages/nx-plugin/generators/create-package",
+        "originalFilePath": "/packages/plugin/src/generators/create-package/schema.json",
+        "path": "/packages/plugin/generators/create-package",
         "type": "generator"
       },
-      "/packages/nx-plugin/generators/e2e-project": {
+      "/packages/plugin/generators/e2e-project": {
         "description": "Create a E2E application for a Nx Plugin.",
-        "file": "generated/packages/nx-plugin/generators/e2e-project.json",
+        "file": "generated/packages/plugin/generators/e2e-project.json",
         "hidden": false,
         "name": "e2e-project",
-        "originalFilePath": "/packages/nx-plugin/src/generators/e2e-project/schema.json",
-        "path": "/packages/nx-plugin/generators/e2e-project",
+        "originalFilePath": "/packages/plugin/src/generators/e2e-project/schema.json",
+        "path": "/packages/plugin/generators/e2e-project",
         "type": "generator"
       },
-      "/packages/nx-plugin/generators/migration": {
+      "/packages/plugin/generators/migration": {
         "description": "Create a migration for an Nx Plugin.",
-        "file": "generated/packages/nx-plugin/generators/migration.json",
+        "file": "generated/packages/plugin/generators/migration.json",
         "hidden": false,
         "name": "migration",
-        "originalFilePath": "/packages/nx-plugin/src/generators/migration/schema.json",
-        "path": "/packages/nx-plugin/generators/migration",
+        "originalFilePath": "/packages/plugin/src/generators/migration/schema.json",
+        "path": "/packages/plugin/generators/migration",
         "type": "generator"
       },
-      "/packages/nx-plugin/generators/generator": {
+      "/packages/plugin/generators/generator": {
         "description": "Create a generator for an Nx Plugin.",
-        "file": "generated/packages/nx-plugin/generators/generator.json",
+        "file": "generated/packages/plugin/generators/generator.json",
         "hidden": false,
         "name": "generator",
-        "originalFilePath": "/packages/nx-plugin/src/generators/generator/schema.json",
-        "path": "/packages/nx-plugin/generators/generator",
+        "originalFilePath": "/packages/plugin/src/generators/generator/schema.json",
+        "path": "/packages/plugin/generators/generator",
         "type": "generator"
       },
-      "/packages/nx-plugin/generators/executor": {
+      "/packages/plugin/generators/executor": {
         "description": "Create an executor for an Nx Plugin.",
-        "file": "generated/packages/nx-plugin/generators/executor.json",
+        "file": "generated/packages/plugin/generators/executor.json",
         "hidden": false,
         "name": "executor",
-        "originalFilePath": "/packages/nx-plugin/src/generators/executor/schema.json",
-        "path": "/packages/nx-plugin/generators/executor",
+        "originalFilePath": "/packages/plugin/src/generators/executor/schema.json",
+        "path": "/packages/plugin/generators/executor",
         "type": "generator"
       },
-      "/packages/nx-plugin/generators/plugin-lint-checks": {
+      "/packages/plugin/generators/plugin-lint-checks": {
         "description": "Adds linting configuration to validate common json files for nx plugins.",
-        "file": "generated/packages/nx-plugin/generators/plugin-lint-checks.json",
+        "file": "generated/packages/plugin/generators/plugin-lint-checks.json",
         "hidden": false,
         "name": "plugin-lint-checks",
-        "originalFilePath": "/packages/nx-plugin/src/generators/lint-checks/schema.json",
-        "path": "/packages/nx-plugin/generators/plugin-lint-checks",
+        "originalFilePath": "/packages/plugin/src/generators/lint-checks/schema.json",
+        "path": "/packages/plugin/generators/plugin-lint-checks",
         "type": "generator"
       },
-      "/packages/nx-plugin/generators/preset": {
+      "/packages/plugin/generators/preset": {
         "description": "Initializes a workspace with an nx-plugin inside of it. Use as: `create-nx-workspace --preset @nrwl/nx-plugin`.",
-        "file": "generated/packages/nx-plugin/generators/preset.json",
+        "file": "generated/packages/plugin/generators/preset.json",
         "hidden": true,
         "name": "preset",
-        "originalFilePath": "/packages/nx-plugin/src/generators/preset/schema.json",
-        "path": "/packages/nx-plugin/generators/preset",
+        "originalFilePath": "/packages/plugin/src/generators/preset/schema.json",
+        "path": "/packages/plugin/generators/preset",
         "type": "generator"
       }
     },
-    "path": "/packages/nx-plugin"
+    "path": "/packages/plugin"
   },
   "react": {
     "githubRoot": "https://github.com/nrwl/nx/blob/master",
diff --git a/docs/generated/packages-metadata.json b/docs/generated/packages-metadata.json
index 29e1fc825a2434..c743dfc65dc3ad 100644
--- a/docs/generated/packages-metadata.json
+++ b/docs/generated/packages-metadata.json
@@ -1759,104 +1759,104 @@
         "id": "overview",
         "name": "Overview",
         "description": "This plugin is used to create Nx plugins! It contains generators for generating common plugin features like generators, executors, migrations and more.",
-        "file": "generated/packages/nx-plugin/documents/overview",
+        "file": "generated/packages/plugin/documents/overview",
         "itemList": [],
         "isExternal": false,
-        "path": "nx-plugin/documents/overview",
+        "path": "plugin/documents/overview",
         "tags": [],
-        "originalFilePath": "shared/packages/nx-plugin/nx-plugin"
+        "originalFilePath": "shared/packages/plugin/plugin"
       }
     ],
     "executors": [
       {
         "description": "Creates and runs the E2E tests for an Nx Plugin.",
-        "file": "generated/packages/nx-plugin/executors/e2e.json",
+        "file": "generated/packages/plugin/executors/e2e.json",
         "hidden": false,
         "name": "e2e",
-        "originalFilePath": "/packages/nx-plugin/src/executors/e2e/schema.json",
-        "path": "nx-plugin/executors/e2e",
+        "originalFilePath": "/packages/plugin/src/executors/e2e/schema.json",
+        "path": "plugin/executors/e2e",
         "type": "executor"
       }
     ],
     "generators": [
       {
         "description": "Create a Nx Plugin.",
-        "file": "generated/packages/nx-plugin/generators/plugin.json",
+        "file": "generated/packages/plugin/generators/plugin.json",
         "hidden": false,
         "name": "plugin",
-        "originalFilePath": "/packages/nx-plugin/src/generators/plugin/schema.json",
-        "path": "nx-plugin/generators/plugin",
+        "originalFilePath": "/packages/plugin/src/generators/plugin/schema.json",
+        "path": "plugin/generators/plugin",
         "type": "generator"
       },
       {
         "description": "Create a package which can be used by npx to create a new workspace",
-        "file": "generated/packages/nx-plugin/generators/create-package.json",
+        "file": "generated/packages/plugin/generators/create-package.json",
         "hidden": false,
         "name": "create-package",
-        "originalFilePath": "/packages/nx-plugin/src/generators/create-package/schema.json",
-        "path": "nx-plugin/generators/create-package",
+        "originalFilePath": "/packages/plugin/src/generators/create-package/schema.json",
+        "path": "plugin/generators/create-package",
         "type": "generator"
       },
       {
         "description": "Create a E2E application for a Nx Plugin.",
-        "file": "generated/packages/nx-plugin/generators/e2e-project.json",
+        "file": "generated/packages/plugin/generators/e2e-project.json",
         "hidden": false,
         "name": "e2e-project",
-        "originalFilePath": "/packages/nx-plugin/src/generators/e2e-project/schema.json",
-        "path": "nx-plugin/generators/e2e-project",
+        "originalFilePath": "/packages/plugin/src/generators/e2e-project/schema.json",
+        "path": "plugin/generators/e2e-project",
         "type": "generator"
       },
       {
         "description": "Create a migration for an Nx Plugin.",
-        "file": "generated/packages/nx-plugin/generators/migration.json",
+        "file": "generated/packages/plugin/generators/migration.json",
         "hidden": false,
         "name": "migration",
-        "originalFilePath": "/packages/nx-plugin/src/generators/migration/schema.json",
-        "path": "nx-plugin/generators/migration",
+        "originalFilePath": "/packages/plugin/src/generators/migration/schema.json",
+        "path": "plugin/generators/migration",
         "type": "generator"
       },
       {
         "description": "Create a generator for an Nx Plugin.",
-        "file": "generated/packages/nx-plugin/generators/generator.json",
+        "file": "generated/packages/plugin/generators/generator.json",
         "hidden": false,
         "name": "generator",
-        "originalFilePath": "/packages/nx-plugin/src/generators/generator/schema.json",
-        "path": "nx-plugin/generators/generator",
+        "originalFilePath": "/packages/plugin/src/generators/generator/schema.json",
+        "path": "plugin/generators/generator",
         "type": "generator"
       },
       {
         "description": "Create an executor for an Nx Plugin.",
-        "file": "generated/packages/nx-plugin/generators/executor.json",
+        "file": "generated/packages/plugin/generators/executor.json",
         "hidden": false,
         "name": "executor",
-        "originalFilePath": "/packages/nx-plugin/src/generators/executor/schema.json",
-        "path": "nx-plugin/generators/executor",
+        "originalFilePath": "/packages/plugin/src/generators/executor/schema.json",
+        "path": "plugin/generators/executor",
         "type": "generator"
       },
       {
         "description": "Adds linting configuration to validate common json files for nx plugins.",
-        "file": "generated/packages/nx-plugin/generators/plugin-lint-checks.json",
+        "file": "generated/packages/plugin/generators/plugin-lint-checks.json",
         "hidden": false,
         "name": "plugin-lint-checks",
-        "originalFilePath": "/packages/nx-plugin/src/generators/lint-checks/schema.json",
-        "path": "nx-plugin/generators/plugin-lint-checks",
+        "originalFilePath": "/packages/plugin/src/generators/lint-checks/schema.json",
+        "path": "plugin/generators/plugin-lint-checks",
         "type": "generator"
       },
       {
         "description": "Initializes a workspace with an nx-plugin inside of it. Use as: `create-nx-workspace --preset @nrwl/nx-plugin`.",
-        "file": "generated/packages/nx-plugin/generators/preset.json",
+        "file": "generated/packages/plugin/generators/preset.json",
         "hidden": true,
         "name": "preset",
-        "originalFilePath": "/packages/nx-plugin/src/generators/preset/schema.json",
-        "path": "nx-plugin/generators/preset",
+        "originalFilePath": "/packages/plugin/src/generators/preset/schema.json",
+        "path": "plugin/generators/preset",
         "type": "generator"
       }
     ],
     "githubRoot": "https://github.com/nrwl/nx/blob/master",
-    "name": "nx-plugin",
+    "name": "plugin",
     "packageName": "@nrwl/nx-plugin",
-    "root": "/packages/nx-plugin",
-    "source": "/packages/nx-plugin/src"
+    "root": "/packages/plugin",
+    "source": "/packages/plugin/src"
   },
   {
     "description": "The React plugin for Nx contains executors and generators for managing React applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Jest, Cypress, and Storybook.\n\n- Generators for applications, libraries, components, hooks, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
diff --git a/docs/generated/packages/nx-plugin/documents/overview.md b/docs/generated/packages/plugin/documents/overview.md
similarity index 100%
rename from docs/generated/packages/nx-plugin/documents/overview.md
rename to docs/generated/packages/plugin/documents/overview.md
diff --git a/docs/generated/packages/nx-plugin/executors/e2e.json b/docs/generated/packages/plugin/executors/e2e.json
similarity index 98%
rename from docs/generated/packages/nx-plugin/executors/e2e.json
rename to docs/generated/packages/plugin/executors/e2e.json
index 89242348217120..e9400f7fa4b9be 100644
--- a/docs/generated/packages/nx-plugin/executors/e2e.json
+++ b/docs/generated/packages/plugin/executors/e2e.json
@@ -1,6 +1,6 @@
 {
   "name": "e2e",
-  "implementation": "/packages/nx-plugin/src/executors/e2e/e2e.impl.ts",
+  "implementation": "/packages/plugin/src/executors/e2e/e2e.impl.ts",
   "schema": {
     "version": 2,
     "outputCapture": "direct-nodejs",
@@ -203,6 +203,6 @@
   "description": "Creates and runs the E2E tests for an Nx Plugin.",
   "aliases": [],
   "hidden": false,
-  "path": "/packages/nx-plugin/src/executors/e2e/schema.json",
+  "path": "/packages/plugin/src/executors/e2e/schema.json",
   "type": "executor"
 }
diff --git a/docs/generated/packages/nx-plugin/generators/create-package.json b/docs/generated/packages/plugin/generators/create-package.json
similarity index 93%
rename from docs/generated/packages/nx-plugin/generators/create-package.json
rename to docs/generated/packages/plugin/generators/create-package.json
index bd20a069a297aa..a6706b8941fa17 100644
--- a/docs/generated/packages/nx-plugin/generators/create-package.json
+++ b/docs/generated/packages/plugin/generators/create-package.json
@@ -67,9 +67,9 @@
     "presets": []
   },
   "description": "Create a package which can be used by npx to create a new workspace",
-  "implementation": "/packages/nx-plugin/src/generators/create-package/create-package.ts",
+  "implementation": "/packages/plugin/src/generators/create-package/create-package.ts",
   "aliases": [],
   "hidden": false,
-  "path": "/packages/nx-plugin/src/generators/create-package/schema.json",
+  "path": "/packages/plugin/src/generators/create-package/schema.json",
   "type": "generator"
 }
diff --git a/docs/generated/packages/nx-plugin/generators/e2e-project.json b/docs/generated/packages/plugin/generators/e2e-project.json
similarity index 93%
rename from docs/generated/packages/nx-plugin/generators/e2e-project.json
rename to docs/generated/packages/plugin/generators/e2e-project.json
index b3af7aa2c8eaa0..67f305138cc113 100644
--- a/docs/generated/packages/nx-plugin/generators/e2e-project.json
+++ b/docs/generated/packages/plugin/generators/e2e-project.json
@@ -57,9 +57,9 @@
     "presets": []
   },
   "description": "Create a E2E application for a Nx Plugin.",
-  "implementation": "/packages/nx-plugin/src/generators/e2e-project/e2e.ts",
+  "implementation": "/packages/plugin/src/generators/e2e-project/e2e.ts",
   "aliases": [],
   "hidden": false,
-  "path": "/packages/nx-plugin/src/generators/e2e-project/schema.json",
+  "path": "/packages/plugin/src/generators/e2e-project/schema.json",
   "type": "generator"
 }
diff --git a/docs/generated/packages/nx-plugin/generators/executor.json b/docs/generated/packages/plugin/generators/executor.json
similarity index 93%
rename from docs/generated/packages/nx-plugin/generators/executor.json
rename to docs/generated/packages/plugin/generators/executor.json
index 65b68e9538d002..2c3d9d58361f11 100644
--- a/docs/generated/packages/nx-plugin/generators/executor.json
+++ b/docs/generated/packages/plugin/generators/executor.json
@@ -62,9 +62,9 @@
     "presets": []
   },
   "description": "Create an executor for an Nx Plugin.",
-  "implementation": "/packages/nx-plugin/src/generators/executor/executor.ts",
+  "implementation": "/packages/plugin/src/generators/executor/executor.ts",
   "aliases": [],
   "hidden": false,
-  "path": "/packages/nx-plugin/src/generators/executor/schema.json",
+  "path": "/packages/plugin/src/generators/executor/schema.json",
   "type": "generator"
 }
diff --git a/docs/generated/packages/nx-plugin/generators/generator.json b/docs/generated/packages/plugin/generators/generator.json
similarity index 92%
rename from docs/generated/packages/nx-plugin/generators/generator.json
rename to docs/generated/packages/plugin/generators/generator.json
index c1b0e78ba7b8bd..204b0b4938b22d 100644
--- a/docs/generated/packages/nx-plugin/generators/generator.json
+++ b/docs/generated/packages/plugin/generators/generator.json
@@ -58,9 +58,9 @@
     "presets": []
   },
   "description": "Create a generator for an Nx Plugin.",
-  "implementation": "/packages/nx-plugin/src/generators/generator/generator.ts",
+  "implementation": "/packages/plugin/src/generators/generator/generator.ts",
   "aliases": [],
   "hidden": false,
-  "path": "/packages/nx-plugin/src/generators/generator/schema.json",
+  "path": "/packages/plugin/src/generators/generator/schema.json",
   "type": "generator"
 }
diff --git a/docs/generated/packages/nx-plugin/generators/migration.json b/docs/generated/packages/plugin/generators/migration.json
similarity index 92%
rename from docs/generated/packages/nx-plugin/generators/migration.json
rename to docs/generated/packages/plugin/generators/migration.json
index 9f95532c3e4f1c..86b39acba21309 100644
--- a/docs/generated/packages/nx-plugin/generators/migration.json
+++ b/docs/generated/packages/plugin/generators/migration.json
@@ -57,9 +57,9 @@
     "presets": []
   },
   "description": "Create a migration for an Nx Plugin.",
-  "implementation": "/packages/nx-plugin/src/generators/migration/migration.ts",
+  "implementation": "/packages/plugin/src/generators/migration/migration.ts",
   "aliases": [],
   "hidden": false,
-  "path": "/packages/nx-plugin/src/generators/migration/schema.json",
+  "path": "/packages/plugin/src/generators/migration/schema.json",
   "type": "generator"
 }
diff --git a/docs/generated/packages/nx-plugin/generators/plugin-lint-checks.json b/docs/generated/packages/plugin/generators/plugin-lint-checks.json
similarity index 86%
rename from docs/generated/packages/nx-plugin/generators/plugin-lint-checks.json
rename to docs/generated/packages/plugin/generators/plugin-lint-checks.json
index b8d94bed459657..3139aae60e97d3 100644
--- a/docs/generated/packages/nx-plugin/generators/plugin-lint-checks.json
+++ b/docs/generated/packages/plugin/generators/plugin-lint-checks.json
@@ -26,9 +26,9 @@
     "presets": []
   },
   "description": "Adds linting configuration to validate common json files for nx plugins.",
-  "implementation": "/packages/nx-plugin/src/generators/lint-checks/generator.ts",
+  "implementation": "/packages/plugin/src/generators/lint-checks/generator.ts",
   "aliases": [],
   "hidden": false,
-  "path": "/packages/nx-plugin/src/generators/lint-checks/schema.json",
+  "path": "/packages/plugin/src/generators/lint-checks/schema.json",
   "type": "generator"
 }
diff --git a/docs/generated/packages/nx-plugin/generators/plugin.json b/docs/generated/packages/plugin/generators/plugin.json
similarity index 95%
rename from docs/generated/packages/nx-plugin/generators/plugin.json
rename to docs/generated/packages/plugin/generators/plugin.json
index 2bbd845fbe5633..bf906b753cd6e5 100644
--- a/docs/generated/packages/nx-plugin/generators/plugin.json
+++ b/docs/generated/packages/plugin/generators/plugin.json
@@ -93,9 +93,9 @@
     "presets": []
   },
   "description": "Create a Nx Plugin.",
-  "implementation": "/packages/nx-plugin/src/generators/plugin/plugin.ts",
+  "implementation": "/packages/plugin/src/generators/plugin/plugin.ts",
   "aliases": [],
   "hidden": false,
-  "path": "/packages/nx-plugin/src/generators/plugin/schema.json",
+  "path": "/packages/plugin/src/generators/plugin/schema.json",
   "type": "generator"
 }
diff --git a/docs/generated/packages/nx-plugin/generators/preset.json b/docs/generated/packages/plugin/generators/preset.json
similarity index 86%
rename from docs/generated/packages/nx-plugin/generators/preset.json
rename to docs/generated/packages/plugin/generators/preset.json
index 082117d91b8887..c3d27fed67b5d8 100644
--- a/docs/generated/packages/nx-plugin/generators/preset.json
+++ b/docs/generated/packages/plugin/generators/preset.json
@@ -25,8 +25,8 @@
   "description": "Initializes a workspace with an nx-plugin inside of it. Use as: `create-nx-workspace --preset @nrwl/nx-plugin`.",
   "hidden": true,
   "x-use-standalone-layout": true,
-  "implementation": "/packages/nx-plugin/src/generators/preset/generator.ts",
+  "implementation": "/packages/plugin/src/generators/preset/generator.ts",
   "aliases": [],
-  "path": "/packages/nx-plugin/src/generators/preset/schema.json",
+  "path": "/packages/plugin/src/generators/preset/schema.json",
   "type": "generator"
 }
diff --git a/docs/map.json b/docs/map.json
index 9be460caec4cfe..c407f0e8910b9b 100644
--- a/docs/map.json
+++ b/docs/map.json
@@ -1627,14 +1627,14 @@
         },
         {
           "name": "Nx Plugin",
-          "id": "nx-plugin",
+          "id": "plugin",
           "description": "Plugin package.",
           "itemList": [
             {
               "id": "overview",
               "name": "Overview",
-              "path": "/packages/nx-plugin",
-              "file": "shared/packages/nx-plugin/nx-plugin"
+              "path": "/packages/plugin",
+              "file": "shared/packages/plugin/plugin"
             }
           ]
         },
diff --git a/docs/packages.json b/docs/packages.json
index ffe87c4af7289a..e48b86656430ad 100644
--- a/docs/packages.json
+++ b/docs/packages.json
@@ -245,8 +245,8 @@
     }
   },
   {
-    "name": "nx-plugin",
-    "packageName": "nx-plugin",
+    "name": "plugin",
+    "packageName": "plugin",
     "description": "This plugin is used to create Nx plugins! It contains generators for generating common plugin features like generators, executors, migrations and more.",
     "path": "generated/packages/nx-plugin.json",
     "schemas": {
diff --git a/docs/shared/deprecated/workspace-executors.md b/docs/shared/deprecated/workspace-executors.md
index d3246199f325d3..a29da6cb9bfd07 100644
--- a/docs/shared/deprecated/workspace-executors.md
+++ b/docs/shared/deprecated/workspace-executors.md
@@ -1,6 +1,6 @@
 # Workspace Executors
 
-In Nx 13.10+, local nx plugins can contain executors that are used in the workspace. When creating a custom executor for your workspace, look into the [nx-plugin guide](/packages/nx-plugin) to simplify the build process.
+In Nx 13.10+, local nx plugins can contain executors that are used in the workspace. When creating a custom executor for your workspace, look into the [nx-plugin guide](/packages/plugin) to simplify the build process.
 
 ## Converting workspace executors to local executors
 
diff --git a/docs/shared/deprecated/workspace-generators.md b/docs/shared/deprecated/workspace-generators.md
index 0eb07647347f9b..6f01e6d06295c1 100644
--- a/docs/shared/deprecated/workspace-generators.md
+++ b/docs/shared/deprecated/workspace-generators.md
@@ -4,7 +4,7 @@ In Nx 13.10, we introduced the ability to run generators from Nx plugins in the
 
 By using a "local" plugin, you can set the plugin as your workspace's default collection and get several other affordances that are not provided to workspace generators. This is the preferred method for "workspace generators", and existing generators will eventually be transitioned to use a local plugin.
 
-Check the [nx-plugin guide](/packages/nx-plugin) for information on creating a new plugin.
+Check the [nx-plugin guide](/packages/plugin) for information on creating a new plugin.
 
 ## Converting workspace generators to local generators
 
diff --git a/docs/shared/packages/nx-plugin/nx-plugin.md b/docs/shared/packages/plugin/plugin.md
similarity index 100%
rename from docs/shared/packages/nx-plugin/nx-plugin.md
rename to docs/shared/packages/plugin/plugin.md
diff --git a/docs/shared/plugin-features/create-your-own-plugin.md b/docs/shared/plugin-features/create-your-own-plugin.md
index 6afcc281ee856e..c1319e544a1226 100644
--- a/docs/shared/plugin-features/create-your-own-plugin.md
+++ b/docs/shared/plugin-features/create-your-own-plugin.md
@@ -26,11 +26,11 @@ Browse through plugins built by Nx and the community.
 
 {% /persona %}
 
-{% persona type="create" title="Build a Plugin" url="/packages/nx-plugin" %}
+{% persona type="create" title="Build a Plugin" url="/packages/plugin" %}
 
 Build a plugin for use in your own repo or to share with others.
 
-- [Build a plugin](/packages/nx-plugin)
+- [Build a plugin](/packages/plugin)
 
 {% /persona %}
 
@@ -56,7 +56,7 @@ All the core plugins are written using [Nx Devkit](/packages/devkit), and you ca
 executors.
 
 {% callout type="check" title="Plugins!" %}
-The Nx team maintains a core set of plugins for many application and tooling frameworks. You can write [generators](/recipes/generators/local-generators) and [executors](/recipes/executors/creating-custom-executors) in a plugin to use in your own repo or share it with the community. The [Nx Plugin](/packages/nx-plugin) plugin provides guidance on how you can build your own custom plugins.
+The Nx team maintains a core set of plugins for many application and tooling frameworks. You can write [generators](/recipes/generators/local-generators) and [executors](/recipes/executors/creating-custom-executors) in a plugin to use in your own repo or share it with the community. The [Nx Plugin](/packages/plugin) plugin provides guidance on how you can build your own custom plugins.
 {% /callout %}
 
 ### Pay as you go
diff --git a/e2e/nx-plugin/jest.config.ts b/e2e/plugin/jest.config.ts
similarity index 89%
rename from e2e/nx-plugin/jest.config.ts
rename to e2e/plugin/jest.config.ts
index 46b814af89a68a..58f3177bb30581 100644
--- a/e2e/nx-plugin/jest.config.ts
+++ b/e2e/plugin/jest.config.ts
@@ -6,6 +6,6 @@ export default {
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
   maxWorkers: 1,
   globals: {},
-  displayName: 'e2e-nx-plugin',
+  displayName: 'e2e-plugin',
   preset: '../../jest.preset.js',
 };
diff --git a/e2e/nx-plugin/project.json b/e2e/plugin/project.json
similarity index 77%
rename from e2e/nx-plugin/project.json
rename to e2e/plugin/project.json
index 08be496492c12a..4dc98bec8998a5 100644
--- a/e2e/nx-plugin/project.json
+++ b/e2e/plugin/project.json
@@ -1,7 +1,7 @@
 {
-  "name": "e2e-nx-plugin",
+  "name": "e2e-plugin",
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
-  "sourceRoot": "e2e/nx-plugin",
+  "sourceRoot": "e2e/plugin",
   "projectType": "application",
   "targets": {
     "e2e": {},
diff --git a/e2e/nx-plugin/src/nx-plugin.fixtures.ts b/e2e/plugin/src/nx-plugin.fixtures.ts
similarity index 100%
rename from e2e/nx-plugin/src/nx-plugin.fixtures.ts
rename to e2e/plugin/src/nx-plugin.fixtures.ts
diff --git a/e2e/nx-plugin/src/nx-plugin.test.ts b/e2e/plugin/src/nx-plugin.test.ts
similarity index 100%
rename from e2e/nx-plugin/src/nx-plugin.test.ts
rename to e2e/plugin/src/nx-plugin.test.ts
diff --git a/e2e/nx-plugin/tsconfig.json b/e2e/plugin/tsconfig.json
similarity index 100%
rename from e2e/nx-plugin/tsconfig.json
rename to e2e/plugin/tsconfig.json
diff --git a/e2e/nx-plugin/tsconfig.spec.json b/e2e/plugin/tsconfig.spec.json
similarity index 100%
rename from e2e/nx-plugin/tsconfig.spec.json
rename to e2e/plugin/tsconfig.spec.json
diff --git a/nx-dev/nx-dev-e2e/src/e2e/packages.cy.ts b/nx-dev/nx-dev-e2e/src/e2e/packages.cy.ts
index 2d7230a1c82110..413f44e88ea148 100644
--- a/nx-dev/nx-dev-e2e/src/e2e/packages.cy.ts
+++ b/nx-dev/nx-dev-e2e/src/e2e/packages.cy.ts
@@ -268,28 +268,28 @@ describe('nx-dev: Packages Section', () => {
       path: '/packages/nx/executors/run-commands',
     },
     { title: 'nx:run-script', path: '/packages/nx/executors/run-script' },
-    { title: 'nx-plugin', path: '/packages/nx-plugin' },
+    { title: 'nx-plugin', path: '/packages/plugin' },
     {
       title: '@nrwl/nx-plugin:plugin',
-      path: '/packages/nx-plugin/generators/plugin',
+      path: '/packages/plugin/generators/plugin',
     },
     {
       title: '@nrwl/nx-plugin:e2e-project',
-      path: '/packages/nx-plugin/generators/e2e-project',
+      path: '/packages/plugin/generators/e2e-project',
     },
     {
       title: '@nrwl/nx-plugin:migration',
-      path: '/packages/nx-plugin/generators/migration',
+      path: '/packages/plugin/generators/migration',
     },
     {
       title: '@nrwl/nx-plugin:generator',
-      path: '/packages/nx-plugin/generators/generator',
+      path: '/packages/plugin/generators/generator',
     },
     {
       title: '@nrwl/nx-plugin:executor',
-      path: '/packages/nx-plugin/generators/executor',
+      path: '/packages/plugin/generators/executor',
     },
-    { title: '@nrwl/nx-plugin:e2e', path: '/packages/nx-plugin/executors/e2e' },
+    { title: '@nrwl/nx-plugin:e2e', path: '/packages/plugin/executors/e2e' },
     { title: '@nrwl/react', path: '/packages/react' },
     { title: '@nrwl/react:init', path: '/packages/react/generators/init' },
     {
diff --git a/nx-dev/nx-dev/redirect-rules.config.js b/nx-dev/nx-dev/redirect-rules.config.js
index 6e46c67c524a80..cf836c6c098db7 100644
--- a/nx-dev/nx-dev/redirect-rules.config.js
+++ b/nx-dev/nx-dev/redirect-rules.config.js
@@ -144,11 +144,19 @@ const schemaUrls = {
   '/react-native/start': '/packages/react-native/executors/start',
   '/react-native/storybook': '/packages/react-native/executors/storybook',
   '/react-native/sync-deps': '/packages/react-native/executors/sync-deps',
-  '/nx-plugin/executor': '/packages/nx-plugin/generators/executor',
-  '/nx-plugin/migration': '/packages/nx-plugin/generators/migration',
-  '/nx-plugin/plugin': '/packages/nx-plugin/generators/plugin',
-  '/nx-plugin/schematic': '/packages/nx-plugin/generators/generator',
-  '/nx-plugin/e2e': '/packages/nx-plugin/executors/e2e',
+  '/packages/nx-plugin/generators/executor':
+    '/packages/plugin/generators/executor',
+  '/packages/nx-plugin/generators/migration':
+    '/packages/plugin/generators/migration',
+  '/packages/nx-plugin/generators/plugin': '/packages/plugin/generators/plugin',
+  '/packages/nx-plugin/generators/schematic':
+    '/packages/plugin/generators/generator',
+  '/packages/nx-plugin/generators/e2e': '/packages/plugin/executors/e2e',
+  '/nx-plugin/executor': '/packages/plugin/generators/executor',
+  '/nx-plugin/migration': '/packages/plugin/generators/migration',
+  '/nx-plugin/plugin': '/packages/plugin/generators/plugin',
+  '/nx-plugin/schematic': '/packages/plugin/generators/generator',
+  '/nx-plugin/e2e': '/packages/plugin/executors/e2e',
 };
 
 /**
@@ -296,7 +304,7 @@ const overviewUrls = {
   '/next/overview': '/packages/next',
   '/detox/overview': '/packages/detox',
   '/react-native/overview': '/packages/react-native',
-  '/nx-plugin/overview': '/packages/nx-plugin',
+  '/nx-plugin/overview': '/packages/plugin',
 };
 
 /**
@@ -428,7 +436,7 @@ const packagesIndexes = {
   '/nx': '/packages/nx',
   '/workspace': '/packages/workspace',
   '/devkit': '/packages/devkit',
-  '/nx-plugin': '/packages/nx-plugin',
+  '/nx-plugin': '/packages/plugin',
   '/angular': '/packages/angular',
   '/cypress': '/packages/cypress',
   '/detox': '/packages/detox',
diff --git a/nx-dev/ui-references/src/lib/icons-map.ts b/nx-dev/ui-references/src/lib/icons-map.ts
index 119e3fc28bdce8..ef50ec7fbb58d1 100644
--- a/nx-dev/ui-references/src/lib/icons-map.ts
+++ b/nx-dev/ui-references/src/lib/icons-map.ts
@@ -16,7 +16,7 @@ export const iconsMap: Record<string, string> = {
   next: '/images/icons/nextdotjs.svg',
   node: '/images/icons/nodedotjs.svg',
   nx: '/images/icons/nx.svg',
-  'nx-plugin': '/images/icons/nx.svg',
+  plugin: '/images/icons/nx.svg',
   react: '/images/icons/react.svg',
   'react-native': '/images/icons/react.svg',
   rollup: '/images/icons/rollup.svg',
diff --git a/packages-legacy/nx-plugin/README.md b/packages-legacy/nx-plugin/README.md
index c5788bbd7eac0f..cd1ceceda8acff 100644
--- a/packages-legacy/nx-plugin/README.md
+++ b/packages-legacy/nx-plugin/README.md
@@ -1,6 +1,6 @@
 ## @nrwl/nx-plugin has been deprecated!
 
-@nrwl/nx-plugin has been deprecated in favor of [@nx/nx-plugin](https://www.npmjs.com/package/@nx/nx-plugin). Please use that instead.
+@nrwl/nx-plugin has been deprecated in favor of [@nx/plugin](https://www.npmjs.com/package/@nx/plugin). Please use that instead.
 
 @nrwl/nx-plugin will no longer be published in Nx v17.
 
diff --git a/packages-legacy/nx-plugin/executors.json b/packages-legacy/nx-plugin/executors.json
index 35d819cebe5b74..4c38f38ba38f49 100644
--- a/packages-legacy/nx-plugin/executors.json
+++ b/packages-legacy/nx-plugin/executors.json
@@ -1,15 +1,15 @@
 {
   "builders": {
     "e2e": {
-      "implementation": "@nx/nx-plugin/src/executors/e2e/compat",
-      "schema": "@nx/nx-plugin/src/executors/e2e/schema.json",
+      "implementation": "@nx/plugin/src/executors/e2e/compat",
+      "schema": "@nx/plugin/src/executors/e2e/schema.json",
       "description": "Creates and runs the E2E tests for an Nx Plugin."
     }
   },
   "executors": {
     "e2e": {
-      "implementation": "@nx/nx-plugin/src/executors/e2e/e2e.impl",
-      "schema": "@nx/nx-plugin/src/executors/e2e/schema.json",
+      "implementation": "@nx/plugin/src/executors/e2e/e2e.impl",
+      "schema": "@nx/plugin/src/executors/e2e/schema.json",
       "description": "Creates and runs the E2E tests for an Nx Plugin."
     }
   }
diff --git a/packages-legacy/nx-plugin/generators.json b/packages-legacy/nx-plugin/generators.json
index fcb719104f062a..0e17f026e301d6 100644
--- a/packages-legacy/nx-plugin/generators.json
+++ b/packages-legacy/nx-plugin/generators.json
@@ -1,4 +1,4 @@
 {
-  "extends": ["@nx/nx-plugin"],
+  "extends": ["@nx/plugin"],
   "schematics": {}
 }
diff --git a/packages-legacy/nx-plugin/generators.ts b/packages-legacy/nx-plugin/generators.ts
index fc3116266d0424..b687cbad8edf37 100644
--- a/packages-legacy/nx-plugin/generators.ts
+++ b/packages-legacy/nx-plugin/generators.ts
@@ -1 +1 @@
-export * from '@nx/nx-plugin/generators';
+export * from '@nx/plugin/generators';
diff --git a/packages-legacy/nx-plugin/package.json b/packages-legacy/nx-plugin/package.json
index c7981c5afc9f6c..ba13c3578e6e19 100644
--- a/packages-legacy/nx-plugin/package.json
+++ b/packages-legacy/nx-plugin/package.json
@@ -24,12 +24,12 @@
   "schematics": "./generators.json",
   "builders": "./executors.json",
   "dependencies": {
-    "@nx/nx-plugin": "file:../../packages/nx-plugin"
+    "@nx/plugin": "file:../../packages/plugin"
   },
   "publishConfig": {
     "access": "public"
   },
   "nx-migrations": {
-    "migrations": "@nx/nx-plugin/migrations.json"
+    "migrations": "@nx/plugin/migrations.json"
   }
 }
diff --git a/packages-legacy/nx-plugin/testing.ts b/packages-legacy/nx-plugin/testing.ts
index 0818c6eb2ca359..483bb9e6f60102 100644
--- a/packages-legacy/nx-plugin/testing.ts
+++ b/packages-legacy/nx-plugin/testing.ts
@@ -1 +1 @@
-export * from '@nx/nx-plugin/testing';
+export * from '@nx/plugin/testing';
diff --git a/packages/create-nx-plugin/bin/create-nx-plugin.ts b/packages/create-nx-plugin/bin/create-nx-plugin.ts
index 4638b8ab98c4b3..8133920df1e47f 100644
--- a/packages/create-nx-plugin/bin/create-nx-plugin.ts
+++ b/packages/create-nx-plugin/bin/create-nx-plugin.ts
@@ -150,10 +150,7 @@ async function main(parsedArgs: yargs.Arguments<CreateNxPluginArguments>) {
     ],
   });
 
-  const workspaceInfo = await createWorkspace(
-    '@nx/nx-plugin',
-    populatedArguments
-  );
+  const workspaceInfo = await createWorkspace('@nx/plugin', populatedArguments);
 
   showNxWarning(parsedArgs.pluginName);
 
diff --git a/packages/create-nx-plugin/project.json b/packages/create-nx-plugin/project.json
index cc023ea9322137..729fece4dbabf7 100644
--- a/packages/create-nx-plugin/project.json
+++ b/packages/create-nx-plugin/project.json
@@ -65,5 +65,5 @@
     },
     "lint": {}
   },
-  "implicitDependencies": ["nx-plugin"]
+  "implicitDependencies": ["plugin"]
 }
diff --git a/packages/nx/src/utils/plugins/core-plugins.ts b/packages/nx/src/utils/plugins/core-plugins.ts
index a63c74df502020..a2c473cde0861a 100644
--- a/packages/nx/src/utils/plugins/core-plugins.ts
+++ b/packages/nx/src/utils/plugins/core-plugins.ts
@@ -57,7 +57,7 @@ export function fetchCorePlugins(): CorePlugin[] {
       capabilities: 'executors',
     },
     {
-      name: '@nx/nx-plugin',
+      name: '@nx/plugin',
       capabilities: 'executors,generators',
     },
     {
diff --git a/packages/nx-plugin/.eslintrc.json b/packages/plugin/.eslintrc.json
similarity index 100%
rename from packages/nx-plugin/.eslintrc.json
rename to packages/plugin/.eslintrc.json
diff --git a/packages/nx-plugin/README.md b/packages/plugin/README.md
similarity index 81%
rename from packages/nx-plugin/README.md
rename to packages/plugin/README.md
index 15aabb9a7b6d4d..9929bffe95193f 100644
--- a/packages/nx-plugin/README.md
+++ b/packages/plugin/README.md
@@ -12,6 +12,6 @@ Nx is a next generation build system with first class monorepo support and power
 
 It's an Nx plugin used to build other Nx plugins.
 
-Check out the list of community plugins and the documentation on how to create one using `create-nx-plugin` here: [https://nx.dev/community](https://nx.dev/community)
+Check out the list of community plugins and the documentation on how to create one using `create-packages-plugin` here: [https://nx.dev/community](https://nx.dev/community)
 
 {{content}}
diff --git a/packages/nx-plugin/executors.json b/packages/plugin/executors.json
similarity index 100%
rename from packages/nx-plugin/executors.json
rename to packages/plugin/executors.json
diff --git a/packages/nx-plugin/generators.json b/packages/plugin/generators.json
similarity index 100%
rename from packages/nx-plugin/generators.json
rename to packages/plugin/generators.json
diff --git a/packages/nx-plugin/generators.ts b/packages/plugin/generators.ts
similarity index 100%
rename from packages/nx-plugin/generators.ts
rename to packages/plugin/generators.ts
diff --git a/packages/nx-plugin/index.ts b/packages/plugin/index.ts
similarity index 100%
rename from packages/nx-plugin/index.ts
rename to packages/plugin/index.ts
diff --git a/packages/nx-plugin/jest.config.ts b/packages/plugin/jest.config.ts
similarity index 90%
rename from packages/nx-plugin/jest.config.ts
rename to packages/plugin/jest.config.ts
index 98ad5fa9e88b2f..31d676606ac2b4 100644
--- a/packages/nx-plugin/jest.config.ts
+++ b/packages/plugin/jest.config.ts
@@ -5,7 +5,7 @@ export default {
   },
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
   globals: {},
-  displayName: 'nx-plugin',
+  displayName: 'plugin',
   testEnvironment: 'node',
   preset: '../../jest.preset.js',
 };
diff --git a/packages/nx-plugin/migrations.json b/packages/plugin/migrations.json
similarity index 96%
rename from packages/nx-plugin/migrations.json
rename to packages/plugin/migrations.json
index 9dc213e219fd98..57a78526981ddc 100644
--- a/packages/nx-plugin/migrations.json
+++ b/packages/plugin/migrations.json
@@ -39,7 +39,7 @@
     "update-16-0-0-add-nx-packages": {
       "cli": "nx",
       "version": "16.0.0-beta.1",
-      "description": "Replace @nrwl/nx-plugin with @nx/nx-plugin",
+      "description": "Replace @nrwl/nx-plugin with @nx/plugin",
       "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages"
     }
   }
diff --git a/packages/nx-plugin/package.json b/packages/plugin/package.json
similarity index 97%
rename from packages/nx-plugin/package.json
rename to packages/plugin/package.json
index 16691ad31262d5..5a481a2c9b5405 100644
--- a/packages/nx-plugin/package.json
+++ b/packages/plugin/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@nx/nx-plugin",
+  "name": "@nx/plugin",
   "version": "0.0.1",
   "private": false,
   "description": "This plugin is used to create Nx plugins! It contains generators for generating common plugin features like generators, executors, migrations and more.",
diff --git a/packages/nx-plugin/project.json b/packages/plugin/project.json
similarity index 68%
rename from packages/nx-plugin/project.json
rename to packages/plugin/project.json
index 9b2c6a09599093..6d61b4356fbcc0 100644
--- a/packages/nx-plugin/project.json
+++ b/packages/plugin/project.json
@@ -1,7 +1,7 @@
 {
-  "name": "nx-plugin",
+  "name": "plugin",
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
-  "sourceRoot": "packages/nx-plugin",
+  "sourceRoot": "packages/plugin",
   "projectType": "library",
   "targets": {
     "test": {},
@@ -10,29 +10,29 @@
       "options": {
         "assets": [
           {
-            "input": "packages/nx-plugin",
+            "input": "packages/plugin",
             "glob": "**/files/**",
             "output": "/"
           },
           {
-            "input": "packages/nx-plugin",
+            "input": "packages/plugin",
             "glob": "**/files/**/.gitkeep",
             "output": "/"
           },
           {
-            "input": "packages/nx-plugin",
+            "input": "packages/plugin",
             "glob": "**/*.json",
             "ignore": ["**/tsconfig*.json", "project.json", ".eslintrc.json"],
             "output": "/"
           },
           {
-            "input": "packages/nx-plugin",
+            "input": "packages/plugin",
             "glob": "**/*.js",
             "ignore": ["**/jest.config.js"],
             "output": "/"
           },
           {
-            "input": "packages/nx-plugin",
+            "input": "packages/plugin",
             "glob": "**/*.d.ts",
             "output": "/"
           },
@@ -46,11 +46,11 @@
     },
     "build": {
       "executor": "nx:run-commands",
-      "outputs": ["{workspaceRoot}/build/packages/nx-plugin"],
+      "outputs": ["{workspaceRoot}/build/packages/plugin"],
       "options": {
         "commands": [
-          "node ./scripts/copy-readme.js nx-plugin",
-          "node ./scripts/add-dependency-to-build.js nx-plugin @nrwl/nx-plugin"
+          "node ./scripts/copy-readme.js plugin",
+          "node ./scripts/add-dependency-to-build.js plugin @nrwl/nx-plugin"
         ]
       }
     },
diff --git a/packages/nx-plugin/src/executors/e2e/compat.ts b/packages/plugin/src/executors/e2e/compat.ts
similarity index 100%
rename from packages/nx-plugin/src/executors/e2e/compat.ts
rename to packages/plugin/src/executors/e2e/compat.ts
diff --git a/packages/nx-plugin/src/executors/e2e/e2e.impl.ts b/packages/plugin/src/executors/e2e/e2e.impl.ts
similarity index 100%
rename from packages/nx-plugin/src/executors/e2e/e2e.impl.ts
rename to packages/plugin/src/executors/e2e/e2e.impl.ts
diff --git a/packages/nx-plugin/src/executors/e2e/schema.d.ts b/packages/plugin/src/executors/e2e/schema.d.ts
similarity index 100%
rename from packages/nx-plugin/src/executors/e2e/schema.d.ts
rename to packages/plugin/src/executors/e2e/schema.d.ts
diff --git a/packages/nx-plugin/src/executors/e2e/schema.json b/packages/plugin/src/executors/e2e/schema.json
similarity index 100%
rename from packages/nx-plugin/src/executors/e2e/schema.json
rename to packages/plugin/src/executors/e2e/schema.json
diff --git a/packages/nx-plugin/src/generators/create-package/create-package.spec.ts b/packages/plugin/src/generators/create-package/create-package.spec.ts
similarity index 100%
rename from packages/nx-plugin/src/generators/create-package/create-package.spec.ts
rename to packages/plugin/src/generators/create-package/create-package.spec.ts
diff --git a/packages/nx-plugin/src/generators/create-package/create-package.ts b/packages/plugin/src/generators/create-package/create-package.ts
similarity index 100%
rename from packages/nx-plugin/src/generators/create-package/create-package.ts
rename to packages/plugin/src/generators/create-package/create-package.ts
diff --git a/packages/nx-plugin/src/generators/create-package/files/create-framework-package/bin/index.ts__tmpl__ b/packages/plugin/src/generators/create-package/files/create-framework-package/bin/index.ts__tmpl__
similarity index 100%
rename from packages/nx-plugin/src/generators/create-package/files/create-framework-package/bin/index.ts__tmpl__
rename to packages/plugin/src/generators/create-package/files/create-framework-package/bin/index.ts__tmpl__
diff --git a/packages/nx-plugin/src/generators/create-package/files/e2e/__name__.spec.ts__tmpl__ b/packages/plugin/src/generators/create-package/files/e2e/__name__.spec.ts__tmpl__
similarity index 95%
rename from packages/nx-plugin/src/generators/create-package/files/e2e/__name__.spec.ts__tmpl__
rename to packages/plugin/src/generators/create-package/files/e2e/__name__.spec.ts__tmpl__
index e0e0f6adda52e8..be0960b719d23b 100644
--- a/packages/nx-plugin/src/generators/create-package/files/e2e/__name__.spec.ts__tmpl__
+++ b/packages/plugin/src/generators/create-package/files/e2e/__name__.spec.ts__tmpl__
@@ -2,7 +2,7 @@ import {
   uniq,
   runCreatePackageCli,
   removeTmpProject,
-} from '@nx/nx-plugin/testing';
+} from '@nx/plugin/testing';
 
 describe('<%= name %> e2e', () => {
   const project = uniq('<%= name %>');
diff --git a/packages/nx-plugin/src/generators/create-package/schema.d.ts b/packages/plugin/src/generators/create-package/schema.d.ts
similarity index 100%
rename from packages/nx-plugin/src/generators/create-package/schema.d.ts
rename to packages/plugin/src/generators/create-package/schema.d.ts
diff --git a/packages/nx-plugin/src/generators/create-package/schema.json b/packages/plugin/src/generators/create-package/schema.json
similarity index 100%
rename from packages/nx-plugin/src/generators/create-package/schema.json
rename to packages/plugin/src/generators/create-package/schema.json
diff --git a/packages/nx-plugin/src/generators/create-package/utils/normalize-schema.ts b/packages/plugin/src/generators/create-package/utils/normalize-schema.ts
similarity index 100%
rename from packages/nx-plugin/src/generators/create-package/utils/normalize-schema.ts
rename to packages/plugin/src/generators/create-package/utils/normalize-schema.ts
diff --git a/packages/nx-plugin/src/generators/e2e-project/e2e.spec.ts b/packages/plugin/src/generators/e2e-project/e2e.spec.ts
similarity index 99%
rename from packages/nx-plugin/src/generators/e2e-project/e2e.spec.ts
rename to packages/plugin/src/generators/e2e-project/e2e.spec.ts
index 3dbd3dd2e5bde9..55adc648e0cd63 100644
--- a/packages/nx-plugin/src/generators/e2e-project/e2e.spec.ts
+++ b/packages/plugin/src/generators/e2e-project/e2e.spec.ts
@@ -116,7 +116,7 @@ describe('NxPlugin e2e-project Generator', () => {
     expect(project.root).toEqual('apps/my-plugin-e2e');
     expect(project.targets.e2e).toBeTruthy();
     expect(project.targets.e2e).toMatchObject({
-      executor: '@nx/nx-plugin:e2e',
+      executor: '@nx/plugin:e2e',
       options: expect.objectContaining({ target: 'my-plugin:build' }),
     });
   });
diff --git a/packages/nx-plugin/src/generators/e2e-project/e2e.ts b/packages/plugin/src/generators/e2e-project/e2e.ts
similarity index 99%
rename from packages/nx-plugin/src/generators/e2e-project/e2e.ts
rename to packages/plugin/src/generators/e2e-project/e2e.ts
index c2bea829b5de38..1c731f93df1954 100644
--- a/packages/nx-plugin/src/generators/e2e-project/e2e.ts
+++ b/packages/plugin/src/generators/e2e-project/e2e.ts
@@ -77,7 +77,7 @@ function updateWorkspaceConfiguration(host: Tree, options: NormalizedSchema) {
     sourceRoot: `${options.projectRoot}/tests`,
     targets: {
       e2e: {
-        executor: '@nx/nx-plugin:e2e',
+        executor: '@nx/plugin:e2e',
         options: { target: `${options.pluginName}:build` },
       },
     },
diff --git a/packages/nx-plugin/src/generators/e2e-project/files/tests/__pluginName__.spec.ts__tmpl__ b/packages/plugin/src/generators/e2e-project/files/tests/__pluginName__.spec.ts__tmpl__
similarity index 97%
rename from packages/nx-plugin/src/generators/e2e-project/files/tests/__pluginName__.spec.ts__tmpl__
rename to packages/plugin/src/generators/e2e-project/files/tests/__pluginName__.spec.ts__tmpl__
index 8f5570f4e07ff4..08b839f01f4ef0 100644
--- a/packages/nx-plugin/src/generators/e2e-project/files/tests/__pluginName__.spec.ts__tmpl__
+++ b/packages/plugin/src/generators/e2e-project/files/tests/__pluginName__.spec.ts__tmpl__
@@ -5,7 +5,7 @@ import {
   runNxCommandAsync,
   runNxCommand,
   uniq,
-} from '@nx/nx-plugin/testing';
+} from '@nx/plugin/testing';
 
 describe('<%= pluginName %> e2e', () => {
   // Setting up individual workspaces per
diff --git a/packages/nx-plugin/src/generators/e2e-project/files/tsconfig.json__tmpl__ b/packages/plugin/src/generators/e2e-project/files/tsconfig.json__tmpl__
similarity index 100%
rename from packages/nx-plugin/src/generators/e2e-project/files/tsconfig.json__tmpl__
rename to packages/plugin/src/generators/e2e-project/files/tsconfig.json__tmpl__
diff --git a/packages/nx-plugin/src/generators/e2e-project/schema.d.ts b/packages/plugin/src/generators/e2e-project/schema.d.ts
similarity index 100%
rename from packages/nx-plugin/src/generators/e2e-project/schema.d.ts
rename to packages/plugin/src/generators/e2e-project/schema.d.ts
diff --git a/packages/nx-plugin/src/generators/e2e-project/schema.json b/packages/plugin/src/generators/e2e-project/schema.json
similarity index 100%
rename from packages/nx-plugin/src/generators/e2e-project/schema.json
rename to packages/plugin/src/generators/e2e-project/schema.json
diff --git a/packages/nx-plugin/src/generators/executor/executor.spec.ts b/packages/plugin/src/generators/executor/executor.spec.ts
similarity index 100%
rename from packages/nx-plugin/src/generators/executor/executor.spec.ts
rename to packages/plugin/src/generators/executor/executor.spec.ts
diff --git a/packages/nx-plugin/src/generators/executor/executor.ts b/packages/plugin/src/generators/executor/executor.ts
similarity index 100%
rename from packages/nx-plugin/src/generators/executor/executor.ts
rename to packages/plugin/src/generators/executor/executor.ts
diff --git a/packages/nx-plugin/src/generators/executor/files/executor/__fileName__/executor.spec.ts__tmpl__ b/packages/plugin/src/generators/executor/files/executor/__fileName__/executor.spec.ts__tmpl__
similarity index 100%
rename from packages/nx-plugin/src/generators/executor/files/executor/__fileName__/executor.spec.ts__tmpl__
rename to packages/plugin/src/generators/executor/files/executor/__fileName__/executor.spec.ts__tmpl__
diff --git a/packages/nx-plugin/src/generators/executor/files/executor/__fileName__/executor.ts__tmpl__ b/packages/plugin/src/generators/executor/files/executor/__fileName__/executor.ts__tmpl__
similarity index 100%
rename from packages/nx-plugin/src/generators/executor/files/executor/__fileName__/executor.ts__tmpl__
rename to packages/plugin/src/generators/executor/files/executor/__fileName__/executor.ts__tmpl__
diff --git a/packages/nx-plugin/src/generators/executor/files/executor/__fileName__/schema.d.ts__tmpl__ b/packages/plugin/src/generators/executor/files/executor/__fileName__/schema.d.ts__tmpl__
similarity index 100%
rename from packages/nx-plugin/src/generators/executor/files/executor/__fileName__/schema.d.ts__tmpl__
rename to packages/plugin/src/generators/executor/files/executor/__fileName__/schema.d.ts__tmpl__
diff --git a/packages/nx-plugin/src/generators/executor/files/executor/__fileName__/schema.json__tmpl__ b/packages/plugin/src/generators/executor/files/executor/__fileName__/schema.json__tmpl__
similarity index 100%
rename from packages/nx-plugin/src/generators/executor/files/executor/__fileName__/schema.json__tmpl__
rename to packages/plugin/src/generators/executor/files/executor/__fileName__/schema.json__tmpl__
diff --git a/packages/nx-plugin/src/generators/executor/files/hasher/__fileName__/hasher.spec.ts__tmpl__ b/packages/plugin/src/generators/executor/files/hasher/__fileName__/hasher.spec.ts__tmpl__
similarity index 100%
rename from packages/nx-plugin/src/generators/executor/files/hasher/__fileName__/hasher.spec.ts__tmpl__
rename to packages/plugin/src/generators/executor/files/hasher/__fileName__/hasher.spec.ts__tmpl__
diff --git a/packages/nx-plugin/src/generators/executor/files/hasher/__fileName__/hasher.ts__tmpl__ b/packages/plugin/src/generators/executor/files/hasher/__fileName__/hasher.ts__tmpl__
similarity index 100%
rename from packages/nx-plugin/src/generators/executor/files/hasher/__fileName__/hasher.ts__tmpl__
rename to packages/plugin/src/generators/executor/files/hasher/__fileName__/hasher.ts__tmpl__
diff --git a/packages/nx-plugin/src/generators/executor/schema.d.ts b/packages/plugin/src/generators/executor/schema.d.ts
similarity index 100%
rename from packages/nx-plugin/src/generators/executor/schema.d.ts
rename to packages/plugin/src/generators/executor/schema.d.ts
diff --git a/packages/nx-plugin/src/generators/executor/schema.json b/packages/plugin/src/generators/executor/schema.json
similarity index 100%
rename from packages/nx-plugin/src/generators/executor/schema.json
rename to packages/plugin/src/generators/executor/schema.json
diff --git a/packages/nx-plugin/src/generators/generator/files/generator/__fileName__/generator.spec.ts__tmpl__ b/packages/plugin/src/generators/generator/files/generator/__fileName__/generator.spec.ts__tmpl__
similarity index 100%
rename from packages/nx-plugin/src/generators/generator/files/generator/__fileName__/generator.spec.ts__tmpl__
rename to packages/plugin/src/generators/generator/files/generator/__fileName__/generator.spec.ts__tmpl__
diff --git a/packages/nx-plugin/src/generators/generator/files/generator/__fileName__/generator.ts__tmpl__ b/packages/plugin/src/generators/generator/files/generator/__fileName__/generator.ts__tmpl__
similarity index 100%
rename from packages/nx-plugin/src/generators/generator/files/generator/__fileName__/generator.ts__tmpl__
rename to packages/plugin/src/generators/generator/files/generator/__fileName__/generator.ts__tmpl__
diff --git a/packages/nx-plugin/src/generators/generator/files/generator/__fileName__/schema.d.ts__tmpl__ b/packages/plugin/src/generators/generator/files/generator/__fileName__/schema.d.ts__tmpl__
similarity index 100%
rename from packages/nx-plugin/src/generators/generator/files/generator/__fileName__/schema.d.ts__tmpl__
rename to packages/plugin/src/generators/generator/files/generator/__fileName__/schema.d.ts__tmpl__
diff --git a/packages/nx-plugin/src/generators/generator/files/generator/__fileName__/schema.json__tmpl__ b/packages/plugin/src/generators/generator/files/generator/__fileName__/schema.json__tmpl__
similarity index 100%
rename from packages/nx-plugin/src/generators/generator/files/generator/__fileName__/schema.json__tmpl__
rename to packages/plugin/src/generators/generator/files/generator/__fileName__/schema.json__tmpl__
diff --git a/packages/nx-plugin/src/generators/generator/generator.spec.ts b/packages/plugin/src/generators/generator/generator.spec.ts
similarity index 100%
rename from packages/nx-plugin/src/generators/generator/generator.spec.ts
rename to packages/plugin/src/generators/generator/generator.spec.ts
diff --git a/packages/nx-plugin/src/generators/generator/generator.ts b/packages/plugin/src/generators/generator/generator.ts
similarity index 100%
rename from packages/nx-plugin/src/generators/generator/generator.ts
rename to packages/plugin/src/generators/generator/generator.ts
diff --git a/packages/nx-plugin/src/generators/generator/schema.d.ts b/packages/plugin/src/generators/generator/schema.d.ts
similarity index 100%
rename from packages/nx-plugin/src/generators/generator/schema.d.ts
rename to packages/plugin/src/generators/generator/schema.d.ts
diff --git a/packages/nx-plugin/src/generators/generator/schema.json b/packages/plugin/src/generators/generator/schema.json
similarity index 100%
rename from packages/nx-plugin/src/generators/generator/schema.json
rename to packages/plugin/src/generators/generator/schema.json
diff --git a/packages/nx-plugin/src/generators/lint-checks/generator.spec.ts b/packages/plugin/src/generators/lint-checks/generator.spec.ts
similarity index 100%
rename from packages/nx-plugin/src/generators/lint-checks/generator.spec.ts
rename to packages/plugin/src/generators/lint-checks/generator.spec.ts
diff --git a/packages/nx-plugin/src/generators/lint-checks/generator.ts b/packages/plugin/src/generators/lint-checks/generator.ts
similarity index 100%
rename from packages/nx-plugin/src/generators/lint-checks/generator.ts
rename to packages/plugin/src/generators/lint-checks/generator.ts
diff --git a/packages/nx-plugin/src/generators/lint-checks/schema.d.ts b/packages/plugin/src/generators/lint-checks/schema.d.ts
similarity index 100%
rename from packages/nx-plugin/src/generators/lint-checks/schema.d.ts
rename to packages/plugin/src/generators/lint-checks/schema.d.ts
diff --git a/packages/nx-plugin/src/generators/lint-checks/schema.json b/packages/plugin/src/generators/lint-checks/schema.json
similarity index 100%
rename from packages/nx-plugin/src/generators/lint-checks/schema.json
rename to packages/plugin/src/generators/lint-checks/schema.json
diff --git a/packages/nx-plugin/src/generators/migration/files/migration/__name__/__name__.spec.ts__tmpl__ b/packages/plugin/src/generators/migration/files/migration/__name__/__name__.spec.ts__tmpl__
similarity index 100%
rename from packages/nx-plugin/src/generators/migration/files/migration/__name__/__name__.spec.ts__tmpl__
rename to packages/plugin/src/generators/migration/files/migration/__name__/__name__.spec.ts__tmpl__
diff --git a/packages/nx-plugin/src/generators/migration/files/migration/__name__/__name__.ts__tmpl__ b/packages/plugin/src/generators/migration/files/migration/__name__/__name__.ts__tmpl__
similarity index 100%
rename from packages/nx-plugin/src/generators/migration/files/migration/__name__/__name__.ts__tmpl__
rename to packages/plugin/src/generators/migration/files/migration/__name__/__name__.ts__tmpl__
diff --git a/packages/nx-plugin/src/generators/migration/migration.spec.ts b/packages/plugin/src/generators/migration/migration.spec.ts
similarity index 100%
rename from packages/nx-plugin/src/generators/migration/migration.spec.ts
rename to packages/plugin/src/generators/migration/migration.spec.ts
diff --git a/packages/nx-plugin/src/generators/migration/migration.ts b/packages/plugin/src/generators/migration/migration.ts
similarity index 100%
rename from packages/nx-plugin/src/generators/migration/migration.ts
rename to packages/plugin/src/generators/migration/migration.ts
diff --git a/packages/nx-plugin/src/generators/migration/schema.d.ts b/packages/plugin/src/generators/migration/schema.d.ts
similarity index 100%
rename from packages/nx-plugin/src/generators/migration/schema.d.ts
rename to packages/plugin/src/generators/migration/schema.d.ts
diff --git a/packages/nx-plugin/src/generators/migration/schema.json b/packages/plugin/src/generators/migration/schema.json
similarity index 100%
rename from packages/nx-plugin/src/generators/migration/schema.json
rename to packages/plugin/src/generators/migration/schema.json
diff --git a/packages/nx-plugin/src/generators/plugin/files/plugin/src/index.ts__tmpl__ b/packages/plugin/src/generators/plugin/files/plugin/src/index.ts__tmpl__
similarity index 100%
rename from packages/nx-plugin/src/generators/plugin/files/plugin/src/index.ts__tmpl__
rename to packages/plugin/src/generators/plugin/files/plugin/src/index.ts__tmpl__
diff --git a/packages/nx-plugin/src/generators/plugin/plugin.spec.ts b/packages/plugin/src/generators/plugin/plugin.spec.ts
similarity index 100%
rename from packages/nx-plugin/src/generators/plugin/plugin.spec.ts
rename to packages/plugin/src/generators/plugin/plugin.spec.ts
diff --git a/packages/nx-plugin/src/generators/plugin/plugin.ts b/packages/plugin/src/generators/plugin/plugin.ts
similarity index 99%
rename from packages/nx-plugin/src/generators/plugin/plugin.ts
rename to packages/plugin/src/generators/plugin/plugin.ts
index 765ee97fd0e7af..b16a7c2bda3dcd 100644
--- a/packages/nx-plugin/src/generators/plugin/plugin.ts
+++ b/packages/plugin/src/generators/plugin/plugin.ts
@@ -98,7 +98,7 @@ export async function pluginGenerator(host: Tree, schema: Schema) {
       {
         '@nx/jest': nxVersion,
         '@nx/js': nxVersion,
-        '@nx/nx-plugin': nxVersion,
+        '@nx/plugin': nxVersion,
       }
     )
   );
diff --git a/packages/nx-plugin/src/generators/plugin/schema.d.ts b/packages/plugin/src/generators/plugin/schema.d.ts
similarity index 100%
rename from packages/nx-plugin/src/generators/plugin/schema.d.ts
rename to packages/plugin/src/generators/plugin/schema.d.ts
diff --git a/packages/nx-plugin/src/generators/plugin/schema.json b/packages/plugin/src/generators/plugin/schema.json
similarity index 100%
rename from packages/nx-plugin/src/generators/plugin/schema.json
rename to packages/plugin/src/generators/plugin/schema.json
diff --git a/packages/nx-plugin/src/generators/plugin/utils/normalize-schema.ts b/packages/plugin/src/generators/plugin/utils/normalize-schema.ts
similarity index 100%
rename from packages/nx-plugin/src/generators/plugin/utils/normalize-schema.ts
rename to packages/plugin/src/generators/plugin/utils/normalize-schema.ts
diff --git a/packages/nx-plugin/src/generators/preset/generator.spec.ts b/packages/plugin/src/generators/preset/generator.spec.ts
similarity index 100%
rename from packages/nx-plugin/src/generators/preset/generator.spec.ts
rename to packages/plugin/src/generators/preset/generator.spec.ts
diff --git a/packages/nx-plugin/src/generators/preset/generator.ts b/packages/plugin/src/generators/preset/generator.ts
similarity index 90%
rename from packages/nx-plugin/src/generators/preset/generator.ts
rename to packages/plugin/src/generators/preset/generator.ts
index 533cc9c86cc28f..0002c2bda340cd 100644
--- a/packages/nx-plugin/src/generators/preset/generator.ts
+++ b/packages/plugin/src/generators/preset/generator.ts
@@ -55,9 +55,9 @@ function removeNpmScope(tree: Tree) {
 
 function moveNxPluginToDevDeps(tree: Tree) {
   updateJson<PackageJson>(tree, 'package.json', (json) => {
-    const nxPluginEntry = json.dependencies['@nx/nx-plugin'];
-    delete json.dependencies['@nx/nx-plugin'];
-    json.devDependencies['@nx/nx-plugin'] = nxPluginEntry;
+    const nxPluginEntry = json.dependencies['@nx/plugin'];
+    delete json.dependencies['@nx/plugin'];
+    json.devDependencies['@nx/plugin'] = nxPluginEntry;
     return json;
   });
 }
diff --git a/packages/nx-plugin/src/generators/preset/schema.d.ts b/packages/plugin/src/generators/preset/schema.d.ts
similarity index 100%
rename from packages/nx-plugin/src/generators/preset/schema.d.ts
rename to packages/plugin/src/generators/preset/schema.d.ts
diff --git a/packages/nx-plugin/src/generators/preset/schema.json b/packages/plugin/src/generators/preset/schema.json
similarity index 100%
rename from packages/nx-plugin/src/generators/preset/schema.json
rename to packages/plugin/src/generators/preset/schema.json
diff --git a/packages/nx-plugin/src/migrations/update-14-1-9/add-swc-deps-if-needed.ts b/packages/plugin/src/migrations/update-14-1-9/add-swc-deps-if-needed.ts
similarity index 100%
rename from packages/nx-plugin/src/migrations/update-14-1-9/add-swc-deps-if-needed.ts
rename to packages/plugin/src/migrations/update-14-1-9/add-swc-deps-if-needed.ts
diff --git a/packages/nx-plugin/src/migrations/update-15-0-0/specify-output-capture.spec.ts b/packages/plugin/src/migrations/update-15-0-0/specify-output-capture.spec.ts
similarity index 100%
rename from packages/nx-plugin/src/migrations/update-15-0-0/specify-output-capture.spec.ts
rename to packages/plugin/src/migrations/update-15-0-0/specify-output-capture.spec.ts
diff --git a/packages/nx-plugin/src/migrations/update-15-0-0/specify-output-capture.ts b/packages/plugin/src/migrations/update-15-0-0/specify-output-capture.ts
similarity index 100%
rename from packages/nx-plugin/src/migrations/update-15-0-0/specify-output-capture.ts
rename to packages/plugin/src/migrations/update-15-0-0/specify-output-capture.ts
diff --git a/packages/nx-plugin/src/migrations/update-15-9-0/__snapshots__/update-configs-jest-29.spec.ts.snap b/packages/plugin/src/migrations/update-15-9-0/__snapshots__/update-configs-jest-29.spec.ts.snap
similarity index 100%
rename from packages/nx-plugin/src/migrations/update-15-9-0/__snapshots__/update-configs-jest-29.spec.ts.snap
rename to packages/plugin/src/migrations/update-15-9-0/__snapshots__/update-configs-jest-29.spec.ts.snap
diff --git a/packages/nx-plugin/src/migrations/update-15-9-0/__snapshots__/update-tests-jest-29.spec.ts.snap b/packages/plugin/src/migrations/update-15-9-0/__snapshots__/update-tests-jest-29.spec.ts.snap
similarity index 100%
rename from packages/nx-plugin/src/migrations/update-15-9-0/__snapshots__/update-tests-jest-29.spec.ts.snap
rename to packages/plugin/src/migrations/update-15-9-0/__snapshots__/update-tests-jest-29.spec.ts.snap
diff --git a/packages/nx-plugin/src/migrations/update-15-9-0/jest-29-configs.ts b/packages/plugin/src/migrations/update-15-9-0/jest-29-configs.ts
similarity index 100%
rename from packages/nx-plugin/src/migrations/update-15-9-0/jest-29-configs.ts
rename to packages/plugin/src/migrations/update-15-9-0/jest-29-configs.ts
diff --git a/packages/nx-plugin/src/migrations/update-15-9-0/jest-29-tests.ts b/packages/plugin/src/migrations/update-15-9-0/jest-29-tests.ts
similarity index 100%
rename from packages/nx-plugin/src/migrations/update-15-9-0/jest-29-tests.ts
rename to packages/plugin/src/migrations/update-15-9-0/jest-29-tests.ts
diff --git a/packages/nx-plugin/src/migrations/update-15-9-0/update-configs-jest-29.spec.ts b/packages/plugin/src/migrations/update-15-9-0/update-configs-jest-29.spec.ts
similarity index 100%
rename from packages/nx-plugin/src/migrations/update-15-9-0/update-configs-jest-29.spec.ts
rename to packages/plugin/src/migrations/update-15-9-0/update-configs-jest-29.spec.ts
diff --git a/packages/nx-plugin/src/migrations/update-15-9-0/update-tests-jest-29.spec.ts b/packages/plugin/src/migrations/update-15-9-0/update-tests-jest-29.spec.ts
similarity index 100%
rename from packages/nx-plugin/src/migrations/update-15-9-0/update-tests-jest-29.spec.ts
rename to packages/plugin/src/migrations/update-15-9-0/update-tests-jest-29.spec.ts
diff --git a/packages/nx-plugin/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.spec.ts b/packages/plugin/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.spec.ts
similarity index 85%
rename from packages/nx-plugin/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.spec.ts
rename to packages/plugin/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.spec.ts
index 0677eaed4fb184..50ce4f1a0b0628 100644
--- a/packages/nx-plugin/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.spec.ts
+++ b/packages/plugin/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.spec.ts
@@ -24,13 +24,13 @@ describe('update-16-0-0-add-nx-packages', () => {
     ).not.toBeDefined();
   });
 
-  it('should add a dependency on @nx/nx-plugin', async () => {
+  it('should add a dependency on @nx/plugin', async () => {
     await replacePackage(tree);
 
     const packageJson = readJson(tree, 'package.json');
     const newDependencyVersion =
-      packageJson.devDependencies['@nx/nx-plugin'] ??
-      packageJson.dependencies['@nx/nx-plugin'];
+      packageJson.devDependencies['@nx/plugin'] ??
+      packageJson.dependencies['@nx/plugin'];
 
     expect(newDependencyVersion).toBeDefined();
   });
diff --git a/packages/nx-plugin/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.ts b/packages/plugin/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.ts
similarity index 70%
rename from packages/nx-plugin/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.ts
rename to packages/plugin/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.ts
index 0b61581707113b..2ea9737e96332e 100644
--- a/packages/nx-plugin/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.ts
+++ b/packages/plugin/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.ts
@@ -2,11 +2,7 @@ import { Tree, formatFiles } from '@nx/devkit';
 import { replaceNrwlPackageWithNxPackage } from '@nx/devkit/src/utils/replace-package';
 
 export default async function replacePackage(tree: Tree): Promise<void> {
-  await replaceNrwlPackageWithNxPackage(
-    tree,
-    '@nrwl/nx-plugin',
-    '@nx/nx-plugin'
-  );
+  await replaceNrwlPackageWithNxPackage(tree, '@nrwl/nx-plugin', '@nx/plugin');
 
   await formatFiles(tree);
 }
diff --git a/packages/nx-plugin/src/migrations/update-16-0-0/cli-in-schema-json.spec.ts b/packages/plugin/src/migrations/update-16-0-0/cli-in-schema-json.spec.ts
similarity index 100%
rename from packages/nx-plugin/src/migrations/update-16-0-0/cli-in-schema-json.spec.ts
rename to packages/plugin/src/migrations/update-16-0-0/cli-in-schema-json.spec.ts
diff --git a/packages/nx-plugin/src/migrations/update-16-0-0/cli-in-schema-json.ts b/packages/plugin/src/migrations/update-16-0-0/cli-in-schema-json.ts
similarity index 100%
rename from packages/nx-plugin/src/migrations/update-16-0-0/cli-in-schema-json.ts
rename to packages/plugin/src/migrations/update-16-0-0/cli-in-schema-json.ts
diff --git a/packages/nx-plugin/src/utils/has-generator.ts b/packages/plugin/src/utils/has-generator.ts
similarity index 100%
rename from packages/nx-plugin/src/utils/has-generator.ts
rename to packages/plugin/src/utils/has-generator.ts
diff --git a/packages/nx-plugin/src/utils/testing-utils/async-commands.ts b/packages/plugin/src/utils/testing-utils/async-commands.ts
similarity index 100%
rename from packages/nx-plugin/src/utils/testing-utils/async-commands.ts
rename to packages/plugin/src/utils/testing-utils/async-commands.ts
diff --git a/packages/nx-plugin/src/utils/testing-utils/commands.ts b/packages/plugin/src/utils/testing-utils/commands.ts
similarity index 100%
rename from packages/nx-plugin/src/utils/testing-utils/commands.ts
rename to packages/plugin/src/utils/testing-utils/commands.ts
diff --git a/packages/nx-plugin/src/utils/testing-utils/create-package-cli.ts b/packages/plugin/src/utils/testing-utils/create-package-cli.ts
similarity index 100%
rename from packages/nx-plugin/src/utils/testing-utils/create-package-cli.ts
rename to packages/plugin/src/utils/testing-utils/create-package-cli.ts
diff --git a/packages/nx-plugin/src/utils/testing-utils/index.ts b/packages/plugin/src/utils/testing-utils/index.ts
similarity index 100%
rename from packages/nx-plugin/src/utils/testing-utils/index.ts
rename to packages/plugin/src/utils/testing-utils/index.ts
diff --git a/packages/nx-plugin/src/utils/testing-utils/nx-project.ts b/packages/plugin/src/utils/testing-utils/nx-project.ts
similarity index 100%
rename from packages/nx-plugin/src/utils/testing-utils/nx-project.ts
rename to packages/plugin/src/utils/testing-utils/nx-project.ts
diff --git a/packages/nx-plugin/src/utils/testing-utils/paths.ts b/packages/plugin/src/utils/testing-utils/paths.ts
similarity index 100%
rename from packages/nx-plugin/src/utils/testing-utils/paths.ts
rename to packages/plugin/src/utils/testing-utils/paths.ts
diff --git a/packages/nx-plugin/src/utils/testing-utils/utils.ts b/packages/plugin/src/utils/testing-utils/utils.ts
similarity index 100%
rename from packages/nx-plugin/src/utils/testing-utils/utils.ts
rename to packages/plugin/src/utils/testing-utils/utils.ts
diff --git a/packages/nx-plugin/src/utils/versions.ts b/packages/plugin/src/utils/versions.ts
similarity index 100%
rename from packages/nx-plugin/src/utils/versions.ts
rename to packages/plugin/src/utils/versions.ts
diff --git a/packages/nx-plugin/testing.ts b/packages/plugin/testing.ts
similarity index 100%
rename from packages/nx-plugin/testing.ts
rename to packages/plugin/testing.ts
diff --git a/packages/nx-plugin/tsconfig.json b/packages/plugin/tsconfig.json
similarity index 100%
rename from packages/nx-plugin/tsconfig.json
rename to packages/plugin/tsconfig.json
diff --git a/packages/nx-plugin/tsconfig.lib.json b/packages/plugin/tsconfig.lib.json
similarity index 100%
rename from packages/nx-plugin/tsconfig.lib.json
rename to packages/plugin/tsconfig.lib.json
diff --git a/packages/nx-plugin/tsconfig.spec.json b/packages/plugin/tsconfig.spec.json
similarity index 100%
rename from packages/nx-plugin/tsconfig.spec.json
rename to packages/plugin/tsconfig.spec.json
diff --git a/packages/storybook/src/generators/configuration/__snapshots__/configuration-v7.spec.ts.snap b/packages/storybook/src/generators/configuration/__snapshots__/configuration-v7.spec.ts.snap
index 4a5e756ce6b9da..840b2f642a35f0 100644
--- a/packages/storybook/src/generators/configuration/__snapshots__/configuration-v7.spec.ts.snap
+++ b/packages/storybook/src/generators/configuration/__snapshots__/configuration-v7.spec.ts.snap
@@ -1120,7 +1120,7 @@ Map {
     "tags": [],
     "targets": {
       "e2e": {
-        "executor": "@nx/nx-plugin:e2e",
+        "executor": "@nx/plugin:e2e",
         "options": {
           "jestConfig": "apps/my-plugin-e2e/jest.config.ts",
           "target": "my-plugin:build",
diff --git a/packages/storybook/src/generators/configuration/test-configs/various-projects.json b/packages/storybook/src/generators/configuration/test-configs/various-projects.json
index a5b981d3492ab4..4d7456d9f47d04 100644
--- a/packages/storybook/src/generators/configuration/test-configs/various-projects.json
+++ b/packages/storybook/src/generators/configuration/test-configs/various-projects.json
@@ -334,7 +334,7 @@
     "sourceRoot": "apps/my-plugin-e2e/src",
     "targets": {
       "e2e": {
-        "executor": "@nx/nx-plugin:e2e",
+        "executor": "@nx/plugin:e2e",
         "options": {
           "target": "my-plugin:build",
           "jestConfig": "apps/my-plugin-e2e/jest.config.ts"
diff --git a/packages/workspace/src/generators/workspace-generator/workspace-generator.ts b/packages/workspace/src/generators/workspace-generator/workspace-generator.ts
index da0f9c888b7473..989684a49091e1 100644
--- a/packages/workspace/src/generators/workspace-generator/workspace-generator.ts
+++ b/packages/workspace/src/generators/workspace-generator/workspace-generator.ts
@@ -4,7 +4,7 @@ import { Tree, stripIndents } from '@nx/devkit';
 export default async function (host: Tree, schema: Schema) {
   const message = stripIndents`Workspace Generators are no longer supported. Instead,
     Nx now supports executing generators or executors from local plugins. To get 
-    started, install @nx/nx-plugin and run \`nx g plugin\`.
+    started, install @nx/plugin and run \`nx g plugin\`.
 
     Afterwards, or if you already have an Nx plugin, you can run 
     \`nx g generator --project {my-plugin}\` to add a new generator.
diff --git a/packages/workspace/src/migrations/update-16-0-0/move-workspace-generators-to-local-plugin.ts b/packages/workspace/src/migrations/update-16-0-0/move-workspace-generators-to-local-plugin.ts
index a7b7e4b6764a66..1a200b2d12de36 100644
--- a/packages/workspace/src/migrations/update-16-0-0/move-workspace-generators-to-local-plugin.ts
+++ b/packages/workspace/src/migrations/update-16-0-0/move-workspace-generators-to-local-plugin.ts
@@ -40,7 +40,7 @@ export default async function (tree: Tree) {
         tree,
         {},
         {
-          '@nx/nx-plugin': nxVersion,
+          '@nx/plugin': nxVersion,
         }
       )
     );
@@ -81,10 +81,10 @@ function collectAndMoveGenerators(tree: Tree, destinationProjectRoot: string) {
 }
 
 async function createNewPlugin(tree: Tree) {
-  ensurePackage('@nx/nx-plugin', nxVersion);
+  ensurePackage('@nx/plugin', nxVersion);
   const { pluginGenerator } =
     // nx-ignore-next-line
-    require('@nx/nx-plugin/src/generators/plugin/plugin');
+    require('@nx/plugin/src/generators/plugin/plugin');
 
   // nx-ignore-next-line
   const { Linter } = ensurePackage('@nx/linter', nxVersion);
@@ -179,10 +179,10 @@ function getCreateGeneratorsJson(): (
   skipLintChecks?: boolean,
   skipFormat?: boolean
 ) => Promise<void> {
-  // We cant use  `as typeof import('@nx/nx-plugin/src/generators/generator/generator');` here
+  // We cant use  `as typeof import('@nx/plugin/src/generators/generator/generator');` here
   // because it will cause a typescript error at build time.
   const { createGeneratorsJson } =
     // nx-ignore-next-line
-    require('@nx/nx-plugin/src/generators/generator/generator');
+    require('@nx/plugin/src/generators/generator/generator');
   return createGeneratorsJson;
 }
diff --git a/scripts/depcheck/missing.ts b/scripts/depcheck/missing.ts
index bb73710f11d9d5..137c66afa193f5 100644
--- a/scripts/depcheck/missing.ts
+++ b/scripts/depcheck/missing.ts
@@ -192,7 +192,7 @@ const IGNORE_MATCHES_BY_FILE: Record<string, string[]> = {
       '../../packages/angular/src/migrations/update-12-3-0/update-storybook.ts'
     ),
   ],
-  '@nx/nx-plugin': [
+  '@nx/plugin': [
     join(
       __dirname,
       '../../packages/workspace/src/migrations/update-16-0-0/move-workspace-generators-to-local-plugin.spec.ts'
diff --git a/scripts/documentation/package-schemas/package-metadata.ts b/scripts/documentation/package-schemas/package-metadata.ts
index 1713cb910f340e..f0724f6b8f80bc 100644
--- a/scripts/documentation/package-schemas/package-metadata.ts
+++ b/scripts/documentation/package-schemas/package-metadata.ts
@@ -132,7 +132,8 @@ export function getPackageMetadataList(
         // TODO(v16): Remove this replace
         packageName: packageJson.name
           .replace('@nx/', '@nrwl/')
-          .replace('@nrwl/eslint-plugin', '@nrwl/eslint-plugin-nx'),
+          .replace('@nrwl/eslint-plugin', '@nrwl/eslint-plugin-nx')
+          .replace('@nrwl/plugin', '@nrwl/nx-plugin'),
         description: packageJson.description,
         root: relativeFolderPath,
         source: join(relativeFolderPath, '/src'),
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 23c390c60ea01a..dae45653f2f645 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -90,8 +90,8 @@
       "@nx/next/*": ["packages/next/*"],
       "@nx/node": ["packages/node"],
       "@nx/node/*": ["packages/node/*"],
-      "@nx/nx-plugin": ["packages/nx-plugin"],
-      "@nx/nx-plugin/*": ["packages/nx-plugin/*"],
+      "@nx/plugin": ["packages/plugin"],
+      "@nx/plugin/*": ["packages/plugin/*"],
       "@nx/react": ["packages/react"],
       "@nx/react-native": ["packages/react-native"],
       "@nx/react-native/*": ["packages/react-native/*"],