diff --git a/docs/generated/packages/angular/executors/webpack-dev-server.json b/docs/generated/packages/angular/executors/webpack-dev-server.json
index 26da9fcb57..a67ca82d47 100644
--- a/docs/generated/packages/angular/executors/webpack-dev-server.json
+++ b/docs/generated/packages/angular/executors/webpack-dev-server.json
@@ -6,7 +6,7 @@
     "outputCapture": "direct-nodejs",
     "$schema": "http://json-schema.org/draft-07/schema",
     "title": "Schema for Webpack Dev Server",
-    "description": "The webpack-dev-server executor is very similar to the standard dev server builder provided by the Angular Devkit. It is usually used in tandem with `@nrwl/angular:webpack-browser` when your Angular application uses a custom webpack configuration.",
+    "description": "The webpack-dev-server executor is very similar to the standard dev server builder provided by the Angular Devkit. It is usually used in tandem with `@nx/angular:webpack-browser` when your Angular application uses a custom webpack configuration.",
     "examplesFile": "##### Seving an application with a custom webpack configuration\n\nThis executor should be used along with `@nx/angular:webpack-browser` to serve an application using a custom webpack configuration.\n\nYour `project.json` file should contain a `build` and `serve` target that matches the following:\n\n```json\n\"build\": {\n    \"executor\": \"@nx/angular:webpack-browser\",\n    \"options\": {\n        ...\n        \"customWebpackConfig\": {\n          \"path\": \"apps/appName/webpack.config.js\"\n        }\n    }\n},\n\"serve\": {\n    \"executor\": \"@nx/angular:webpack-dev-server\",\n    \"configurations\": {\n        \"production\": {\n            \"browserTarget\": \"appName:build:production\"\n        },\n        \"development\": {\n            \"browserTarget\": \"appName:build:development\"\n        }\n    },\n    \"defaultConfiguration\": \"development\",\n}\n```\n",
     "type": "object",
     "presets": [
diff --git a/docs/generated/packages/angular/executors/webpack-server.json b/docs/generated/packages/angular/executors/webpack-server.json
index a86f89275c..6dd917c2cd 100644
--- a/docs/generated/packages/angular/executors/webpack-server.json
+++ b/docs/generated/packages/angular/executors/webpack-server.json
@@ -6,7 +6,7 @@
     "outputCapture": "direct-nodejs",
     "$schema": "http://json-schema.org/draft-07/schema",
     "title": "Schema for Webpack Server",
-    "description": "The webpack-dev-server executor is very similar to the standard server builder provided by the Angular Devkit. It is usually used in tandem with `@nrwl/angular:webpack-browser` when your Angular application uses a custom webpack configuration and NgUniversal for SSR.",
+    "description": "The webpack-dev-server executor is very similar to the standard server builder provided by the Angular Devkit. It is usually used in tandem with `@nx/angular:webpack-browser` when your Angular application uses a custom webpack configuration and NgUniversal for SSR.",
     "type": "object",
     "properties": {
       "assets": {
diff --git a/docs/generated/packages/angular/generators/add-linting.json b/docs/generated/packages/angular/generators/add-linting.json
index 2baf5f7a7a..88f01478df 100644
--- a/docs/generated/packages/angular/generators/add-linting.json
+++ b/docs/generated/packages/angular/generators/add-linting.json
@@ -10,7 +10,7 @@
     "type": "object",
     "examples": [
       {
-        "command": "nx g @nrwl/angular:add-linting --prefix=cool --projectName=cool-lib --projectRoot=libs/cool-lib",
+        "command": "nx g @nx/angular:add-linting --prefix=cool --projectName=cool-lib --projectRoot=libs/cool-lib",
         "description": "Adds ESLint with Angular-specific rules for an existing project named `cool-lib` with the [prefix](https://angular.io/guide/styleguide#style-02-07) `cool`"
       }
     ],
diff --git a/docs/generated/packages/angular/generators/convert-to-with-mf.json b/docs/generated/packages/angular/generators/convert-to-with-mf.json
index a55a9b326e..0d03b5d750 100644
--- a/docs/generated/packages/angular/generators/convert-to-with-mf.json
+++ b/docs/generated/packages/angular/generators/convert-to-with-mf.json
@@ -11,7 +11,7 @@
     "additionalProperties": false,
     "examples": [
       {
-        "command": "nx g @nrwl/angular:convert-to-with-mf --project mf-app",
+        "command": "nx g @nx/angular:convert-to-with-mf --project mf-app",
         "description": "Convert a Module Federation Project using legacy webpack config to use the `withModuleFederation` helper."
       }
     ],
diff --git a/docs/generated/packages/angular/generators/host.json b/docs/generated/packages/angular/generators/host.json
index 856524fd58..c22fff9051 100644
--- a/docs/generated/packages/angular/generators/host.json
+++ b/docs/generated/packages/angular/generators/host.json
@@ -10,7 +10,7 @@
     "type": "object",
     "examples": [
       {
-        "command": "nx g @nrwl/angular:host appName --remotes=remote1",
+        "command": "nx g @nx/angular:host appName --remotes=remote1",
         "description": "Create an Angular application with configuration in place for Module Federation. If the `remotes` option is provided, attach the remote application to this application's configuration"
       }
     ],
diff --git a/docs/generated/packages/angular/generators/init.json b/docs/generated/packages/angular/generators/init.json
index 8eb9ad6271..bd4e1ac196 100644
--- a/docs/generated/packages/angular/generators/init.json
+++ b/docs/generated/packages/angular/generators/init.json
@@ -6,12 +6,12 @@
     "$id": "SchematicsAngularModuleInit",
     "cli": "nx",
     "title": "Init Angular Plugin",
-    "description": "Initializes the `@nrwl/angular` plugin. NOTE: Does not work in the `--dry-run` mode.",
+    "description": "Initializes the `@nx/angular` plugin. NOTE: Does not work in the `--dry-run` mode.",
     "type": "object",
     "examples": [
       {
-        "command": "nx g @nrwl/angular:init --style=scss",
-        "description": "Installs angular dependencies and initializes the `@nrwl/angular` plugin with the `scss` stylesheet format."
+        "command": "nx g @nx/angular:init --style=scss",
+        "description": "Installs angular dependencies and initializes the `@nx/angular` plugin with the `scss` stylesheet format."
       }
     ],
     "properties": {
@@ -31,7 +31,7 @@
       },
       "skipInstall": {
         "type": "boolean",
-        "description": "Skip installing after adding `@nrwl/workspace`.",
+        "description": "Skip installing after adding `@nx/workspace`.",
         "default": false,
         "x-priority": "internal"
       },
diff --git a/docs/generated/packages/angular/generators/move.json b/docs/generated/packages/angular/generators/move.json
index 6da5bef439..d89b0d89e8 100644
--- a/docs/generated/packages/angular/generators/move.json
+++ b/docs/generated/packages/angular/generators/move.json
@@ -10,7 +10,7 @@
     "type": "object",
     "examples": [
       {
-        "command": "nx g @nrwl/angular:move --project my-feature-lib --destination shared/my-feature-lib",
+        "command": "nx g @nx/angular:move --project my-feature-lib --destination shared/my-feature-lib",
         "description": "Move libs/my-feature-lib to libs/shared/my-feature-lib."
       }
     ],
diff --git a/docs/generated/packages/angular/generators/ngrx.json b/docs/generated/packages/angular/generators/ngrx.json
index 3d1b37eb37..d417ddd5e8 100644
--- a/docs/generated/packages/angular/generators/ngrx.json
+++ b/docs/generated/packages/angular/generators/ngrx.json
@@ -10,19 +10,19 @@
     "type": "object",
     "examples": [
       {
-        "command": "nx g @nrwl/angular:ngrx --root --parent=apps/my-app/src/app/app.module.ts --facade=false placeholder",
+        "command": "nx g @nx/angular:ngrx --root --parent=apps/my-app/src/app/app.module.ts --facade=false placeholder",
         "description": "Add root ngrx configration to the `my-app` application"
       },
       {
-        "command": "nx g @nrwl/angular:ngrx --parent=libs/my-lib/src/lib/my-lib.module.ts --facade=true --root=false users",
+        "command": "nx g @nx/angular:ngrx --parent=libs/my-lib/src/lib/my-lib.module.ts --facade=true --root=false users",
         "description": "Add a `users` state with a facade to the `my-lib` library. It will be tracked under the default `+state` folder in the lib"
       },
       {
-        "command": "nx g @nrwl/angular:ngrx --parent=apps/my-app/src/app/app.config.ts --root",
+        "command": "nx g @nx/angular:ngrx --parent=apps/my-app/src/app/app.config.ts --root",
         "description": "Add a root state configuration to `my-app` when `my-app` uses Standalone APIs"
       },
       {
-        "command": "nx g @nrwl/angular:ngrx --parent=libs/my-lib/src/lib.routes.ts users",
+        "command": "nx g @nx/angular:ngrx --parent=libs/my-lib/src/lib.routes.ts users",
         "description": "Add a `users` feature state to the Route definition of a library using Standalone APIs"
       }
     ],
diff --git a/docs/generated/packages/angular/generators/remote.json b/docs/generated/packages/angular/generators/remote.json
index 793a89111a..e94bd1b698 100644
--- a/docs/generated/packages/angular/generators/remote.json
+++ b/docs/generated/packages/angular/generators/remote.json
@@ -10,7 +10,7 @@
     "type": "object",
     "examples": [
       {
-        "command": "nx g @nrwl/angular:remote appName --host=host --port=4201",
+        "command": "nx g @nx/angular:remote appName --host=host --port=4201",
         "description": "Create an Angular app with configuration in place for Module Federation. If host is provided, attach this remote app to host app's configuration."
       }
     ],
diff --git a/docs/generated/packages/angular/generators/scam-directive.json b/docs/generated/packages/angular/generators/scam-directive.json
index 7856f604f7..79116e21df 100644
--- a/docs/generated/packages/angular/generators/scam-directive.json
+++ b/docs/generated/packages/angular/generators/scam-directive.json
@@ -9,7 +9,7 @@
     "type": "object",
     "examples": [
       {
-        "command": "nx g @nrwl/angular:scam-directive --project=my-lib --flat=false my-sample",
+        "command": "nx g @nx/angular:scam-directive --project=my-lib --flat=false my-sample",
         "description": "Generate a `MySampleDirective` directive in a `my-sample` folder in the `my-lib` library"
       }
     ],
diff --git a/docs/generated/packages/angular/generators/scam-pipe.json b/docs/generated/packages/angular/generators/scam-pipe.json
index 6c5fa58bbd..03e61d937b 100644
--- a/docs/generated/packages/angular/generators/scam-pipe.json
+++ b/docs/generated/packages/angular/generators/scam-pipe.json
@@ -9,7 +9,7 @@
     "type": "object",
     "examples": [
       {
-        "command": "nx g @nrwl/angular:scam-pipe --project=my-lib --flat=false my-transformation",
+        "command": "nx g @nx/angular:scam-pipe --project=my-lib --flat=false my-transformation",
         "description": "Generates a `MyTransformationPipe` in a `my-transformation` folder in the `my-lib` project"
       }
     ],
diff --git a/docs/generated/packages/angular/generators/scam.json b/docs/generated/packages/angular/generators/scam.json
index 030d961b9c..75fc4233c6 100644
--- a/docs/generated/packages/angular/generators/scam.json
+++ b/docs/generated/packages/angular/generators/scam.json
@@ -9,7 +9,7 @@
     "type": "object",
     "examples": [
       {
-        "command": "nx g @nrwl/angular:scam --project=my-lib my-sample",
+        "command": "nx g @nx/angular:scam --project=my-lib my-sample",
         "description": "Generate a `MySampleComponent` component in the `my-lib` library."
       }
     ],
diff --git a/docs/generated/packages/cypress/generators/cypress-component-configuration.json b/docs/generated/packages/cypress/generators/cypress-component-configuration.json
index d99a2b20e5..ff239fa034 100644
--- a/docs/generated/packages/cypress/generators/cypress-component-configuration.json
+++ b/docs/generated/packages/cypress/generators/cypress-component-configuration.json
@@ -10,7 +10,7 @@
     "type": "object",
     "examples": [
       {
-        "command": "nx g @nrwl/cypress:cypress-component-configuration --project=my-cool-lib ",
+        "command": "nx g @nx/cypress:cypress-component-configuration --project=my-cool-lib ",
         "description": "Add cypress component testing to an existing project named my-cool-lib"
       }
     ],
diff --git a/docs/generated/packages/cypress/generators/migrate-to-cypress-11.json b/docs/generated/packages/cypress/generators/migrate-to-cypress-11.json
index 3e1d6c9efc..28feee6b5e 100644
--- a/docs/generated/packages/cypress/generators/migrate-to-cypress-11.json
+++ b/docs/generated/packages/cypress/generators/migrate-to-cypress-11.json
@@ -10,7 +10,7 @@
     "type": "object",
     "examples": [
       {
-        "command": "nx g @nrwl/cypress:migrate-to-cypress-11",
+        "command": "nx g @nx/cypress:migrate-to-cypress-11",
         "description": "Migrate existing cypress projects to Cypress v11"
       }
     ],
diff --git a/docs/generated/packages/expo/generators/application.json b/docs/generated/packages/expo/generators/application.json
index 94ae26f44b..6ea6bddd89 100644
--- a/docs/generated/packages/expo/generators/application.json
+++ b/docs/generated/packages/expo/generators/application.json
@@ -8,11 +8,11 @@
     "description": "Create an Expo Application for Nx.",
     "examples": [
       {
-        "command": "g @nrwl/expo:app myapp --directory=nested",
+        "command": "g @nx/expo:app myapp --directory=nested",
         "description": "Generate apps/nested/myapp"
       },
       {
-        "command": "g @nrwl/expo:app myapp --classComponent",
+        "command": "g @nx/expo:app myapp --classComponent",
         "description": "Use class components instead of functional components"
       }
     ],
diff --git a/docs/generated/packages/expo/generators/component.json b/docs/generated/packages/expo/generators/component.json
index 5a58fa894c..46abac021b 100644
--- a/docs/generated/packages/expo/generators/component.json
+++ b/docs/generated/packages/expo/generators/component.json
@@ -9,11 +9,11 @@
     "type": "object",
     "examples": [
       {
-        "command": "g @nrwl/expo:component my-component --project=mylib",
+        "command": "g @nx/expo:component my-component --project=mylib",
         "description": "Generate a component in the mylib library"
       },
       {
-        "command": "g @nrwl/expo:component my-component --project=mylib --classComponent",
+        "command": "g @nx/expo:component my-component --project=mylib --classComponent",
         "description": "Generate a class component in the mylib library"
       }
     ],
diff --git a/docs/generated/packages/expo/generators/library.json b/docs/generated/packages/expo/generators/library.json
index b3976b6ae0..855c37afd4 100644
--- a/docs/generated/packages/expo/generators/library.json
+++ b/docs/generated/packages/expo/generators/library.json
@@ -9,7 +9,7 @@
     "type": "object",
     "examples": [
       {
-        "command": "g @nrwl/expo:lib mylib --directory=myapp",
+        "command": "g @nx/expo:lib mylib --directory=myapp",
         "description": "Generate libs/myapp/mylib"
       }
     ],
diff --git a/docs/generated/packages/js/generators/init.json b/docs/generated/packages/js/generators/init.json
index c6ee45b6be..e5ab984fc8 100644
--- a/docs/generated/packages/js/generators/init.json
+++ b/docs/generated/packages/js/generators/init.json
@@ -5,8 +5,8 @@
     "$schema": "http://json-schema.org/schema",
     "$id": "NxTypescriptInit",
     "cli": "nx",
-    "title": "Init nrwl/js",
-    "description": "Init generator placeholder for nrwl/js.",
+    "title": "Init nx/js",
+    "description": "Init generator placeholder for nx/js.",
     "properties": {
       "js": {
         "type": "boolean",
diff --git a/docs/generated/packages/linter/generators/workspace-rules-project.json b/docs/generated/packages/linter/generators/workspace-rules-project.json
index bf08014035..571bb3c580 100644
--- a/docs/generated/packages/linter/generators/workspace-rules-project.json
+++ b/docs/generated/packages/linter/generators/workspace-rules-project.json
@@ -10,7 +10,7 @@
     "type": "object",
     "examples": [
       {
-        "command": "nx g @nrwl/linter:workspace-rules-project",
+        "command": "nx g @nx/linter:workspace-rules-project",
         "description": "Create the Workspace Lint Rules Project"
       }
     ],
diff --git a/docs/generated/packages/next/generators/cypress-component-configuration.json b/docs/generated/packages/next/generators/cypress-component-configuration.json
index 8d9ff9c8e1..17ea57b30e 100644
--- a/docs/generated/packages/next/generators/cypress-component-configuration.json
+++ b/docs/generated/packages/next/generators/cypress-component-configuration.json
@@ -10,11 +10,11 @@
     "type": "object",
     "examples": [
       {
-        "command": "nx g @nrwl/next:cypress-component-configuration --project=my-next-project",
+        "command": "nx g @nx/next:cypress-component-configuration --project=my-next-project",
         "description": "Add component testing to your Next project"
       },
       {
-        "command": "nx g @nrwl/next:cypress-component-configuration --project=my-next-project --generate-tests",
+        "command": "nx g @nx/next:cypress-component-configuration --project=my-next-project --generate-tests",
         "description": "Add component testing to your Next project and generate component tests for your existing components"
       }
     ],
diff --git a/docs/generated/packages/plugin/generators/preset.json b/docs/generated/packages/plugin/generators/preset.json
index c3d27fed67..ba1a0769f0 100644
--- a/docs/generated/packages/plugin/generators/preset.json
+++ b/docs/generated/packages/plugin/generators/preset.json
@@ -6,7 +6,7 @@
     "cli": "nx",
     "$id": "NxPluginPreset",
     "title": "Generator ran by create-nx-plugin",
-    "description": "Initializes a workspace with an nx-plugin inside of it. Use as: `create-nx-plugin` or `create-nx-workspace --preset @nrwl/nx-plugin`.",
+    "description": "Initializes a workspace with an nx-plugin inside of it. Use as: `create-nx-plugin` or `create-nx-workspace --preset @nx/nx-plugin`.",
     "type": "object",
     "properties": {
       "pluginName": {
diff --git a/docs/generated/packages/react-native/generators/application.json b/docs/generated/packages/react-native/generators/application.json
index 318198dc3c..3294493dfa 100644
--- a/docs/generated/packages/react-native/generators/application.json
+++ b/docs/generated/packages/react-native/generators/application.json
@@ -9,11 +9,11 @@
     "description": "Create a React Application for Nx.",
     "examples": [
       {
-        "command": "nx g @nrwl/react-native:app myapp --directory=nested",
+        "command": "nx g @nx/react-native:app myapp --directory=nested",
         "description": "Generate `apps/nested/myapp`"
       },
       {
-        "command": "nx g @nrwl/react-native:app myapp --classComponent",
+        "command": "nx g @nx/react-native:app myapp --classComponent",
         "description": "Use class components instead of functional components"
       }
     ],
diff --git a/docs/generated/packages/react-native/generators/component.json b/docs/generated/packages/react-native/generators/component.json
index f17f6fac1f..357a1b5c5b 100644
--- a/docs/generated/packages/react-native/generators/component.json
+++ b/docs/generated/packages/react-native/generators/component.json
@@ -10,11 +10,11 @@
     "type": "object",
     "examples": [
       {
-        "command": "nx g @nrwl/react-native:component my-component --project=mylib",
+        "command": "nx g @nx/react-native:component my-component --project=mylib",
         "description": "Generate a component in the `mylib` library"
       },
       {
-        "command": "nx g @nrwl/react-native:component my-component --project=mylib --classComponent",
+        "command": "nx g @nx/react-native:component my-component --project=mylib --classComponent",
         "description": "Generate a class component in the `mylib` library"
       }
     ],
diff --git a/docs/generated/packages/react-native/generators/library.json b/docs/generated/packages/react-native/generators/library.json
index 906eb413a0..7e6bb92c4b 100644
--- a/docs/generated/packages/react-native/generators/library.json
+++ b/docs/generated/packages/react-native/generators/library.json
@@ -10,7 +10,7 @@
     "type": "object",
     "examples": [
       {
-        "command": "nx g @nrwl/react-native:lib mylib --directory=myapp",
+        "command": "nx g @nx/react-native:lib mylib --directory=myapp",
         "description": "Generate `libs/myapp/mylib`"
       }
     ],
diff --git a/docs/generated/packages/react/generators/component-test.json b/docs/generated/packages/react/generators/component-test.json
index 85054c027f..b3973d92a1 100644
--- a/docs/generated/packages/react/generators/component-test.json
+++ b/docs/generated/packages/react/generators/component-test.json
@@ -10,7 +10,7 @@
     "type": "object",
     "examples": [
       {
-        "command": "nx g @nrwl/react:component-test --project=my-react-project --component-path=src/lib/fancy-component.tsx",
+        "command": "nx g @nx/react:component-test --project=my-react-project --component-path=src/lib/fancy-component.tsx",
         "description": "Create a cypress component test for FancyComponent"
       }
     ],
diff --git a/docs/generated/packages/react/generators/cypress-component-configuration.json b/docs/generated/packages/react/generators/cypress-component-configuration.json
index de9af1f65a..bfaaf90bf3 100644
--- a/docs/generated/packages/react/generators/cypress-component-configuration.json
+++ b/docs/generated/packages/react/generators/cypress-component-configuration.json
@@ -10,11 +10,11 @@
     "type": "object",
     "examples": [
       {
-        "command": "nx g @nrwl/react:cypress-component-configuration --project=my-react-project",
+        "command": "nx g @nx/react:cypress-component-configuration --project=my-react-project",
         "description": "Add component testing to your react project"
       },
       {
-        "command": "nx g @nrwl/react:cypress-component-configuration --project=my-react-project --generate-tests",
+        "command": "nx g @nx/react:cypress-component-configuration --project=my-react-project --generate-tests",
         "description": "Add component testing to your react project and generate component tests for your existing components"
       }
     ],
diff --git a/docs/generated/packages/vite/generators/configuration.json b/docs/generated/packages/vite/generators/configuration.json
index e1534416b8..05e6f2c68f 100644
--- a/docs/generated/packages/vite/generators/configuration.json
+++ b/docs/generated/packages/vite/generators/configuration.json
@@ -40,15 +40,15 @@
       },
       "buildTarget": {
         "type": "string",
-        "description": "The build target of the project to be transformed to use the @nrwl/vite:build executor."
+        "description": "The build target of the project to be transformed to use the @nx/vite:build executor."
       },
       "serveTarget": {
         "type": "string",
-        "description": "The serve target of the project to be transformed to use the @nrwl/vite:dev-server and @nrwl/vite:preview-server executors."
+        "description": "The serve target of the project to be transformed to use the @nx/vite:dev-server and @nrwl/vite:preview-server executors."
       },
       "testTarget": {
         "type": "string",
-        "description": "The test target of the project to be transformed to use the @nrwl/vite:test executor."
+        "description": "The test target of the project to be transformed to use the @nx/vite:test executor."
       },
       "skipFormat": {
         "description": "Skip formatting files.",
diff --git a/docs/generated/packages/vite/generators/vitest.json b/docs/generated/packages/vite/generators/vitest.json
index a2b7fb7814..effc408f9f 100644
--- a/docs/generated/packages/vite/generators/vitest.json
+++ b/docs/generated/packages/vite/generators/vitest.json
@@ -38,7 +38,7 @@
       },
       "testTarget": {
         "type": "string",
-        "description": "The test target of the project to be transformed to use the @nrwl/vite:test executor.",
+        "description": "The test target of the project to be transformed to use the @nx/vite:test executor.",
         "hidden": true
       },
       "skipFormat": {
diff --git a/docs/generated/packages/workspace/generators/fix-configuration.json b/docs/generated/packages/workspace/generators/fix-configuration.json
index e46f4a30f0..8b137c96c0 100644
--- a/docs/generated/packages/workspace/generators/fix-configuration.json
+++ b/docs/generated/packages/workspace/generators/fix-configuration.json
@@ -4,17 +4,17 @@
   "schema": {
     "$schema": "http://json-schema.org/schema",
     "$id": "SchematicsConvertToNxProject",
-    "title": "@nrwl/workspace:fix-configuration",
+    "title": "@nx/workspace:fix-configuration",
     "description": "Migrates v1 config to v2 standalone configuration.",
     "type": "object",
     "cli": "nx",
     "examples": [
       {
-        "command": "nx g @nrwl/workspace:convert-to-nx-project --project my-feature-lib",
+        "command": "nx g @nx/workspace:convert-to-nx-project --project my-feature-lib",
         "description": "Convert the `my-feature-lib` project to use `project.json` file instead of `workspace.json`"
       },
       {
-        "command": "nx g @nrwl/workspace:convert-to-nx-project --all",
+        "command": "nx g @nx/workspace:convert-to-nx-project --all",
         "description": "Convert all projects in `workspace.json` to separate `project.json` files"
       }
     ],
diff --git a/docs/generated/packages/workspace/generators/move.json b/docs/generated/packages/workspace/generators/move.json
index 65cacacee3..5942f98da6 100644
--- a/docs/generated/packages/workspace/generators/move.json
+++ b/docs/generated/packages/workspace/generators/move.json
@@ -10,7 +10,7 @@
     "type": "object",
     "examples": [
       {
-        "command": "nx g @nrwl/workspace:move --project my-feature-lib --destination shared/my-feature-lib",
+        "command": "nx g @nx/workspace:move --project my-feature-lib --destination shared/my-feature-lib",
         "description": "Move `libs/my-feature-lib` to `libs/shared/my-feature-lib`"
       }
     ],
diff --git a/docs/generated/packages/workspace/generators/remove.json b/docs/generated/packages/workspace/generators/remove.json
index f5f4a4e51d..f4dff57a0a 100644
--- a/docs/generated/packages/workspace/generators/remove.json
+++ b/docs/generated/packages/workspace/generators/remove.json
@@ -10,11 +10,11 @@
     "type": "object",
     "examples": [
       {
-        "command": "nx g @nrwl/workspace:remove my-feature-lib",
+        "command": "nx g @nx/workspace:remove my-feature-lib",
         "description": "Remove `my-feature-lib` from the workspace"
       },
       {
-        "command": "nx g @nrwl/workspace:remove my-feature-lib --forceRemove",
+        "command": "nx g @nx/workspace:remove my-feature-lib --forceRemove",
         "description": "Force removal of `my-feature-lib` from the workspace"
       }
     ],
diff --git a/docs/generated/packages/workspace/generators/run-commands.json b/docs/generated/packages/workspace/generators/run-commands.json
index c78cde9c2b..e7f8b805f5 100644
--- a/docs/generated/packages/workspace/generators/run-commands.json
+++ b/docs/generated/packages/workspace/generators/run-commands.json
@@ -10,7 +10,7 @@
     "cli": "nx",
     "examples": [
       {
-        "command": "nx g @nrwl/workspace:run-commands printhello --project my-feature-lib --command 'echo hello'",
+        "command": "nx g @nx/workspace:run-commands printhello --project my-feature-lib --command 'echo hello'",
         "description": "Add the `printhello` target to `my-feature-lib`"
       }
     ],
diff --git a/docs/shared/recipes/rescope.md b/docs/shared/recipes/rescope.md
index d0fe3cf438..a4c3b18a0f 100644
--- a/docs/shared/recipes/rescope.md
+++ b/docs/shared/recipes/rescope.md
@@ -33,21 +33,27 @@ All other packages keep the same name, but change scope from `@nrwl` to `@nx`.
 | Nx 15 and lower    | Nx 16 and higher |
 | ------------------ | ---------------- |
 | @nrwl/angular      | @nx/angular      |
+| @nrwl/aws-lambda   | @nx/aws-lambda   |
 | @nrwl/cypress      | @nx/cypress      |
+| @nrwl/deno         | @nx/deno         |
 | @nrwl/detox        | @nx/detox        |
 | @nrwl/devkit       | @nx/devkit       |
 | @nrwl/esbuild      | @nx/esbuild      |
 | @nrwl/expo         | @nx/expo         |
 | @nrwl/express      | @nx/express      |
+| @nrwl/gatsby       | @nx/gatsby       |
 | @nrwl/jest         | @nx/jest         |
 | @nrwl/js           | @nx/js           |
 | @nrwl/linter       | @nx/linter       |
 | @nrwl/nest         | @nx/nest         |
+| @nrwl/netlify      | @nx/netlify      |
 | @nrwl/next         | @nx/next         |
 | @nrwl/node         | @nx/node         |
 | @nrwl/react        | @nx/react        |
 | @nrwl/react-native | @nx/react-native |
+| @nrwl/remix        | @nx/remix        |
 | @nrwl/rollup       | @nx/rollup       |
+| @nrwl/rspack       | @nx/rspack       |
 | @nrwl/storybook    | @nx/storybook    |
 | @nrwl/vite         | @nx/vite         |
 | @nrwl/web          | @nx/web          |
diff --git a/packages/angular/src/builders/webpack-dev-server/schema.json b/packages/angular/src/builders/webpack-dev-server/schema.json
index df8e9d4ffa..f2f293096b 100644
--- a/packages/angular/src/builders/webpack-dev-server/schema.json
+++ b/packages/angular/src/builders/webpack-dev-server/schema.json
@@ -3,7 +3,7 @@
   "outputCapture": "direct-nodejs",
   "$schema": "http://json-schema.org/draft-07/schema",
   "title": "Schema for Webpack Dev Server",
-  "description": "The webpack-dev-server executor is very similar to the standard dev server builder provided by the Angular Devkit. It is usually used in tandem with `@nrwl/angular:webpack-browser` when your Angular application uses a custom webpack configuration.",
+  "description": "The webpack-dev-server executor is very similar to the standard dev server builder provided by the Angular Devkit. It is usually used in tandem with `@nx/angular:webpack-browser` when your Angular application uses a custom webpack configuration.",
   "examplesFile": "../../../docs/webpack-dev-server-examples.md",
   "type": "object",
   "presets": [
diff --git a/packages/angular/src/builders/webpack-server/schema.json b/packages/angular/src/builders/webpack-server/schema.json
index fc29706ec6..4bb2054adb 100644
--- a/packages/angular/src/builders/webpack-server/schema.json
+++ b/packages/angular/src/builders/webpack-server/schema.json
@@ -3,7 +3,7 @@
   "outputCapture": "direct-nodejs",
   "$schema": "http://json-schema.org/draft-07/schema",
   "title": "Schema for Webpack Server",
-  "description": "The webpack-dev-server executor is very similar to the standard server builder provided by the Angular Devkit. It is usually used in tandem with `@nrwl/angular:webpack-browser` when your Angular application uses a custom webpack configuration and NgUniversal for SSR.",
+  "description": "The webpack-dev-server executor is very similar to the standard server builder provided by the Angular Devkit. It is usually used in tandem with `@nx/angular:webpack-browser` when your Angular application uses a custom webpack configuration and NgUniversal for SSR.",
   "type": "object",
   "properties": {
     "assets": {
diff --git a/packages/angular/src/generators/add-linting/schema.json b/packages/angular/src/generators/add-linting/schema.json
index 2e74b4667a..517bab6678 100644
--- a/packages/angular/src/generators/add-linting/schema.json
+++ b/packages/angular/src/generators/add-linting/schema.json
@@ -7,7 +7,7 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g @nrwl/angular:add-linting --prefix=cool --projectName=cool-lib --projectRoot=libs/cool-lib",
+      "command": "nx g @nx/angular:add-linting --prefix=cool --projectName=cool-lib --projectRoot=libs/cool-lib",
       "description": "Adds ESLint with Angular-specific rules for an existing project named `cool-lib` with the [prefix](https://angular.io/guide/styleguide#style-02-07) `cool`"
     }
   ],
diff --git a/packages/angular/src/generators/convert-to-with-mf/schema.json b/packages/angular/src/generators/convert-to-with-mf/schema.json
index 3282d077b7..a956cdcbfd 100644
--- a/packages/angular/src/generators/convert-to-with-mf/schema.json
+++ b/packages/angular/src/generators/convert-to-with-mf/schema.json
@@ -8,7 +8,7 @@
   "additionalProperties": false,
   "examples": [
     {
-      "command": "nx g @nrwl/angular:convert-to-with-mf --project mf-app",
+      "command": "nx g @nx/angular:convert-to-with-mf --project mf-app",
       "description": "Convert a Module Federation Project using legacy webpack config to use the `withModuleFederation` helper."
     }
   ],
diff --git a/packages/angular/src/generators/host/schema.json b/packages/angular/src/generators/host/schema.json
index f24b551c3c..c1d21991c0 100644
--- a/packages/angular/src/generators/host/schema.json
+++ b/packages/angular/src/generators/host/schema.json
@@ -7,7 +7,7 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g @nrwl/angular:host appName --remotes=remote1",
+      "command": "nx g @nx/angular:host appName --remotes=remote1",
       "description": "Create an Angular application with configuration in place for Module Federation. If the `remotes` option is provided, attach the remote application to this application's configuration"
     }
   ],
diff --git a/packages/angular/src/generators/init/schema.json b/packages/angular/src/generators/init/schema.json
index 283bb9edb1..4d3a13fdb4 100644
--- a/packages/angular/src/generators/init/schema.json
+++ b/packages/angular/src/generators/init/schema.json
@@ -3,12 +3,12 @@
   "$id": "SchematicsAngularModuleInit",
   "cli": "nx",
   "title": "Init Angular Plugin",
-  "description": "Initializes the `@nrwl/angular` plugin. NOTE: Does not work in the `--dry-run` mode.",
+  "description": "Initializes the `@nx/angular` plugin. NOTE: Does not work in the `--dry-run` mode.",
   "type": "object",
   "examples": [
     {
-      "command": "nx g @nrwl/angular:init --style=scss",
-      "description": "Installs angular dependencies and initializes the `@nrwl/angular` plugin with the `scss` stylesheet format."
+      "command": "nx g @nx/angular:init --style=scss",
+      "description": "Installs angular dependencies and initializes the `@nx/angular` plugin with the `scss` stylesheet format."
     }
   ],
   "properties": {
@@ -28,7 +28,7 @@
     },
     "skipInstall": {
       "type": "boolean",
-      "description": "Skip installing after adding `@nrwl/workspace`.",
+      "description": "Skip installing after adding `@nx/workspace`.",
       "default": false,
       "x-priority": "internal"
     },
diff --git a/packages/angular/src/generators/move/schema.json b/packages/angular/src/generators/move/schema.json
index 2975641882..eac1fd01d5 100644
--- a/packages/angular/src/generators/move/schema.json
+++ b/packages/angular/src/generators/move/schema.json
@@ -7,7 +7,7 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g @nrwl/angular:move --project my-feature-lib --destination shared/my-feature-lib",
+      "command": "nx g @nx/angular:move --project my-feature-lib --destination shared/my-feature-lib",
       "description": "Move libs/my-feature-lib to libs/shared/my-feature-lib."
     }
   ],
diff --git a/packages/angular/src/generators/ngrx/schema.json b/packages/angular/src/generators/ngrx/schema.json
index 4c77342881..b6048470ff 100644
--- a/packages/angular/src/generators/ngrx/schema.json
+++ b/packages/angular/src/generators/ngrx/schema.json
@@ -7,19 +7,19 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g @nrwl/angular:ngrx --root --parent=apps/my-app/src/app/app.module.ts --facade=false placeholder",
+      "command": "nx g @nx/angular:ngrx --root --parent=apps/my-app/src/app/app.module.ts --facade=false placeholder",
       "description": "Add root ngrx configration to the `my-app` application"
     },
     {
-      "command": "nx g @nrwl/angular:ngrx --parent=libs/my-lib/src/lib/my-lib.module.ts --facade=true --root=false users",
+      "command": "nx g @nx/angular:ngrx --parent=libs/my-lib/src/lib/my-lib.module.ts --facade=true --root=false users",
       "description": "Add a `users` state with a facade to the `my-lib` library. It will be tracked under the default `+state` folder in the lib"
     },
     {
-      "command": "nx g @nrwl/angular:ngrx --parent=apps/my-app/src/app/app.config.ts --root",
+      "command": "nx g @nx/angular:ngrx --parent=apps/my-app/src/app/app.config.ts --root",
       "description": "Add a root state configuration to `my-app` when `my-app` uses Standalone APIs"
     },
     {
-      "command": "nx g @nrwl/angular:ngrx --parent=libs/my-lib/src/lib.routes.ts users",
+      "command": "nx g @nx/angular:ngrx --parent=libs/my-lib/src/lib.routes.ts users",
       "description": "Add a `users` feature state to the Route definition of a library using Standalone APIs"
     }
   ],
diff --git a/packages/angular/src/generators/remote/schema.json b/packages/angular/src/generators/remote/schema.json
index 22601e3b5f..42e2532ecd 100644
--- a/packages/angular/src/generators/remote/schema.json
+++ b/packages/angular/src/generators/remote/schema.json
@@ -7,7 +7,7 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g @nrwl/angular:remote appName --host=host --port=4201",
+      "command": "nx g @nx/angular:remote appName --host=host --port=4201",
       "description": "Create an Angular app with configuration in place for Module Federation. If host is provided, attach this remote app to host app's configuration."
     }
   ],
diff --git a/packages/angular/src/generators/scam-directive/schema.json b/packages/angular/src/generators/scam-directive/schema.json
index 4876133c94..0c61aaa886 100644
--- a/packages/angular/src/generators/scam-directive/schema.json
+++ b/packages/angular/src/generators/scam-directive/schema.json
@@ -6,7 +6,7 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g @nrwl/angular:scam-directive --project=my-lib --flat=false my-sample",
+      "command": "nx g @nx/angular:scam-directive --project=my-lib --flat=false my-sample",
       "description": "Generate a `MySampleDirective` directive in a `my-sample` folder in the `my-lib` library"
     }
   ],
diff --git a/packages/angular/src/generators/scam-pipe/schema.json b/packages/angular/src/generators/scam-pipe/schema.json
index 0ef5b7d429..089a462452 100644
--- a/packages/angular/src/generators/scam-pipe/schema.json
+++ b/packages/angular/src/generators/scam-pipe/schema.json
@@ -6,7 +6,7 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g @nrwl/angular:scam-pipe --project=my-lib --flat=false my-transformation",
+      "command": "nx g @nx/angular:scam-pipe --project=my-lib --flat=false my-transformation",
       "description": "Generates a `MyTransformationPipe` in a `my-transformation` folder in the `my-lib` project"
     }
   ],
diff --git a/packages/angular/src/generators/scam/schema.json b/packages/angular/src/generators/scam/schema.json
index fa45935e2e..03658184f7 100644
--- a/packages/angular/src/generators/scam/schema.json
+++ b/packages/angular/src/generators/scam/schema.json
@@ -6,7 +6,7 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g @nrwl/angular:scam --project=my-lib my-sample",
+      "command": "nx g @nx/angular:scam --project=my-lib my-sample",
       "description": "Generate a `MySampleComponent` component in the `my-lib` library."
     }
   ],
diff --git a/packages/cypress/src/generators/cypress-component-configuration/schema.json b/packages/cypress/src/generators/cypress-component-configuration/schema.json
index d182c53f30..71166a4cb3 100644
--- a/packages/cypress/src/generators/cypress-component-configuration/schema.json
+++ b/packages/cypress/src/generators/cypress-component-configuration/schema.json
@@ -7,7 +7,7 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g @nrwl/cypress:cypress-component-configuration --project=my-cool-lib ",
+      "command": "nx g @nx/cypress:cypress-component-configuration --project=my-cool-lib ",
       "description": "Add cypress component testing to an existing project named my-cool-lib"
     }
   ],
diff --git a/packages/cypress/src/generators/migrate-to-cypress-11/schema.json b/packages/cypress/src/generators/migrate-to-cypress-11/schema.json
index 1deb236210..8bbf655ee6 100644
--- a/packages/cypress/src/generators/migrate-to-cypress-11/schema.json
+++ b/packages/cypress/src/generators/migrate-to-cypress-11/schema.json
@@ -7,7 +7,7 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g @nrwl/cypress:migrate-to-cypress-11",
+      "command": "nx g @nx/cypress:migrate-to-cypress-11",
       "description": "Migrate existing cypress projects to Cypress v11"
     }
   ],
diff --git a/packages/expo/src/generators/application/schema.json b/packages/expo/src/generators/application/schema.json
index c507bcc6af..27ac2c95d8 100644
--- a/packages/expo/src/generators/application/schema.json
+++ b/packages/expo/src/generators/application/schema.json
@@ -5,11 +5,11 @@
   "description": "Create an Expo Application for Nx.",
   "examples": [
     {
-      "command": "g @nrwl/expo:app myapp --directory=nested",
+      "command": "g @nx/expo:app myapp --directory=nested",
       "description": "Generate apps/nested/myapp"
     },
     {
-      "command": "g @nrwl/expo:app myapp --classComponent",
+      "command": "g @nx/expo:app myapp --classComponent",
       "description": "Use class components instead of functional components"
     }
   ],
diff --git a/packages/expo/src/generators/component/schema.json b/packages/expo/src/generators/component/schema.json
index 80de6c1796..6c61759cd7 100644
--- a/packages/expo/src/generators/component/schema.json
+++ b/packages/expo/src/generators/component/schema.json
@@ -6,11 +6,11 @@
   "type": "object",
   "examples": [
     {
-      "command": "g @nrwl/expo:component my-component --project=mylib",
+      "command": "g @nx/expo:component my-component --project=mylib",
       "description": "Generate a component in the mylib library"
     },
     {
-      "command": "g @nrwl/expo:component my-component --project=mylib --classComponent",
+      "command": "g @nx/expo:component my-component --project=mylib --classComponent",
       "description": "Generate a class component in the mylib library"
     }
   ],
diff --git a/packages/expo/src/generators/library/schema.json b/packages/expo/src/generators/library/schema.json
index 0961290da0..8ef6e4d777 100644
--- a/packages/expo/src/generators/library/schema.json
+++ b/packages/expo/src/generators/library/schema.json
@@ -6,7 +6,7 @@
   "type": "object",
   "examples": [
     {
-      "command": "g @nrwl/expo:lib mylib --directory=myapp",
+      "command": "g @nx/expo:lib mylib --directory=myapp",
       "description": "Generate libs/myapp/mylib"
     }
   ],
diff --git a/packages/js/src/generators/init/schema.json b/packages/js/src/generators/init/schema.json
index f4c8144a2f..acf1ed0e8d 100644
--- a/packages/js/src/generators/init/schema.json
+++ b/packages/js/src/generators/init/schema.json
@@ -2,8 +2,8 @@
   "$schema": "http://json-schema.org/schema",
   "$id": "NxTypescriptInit",
   "cli": "nx",
-  "title": "Init nrwl/js",
-  "description": "Init generator placeholder for nrwl/js.",
+  "title": "Init nx/js",
+  "description": "Init generator placeholder for nx/js.",
   "properties": {
     "js": {
       "type": "boolean",
diff --git a/packages/linter/src/generators/workspace-rules-project/schema.json b/packages/linter/src/generators/workspace-rules-project/schema.json
index dcd3eb0460..1b64f43a4d 100644
--- a/packages/linter/src/generators/workspace-rules-project/schema.json
+++ b/packages/linter/src/generators/workspace-rules-project/schema.json
@@ -7,7 +7,7 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g @nrwl/linter:workspace-rules-project",
+      "command": "nx g @nx/linter:workspace-rules-project",
       "description": "Create the Workspace Lint Rules Project"
     }
   ],
diff --git a/packages/next/src/generators/cypress-component-configuration/schema.json b/packages/next/src/generators/cypress-component-configuration/schema.json
index a0e4f933a3..0eb33f80c0 100644
--- a/packages/next/src/generators/cypress-component-configuration/schema.json
+++ b/packages/next/src/generators/cypress-component-configuration/schema.json
@@ -7,11 +7,11 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g @nrwl/next:cypress-component-configuration --project=my-next-project",
+      "command": "nx g @nx/next:cypress-component-configuration --project=my-next-project",
       "description": "Add component testing to your Next project"
     },
     {
-      "command": "nx g @nrwl/next:cypress-component-configuration --project=my-next-project --generate-tests",
+      "command": "nx g @nx/next:cypress-component-configuration --project=my-next-project --generate-tests",
       "description": "Add component testing to your Next project and generate component tests for your existing components"
     }
   ],
diff --git a/packages/plugin/src/generators/preset/schema.json b/packages/plugin/src/generators/preset/schema.json
index b59a3f317c..3d5f5f0b1a 100644
--- a/packages/plugin/src/generators/preset/schema.json
+++ b/packages/plugin/src/generators/preset/schema.json
@@ -3,7 +3,7 @@
   "cli": "nx",
   "$id": "NxPluginPreset",
   "title": "Generator ran by create-nx-plugin",
-  "description": "Initializes a workspace with an nx-plugin inside of it. Use as: `create-nx-plugin` or `create-nx-workspace --preset @nrwl/nx-plugin`.",
+  "description": "Initializes a workspace with an nx-plugin inside of it. Use as: `create-nx-plugin` or `create-nx-workspace --preset @nx/nx-plugin`.",
   "type": "object",
   "properties": {
     "pluginName": {
diff --git a/packages/react-native/src/generators/application/schema.json b/packages/react-native/src/generators/application/schema.json
index 1ef969aa55..fb33f20f40 100644
--- a/packages/react-native/src/generators/application/schema.json
+++ b/packages/react-native/src/generators/application/schema.json
@@ -6,11 +6,11 @@
   "description": "Create a React Application for Nx.",
   "examples": [
     {
-      "command": "nx g @nrwl/react-native:app myapp --directory=nested",
+      "command": "nx g @nx/react-native:app myapp --directory=nested",
       "description": "Generate `apps/nested/myapp`"
     },
     {
-      "command": "nx g @nrwl/react-native:app myapp --classComponent",
+      "command": "nx g @nx/react-native:app myapp --classComponent",
       "description": "Use class components instead of functional components"
     }
   ],
diff --git a/packages/react-native/src/generators/component/schema.json b/packages/react-native/src/generators/component/schema.json
index 68e65cd0ae..11e5292ac6 100644
--- a/packages/react-native/src/generators/component/schema.json
+++ b/packages/react-native/src/generators/component/schema.json
@@ -7,11 +7,11 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g @nrwl/react-native:component my-component --project=mylib",
+      "command": "nx g @nx/react-native:component my-component --project=mylib",
       "description": "Generate a component in the `mylib` library"
     },
     {
-      "command": "nx g @nrwl/react-native:component my-component --project=mylib --classComponent",
+      "command": "nx g @nx/react-native:component my-component --project=mylib --classComponent",
       "description": "Generate a class component in the `mylib` library"
     }
   ],
diff --git a/packages/react-native/src/generators/library/schema.json b/packages/react-native/src/generators/library/schema.json
index bd727f6e4a..4eb1cef4ab 100644
--- a/packages/react-native/src/generators/library/schema.json
+++ b/packages/react-native/src/generators/library/schema.json
@@ -7,7 +7,7 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g @nrwl/react-native:lib mylib --directory=myapp",
+      "command": "nx g @nx/react-native:lib mylib --directory=myapp",
       "description": "Generate `libs/myapp/mylib`"
     }
   ],
diff --git a/packages/react/src/generators/application/application.ts b/packages/react/src/generators/application/application.ts
index a11ccc9323..7b6692ed13 100644
--- a/packages/react/src/generators/application/application.ts
+++ b/packages/react/src/generators/application/application.ts
@@ -145,7 +145,7 @@ export async function applicationGenerator(
     tasks.push(webpackInitTask);
   } else if (options.bundler === 'rspack') {
     const { configurationGenerator } = ensurePackage(
-      '@nrwl/rspack',
+      '@nx/rspack',
       nxRspackVersion
     );
     const rspackTask = await configurationGenerator(host, {
@@ -231,7 +231,7 @@ export async function applicationGenerator(
     host.write(
       joinPathFragments(options.appProjectRoot, 'rspack.config.js'),
       stripIndents`
-        const { composePlugins, withNx, withWeb } = require('@nrwl/rspack');
+        const { composePlugins, withNx, withWeb } = require('@nx/rspack');
         module.exports = composePlugins(withNx(), withWeb(), (config) => {
           config.module.rules.push({
             test: /\\.[jt]sx$/i,
diff --git a/packages/react/src/generators/component-test/schema.json b/packages/react/src/generators/component-test/schema.json
index 42eaacb5eb..7d569dc2b6 100644
--- a/packages/react/src/generators/component-test/schema.json
+++ b/packages/react/src/generators/component-test/schema.json
@@ -7,7 +7,7 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g @nrwl/react:component-test --project=my-react-project --component-path=src/lib/fancy-component.tsx",
+      "command": "nx g @nx/react:component-test --project=my-react-project --component-path=src/lib/fancy-component.tsx",
       "description": "Create a cypress component test for FancyComponent"
     }
   ],
diff --git a/packages/react/src/generators/cypress-component-configuration/schema.json b/packages/react/src/generators/cypress-component-configuration/schema.json
index 094d2c7f86..8e1dfb3c9e 100644
--- a/packages/react/src/generators/cypress-component-configuration/schema.json
+++ b/packages/react/src/generators/cypress-component-configuration/schema.json
@@ -7,11 +7,11 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g @nrwl/react:cypress-component-configuration --project=my-react-project",
+      "command": "nx g @nx/react:cypress-component-configuration --project=my-react-project",
       "description": "Add component testing to your react project"
     },
     {
-      "command": "nx g @nrwl/react:cypress-component-configuration --project=my-react-project --generate-tests",
+      "command": "nx g @nx/react:cypress-component-configuration --project=my-react-project --generate-tests",
       "description": "Add component testing to your react project and generate component tests for your existing components"
     }
   ],
diff --git a/packages/vite/src/generators/configuration/schema.json b/packages/vite/src/generators/configuration/schema.json
index f8be75665e..8e2698beee 100644
--- a/packages/vite/src/generators/configuration/schema.json
+++ b/packages/vite/src/generators/configuration/schema.json
@@ -40,15 +40,15 @@
     },
     "buildTarget": {
       "type": "string",
-      "description": "The build target of the project to be transformed to use the @nrwl/vite:build executor."
+      "description": "The build target of the project to be transformed to use the @nx/vite:build executor."
     },
     "serveTarget": {
       "type": "string",
-      "description": "The serve target of the project to be transformed to use the @nrwl/vite:dev-server and @nrwl/vite:preview-server executors."
+      "description": "The serve target of the project to be transformed to use the @nx/vite:dev-server and @nrwl/vite:preview-server executors."
     },
     "testTarget": {
       "type": "string",
-      "description": "The test target of the project to be transformed to use the @nrwl/vite:test executor."
+      "description": "The test target of the project to be transformed to use the @nx/vite:test executor."
     },
     "skipFormat": {
       "description": "Skip formatting files.",
diff --git a/packages/vite/src/generators/vitest/schema.json b/packages/vite/src/generators/vitest/schema.json
index 3cd8da9159..ce286e5c54 100644
--- a/packages/vite/src/generators/vitest/schema.json
+++ b/packages/vite/src/generators/vitest/schema.json
@@ -35,7 +35,7 @@
     },
     "testTarget": {
       "type": "string",
-      "description": "The test target of the project to be transformed to use the @nrwl/vite:test executor.",
+      "description": "The test target of the project to be transformed to use the @nx/vite:test executor.",
       "hidden": true
     },
     "skipFormat": {
diff --git a/packages/workspace/src/generators/convert-to-nx-project/schema.json b/packages/workspace/src/generators/convert-to-nx-project/schema.json
index 3255c0e07a..65ecdfc82e 100644
--- a/packages/workspace/src/generators/convert-to-nx-project/schema.json
+++ b/packages/workspace/src/generators/convert-to-nx-project/schema.json
@@ -1,17 +1,17 @@
 {
   "$schema": "http://json-schema.org/schema",
   "$id": "SchematicsConvertToNxProject",
-  "title": "@nrwl/workspace:fix-configuration",
+  "title": "@nx/workspace:fix-configuration",
   "description": "Migrates v1 config to v2 standalone configuration.",
   "type": "object",
   "cli": "nx",
   "examples": [
     {
-      "command": "nx g @nrwl/workspace:convert-to-nx-project --project my-feature-lib",
+      "command": "nx g @nx/workspace:convert-to-nx-project --project my-feature-lib",
       "description": "Convert the `my-feature-lib` project to use `project.json` file instead of `workspace.json`"
     },
     {
-      "command": "nx g @nrwl/workspace:convert-to-nx-project --all",
+      "command": "nx g @nx/workspace:convert-to-nx-project --all",
       "description": "Convert all projects in `workspace.json` to separate `project.json` files"
     }
   ],
diff --git a/packages/workspace/src/generators/move/schema.json b/packages/workspace/src/generators/move/schema.json
index ab9355b33f..22422bbb8f 100644
--- a/packages/workspace/src/generators/move/schema.json
+++ b/packages/workspace/src/generators/move/schema.json
@@ -7,7 +7,7 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g @nrwl/workspace:move --project my-feature-lib --destination shared/my-feature-lib",
+      "command": "nx g @nx/workspace:move --project my-feature-lib --destination shared/my-feature-lib",
       "description": "Move `libs/my-feature-lib` to `libs/shared/my-feature-lib`"
     }
   ],
diff --git a/packages/workspace/src/generators/remove/schema.json b/packages/workspace/src/generators/remove/schema.json
index 72544c423a..e593f9904a 100644
--- a/packages/workspace/src/generators/remove/schema.json
+++ b/packages/workspace/src/generators/remove/schema.json
@@ -7,11 +7,11 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g @nrwl/workspace:remove my-feature-lib",
+      "command": "nx g @nx/workspace:remove my-feature-lib",
       "description": "Remove `my-feature-lib` from the workspace"
     },
     {
-      "command": "nx g @nrwl/workspace:remove my-feature-lib --forceRemove",
+      "command": "nx g @nx/workspace:remove my-feature-lib --forceRemove",
       "description": "Force removal of `my-feature-lib` from the workspace"
     }
   ],
diff --git a/packages/workspace/src/generators/run-commands/schema.json b/packages/workspace/src/generators/run-commands/schema.json
index 39efdf3494..c4e0f3aff5 100644
--- a/packages/workspace/src/generators/run-commands/schema.json
+++ b/packages/workspace/src/generators/run-commands/schema.json
@@ -7,7 +7,7 @@
   "cli": "nx",
   "examples": [
     {
-      "command": "nx g @nrwl/workspace:run-commands printhello --project my-feature-lib --command 'echo hello'",
+      "command": "nx g @nx/workspace:run-commands printhello --project my-feature-lib --command 'echo hello'",
       "description": "Add the `printhello` target to `my-feature-lib`"
     }
   ],