From 76dfc6241212a542bb30754c6a60003d9a221cf7 Mon Sep 17 00:00:00 2001
From: Jason Jean <jasonjean1993@gmail.com>
Date: Wed, 19 Apr 2023 10:59:41 -0400
Subject: [PATCH] feat(web): replace usages of @nrwl with @nx (#16376)

---
 packages/js/.babelrc                          |  2 +-
 packages/js/babel.ts                          |  2 +-
 .../convert-to-swc/convert-to-swc.spec.ts     |  4 ++--
 .../convert-to-swc/convert-to-swc.ts          |  8 +++++--
 packages/js/src/generators/init/init.ts       |  2 +-
 .../js/src/generators/library/library.spec.ts | 20 ++++++++---------
 packages/js/src/generators/library/library.ts | 14 ++++++------
 .../update-15-8-0/rename-swcrc-config.spec.ts |  1 +
 .../src/utils/compiler-helper-dependency.ts   |  4 ++--
 .../js/src/utils/minimal-publish-script.ts    |  2 +-
 packages/next/.eslintrc.json                  |  2 +-
 packages/next/generators.json                 |  2 +-
 packages/next/plugins/with-nx.ts              | 12 ++++++++--
 .../__snapshots__/application.spec.ts.snap    |  4 ++--
 .../application/application.spec.ts           | 10 ++++-----
 .../application/files/common/.babelrc__tmpl__ |  4 ++--
 .../files/common/next.config.js__tmpl__       | 22 +++++++++----------
 .../generators/application/lib/add-linting.ts |  4 ++--
 .../generators/application/lib/add-project.ts |  6 ++---
 .../lib/create-application-files.helpers.ts   |  4 ++--
 .../application/lib/set-defaults.ts           | 19 +++++-----------
 .../application/lib/update-jest-config.ts     |  7 ++----
 .../generators/custom-server/custom-server.ts | 13 ++++++-----
 .../files/server/main.ts__tmpl__              |  2 +-
 .../next/src/generators/init/init.spec.ts     |  4 ++--
 packages/next/src/generators/init/init.ts     |  2 +-
 .../src/generators/library/library.spec.ts    | 16 +++++++-------
 .../next/src/generators/library/library.ts    | 10 ++++-----
 .../update-13-1-1/enable-swc.spec.ts          |  8 +++++++
 packages/next/src/utils/generate-globs.ts     |  2 +-
 .../src/generators/plugin/plugin.spec.ts      |  6 ++---
 packages/react-native/generators.json         |  2 +-
 packages/react-native/migrations.json         | 20 -----------------
 .../files/app/metro.config.js.template        |  4 ++--
 .../files/app/src/app/App.tsx.template        |  4 ++--
 .../files/app/tsconfig.json.template          |  2 +-
 .../generators/application/lib/add-project.ts | 20 ++++++++---------
 .../src/generators/component/schema.d.ts      |  2 +-
 .../react-native/src/generators/init/init.ts  |  4 ++--
 .../files/lib/babel.config.json.template      |  2 +-
 .../src/generators/library/library.spec.ts    |  4 ++--
 .../src/generators/library/library.ts         |  4 ++--
 .../src/generators/library/schema.d.ts        |  2 +-
 .../configuration.spec.ts                     |  2 +-
 .../storybook-configuration/configuration.ts  |  2 +-
 .../lib/create-storybook-files.ts             |  2 ++
 packages/react-native/src/utils/add-jest.ts   |  4 ++--
 .../utils/ensure-node-modules-symlink.spec.ts |  8 +++----
 .../utils/find-all-npm-dependencies.spec.ts   |  8 +++----
 .../src/utils/find-all-npm-dependencies.ts    |  7 ++++--
 packages/react/.eslintrc.json                 |  2 +-
 packages/react/generators.json                |  2 +-
 .../react/plugins/component-testing/index.ts  |  4 ++--
 .../component-testing/webpack-fallback.ts     |  2 +-
 packages/react/plugins/storybook/index.ts     |  2 +-
 packages/react/plugins/webpack.ts             |  2 +-
 .../module-federation-dev-server.impl.ts      |  2 +-
 .../module-federation-ssr-dev-server.impl.ts  |  2 +-
 .../application/application.spec.ts           | 18 +++++++--------
 .../files/base-vite/tsconfig.app.json__tmpl__ |  6 ++---
 .../files/base-webpack/.babelrc__tmpl__       |  2 +-
 .../base-webpack/tsconfig.app.json__tmpl__    |  6 ++---
 .../base-webpack/webpack.config.js__tmpl__    |  4 ++--
 .../files/nx-welcome/src/app/nx-welcome.tsx   |  4 ++--
 .../generators/application/lib/add-project.ts |  4 ++--
 .../lib/install-common-dependencies.ts        |  2 +-
 .../application/lib/set-defaults.ts           |  6 ++---
 .../application/lib/update-jest-config.ts     |  6 ++---
 ...press-component-configuration.spec.ts.snap |  8 +++----
 .../files/cypress.config.ts__tpl__            |  2 +-
 ...module-federation.server.config.js__tmpl__ |  2 +-
 .../webpack.server.config.js__tmpl__          |  6 ++---
 .../webpack.config.js__tmpl__                 |  6 ++---
 .../webpack.config.prod.js__tmpl__            |  6 ++---
 .../react/src/generators/host/host.spec.ts    |  4 ++--
 .../generators/host/lib/setup-ssr-for-host.ts |  3 +--
 packages/react/src/generators/init/init.ts    |  8 +++----
 .../library/files/common/.babelrc__tmpl__     |  2 +-
 .../files/common/tsconfig.lib.json__tmpl__    |  6 ++---
 .../files/vite/tsconfig.lib.json__tmpl__      |  6 ++---
 .../library/lib/add-rollup-build-target.ts    |  6 ++---
 .../lib/install-common-dependencies.ts        |  2 +-
 .../generators/library/lib/set-defaults.ts    |  6 ++---
 .../src/generators/library/library.spec.ts    | 10 ++++-----
 .../module-federation-ssr/server.ts__tmpl__   |  2 +-
 .../webpack.server.config.js__tmpl__          |  6 ++---
 .../webpack.config.js__tmpl__                 |  6 ++---
 .../remote/lib/update-host-with-remote.ts     |  6 ++---
 .../src/generators/remote/remote.spec.ts      |  4 ++--
 .../src/generators/setup-ssr/setup-ssr.ts     |  6 ++---
 .../files/tailwind.config.js__tmpl__          |  2 +-
 .../setup-tailwind/lib/update-project.ts      |  5 ++++-
 .../setup-tailwind/setup-tailwind.spec.ts     |  2 +-
 .../generators/stories/stories.nextjs.spec.ts |  4 ++--
 .../configuration.spec.ts                     |  2 +-
 .../storybook-configuration/configuration.ts  |  3 ++-
 .../src/module-federation/load-config.ts      |  2 +-
 .../rules/update-module-federation-project.ts |  6 ++---
 packages/react/src/utils/jest-utils.ts        |  4 ++--
 packages/react/src/utils/lint.ts              |  4 ++--
 .../configuration/configuration.spec.ts       |  4 ++--
 .../init/__snapshots__/init.spec.ts.snap      |  2 +-
 .../src/generators/init/init.spec.ts          |  2 +-
 .../init/__snapshots__/init.spec.ts.snap      |  2 +-
 packages/web/.eslintrc.json                   |  2 +-
 packages/web/babel.ts                         |  2 +-
 packages/web/generators.json                  |  2 +-
 .../web/src/executors/rollup/rollup.impl.ts   |  2 +-
 .../src/generators/application/application.ts |  6 ++---
 .../files/app-vite/.babelrc__tmpl__           |  2 +-
 .../app-vite/src/app/app.element.ts__tmpl__   |  4 ++--
 .../files/app-webpack/.babelrc__tmpl__        |  2 +-
 .../src/app/app.element.ts__tmpl__            |  4 ++--
 .../app-webpack/webpack.config.js__tmpl__     |  2 +-
 packages/web/src/generators/init/init.spec.ts |  6 ++---
 packages/web/src/generators/init/init.ts      |  4 ++--
 .../static-serve-configuration.spec.ts        | 12 +++++-----
 .../static-serve-configuration.ts             |  4 ++--
 .../preset/__snapshots__/preset.spec.ts.snap  |  2 +-
 119 files changed, 305 insertions(+), 305 deletions(-)

diff --git a/packages/js/.babelrc b/packages/js/.babelrc
index b63f0528f976c..fd4cbcdef1229 100644
--- a/packages/js/.babelrc
+++ b/packages/js/.babelrc
@@ -1,7 +1,7 @@
 {
   "presets": [
     [
-      "@nrwl/js/babel",
+      "@nx/js/babel",
       {
         "useBuiltIns": "usage"
       }
diff --git a/packages/js/babel.ts b/packages/js/babel.ts
index 73f7e41feeb00..8f1e0935c7174 100644
--- a/packages/js/babel.ts
+++ b/packages/js/babel.ts
@@ -20,7 +20,7 @@ module.exports = function (api: any, options: NxWebBabelPresetOptions = {}) {
 
   const isModern = api.caller((caller) => caller?.isModern);
 
-  // This is set by `@nrwl/web:rollup` executor
+  // This is set by `@nx/web:rollup` executor
   const isNxPackage = api.caller((caller) => caller?.isNxPackage);
 
   const emitDecoratorMetadata = api.caller(
diff --git a/packages/js/src/generators/convert-to-swc/convert-to-swc.spec.ts b/packages/js/src/generators/convert-to-swc/convert-to-swc.spec.ts
index cb53133bb59d8..c1760f58cff95 100644
--- a/packages/js/src/generators/convert-to-swc/convert-to-swc.spec.ts
+++ b/packages/js/src/generators/convert-to-swc/convert-to-swc.spec.ts
@@ -36,13 +36,13 @@ describe('convert to swc', () => {
 
     expect(
       readProjectConfiguration(tree, 'tsc-lib').targets['build']['executor']
-    ).toEqual('@nrwl/js:tsc');
+    ).toEqual('@nx/js:tsc');
 
     await convertToSwcGenerator(tree, { project: 'tsc-lib' });
 
     expect(
       readProjectConfiguration(tree, 'tsc-lib').targets['build']['executor']
-    ).toEqual('@nrwl/js:swc');
+    ).toEqual('@nx/js:swc');
     expect(
       tree.exists(
         join(readProjectConfiguration(tree, 'tsc-lib').root, '.swcrc')
diff --git a/packages/js/src/generators/convert-to-swc/convert-to-swc.ts b/packages/js/src/generators/convert-to-swc/convert-to-swc.ts
index 38d82b038bed4..fb55f63966e98 100644
--- a/packages/js/src/generators/convert-to-swc/convert-to-swc.ts
+++ b/packages/js/src/generators/convert-to-swc/convert-to-swc.ts
@@ -50,9 +50,13 @@ function updateProjectBuildTargets(
 ) {
   for (const target of projectTargets) {
     const targetConfiguration = projectConfiguration.targets[target];
-    if (!targetConfiguration || targetConfiguration.executor !== '@nrwl/js:tsc')
+    if (
+      !targetConfiguration ||
+      (targetConfiguration.executor !== '@nx/js:tsc' &&
+        targetConfiguration.executor !== '@nrwl/js:tsc')
+    )
       continue;
-    targetConfiguration.executor = '@nrwl/js:swc';
+    targetConfiguration.executor = '@nx/js:swc';
   }
 
   updateProjectConfiguration(tree, projectName, projectConfiguration);
diff --git a/packages/js/src/generators/init/init.ts b/packages/js/src/generators/init/init.ts
index 667234a2259ea..86936f80bb1a2 100644
--- a/packages/js/src/generators/init/init.ts
+++ b/packages/js/src/generators/init/init.ts
@@ -33,7 +33,7 @@ export async function initGenerator(
     });
   }
   const devDependencies = {
-    '@nrwl/js': nxVersion,
+    '@nx/js': nxVersion,
     prettier: prettierVersion,
   };
 
diff --git a/packages/js/src/generators/library/library.spec.ts b/packages/js/src/generators/library/library.spec.ts
index 3db38105d6a4e..d8fb788cea1c6 100644
--- a/packages/js/src/generators/library/library.spec.ts
+++ b/packages/js/src/generators/library/library.spec.ts
@@ -756,7 +756,7 @@ describe('lib', () => {
 
         const config = readProjectConfiguration(tree, 'my-lib');
         expect(config.targets.build).toEqual({
-          executor: '@nrwl/js:tsc',
+          executor: '@nx/js:tsc',
           options: {
             assets: ['libs/my-lib/*.md'],
             main: 'libs/my-lib/src/index.ts',
@@ -776,7 +776,7 @@ describe('lib', () => {
 
         const config = readProjectConfiguration(tree, 'my-lib');
         expect(config.targets.build).toEqual({
-          executor: '@nrwl/js:swc',
+          executor: '@nx/js:swc',
           options: {
             assets: ['libs/my-lib/*.md'],
             main: 'libs/my-lib/src/index.ts',
@@ -830,7 +830,7 @@ describe('lib', () => {
 
         const config = readProjectConfiguration(tree, 'my-lib');
         expect(config.targets.build).toEqual({
-          executor: '@nrwl/js:tsc',
+          executor: '@nx/js:tsc',
           options: {
             assets: ['libs/my-lib/*.md'],
             main: 'libs/my-lib/src/index.ts',
@@ -851,7 +851,7 @@ describe('lib', () => {
 
         const config = readProjectConfiguration(tree, 'my-lib');
         expect(config.targets.build).toEqual({
-          executor: '@nrwl/js:swc',
+          executor: '@nx/js:swc',
           options: {
             assets: ['libs/my-lib/*.md'],
             main: 'libs/my-lib/src/index.ts',
@@ -935,7 +935,7 @@ describe('lib', () => {
 
         const config = readProjectConfiguration(tree, 'my-lib');
         expect(config.targets.build).toEqual({
-          executor: '@nrwl/js:tsc',
+          executor: '@nx/js:tsc',
           options: {
             assets: ['libs/my-lib/*.md'],
             main: 'libs/my-lib/src/index.ts',
@@ -1011,7 +1011,7 @@ describe('lib', () => {
         expect(tree.exists('libs/my-lib/.babelrc')).toBeFalsy();
       });
 
-      it('should generate a .babelrc when flag is set to true (even if there is no `@nrwl/web` plugin installed)', async () => {
+      it('should generate a .babelrc when flag is set to true (even if there is no `@nx/web` plugin installed)', async () => {
         updateJson(tree, 'package.json', (json) => {
           json.devDependencies = {};
           return json;
@@ -1030,7 +1030,7 @@ describe('lib', () => {
           {
             "presets": [
               [
-                "@nrwl/js/babel",
+                "@nx/js/babel",
                 {
                   "useBuiltIns": "usage",
                 },
@@ -1040,11 +1040,11 @@ describe('lib', () => {
         `);
       });
 
-      it('should not generate a .babelrc when flag is not set and there is NOT a `@nrwl/web` package installed', async () => {
+      it('should not generate a .babelrc when flag is not set and there is NOT a `@nx/web` package installed', async () => {
         updateJson(tree, 'package.json', (json) => {
           json.devDependencies = {
-            '@nrwl/angular': '1.1.1',
-            '@nrwl/next': '1.1.1',
+            '@nx/angular': '1.1.1',
+            '@nx/next': '1.1.1',
           };
           return json;
         });
diff --git a/packages/js/src/generators/library/library.ts b/packages/js/src/generators/library/library.ts
index b39037738103c..458ff7ec44a42 100644
--- a/packages/js/src/generators/library/library.ts
+++ b/packages/js/src/generators/library/library.ts
@@ -267,7 +267,7 @@ function addBabelRc(tree: Tree, options: NormalizedSchema) {
   const filename = '.babelrc';
 
   const babelrc = {
-    presets: [['@nrwl/js/babel', { useBuiltIns: 'usage' }]],
+    presets: [['@nx/js/babel', { useBuiltIns: 'usage' }]],
   };
 
   writeJson(tree, join(options.projectRoot, filename), babelrc);
@@ -426,7 +426,7 @@ function normalizeOptions(
    *
    * In the past, the only way to get a non-buildable library was to set buildable to false.
    * Now, the only way to get a non-buildble library is to set bundler to none.
-   * By default, with nothing provided, libraries are buildable with `@nrwl/js:tsc`.
+   * By default, with nothing provided, libraries are buildable with `@nx/js:tsc`.
    */
 
   options.bundler = options.bundler ?? options.compiler ?? 'tsc';
@@ -534,7 +534,7 @@ function addProjectDependencies(
       tree,
       {},
       {
-        '@nrwl/esbuild': nxVersion,
+        '@nx/esbuild': nxVersion,
         '@types/node': typesNodeVersion,
         esbuild: esbuildVersion,
       }
@@ -558,14 +558,14 @@ function addProjectDependencies(
 function getBuildExecutor(bundler: Bundler) {
   switch (bundler) {
     case 'esbuild':
-      return `@nrwl/esbuild:esbuild`;
+      return `@nx/esbuild:esbuild`;
     case 'rollup':
-      return `@nrwl/rollup:rollup`;
+      return `@nx/rollup:rollup`;
     case 'swc':
     case 'tsc':
-      return `@nrwl/js:${bundler}`;
+      return `@nx/js:${bundler}`;
     case 'vite':
-      return `@nrwl/vite:build`;
+      return `@nx/vite:build`;
     case 'none':
     default:
       return undefined;
diff --git a/packages/js/src/migrations/update-15-8-0/rename-swcrc-config.spec.ts b/packages/js/src/migrations/update-15-8-0/rename-swcrc-config.spec.ts
index edeb8e7eb5fbd..4b41010a742b8 100644
--- a/packages/js/src/migrations/update-15-8-0/rename-swcrc-config.spec.ts
+++ b/packages/js/src/migrations/update-15-8-0/rename-swcrc-config.spec.ts
@@ -66,6 +66,7 @@ async function setup(tree: Tree) {
   });
 
   const projectConfig = readProjectConfiguration(tree, 'my-lib');
+  projectConfig.targets.build.executor = '@nrwl/js:swc';
   projectConfig.targets.test.executor = '@nrwl/jest:jest';
   updateProjectConfiguration(tree, 'my-lib', projectConfig);
 
diff --git a/packages/js/src/utils/compiler-helper-dependency.ts b/packages/js/src/utils/compiler-helper-dependency.ts
index 9708b41d39bc4..6c467fd2ddf7b 100644
--- a/packages/js/src/utils/compiler-helper-dependency.ts
+++ b/packages/js/src/utils/compiler-helper-dependency.ts
@@ -16,12 +16,12 @@ export enum HelperDependency {
 }
 
 const jsExecutors = {
-  '@nrwl/js:tsc': {
+  '@nx/js:tsc': {
     helperDependency: HelperDependency.tsc,
     getConfigPath: (options: ExecutorOptions, contextRoot: string, _: string) =>
       join(contextRoot, options.tsConfig),
   } as const,
-  '@nrwl/js:swc': {
+  '@nx/js:swc': {
     helperDependency: HelperDependency.swc,
     getConfigPath: (
       options: SwcExecutorOptions,
diff --git a/packages/js/src/utils/minimal-publish-script.ts b/packages/js/src/utils/minimal-publish-script.ts
index 13fefbf98d59f..222a605d06873 100644
--- a/packages/js/src/utils/minimal-publish-script.ts
+++ b/packages/js/src/utils/minimal-publish-script.ts
@@ -10,7 +10,7 @@ const publishScriptContent = `
  * You might need to authenticate with NPM before running this script.
  */
 
-import { readCachedProjectGraph  } from '@nrwl/devkit';
+import { readCachedProjectGraph  } from '@nx/devkit';
 import { execSync } from 'child_process';
 import { readFileSync, writeFileSync } from 'fs';
 import chalk from 'chalk';
diff --git a/packages/next/.eslintrc.json b/packages/next/.eslintrc.json
index 4a142b79a6e0f..5f199bc850003 100644
--- a/packages/next/.eslintrc.json
+++ b/packages/next/.eslintrc.json
@@ -12,7 +12,7 @@
       "rules": {
         "no-restricted-imports": [
           "error",
-          "@nrwl/workspace",
+          "@nx/workspace",
           "@angular-devkit/core",
           "@angular-devkit/schematics",
           "@angular-devkit/architect"
diff --git a/packages/next/generators.json b/packages/next/generators.json
index cabfd86d53426..573c45ef8e521 100644
--- a/packages/next/generators.json
+++ b/packages/next/generators.json
@@ -1,7 +1,7 @@
 {
   "name": "nx/next",
   "version": "0.1",
-  "extends": ["@nrwl/react"],
+  "extends": ["@nx/react"],
   "schematics": {
     "init": {
       "factory": "./src/generators/init/init#nextInitSchematic",
diff --git a/packages/next/plugins/with-nx.ts b/packages/next/plugins/with-nx.ts
index bc2a6d590ad2c..101606427d16d 100644
--- a/packages/next/plugins/with-nx.ts
+++ b/packages/next/plugins/with-nx.ts
@@ -80,7 +80,10 @@ function getNxContext(
 } {
   const targetConfig = getTargetConfig(graph, target);
 
-  if ('@nrwl/next:build' === targetConfig.executor) {
+  if (
+    '@nx/next:build' === targetConfig.executor ||
+    '@nrwl/next:build' === targetConfig.executor
+  ) {
     return {
       node: graph.nodes[target.project],
       options: getOptions(graph, target),
@@ -101,7 +104,12 @@ function getNxContext(
 
     return getNxContext(graph, devServerTarget);
   } else if (
-    ['@nrwl/next:server', '@nrwl/next:export'].includes(targetConfig.executor)
+    [
+      '@nx/next:server',
+      '@nx/next:export',
+      '@nrwl/next:server',
+      '@nrwl/next:export',
+    ].includes(targetConfig.executor)
   ) {
     const buildTarget = parseTargetString(targetOptions.buildTarget, graph);
     return getNxContext(graph, buildTarget);
diff --git a/packages/next/src/generators/application/__snapshots__/application.spec.ts.snap b/packages/next/src/generators/application/__snapshots__/application.spec.ts.snap
index fcab00151a95d..c9c272447c351 100644
--- a/packages/next/src/generators/application/__snapshots__/application.spec.ts.snap
+++ b/packages/next/src/generators/application/__snapshots__/application.spec.ts.snap
@@ -347,9 +347,9 @@ exports[`app --style styled-jsx should use <style jsx> in index page 1`] = `
               </summary>
               <pre>
                 <span># Generate UI lib</span>
-                nx g @nrwl/next:library ui
+                nx g @nx/next:library ui
                 <span># Add a component</span>
-                nx g @nrwl/next:component button --project=ui
+                nx g @nx/next:component button --project=ui
               </pre>
             </details>
             <details>
diff --git a/packages/next/src/generators/application/application.spec.ts b/packages/next/src/generators/application/application.spec.ts
index 6d01f0b0358a4..34d4a675f60ec 100644
--- a/packages/next/src/generators/application/application.spec.ts
+++ b/packages/next/src/generators/application/application.spec.ts
@@ -224,7 +224,7 @@ describe('app', () => {
     });
 
     expect(tree.read('apps/my-app/jest.config.ts', 'utf-8')).toContain(
-      `'^(?!.*\\\\.(js|jsx|ts|tsx|css|json)$)': '@nrwl/react/plugins/jest'`
+      `'^(?!.*\\\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest'`
     );
   });
 
@@ -236,7 +236,7 @@ describe('app', () => {
 
     const projectConfiguration = readProjectConfiguration(tree, 'my-app');
     expect(projectConfiguration.targets.build.executor).toEqual(
-      '@nrwl/next:build'
+      '@nx/next:build'
     );
     expect(projectConfiguration.targets.build.options).toEqual({
       root: 'apps/my-app',
@@ -252,7 +252,7 @@ describe('app', () => {
 
     const projectConfiguration = readProjectConfiguration(tree, 'my-app');
     expect(projectConfiguration.targets.serve.executor).toEqual(
-      '@nrwl/next:server'
+      '@nx/next:server'
     );
     expect(projectConfiguration.targets.serve.options).toEqual({
       buildTarget: 'my-app:build',
@@ -275,7 +275,7 @@ describe('app', () => {
 
     const projectConfiguration = readProjectConfiguration(tree, 'my-app');
     expect(projectConfiguration.targets.export.executor).toEqual(
-      '@nrwl/next:export'
+      '@nx/next:export'
     );
     expect(projectConfiguration.targets.export.options).toEqual({
       buildTarget: 'my-app:build:production',
@@ -339,7 +339,7 @@ describe('app', () => {
               "jest": true,
             },
             "extends": [
-              "plugin:@nrwl/nx/react-typescript",
+              "plugin:@nx/nx/react-typescript",
               "next",
               "next/core-web-vitals",
               "../../.eslintrc.json",
diff --git a/packages/next/src/generators/application/files/common/.babelrc__tmpl__ b/packages/next/src/generators/application/files/common/.babelrc__tmpl__
index d9daea395c5c6..8bd5819bd2a4f 100644
--- a/packages/next/src/generators/application/files/common/.babelrc__tmpl__
+++ b/packages/next/src/generators/application/files/common/.babelrc__tmpl__
@@ -2,7 +2,7 @@
   "presets": [
     <% if (style === '@emotion/styled') { %>
     [
-      "@nrwl/next/babel",
+      "@nx/next/babel",
       {
         "preset-react": {
           "runtime": "automatic",
@@ -11,7 +11,7 @@
       }
     ]
     <% } else { %>
-    "@nrwl/next/babel"
+    "@nx/next/babel"
     <% } %>
   ],
   "plugins": [
diff --git a/packages/next/src/generators/application/files/common/next.config.js__tmpl__ b/packages/next/src/generators/application/files/common/next.config.js__tmpl__
index 84f60029cb1a1..82dd31149f8ed 100644
--- a/packages/next/src/generators/application/files/common/next.config.js__tmpl__
+++ b/packages/next/src/generators/application/files/common/next.config.js__tmpl__
@@ -1,15 +1,15 @@
 //@ts-check
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const { composePlugins, withNx } = require('@nrwl/next');
+const { composePlugins, withNx } = require('@nx/next');
 
 <% if (style === 'less') { %>
 // This plugin is needed until this PR is merged.
 // https://github.com/vercel/next.js/pull/23185
-const { withLess } = require('@nrwl/next/plugins/with-less');
+const { withLess } = require('@nx/next/plugins/with-less');
 
 /**
- * @type {import('@nrwl/next/plugins/with-nx').WithNxOptions}
+ * @type {import('@nx/next/plugins/with-nx').WithNxOptions}
  **/
 const nextConfig = {
   nx: {
@@ -18,7 +18,7 @@ const nextConfig = {
     svgr: false,
   },
   <% if(appDir) { %>
-  experimental: { 
+  experimental: {
     appDir: true
   },
   <% } %>
@@ -32,10 +32,10 @@ const plugins = [
 
 module.exports = composePlugins(...plugins)(nextConfig));
 <% } else if (style === 'styl') { %>
-const { withStylus } = require('@nrwl/next/plugins/with-stylus');
+const { withStylus } = require('@nx/next/plugins/with-stylus');
 
 /**
- * @type {import('@nrwl/next/plugins/with-nx').WithNxOptions}
+ * @type {import('@nx/next/plugins/with-nx').WithNxOptions}
  **/
 const nextConfig = {
   nx: {
@@ -44,7 +44,7 @@ const nextConfig = {
     svgr: false,
   },
   <% if(appDir) { %>
-  experimental: { 
+  experimental: {
     appDir: true
   },
   <% } %>
@@ -64,7 +64,7 @@ module.exports = composePlugins(...plugins)(nextConfig);
   || style === 'none'
 ) { %>
 /**
- * @type {import('@nrwl/next/plugins/with-nx').WithNxOptions}
+ * @type {import('@nx/next/plugins/with-nx').WithNxOptions}
  **/
 const nextConfig = {
   nx: {
@@ -73,7 +73,7 @@ const nextConfig = {
     svgr: false,
   },
   <% if(appDir) { %>
-  experimental: { 
+  experimental: {
     appDir: true
   },
   <% } %>
@@ -88,7 +88,7 @@ module.exports = composePlugins(...plugins)(nextConfig);
 <% } else {
 // Defaults to CSS/SASS (which don't need plugin as of Next 9.3) %>
 /**
- * @type {import('@nrwl/next/plugins/with-nx').WithNxOptions}
+ * @type {import('@nx/next/plugins/with-nx').WithNxOptions}
  **/
 const nextConfig = {
   nx: {
@@ -97,7 +97,7 @@ const nextConfig = {
     svgr: false,
   },
   <% if(appDir) { %>
-  experimental: { 
+  experimental: {
     appDir: true
   },
   <% } %>
diff --git a/packages/next/src/generators/application/lib/add-linting.ts b/packages/next/src/generators/application/lib/add-linting.ts
index 8ec251ea8b374..c69906f26c9f7 100644
--- a/packages/next/src/generators/application/lib/add-linting.ts
+++ b/packages/next/src/generators/application/lib/add-linting.ts
@@ -78,10 +78,10 @@ export async function addLinting(
         json.extends.unshift(...['next', 'next/core-web-vitals']);
         // remove nx/react plugin, as it conflicts with the next.js one
         json.extends = json.extends.filter(
-          (name) => name !== 'plugin:@nrwl/nx/react'
+          (name) => name !== 'plugin:@nx/nx/react'
         );
 
-        json.extends.unshift('plugin:@nrwl/nx/react-typescript');
+        json.extends.unshift('plugin:@nx/nx/react-typescript');
         if (!json.env) {
           json.env = {};
         }
diff --git a/packages/next/src/generators/application/lib/add-project.ts b/packages/next/src/generators/application/lib/add-project.ts
index b1f4132c39d49..f94d4109ed4e8 100644
--- a/packages/next/src/generators/application/lib/add-project.ts
+++ b/packages/next/src/generators/application/lib/add-project.ts
@@ -10,7 +10,7 @@ export function addProject(host: Tree, options: NormalizedSchema) {
   const targets: Record<string, any> = {};
 
   targets.build = {
-    executor: '@nrwl/next:build',
+    executor: '@nx/next:build',
     outputs: ['{options.outputPath}'],
     defaultConfiguration: 'production',
     options: {
@@ -26,7 +26,7 @@ export function addProject(host: Tree, options: NormalizedSchema) {
   };
 
   targets.serve = {
-    executor: '@nrwl/next:server',
+    executor: '@nx/next:server',
     defaultConfiguration: 'development',
     options: {
       buildTarget: `${options.projectName}:build`,
@@ -45,7 +45,7 @@ export function addProject(host: Tree, options: NormalizedSchema) {
   };
 
   targets.export = {
-    executor: '@nrwl/next:export',
+    executor: '@nx/next:export',
     options: {
       buildTarget: `${options.projectName}:build:production`,
     },
diff --git a/packages/next/src/generators/application/lib/create-application-files.helpers.ts b/packages/next/src/generators/application/lib/create-application-files.helpers.ts
index 86fa63a510879..d21e7aea5c8b4 100644
--- a/packages/next/src/generators/application/lib/create-application-files.helpers.ts
+++ b/packages/next/src/generators/application/lib/create-application-files.helpers.ts
@@ -322,9 +322,9 @@ export function createAppJsx(name: string) {
             </summary>
             <pre>
               <span># Generate UI lib</span>
-              nx g @nrwl/next:library ui
+              nx g @nx/next:library ui
               <span># Add a component</span>
-              nx g @nrwl/next:component button --project=ui
+              nx g @nx/next:component button --project=ui
             </pre>
           </details>
           <details>
diff --git a/packages/next/src/generators/application/lib/set-defaults.ts b/packages/next/src/generators/application/lib/set-defaults.ts
index d4799dd80bca4..f0e5315bb8090 100644
--- a/packages/next/src/generators/application/lib/set-defaults.ts
+++ b/packages/next/src/generators/application/lib/set-defaults.ts
@@ -5,20 +5,11 @@ import { NormalizedSchema } from './normalize-options';
 export function setDefaults(host: Tree, options: NormalizedSchema) {
   const nxJson = readNxJson(host);
 
-  nxJson.generators = nxJson.generators || {};
-  nxJson.generators['@nrwl/next'] = nxJson.generators['@nrwl/next'] || {};
-  const prev = nxJson.generators['@nrwl/next'];
+  nxJson.generators ??= {};
+  nxJson.generators['@nx/next'] ??= {};
+  nxJson.generators['@nx/next'].application ??= {};
+  nxJson.generators['@nx/next'].application.style ??= options.style;
+  nxJson.generators['@nx/next'].application.linter ??= options.linter;
 
-  nxJson.generators = {
-    ...nxJson.generators,
-    '@nrwl/next': {
-      ...prev,
-      application: {
-        style: options.style,
-        linter: options.linter,
-        ...prev.application,
-      },
-    },
-  };
   updateNxJson(host, nxJson);
 }
diff --git a/packages/next/src/generators/application/lib/update-jest-config.ts b/packages/next/src/generators/application/lib/update-jest-config.ts
index 94d358460d5e8..2449493dc00a7 100644
--- a/packages/next/src/generators/application/lib/update-jest-config.ts
+++ b/packages/next/src/generators/application/lib/update-jest-config.ts
@@ -13,11 +13,8 @@ export function updateJestConfig(host: Tree, options: NormalizedSchema) {
   const content = originalContent
     .replace(
       'transform: {',
-      "transform: {\n    '^(?!.*\\\\.(js|jsx|ts|tsx|css|json)$)': '@nrwl/react/plugins/jest',"
+      "transform: {\n    '^(?!.*\\\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest',"
     )
-    .replace(
-      `'babel-jest'`,
-      `['babel-jest', { presets: ['@nrwl/next/babel'] }]`
-    );
+    .replace(`'babel-jest'`, `['babel-jest', { presets: ['@nx/next/babel'] }]`);
   host.write(configPath, content);
 }
diff --git a/packages/next/src/generators/custom-server/custom-server.ts b/packages/next/src/generators/custom-server/custom-server.ts
index a5c2c4da37f4a..9f98eaad5831d 100644
--- a/packages/next/src/generators/custom-server/custom-server.ts
+++ b/packages/next/src/generators/custom-server/custom-server.ts
@@ -17,9 +17,12 @@ export async function customServerGenerator(
 ): Promise<void> {
   const project = readProjectConfiguration(host, options.project);
 
-  if (project.targets?.build?.executor !== '@nrwl/next:build') {
+  if (
+    project.targets?.build?.executor !== '@nx/next:build' &&
+    project.targets?.build?.executor !== '@nrwl/next:build'
+  ) {
     logger.error(
-      `Project ${options.project} is not a Next.js project. Did you generate it with "nx g @nrwl/next:app"?`
+      `Project ${options.project} is not a Next.js project. Did you generate it with "nx g @nx/next:app"?`
     );
     return;
   }
@@ -34,7 +37,7 @@ export async function customServerGenerator(
     !project.targets?.build?.configurations?.production
   ) {
     logger.error(
-      `Project ${options.project} has invalid config. Did you generate it with "nx g @nrwl/next:app"?`
+      `Project ${options.project} has invalid config. Did you generate it with "nx g @nx/next:app"?`
     );
     return;
   }
@@ -62,7 +65,7 @@ export async function customServerGenerator(
   project.targets.serve.configurations.production.customServerTarget = `${options.project}:serve-custom-server:production`;
 
   project.targets['build-custom-server'] = {
-    executor: '@nrwl/js:tsc',
+    executor: '@nx/js:tsc',
     defaultConfiguration: 'production',
     options: {
       outputPath,
@@ -78,7 +81,7 @@ export async function customServerGenerator(
   };
 
   project.targets['serve-custom-server'] = {
-    executor: '@nrwl/js:node',
+    executor: '@nx/js:node',
     defaultConfiguration: 'development',
     options: {
       buildTarget: `${options.project}:build-custom-server`,
diff --git a/packages/next/src/generators/custom-server/files/server/main.ts__tmpl__ b/packages/next/src/generators/custom-server/files/server/main.ts__tmpl__
index 01ffab21ff158..b492e7340b9fd 100644
--- a/packages/next/src/generators/custom-server/files/server/main.ts__tmpl__
+++ b/packages/next/src/generators/custom-server/files/server/main.ts__tmpl__
@@ -12,7 +12,7 @@ import * as path from 'path';
 import next from 'next';
 
 // Next.js server options:
-// - The environment variable is set by `@nrwl/next:server` when running the dev server.
+// - The environment variable is set by `@nx/next:server` when running the dev server.
 // - The fallback `__dirname` is for production builds.
 // - Feel free to change this to suit your needs.
 const dir = process.env.NX_NEXT_DIR || path.join(__dirname, '..');
diff --git a/packages/next/src/generators/init/init.spec.ts b/packages/next/src/generators/init/init.spec.ts
index ccd748b76a8cd..c606cf09d7c69 100644
--- a/packages/next/src/generators/init/init.spec.ts
+++ b/packages/next/src/generators/init/init.spec.ts
@@ -13,8 +13,8 @@ describe('init', () => {
   it('should add react dependencies', async () => {
     await nextInitGenerator(tree, {});
     const packageJson = readJson(tree, 'package.json');
-    expect(packageJson.dependencies['@nrwl/react']).toBeUndefined();
-    expect(packageJson.dependencies['@nrwl/next']).toBeDefined();
+    expect(packageJson.dependencies['@nx/react']).toBeUndefined();
+    expect(packageJson.dependencies['@nx/next']).toBeDefined();
     expect(packageJson.dependencies['next']).toBeDefined();
   });
 
diff --git a/packages/next/src/generators/init/init.ts b/packages/next/src/generators/init/init.ts
index cb93bd487a08d..e0bc4061a29f3 100644
--- a/packages/next/src/generators/init/init.ts
+++ b/packages/next/src/generators/init/init.ts
@@ -24,7 +24,7 @@ function updateDependencies(host: Tree) {
   return addDependenciesToPackageJson(
     host,
     {
-      '@nrwl/next': nxVersion,
+      '@nx/next': nxVersion,
       next: nextVersion,
       react: reactVersion,
       'react-dom': reactDomVersion,
diff --git a/packages/next/src/generators/library/library.spec.ts b/packages/next/src/generators/library/library.spec.ts
index a1faf83686ae0..5417ebf7642fc 100644
--- a/packages/next/src/generators/library/library.spec.ts
+++ b/packages/next/src/generators/library/library.spec.ts
@@ -13,7 +13,7 @@ describe('next library', () => {
   let mockedInstalledCypressVersion: jest.Mock<
     ReturnType<typeof installedCypressVersion>
   > = installedCypressVersion as never;
-  it('should use "@nrwl/next/babel" preset in babelrc', async () => {
+  it('should use "@nx/next/babel" preset in babelrc', async () => {
     const baseOptions: Schema = {
       name: '',
       linter: Linter.EsLint,
@@ -47,13 +47,13 @@ describe('next library', () => {
     });
 
     expect(readJson(appTree, 'libs/my-lib/.babelrc')).toEqual({
-      presets: ['@nrwl/next/babel'],
+      presets: ['@nx/next/babel'],
       plugins: [],
     });
     expect(readJson(appTree, 'libs/my-lib2/.babelrc')).toEqual({
       presets: [
         [
-          '@nrwl/next/babel',
+          '@nx/next/babel',
           {
             'preset-react': {
               runtime: 'automatic',
@@ -65,16 +65,16 @@ describe('next library', () => {
       plugins: ['@emotion/babel-plugin'],
     });
     expect(readJson(appTree, 'libs/my-lib-styled-jsx/.babelrc')).toEqual({
-      presets: ['@nrwl/next/babel'],
+      presets: ['@nx/next/babel'],
       plugins: [],
     });
     expect(readJson(appTree, 'libs/my-dir/my-lib3/.babelrc')).toEqual({
-      presets: ['@nrwl/next/babel'],
+      presets: ['@nx/next/babel'],
       plugins: [],
     });
   });
 
-  it('should use @nrwl/next images.d.ts file', async () => {
+  it('should use @nx/next images.d.ts file', async () => {
     const baseOptions: Schema = {
       name: '',
       linter: Linter.EsLint,
@@ -96,10 +96,10 @@ describe('next library', () => {
     ).files;
 
     expect(tsconfigFiles).toContain(
-      '../../node_modules/@nrwl/next/typings/image.d.ts'
+      '../../node_modules/@nx/next/typings/image.d.ts'
     );
     expect(tsconfigFiles).not.toContain(
-      '../../node_modules/@nrwl/react/typings/image.d.ts'
+      '../../node_modules/@nx/react/typings/image.d.ts'
     );
   });
 
diff --git a/packages/next/src/generators/library/library.ts b/packages/next/src/generators/library/library.ts
index 9828eea9b6ff2..c548ee0d9f705 100644
--- a/packages/next/src/generators/library/library.ts
+++ b/packages/next/src/generators/library/library.ts
@@ -65,7 +65,7 @@ export async function libraryGenerator(host: Tree, rawOptions: Schema) {
       if (options.style === '@emotion/styled') {
         json.presets = [
           [
-            '@nrwl/next/babel',
+            '@nx/next/babel',
             {
               'preset-react': {
                 runtime: 'automatic',
@@ -77,12 +77,12 @@ export async function libraryGenerator(host: Tree, rawOptions: Schema) {
       } else if (options.style === 'styled-jsx') {
         // next.js doesn't require the `styled-jsx/babel' plugin as it is already
         // built-into the `next/babel` preset
-        json.presets = ['@nrwl/next/babel'];
+        json.presets = ['@nx/next/babel'];
         json.plugins = (json.plugins || []).filter(
           (x) => x !== 'styled-jsx/babel'
         );
       } else {
-        json.presets = ['@nrwl/next/babel'];
+        json.presets = ['@nx/next/babel'];
       }
       return json;
     }
@@ -109,8 +109,8 @@ export async function libraryGenerator(host: Tree, rawOptions: Schema) {
       json.files = json.files.map((path: string) => {
         if (path.endsWith('react/typings/image.d.ts')) {
           return path.replace(
-            '@nrwl/react/typings/image.d.ts',
-            '@nrwl/next/typings/image.d.ts'
+            '@nx/react/typings/image.d.ts',
+            '@nx/next/typings/image.d.ts'
           );
         }
         return path;
diff --git a/packages/next/src/migrations/update-13-1-1/enable-swc.spec.ts b/packages/next/src/migrations/update-13-1-1/enable-swc.spec.ts
index 8cab7097fbde7..d6fa07ed81ed1 100644
--- a/packages/next/src/migrations/update-13-1-1/enable-swc.spec.ts
+++ b/packages/next/src/migrations/update-13-1-1/enable-swc.spec.ts
@@ -1,6 +1,7 @@
 import {
   readProjectConfiguration,
   Tree,
+  updateJson,
   updateProjectConfiguration,
 } from '@nx/devkit';
 import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
@@ -22,6 +23,13 @@ describe('Migration: enable SWC', () => {
       skipFormat: false,
       swc: false,
     });
+
+    updateJson(tree, 'apps/demo/.babelrc', (json) => {
+      json.presets[0] = '@nrwl/next/babel';
+
+      return json;
+    });
+
     // rename jest config to js as that was standard at this version of nx
     tree.delete('apps/demo/jest.config.ts');
     updateProjectConfiguration(tree, 'demo', {
diff --git a/packages/next/src/utils/generate-globs.ts b/packages/next/src/utils/generate-globs.ts
index b03d5275b85c2..4aa831ae85a2a 100644
--- a/packages/next/src/utils/generate-globs.ts
+++ b/packages/next/src/utils/generate-globs.ts
@@ -12,7 +12,7 @@ export function createGlobPatternsOfDependentProjects(
   fileGlobPattern: string = '/**/!(*.stories|*.spec).tsx'
 ): string[] {
   logger.warn(
-    `createGlobPatternsOfDependentProjects is deprecated. Use "createGlobPatternsForDependencies(__dirname)" from "@nrwl/next/tailwind" instead`
+    `createGlobPatternsOfDependentProjects is deprecated. Use "createGlobPatternsForDependencies(__dirname)" from "@nx/next/tailwind" instead`
   );
 
   try {
diff --git a/packages/nx-plugin/src/generators/plugin/plugin.spec.ts b/packages/nx-plugin/src/generators/plugin/plugin.spec.ts
index ff26bacbb84fd..6abb31d39c392 100644
--- a/packages/nx-plugin/src/generators/plugin/plugin.spec.ts
+++ b/packages/nx-plugin/src/generators/plugin/plugin.spec.ts
@@ -35,7 +35,7 @@ describe('NxPlugin Plugin Generator', () => {
     const project = readProjectConfiguration(tree, 'my-plugin');
     expect(project.root).toEqual('libs/my-plugin');
     expect(project.targets.build).toEqual({
-      executor: '@nrwl/js:tsc',
+      executor: '@nx/js:tsc',
       outputs: ['{options.outputPath}'],
       options: {
         outputPath: 'dist/libs/my-plugin',
@@ -139,7 +139,7 @@ describe('NxPlugin Plugin Generator', () => {
 
       const { build } = readProjectConfiguration(tree, 'my-plugin').targets;
 
-      expect(build.executor).toEqual('@nrwl/js:tsc');
+      expect(build.executor).toEqual('@nx/js:tsc');
     });
 
     it('should specify swc as compiler', async () => {
@@ -152,7 +152,7 @@ describe('NxPlugin Plugin Generator', () => {
 
       const { build } = readProjectConfiguration(tree, 'my-plugin').targets;
 
-      expect(build.executor).toEqual('@nrwl/js:swc');
+      expect(build.executor).toEqual('@nx/js:swc');
     });
   });
 
diff --git a/packages/react-native/generators.json b/packages/react-native/generators.json
index 4e4e8b33821c5..f50bafa8446a0 100644
--- a/packages/react-native/generators.json
+++ b/packages/react-native/generators.json
@@ -1,7 +1,7 @@
 {
   "name": "Nx React Native",
   "version": "0.1",
-  "extends": ["@nrwl/workspace"],
+  "extends": ["@nx/workspace"],
   "schematics": {
     "init": {
       "factory": "./src/generators/init/init#reactNativeInitSchematic",
diff --git a/packages/react-native/migrations.json b/packages/react-native/migrations.json
index 97a6df903acf1..32dbc2f369994 100644
--- a/packages/react-native/migrations.json
+++ b/packages/react-native/migrations.json
@@ -134,18 +134,6 @@
           "version": "0.64.1",
           "alwaysAddToPackageJson": false
         },
-        "@nrwl/react": {
-          "version": "12.3.6",
-          "alwaysAddToPackageJson": false
-        },
-        "@nrwl/jest": {
-          "version": "12.3.6",
-          "alwaysAddToPackageJson": false
-        },
-        "@nrwl/linter": {
-          "version": "12.3.6",
-          "alwaysAddToPackageJson": false
-        },
         "@types/react": {
           "version": "17.0.6",
           "alwaysAddToPackageJson": false
@@ -191,14 +179,6 @@
     "12.5.0": {
       "version": "12.5.0-beta.0",
       "packages": {
-        "@nrwl/jest": {
-          "version": "12.5.7",
-          "alwaysAddToPackageJson": false
-        },
-        "@nrwl/linter": {
-          "version": "12.5.7",
-          "alwaysAddToPackageJson": false
-        },
         "react": {
           "version": "17.0.2",
           "alwaysAddToPackageJson": false
diff --git a/packages/react-native/src/generators/application/files/app/metro.config.js.template b/packages/react-native/src/generators/application/files/app/metro.config.js.template
index 25434b26bd748..6e58334d057dc 100644
--- a/packages/react-native/src/generators/application/files/app/metro.config.js.template
+++ b/packages/react-native/src/generators/application/files/app/metro.config.js.template
@@ -1,4 +1,4 @@
-const { withNxMetro } = require('@nrwl/react-native');
+const { withNxMetro } = require('@nx/react-native');
 const { getDefaultConfig } = require('metro-config');
 const exclusionList = require('metro-config/src/defaults/exclusionList');
 
@@ -35,4 +35,4 @@ module.exports = (async () => {
       watchFolders: []
     }
   );
-})();
\ No newline at end of file
+})();
diff --git a/packages/react-native/src/generators/application/files/app/src/app/App.tsx.template b/packages/react-native/src/generators/application/files/app/src/app/App.tsx.template
index 02c75b7027276..09a25022ea33b 100644
--- a/packages/react-native/src/generators/application/files/app/src/app/App.tsx.template
+++ b/packages/react-native/src/generators/application/files/app/src/app/App.tsx.template
@@ -452,14 +452,14 @@ export const App = () => {
                     styles.marginBottomMd,
                   ]}
                 >
-                  nx g @nrwl/react-native:lib ui
+                  nx g @nx/react-native:lib ui
                 </Text>
                 <Text style={[styles.textXS, styles.monospace, styles.comment]}>
                   # Add a component
                 </Text>
                 <Text style={[styles.textXS, styles.monospace]}>nx g \</Text>
                 <Text style={[styles.textXS, styles.monospace]}>
-                  @nrwl/react-native:component \
+                  @nx/react-native:component \
                 </Text>
                 <Text style={[styles.textXS, styles.monospace]}>
                   button --project ui
diff --git a/packages/react-native/src/generators/application/files/app/tsconfig.json.template b/packages/react-native/src/generators/application/files/app/tsconfig.json.template
index fc5620b9e6c08..5fc37a40c70eb 100644
--- a/packages/react-native/src/generators/application/files/app/tsconfig.json.template
+++ b/packages/react-native/src/generators/application/files/app/tsconfig.json.template
@@ -11,7 +11,7 @@
     "declaration": true
   },
   "files": [
-    "../../node_modules/@nrwl/react-native/typings/svg.d.ts"
+    "../../node_modules/@nx/react-native/typings/svg.d.ts"
   ],
   "include": [],
   "references": [
diff --git a/packages/react-native/src/generators/application/lib/add-project.ts b/packages/react-native/src/generators/application/lib/add-project.ts
index 8599c86f6a897..c54c580a98b58 100644
--- a/packages/react-native/src/generators/application/lib/add-project.ts
+++ b/packages/react-native/src/generators/application/lib/add-project.ts
@@ -24,7 +24,7 @@ function getTargets(options: NormalizedSchema) {
   const architect: { [key: string]: TargetConfiguration } = {};
 
   architect.start = {
-    executor: '@nrwl/react-native:start',
+    executor: '@nx/react-native:start',
     options: {
       port: 8081,
     },
@@ -38,12 +38,12 @@ function getTargets(options: NormalizedSchema) {
   };
 
   architect['run-ios'] = {
-    executor: '@nrwl/react-native:run-ios',
+    executor: '@nx/react-native:run-ios',
     options: {},
   };
 
   architect['bundle-ios'] = {
-    executor: '@nrwl/react-native:bundle',
+    executor: '@nx/react-native:bundle',
     outputs: ['{options.bundleOutput}'],
     options: {
       entryFile: options.entryFile,
@@ -53,12 +53,12 @@ function getTargets(options: NormalizedSchema) {
   };
 
   architect['run-android'] = {
-    executor: '@nrwl/react-native:run-android',
+    executor: '@nx/react-native:run-android',
     options: {},
   };
 
   architect['build-android'] = {
-    executor: '@nrwl/react-native:build-android',
+    executor: '@nx/react-native:build-android',
     outputs: [
       `{projectRoot}/android/app/build/outputs/bundle`,
       `{projectRoot}/android/app/build/outputs/apk`,
@@ -67,18 +67,18 @@ function getTargets(options: NormalizedSchema) {
   };
 
   architect['build-ios'] = {
-    executor: '@nrwl/react-native:build-ios',
+    executor: '@nx/react-native:build-ios',
     outputs: ['{projectRoot}/ios/build/Build'],
     options: {},
   };
 
   architect['pod-install'] = {
-    executor: '@nrwl/react-native:pod-install',
+    executor: '@nx/react-native:pod-install',
     options: {},
   };
 
   architect['bundle-android'] = {
-    executor: '@nrwl/react-native:bundle',
+    executor: '@nx/react-native:bundle',
     outputs: ['{options.bundleOutput}'],
     options: {
       entryFile: options.entryFile,
@@ -88,12 +88,12 @@ function getTargets(options: NormalizedSchema) {
   };
 
   architect['sync-deps'] = {
-    executor: '@nrwl/react-native:sync-deps',
+    executor: '@nx/react-native:sync-deps',
     options: {},
   };
 
   architect['ensure-symlink'] = {
-    executor: '@nrwl/react-native:ensure-symlink',
+    executor: '@nx/react-native:ensure-symlink',
     options: {},
   };
 
diff --git a/packages/react-native/src/generators/component/schema.d.ts b/packages/react-native/src/generators/component/schema.d.ts
index 17e23f569d756..9f795353418ea 100644
--- a/packages/react-native/src/generators/component/schema.d.ts
+++ b/packages/react-native/src/generators/component/schema.d.ts
@@ -1,5 +1,5 @@
 /**
- * Same as the @nrwl/react library schema, except it removes keys: style, routing, globalCss
+ * Same as the @nx/react library schema, except it removes keys: style, routing, globalCss
  */
 export interface Schema {
   name: string;
diff --git a/packages/react-native/src/generators/init/init.ts b/packages/react-native/src/generators/init/init.ts
index 6c0a7c7b1c2fe..7d1ae21b0060d 100644
--- a/packages/react-native/src/generators/init/init.ts
+++ b/packages/react-native/src/generators/init/init.ts
@@ -90,7 +90,7 @@ export function updateDependencies(host: Tree) {
       'react-native': reactNativeVersion,
     },
     {
-      '@nrwl/react-native': nxVersion,
+      '@nx/react-native': nxVersion,
       '@types/node': typesNodeVersion,
       '@types/react': typesReactVersion,
       '@types/react-native': typesReactNativeVersion,
@@ -124,7 +124,7 @@ export function updateDependencies(host: Tree) {
 }
 
 function moveDependency(host: Tree) {
-  return removeDependenciesFromPackageJson(host, ['@nrwl/react-native'], []);
+  return removeDependenciesFromPackageJson(host, ['@nx/react-native'], []);
 }
 
 export default reactNativeInitGenerator;
diff --git a/packages/react-native/src/generators/library/files/lib/babel.config.json.template b/packages/react-native/src/generators/library/files/lib/babel.config.json.template
index 3c1b877fca28c..34e8832831f4e 100644
--- a/packages/react-native/src/generators/library/files/lib/babel.config.json.template
+++ b/packages/react-native/src/generators/library/files/lib/babel.config.json.template
@@ -1,7 +1,7 @@
 {
   "presets": [
     [
-      "@nrwl/react/babel",
+      "@nx/react/babel",
       {
         "runtime": "automatic",
         "useBuiltIns": "usage"
diff --git a/packages/react-native/src/generators/library/library.spec.ts b/packages/react-native/src/generators/library/library.spec.ts
index 7bf0509a9dd3e..cf0e871e57f59 100644
--- a/packages/react-native/src/generators/library/library.spec.ts
+++ b/packages/react-native/src/generators/library/library.spec.ts
@@ -268,7 +268,7 @@ describe('lib', () => {
       const projectConfiguration = readProjectConfiguration(appTree, 'my-lib');
 
       expect(projectConfiguration.targets.build).toMatchObject({
-        executor: '@nrwl/web:rollup',
+        executor: '@nx/web:rollup',
         outputs: ['{options.outputPath}'],
         options: {
           external: ['react/jsx-runtime', 'react-native'],
@@ -276,7 +276,7 @@ describe('lib', () => {
           outputPath: 'dist/libs/my-lib',
           project: 'libs/my-lib/package.json',
           tsConfig: 'libs/my-lib/tsconfig.lib.json',
-          rollupConfig: '@nrwl/react/plugins/bundle-rollup',
+          rollupConfig: '@nx/react/plugins/bundle-rollup',
         },
       });
     });
diff --git a/packages/react-native/src/generators/library/library.ts b/packages/react-native/src/generators/library/library.ts
index 9c36142754de1..d1cc5962e58d2 100644
--- a/packages/react-native/src/generators/library/library.ts
+++ b/packages/react-native/src/generators/library/library.ts
@@ -84,7 +84,7 @@ function addProject(host: Tree, options: NormalizedSchema) {
     const external = ['react/jsx-runtime', 'react-native'];
 
     targets.build = {
-      executor: '@nrwl/web:rollup',
+      executor: '@nx/web:rollup',
       outputs: ['{options.outputPath}'],
       options: {
         outputPath: `dist/${libsDir}/${options.projectDirectory}`,
@@ -92,7 +92,7 @@ function addProject(host: Tree, options: NormalizedSchema) {
         project: `${options.projectRoot}/package.json`,
         entryFile: maybeJs(options, `${options.projectRoot}/src/index.ts`),
         external,
-        rollupConfig: `@nrwl/react/plugins/bundle-rollup`,
+        rollupConfig: `@nx/react/plugins/bundle-rollup`,
         assets: [
           {
             glob: `${options.projectRoot}/README.md`,
diff --git a/packages/react-native/src/generators/library/schema.d.ts b/packages/react-native/src/generators/library/schema.d.ts
index 3046620cb011c..885038f3ee233 100644
--- a/packages/react-native/src/generators/library/schema.d.ts
+++ b/packages/react-native/src/generators/library/schema.d.ts
@@ -1,7 +1,7 @@
 import { Linter } from '@nx/linter';
 
 /**
- * Same as the @nrwl/react library schema, except it removes keys: style, component, routing, appProject
+ * Same as the @nx/react library schema, except it removes keys: style, component, routing, appProject
  */
 export interface Schema {
   name: string;
diff --git a/packages/react-native/src/generators/storybook-configuration/configuration.spec.ts b/packages/react-native/src/generators/storybook-configuration/configuration.spec.ts
index 9062afc948d07..c2e6b45aa2b23 100644
--- a/packages/react-native/src/generators/storybook-configuration/configuration.spec.ts
+++ b/packages/react-native/src/generators/storybook-configuration/configuration.spec.ts
@@ -95,7 +95,7 @@ describe('react-native:storybook-configuration', () => {
       });
 
       // Currently the auto-generate stories feature only picks up components under the 'lib' directory.
-      // In our 'createTestAppLib' function, we call @nrwl/react-native:component to generate a component
+      // In our 'createTestAppLib' function, we call @nx/react-native:component to generate a component
       // under the specified 'lib' directory
       expect(
         appTree.exists(
diff --git a/packages/react-native/src/generators/storybook-configuration/configuration.ts b/packages/react-native/src/generators/storybook-configuration/configuration.ts
index df1c02197b472..d9fe8d11f0d86 100644
--- a/packages/react-native/src/generators/storybook-configuration/configuration.ts
+++ b/packages/react-native/src/generators/storybook-configuration/configuration.ts
@@ -59,7 +59,7 @@ export async function storybookConfigurationGenerator(
 function addStorybookTask(host: Tree, projectName: string) {
   const projectConfig = readProjectConfiguration(host, projectName);
   projectConfig.targets['storybook'] = {
-    executor: '@nrwl/react-native:storybook',
+    executor: '@nx/react-native:storybook',
     options: {
       searchDir: [projectConfig.root],
       outputFile: './.storybook/story-loader.js',
diff --git a/packages/react-native/src/generators/storybook-configuration/lib/create-storybook-files.ts b/packages/react-native/src/generators/storybook-configuration/lib/create-storybook-files.ts
index 1cfd7a253ab88..3c391fdfe722a 100644
--- a/packages/react-native/src/generators/storybook-configuration/lib/create-storybook-files.ts
+++ b/packages/react-native/src/generators/storybook-configuration/lib/create-storybook-files.ts
@@ -25,6 +25,8 @@ export async function createStorybookFiles(
 
   // do not proceed if not a react native project
   if (
+    targets?.start?.executor !== '@nx/react-native:start' &&
+    targets?.start?.executor !== '@nx/expo:start' &&
     targets?.start?.executor !== '@nrwl/react-native:start' &&
     targets?.start?.executor !== '@nrwl/expo:start'
   ) {
diff --git a/packages/react-native/src/utils/add-jest.ts b/packages/react-native/src/utils/add-jest.ts
index ec517265bf702..2d7af82123970 100644
--- a/packages/react-native/src/utils/add-jest.ts
+++ b/packages/react-native/src/utils/add-jest.ts
@@ -29,11 +29,11 @@ export async function addJest(
   const content = `module.exports = {
   displayName: '${projectName}',
   preset: 'react-native',
-  resolver: '@nrwl/jest/plugins/resolver',
+  resolver: '@nx/jest/plugins/resolver',
   moduleFileExtensions: ['ts', 'js', 'html', 'tsx', 'jsx'],
   setupFilesAfterEnv: ['<rootDir>/test-setup.${js ? 'js' : 'ts'}'],
   moduleNameMapper: {
-    '\\\\.svg$': '@nrwl/react-native/plugins/jest/svg-mock'
+    '\\\\.svg$': '@nx/react-native/plugins/jest/svg-mock'
   }
 };`;
   host.write(configPath, content);
diff --git a/packages/react-native/src/utils/ensure-node-modules-symlink.spec.ts b/packages/react-native/src/utils/ensure-node-modules-symlink.spec.ts
index 76b1bca3e5ad4..bf7a05c3fda8d 100644
--- a/packages/react-native/src/utils/ensure-node-modules-symlink.spec.ts
+++ b/packages/react-native/src/utils/ensure-node-modules-symlink.spec.ts
@@ -25,7 +25,7 @@ describe('ensureNodeModulesSymlink', () => {
       JSON.stringify({
         name: 'workspace',
         dependencies: {
-          '@nrwl/react-native': '9999.9.9',
+          '@nx/react-native': '9999.9.9',
           '@react-native-community/cli-platform-ios': '7777.7.7',
           '@react-native-community/cli-platform-android': '7777.7.7',
           'react-native': '0.9999.0',
@@ -39,7 +39,7 @@ describe('ensureNodeModulesSymlink', () => {
   });
 
   it('should create symlinks', () => {
-    createNpmDirectory('@nrwl/react-native', '9999.9.9');
+    createNpmDirectory('@nx/react-native', '9999.9.9');
     createNpmDirectory(
       '@react-native-community/cli-platform-android',
       '7777.7.7'
@@ -52,7 +52,7 @@ describe('ensureNodeModulesSymlink', () => {
 
     ensureNodeModulesSymlink(workspaceDir, appDir);
 
-    expectSymlinkToExist('@nrwl/react-native');
+    expectSymlinkToExist('@nx/react-native');
     expectSymlinkToExist('react-native');
     expectSymlinkToExist('jsc-android');
     expectSymlinkToExist('hermes-engine');
@@ -71,7 +71,7 @@ describe('ensureNodeModulesSymlink', () => {
         },
       })
     );
-    createNpmDirectory('@nrwl/react-native', '9999.9.9');
+    createNpmDirectory('@nx/react-native', '9999.9.9');
     createNpmDirectory(
       '@react-native-community/cli-platform-android',
       '7777.7.7'
diff --git a/packages/react-native/src/utils/find-all-npm-dependencies.spec.ts b/packages/react-native/src/utils/find-all-npm-dependencies.spec.ts
index 73a17edbdf756..e7ecf1955b8e3 100644
--- a/packages/react-native/src/utils/find-all-npm-dependencies.spec.ts
+++ b/packages/react-native/src/utils/find-all-npm-dependencies.spec.ts
@@ -50,12 +50,12 @@ test('findAllNpmDependencies', () => {
           packageName: 'react-native-snackbar',
         },
       },
-      'npm:@nrwl/react-native': {
+      'npm:@nx/react-native': {
         type: 'npm',
-        name: 'npm:@nrwl/react-native',
+        name: 'npm:@nx/react-native',
         data: {
           version: '1',
-          packageName: '@nrwl/react-native',
+          packageName: '@nx/react-native',
         },
       },
     },
@@ -71,7 +71,7 @@ test('findAllNpmDependencies', () => {
         {
           type: 'static',
           source: 'myapp',
-          target: 'npm:@nrwl/react-native',
+          target: 'npm:@nx/react-native',
         },
       ],
       lib1: [
diff --git a/packages/react-native/src/utils/find-all-npm-dependencies.ts b/packages/react-native/src/utils/find-all-npm-dependencies.ts
index fe1558ddddf0a..c8136ce96f927 100644
--- a/packages/react-native/src/utils/find-all-npm-dependencies.ts
+++ b/packages/react-native/src/utils/find-all-npm-dependencies.ts
@@ -14,10 +14,13 @@ export function findAllNpmDependencies(
 
   const node = graph.externalNodes[projectName];
 
-  // Don't want to include '@nrwl/react-native' because React Native
+  // Don't want to include '@nx/react-native' because React Native
   // autolink will warn that the package has no podspec file for iOS.
   if (node) {
-    if (node.name !== 'npm:@nrwl/react-native') {
+    if (
+      node.name !== 'npm:@nx/react-native' &&
+      node.name !== 'npm:@nrwl/react-native'
+    ) {
       list.push(node.data.packageName);
     }
   } else {
diff --git a/packages/react/.eslintrc.json b/packages/react/.eslintrc.json
index 4a142b79a6e0f..5f199bc850003 100644
--- a/packages/react/.eslintrc.json
+++ b/packages/react/.eslintrc.json
@@ -12,7 +12,7 @@
       "rules": {
         "no-restricted-imports": [
           "error",
-          "@nrwl/workspace",
+          "@nx/workspace",
           "@angular-devkit/core",
           "@angular-devkit/schematics",
           "@angular-devkit/architect"
diff --git a/packages/react/generators.json b/packages/react/generators.json
index 7232910d7fa9e..05f872343324c 100644
--- a/packages/react/generators.json
+++ b/packages/react/generators.json
@@ -1,7 +1,7 @@
 {
   "name": "Nx React",
   "version": "0.1",
-  "extends": ["@nrwl/workspace"],
+  "extends": ["@nx/workspace"],
   "schematics": {
     "init": {
       "factory": "./src/generators/init/init#reactInitSchematic",
diff --git a/packages/react/plugins/component-testing/index.ts b/packages/react/plugins/component-testing/index.ts
index 9da81e6df67fd..300f1a17eb33e 100644
--- a/packages/react/plugins/component-testing/index.ts
+++ b/packages/react/plugins/component-testing/index.ts
@@ -135,7 +135,7 @@ export function nxComponentTestingPreset(
 }
 
 /**
- * apply the schema.json defaults from the @nrwl/web:webpack executor to the target options
+ * apply the schema.json defaults from the @nx/web:webpack executor to the target options
  */
 function withSchemaDefaults(target: Target, context: ExecutorContext) {
   const options = readTargetOptions(target, context);
@@ -213,7 +213,7 @@ function buildTargetWebpack(
 
     return async () => {
       customWebpack = await customWebpack;
-      // TODO(jack): Once webpackConfig is always set in @nrwl/webpack:webpack, we no longer need this default.
+      // TODO(jack): Once webpackConfig is always set in @nx/webpack:webpack, we no longer need this default.
       const defaultWebpack = getWebpackConfig(context, {
         ...options,
         root: workspaceRoot,
diff --git a/packages/react/plugins/component-testing/webpack-fallback.ts b/packages/react/plugins/component-testing/webpack-fallback.ts
index 7e472ed92acd6..0da89a795e2b8 100644
--- a/packages/react/plugins/component-testing/webpack-fallback.ts
+++ b/packages/react/plugins/component-testing/webpack-fallback.ts
@@ -71,7 +71,7 @@ export function buildBaseWebpackConfig({
       test: /\.(js|jsx|mjs|ts|tsx)$/,
       loader: require.resolve('babel-loader'),
       options: {
-        presets: [`@nrwl/react/babel`],
+        presets: [`@nx/react/babel`],
         rootMode: 'upward',
         babelrc: true,
       },
diff --git a/packages/react/plugins/storybook/index.ts b/packages/react/plugins/storybook/index.ts
index 54c23f4e62276..92550ea3f9796 100644
--- a/packages/react/plugins/storybook/index.ts
+++ b/packages/react/plugins/storybook/index.ts
@@ -63,7 +63,7 @@ export const webpack = async (
   options: any
 ): Promise<Configuration> => {
   logger.info(
-    '=> Loading Nx React Storybook Addon from "@nrwl/react/plugins/storybook"'
+    '=> Loading Nx React Storybook Addon from "@nx/react/plugins/storybook"'
   );
   // In case anyone is missing dep and did not run migrations.
   // See: https://github.com/nrwl/nx/issues/14455
diff --git a/packages/react/plugins/webpack.ts b/packages/react/plugins/webpack.ts
index 7576c3ac6ab71..e9ae67c7e528e 100644
--- a/packages/react/plugins/webpack.ts
+++ b/packages/react/plugins/webpack.ts
@@ -4,7 +4,7 @@ import { withReact } from './with-react';
 const legacyExport: any = withReact();
 legacyExport.withReact = withReact;
 
-/** @deprecated use `import { withReact } from '@nrwl/react'` */
+/** @deprecated use `import { withReact } from '@nx/react'` */
 // This is here for backward compatibility if anyone imports {getWebpackConfig} directly.
 // TODO(jack): Remove in Nx 16
 const getWebpackConfig = withReact();
diff --git a/packages/react/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts b/packages/react/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts
index b903807b5d8d3..95e2b6f4f09fe 100644
--- a/packages/react/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts
+++ b/packages/react/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts
@@ -32,7 +32,7 @@ export default async function* moduleFederationDevServer(
   } catch {
     // TODO(jack): Add a link to guide
     throw new Error(
-      `Could not load ${moduleFederationConfigPath}. Was this project generated with "@nrwl/react:host"?`
+      `Could not load ${moduleFederationConfigPath}. Was this project generated with "@nx/react:host"?`
     );
   }
 
diff --git a/packages/react/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.ts b/packages/react/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.ts
index e4e640c4af7c4..1e6929ed8feba 100644
--- a/packages/react/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.ts
+++ b/packages/react/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.ts
@@ -41,7 +41,7 @@ export default async function* moduleFederationSsrDevServer(
   } catch {
     // TODO(jack): Add a link to guide
     throw new Error(
-      `Could not load ${moduleFederationConfigPath}. Was this project generated with "@nrwl/react:host"?`
+      `Could not load ${moduleFederationConfigPath}. Was this project generated with "@nx/react:host"?`
     );
   }
 
diff --git a/packages/react/src/generators/application/application.spec.ts b/packages/react/src/generators/application/application.spec.ts
index 6452b959f0a49..3ad86142d0edd 100644
--- a/packages/react/src/generators/application/application.spec.ts
+++ b/packages/react/src/generators/application/application.spec.ts
@@ -102,7 +102,7 @@ describe('app', () => {
       expect(appTree.exists('apps/my-app/src/app/app.module.css')).toBeTruthy();
 
       const jestConfig = appTree.read('apps/my-app/jest.config.ts').toString();
-      expect(jestConfig).toContain('@nrwl/react/plugins/jest');
+      expect(jestConfig).toContain('@nx/react/plugins/jest');
 
       const tsconfig = readJson(appTree, 'apps/my-app/tsconfig.json');
       expect(tsconfig.references).toEqual([
@@ -131,7 +131,7 @@ describe('app', () => {
 
       const eslintJson = readJson(appTree, 'apps/my-app/.eslintrc.json');
       expect(eslintJson.extends).toEqual([
-        'plugin:@nrwl/nx/react',
+        'plugin:@nx/nx/react',
         '../../.eslintrc.json',
       ]);
 
@@ -247,7 +247,7 @@ describe('app', () => {
         {
           path: 'apps/my-dir/my-app/.eslintrc.json',
           lookupFn: (json) => json.extends,
-          expectedValue: ['plugin:@nrwl/nx/react', '../../../.eslintrc.json'],
+          expectedValue: ['plugin:@nx/nx/react', '../../../.eslintrc.json'],
         },
       ].forEach(hasJsonValue);
     });
@@ -304,7 +304,7 @@ describe('app', () => {
     await applicationGenerator(appTree, { ...schema, name: 'my-app' });
 
     expect(appTree.read('apps/my-app/jest.config.ts').toString()).toContain(
-      "['babel-jest', { presets: ['@nrwl/react/babel'] }]"
+      "['babel-jest', { presets: ['@nx/react/babel'] }]"
     );
   });
 
@@ -325,7 +325,7 @@ describe('app', () => {
 
     const projectsConfigurations = getProjects(appTree);
     const targetConfig = projectsConfigurations.get('my-app').targets;
-    expect(targetConfig.build.executor).toEqual('@nrwl/webpack:webpack');
+    expect(targetConfig.build.executor).toEqual('@nx/webpack:webpack');
     expect(targetConfig.build.outputs).toEqual(['{options.outputPath}']);
     expect(targetConfig.build.options).toEqual({
       compiler: 'babel',
@@ -387,7 +387,7 @@ describe('app', () => {
 
     const projectsConfigurations = getProjects(appTree);
     const targetConfig = projectsConfigurations.get('my-app').targets;
-    expect(targetConfig.serve.executor).toEqual('@nrwl/webpack:dev-server');
+    expect(targetConfig.serve.executor).toEqual('@nx/webpack:dev-server');
     expect(targetConfig.serve.options).toEqual({
       buildTarget: 'my-app:build',
       hmr: true,
@@ -532,7 +532,7 @@ describe('app', () => {
     expect(eslintJson).toMatchInlineSnapshot(`
       {
         "extends": [
-          "plugin:@nrwl/nx/react",
+          "plugin:@nx/nx/react",
           "../../.eslintrc.json",
         ],
         "ignorePatterns": [
@@ -609,7 +609,7 @@ describe('app', () => {
       await applicationGenerator(appTree, { ...schema, style: 'none' });
 
       const nxJson = readNxJson(appTree);
-      expect(nxJson.generators['@nrwl/react']).toMatchObject({
+      expect(nxJson.generators['@nx/react']).toMatchObject({
         application: {
           style: 'none',
         },
@@ -842,7 +842,7 @@ describe('app', () => {
       });
 
       const nxJson = readNxJson(appTree);
-      expect(nxJson.generators['@nrwl/react']).toMatchObject({
+      expect(nxJson.generators['@nx/react']).toMatchObject({
         application: {
           babel: true,
           style: 'styled-components',
diff --git a/packages/react/src/generators/application/files/base-vite/tsconfig.app.json__tmpl__ b/packages/react/src/generators/application/files/base-vite/tsconfig.app.json__tmpl__
index 7ef8db93efeac..12eaf7da89834 100644
--- a/packages/react/src/generators/application/files/base-vite/tsconfig.app.json__tmpl__
+++ b/packages/react/src/generators/application/files/base-vite/tsconfig.app.json__tmpl__
@@ -5,9 +5,9 @@
     "types": ["node"]
   },
   "files": [
-    <% if (style === 'styled-jsx') { %>"<%= offsetFromRoot %>node_modules/@nrwl/react/typings/styled-jsx.d.ts",<% } %>
-    "<%= offsetFromRoot %>node_modules/@nrwl/react/typings/cssmodule.d.ts",
-    "<%= offsetFromRoot %>node_modules/@nrwl/react/typings/image.d.ts"
+    <% if (style === 'styled-jsx') { %>"<%= offsetFromRoot %>node_modules/@nx/react/typings/styled-jsx.d.ts",<% } %>
+    "<%= offsetFromRoot %>node_modules/@nx/react/typings/cssmodule.d.ts",
+    "<%= offsetFromRoot %>node_modules/@nx/react/typings/image.d.ts"
   ],
   "exclude": ["src/**/*.spec.ts", "src/**/*.test.ts", "src/**/*.spec.tsx", "src/**/*.test.tsx", "src/**/*.spec.js", "src/**/*.test.js", "src/**/*.spec.jsx", "src/**/*.test.jsx"],
   "include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"]
diff --git a/packages/react/src/generators/application/files/base-webpack/.babelrc__tmpl__ b/packages/react/src/generators/application/files/base-webpack/.babelrc__tmpl__
index 626dc3ed79947..88746cdac6ac9 100644
--- a/packages/react/src/generators/application/files/base-webpack/.babelrc__tmpl__
+++ b/packages/react/src/generators/application/files/base-webpack/.babelrc__tmpl__
@@ -1,7 +1,7 @@
 {
   "presets": [
     [
-      "@nrwl/react/babel", {
+      "@nx/react/babel", {
         "runtime": "automatic"<% if (style === '@emotion/styled') { %>,<% } %>
         <% if (style === '@emotion/styled') { %>"importSource": "@emotion/react" <% } %>
       }
diff --git a/packages/react/src/generators/application/files/base-webpack/tsconfig.app.json__tmpl__ b/packages/react/src/generators/application/files/base-webpack/tsconfig.app.json__tmpl__
index 71e273bf2fc3c..95917f8cff001 100644
--- a/packages/react/src/generators/application/files/base-webpack/tsconfig.app.json__tmpl__
+++ b/packages/react/src/generators/application/files/base-webpack/tsconfig.app.json__tmpl__
@@ -5,9 +5,9 @@
     "types": ["node"]
   },
   "files": [
-    <% if (style === 'styled-jsx') { %>"<%= offsetFromRoot %>node_modules/@nrwl/react/typings/styled-jsx.d.ts",<% } %>
-    "<%= offsetFromRoot %>node_modules/@nrwl/react/typings/cssmodule.d.ts",
-    "<%= offsetFromRoot %>node_modules/@nrwl/react/typings/image.d.ts"
+    <% if (style === 'styled-jsx') { %>"<%= offsetFromRoot %>node_modules/@nx/react/typings/styled-jsx.d.ts",<% } %>
+    "<%= offsetFromRoot %>node_modules/@nx/react/typings/cssmodule.d.ts",
+    "<%= offsetFromRoot %>node_modules/@nx/react/typings/image.d.ts"
   ],
   "exclude": ["jest.config.ts","src/**/*.spec.ts", "src/**/*.test.ts", "src/**/*.spec.tsx", "src/**/*.test.tsx", "src/**/*.spec.js", "src/**/*.test.js", "src/**/*.spec.jsx", "src/**/*.test.jsx"],
   "include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"]
diff --git a/packages/react/src/generators/application/files/base-webpack/webpack.config.js__tmpl__ b/packages/react/src/generators/application/files/base-webpack/webpack.config.js__tmpl__
index 8d695556b2320..f92d94803544c 100644
--- a/packages/react/src/generators/application/files/base-webpack/webpack.config.js__tmpl__
+++ b/packages/react/src/generators/application/files/base-webpack/webpack.config.js__tmpl__
@@ -1,5 +1,5 @@
-const { composePlugins, withNx } = require('@nrwl/webpack');
-const { withReact } = require('@nrwl/react');
+const { composePlugins, withNx } = require('@nx/webpack');
+const { withReact } = require('@nx/react');
 
 // Nx plugins for webpack.
 module.exports = composePlugins(withNx(), withReact(), (config) => {
diff --git a/packages/react/src/generators/application/files/nx-welcome/src/app/nx-welcome.tsx b/packages/react/src/generators/application/files/nx-welcome/src/app/nx-welcome.tsx
index 1aff4c84a78db..f0cd657b7d478 100644
--- a/packages/react/src/generators/application/files/nx-welcome/src/app/nx-welcome.tsx
+++ b/packages/react/src/generators/application/files/nx-welcome/src/app/nx-welcome.tsx
@@ -768,9 +768,9 @@ export function NxWelcome({ title }: { title: string }) {
               </summary>
               <pre>
                 <span># Generate UI lib</span>
-                nx g @nrwl/react:lib ui
+                nx g @nx/react:lib ui
                 <span># Add a component</span>
-                nx g @nrwl/react:component button --project ui
+                nx g @nx/react:component button --project ui
               </pre>
             </details>
             <details>
diff --git a/packages/react/src/generators/application/lib/add-project.ts b/packages/react/src/generators/application/lib/add-project.ts
index f027602b140ab..72c18a5f97720 100644
--- a/packages/react/src/generators/application/lib/add-project.ts
+++ b/packages/react/src/generators/application/lib/add-project.ts
@@ -35,7 +35,7 @@ function maybeJs(options: NormalizedSchema, path: string): string {
 
 function createBuildTarget(options: NormalizedSchema): TargetConfiguration {
   return {
-    executor: '@nrwl/webpack:webpack',
+    executor: '@nx/webpack:webpack',
     outputs: ['{options.outputPath}'],
     defaultConfiguration: 'production',
     options: {
@@ -106,7 +106,7 @@ function createBuildTarget(options: NormalizedSchema): TargetConfiguration {
 
 function createServeTarget(options: NormalizedSchema): TargetConfiguration {
   return {
-    executor: '@nrwl/webpack:dev-server',
+    executor: '@nx/webpack:dev-server',
     defaultConfiguration: 'development',
     options: {
       buildTarget: `${options.projectName}:build`,
diff --git a/packages/react/src/generators/application/lib/install-common-dependencies.ts b/packages/react/src/generators/application/lib/install-common-dependencies.ts
index fb239fd4bec56..b321a7453a865 100644
--- a/packages/react/src/generators/application/lib/install-common-dependencies.ts
+++ b/packages/react/src/generators/application/lib/install-common-dependencies.ts
@@ -13,7 +13,7 @@ export function installCommonDependencies(
   let devDependencies = null;
 
   // Vite requires style preprocessors to be installed manually.
-  // `@nrwl/webpack` installs them automatically for now.
+  // `@nx/webpack` installs them automatically for now.
   // TODO(jack): Once we clean up webpack we can remove this check
   if (options.bundler === 'vite' || options.unitTestRunner === 'vitest') {
     switch (options.style) {
diff --git a/packages/react/src/generators/application/lib/set-defaults.ts b/packages/react/src/generators/application/lib/set-defaults.ts
index 4ab20d3d2449e..cad4019796757 100644
--- a/packages/react/src/generators/application/lib/set-defaults.ts
+++ b/packages/react/src/generators/application/lib/set-defaults.ts
@@ -13,9 +13,9 @@ export function setDefaults(host: Tree, options: NormalizedSchema) {
   }
 
   nxJson.generators = nxJson.generators || {};
-  nxJson.generators['@nrwl/react'] = nxJson.generators['@nrwl/react'] || {};
+  nxJson.generators['@nx/react'] = nxJson.generators['@nx/react'] || {};
 
-  const prev = { ...nxJson.generators['@nrwl/react'] };
+  const prev = { ...nxJson.generators['@nx/react'] };
 
   const appDefaults = {
     style: options.style,
@@ -35,7 +35,7 @@ export function setDefaults(host: Tree, options: NormalizedSchema) {
 
   nxJson.generators = {
     ...nxJson.generators,
-    '@nrwl/react': {
+    '@nx/react': {
       ...prev,
       application: appDefaults,
       component: componentDefaults,
diff --git a/packages/react/src/generators/application/lib/update-jest-config.ts b/packages/react/src/generators/application/lib/update-jest-config.ts
index e76e187d18334..fece93f8fe7bd 100644
--- a/packages/react/src/generators/application/lib/update-jest-config.ts
+++ b/packages/react/src/generators/application/lib/update-jest-config.ts
@@ -10,12 +10,12 @@ export function updateSpecConfig(host: Tree, options: NormalizedSchema) {
   updateJson(host, `${options.appProjectRoot}/tsconfig.spec.json`, (json) => {
     const offset = offsetFromRoot(options.appProjectRoot);
     json.files = [
-      `${offset}node_modules/@nrwl/react/typings/cssmodule.d.ts`,
-      `${offset}node_modules/@nrwl/react/typings/image.d.ts`,
+      `${offset}node_modules/@nx/react/typings/cssmodule.d.ts`,
+      `${offset}node_modules/@nx/react/typings/image.d.ts`,
     ];
     if (options.style === 'styled-jsx') {
       json.files.unshift(
-        `${offset}node_modules/@nrwl/react/typings/styled-jsx.d.ts`
+        `${offset}node_modules/@nx/react/typings/styled-jsx.d.ts`
       );
     }
     return json;
diff --git a/packages/react/src/generators/cypress-component-configuration/__snapshots__/cypress-component-configuration.spec.ts.snap b/packages/react/src/generators/cypress-component-configuration/__snapshots__/cypress-component-configuration.spec.ts.snap
index a3e3b0d3c27d8..72e505364ff8b 100644
--- a/packages/react/src/generators/cypress-component-configuration/__snapshots__/cypress-component-configuration.spec.ts.snap
+++ b/packages/react/src/generators/cypress-component-configuration/__snapshots__/cypress-component-configuration.spec.ts.snap
@@ -2,7 +2,7 @@
 
 exports[`React:CypressComponentTestConfiguration should generate cypress component test config with --build-target 1`] = `
 "import { defineConfig } from 'cypress';
-import { nxComponentTestingPreset } from '@nrwl/react/plugins/component-testing';
+import { nxComponentTestingPreset } from '@nx/react/plugins/component-testing';
 
 export default defineConfig({
   component: nxComponentTestingPreset(__filename, {
@@ -14,7 +14,7 @@ export default defineConfig({
 
 exports[`React:CypressComponentTestConfiguration should generate cypress component test config with project graph 1`] = `
 "import { defineConfig } from 'cypress';
-import { nxComponentTestingPreset } from '@nrwl/react/plugins/component-testing';
+import { nxComponentTestingPreset } from '@nx/react/plugins/component-testing';
 
 export default defineConfig({
   component: nxComponentTestingPreset(__filename, {
@@ -26,7 +26,7 @@ export default defineConfig({
 
 exports[`React:CypressComponentTestConfiguration should generate cypress component test config with webpack 1`] = `
 "import { defineConfig } from 'cypress';
-import { nxComponentTestingPreset } from '@nrwl/react/plugins/component-testing';
+import { nxComponentTestingPreset } from '@nx/react/plugins/component-testing';
 
 export default defineConfig({
   component: nxComponentTestingPreset(__filename, {
@@ -38,7 +38,7 @@ export default defineConfig({
 
 exports[`React:CypressComponentTestConfiguration should generate cypress config with vite 1`] = `
 "import { defineConfig } from 'cypress';
-import { nxComponentTestingPreset } from '@nrwl/react/plugins/component-testing';
+import { nxComponentTestingPreset } from '@nx/react/plugins/component-testing';
 
 export default defineConfig({
   component: nxComponentTestingPreset(__filename, {
diff --git a/packages/react/src/generators/cypress-component-configuration/files/cypress.config.ts__tpl__ b/packages/react/src/generators/cypress-component-configuration/files/cypress.config.ts__tpl__
index fae43e41d7b39..afe99033f5217 100644
--- a/packages/react/src/generators/cypress-component-configuration/files/cypress.config.ts__tpl__
+++ b/packages/react/src/generators/cypress-component-configuration/files/cypress.config.ts__tpl__
@@ -1,5 +1,5 @@
 import { defineConfig } from 'cypress';
-import { nxComponentTestingPreset } from '@nrwl/react/plugins/component-testing';
+import { nxComponentTestingPreset } from '@nx/react/plugins/component-testing';
 
 export default defineConfig({
   component: nxComponentTestingPreset(__filename, {
diff --git a/packages/react/src/generators/host/files/module-federation-ssr/module-federation.server.config.js__tmpl__ b/packages/react/src/generators/host/files/module-federation-ssr/module-federation.server.config.js__tmpl__
index 17511add9a8e6..36eacd1efd9d8 100644
--- a/packages/react/src/generators/host/files/module-federation-ssr/module-federation.server.config.js__tmpl__
+++ b/packages/react/src/generators/host/files/module-federation-ssr/module-federation.server.config.js__tmpl__
@@ -1,7 +1,7 @@
 // @ts-check
 
 /**
- * @type {import('@nrwl/devkit').ModuleFederationConfig}
+ * @type {import('@nx/devkit').ModuleFederationConfig}
  **/
 const moduleFederationConfig = {
     name: '<%= projectName %>',
diff --git a/packages/react/src/generators/host/files/module-federation-ssr/webpack.server.config.js__tmpl__ b/packages/react/src/generators/host/files/module-federation-ssr/webpack.server.config.js__tmpl__
index 7b20cd471df31..c1fd0e6e6d71a 100644
--- a/packages/react/src/generators/host/files/module-federation-ssr/webpack.server.config.js__tmpl__
+++ b/packages/react/src/generators/host/files/module-federation-ssr/webpack.server.config.js__tmpl__
@@ -1,6 +1,6 @@
-const { composePlugins, withNx } = require('@nrwl/webpack');
-const { withReact } = require('@nrwl/react');
-const { withModuleFederationForSSR } = require('@nrwl/react/module-federation');
+const { composePlugins, withNx } = require('@nx/webpack');
+const { withReact } = require('@nx/react');
+const { withModuleFederationForSSR } = require('@nx/react/module-federation');
 
 const baseConfig = require('./module-federation.config');
 
diff --git a/packages/react/src/generators/host/files/module-federation/webpack.config.js__tmpl__ b/packages/react/src/generators/host/files/module-federation/webpack.config.js__tmpl__
index 31055fab95c01..80e9c0cffb279 100644
--- a/packages/react/src/generators/host/files/module-federation/webpack.config.js__tmpl__
+++ b/packages/react/src/generators/host/files/module-federation/webpack.config.js__tmpl__
@@ -1,6 +1,6 @@
-const { composePlugins, withNx } = require('@nrwl/webpack');
-const { withReact } = require('@nrwl/react');
-const { withModuleFederation } = require('@nrwl/react/module-federation');
+const { composePlugins, withNx } = require('@nx/webpack');
+const { withReact } = require('@nx/react');
+const { withModuleFederation } = require('@nx/react/module-federation');
 
 const baseConfig = require('./module-federation.config');
 
diff --git a/packages/react/src/generators/host/files/module-federation/webpack.config.prod.js__tmpl__ b/packages/react/src/generators/host/files/module-federation/webpack.config.prod.js__tmpl__
index d59f533272f9b..0d1b3b4304973 100644
--- a/packages/react/src/generators/host/files/module-federation/webpack.config.prod.js__tmpl__
+++ b/packages/react/src/generators/host/files/module-federation/webpack.config.prod.js__tmpl__
@@ -1,6 +1,6 @@
-const { composePlugins, withNx } = require('@nrwl/webpack');
-const { withReact } = require('@nrwl/react');
-const { withModuleFederation } = require('@nrwl/react/module-federation');
+const { composePlugins, withNx } = require('@nx/webpack');
+const { withReact } = require('@nx/react');
+const { withModuleFederation } = require('@nx/react/module-federation');
 
 const baseConfig = require('./module-federation.config');
 
diff --git a/packages/react/src/generators/host/host.spec.ts b/packages/react/src/generators/host/host.spec.ts
index 64ff617f0385e..73006a890e2df 100644
--- a/packages/react/src/generators/host/host.spec.ts
+++ b/packages/react/src/generators/host/host.spec.ts
@@ -28,7 +28,7 @@ describe('hostGenerator', () => {
     expect(tree.exists('apps/test/src/remotes.d.ts'));
   });
 
-  it('should install @nrwl/web for the file-server executor', async () => {
+  it('should install @nx/web for the file-server executor', async () => {
     const tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
     await hostGenerator(tree, {
       name: 'test',
@@ -39,7 +39,7 @@ describe('hostGenerator', () => {
     });
 
     const packageJson = readJson(tree, 'package.json');
-    expect(packageJson.devDependencies['@nrwl/web']).toBeDefined();
+    expect(packageJson.devDependencies['@nx/web']).toBeDefined();
   });
 
   it('should generate host files and configs for SSR', async () => {
diff --git a/packages/react/src/generators/host/lib/setup-ssr-for-host.ts b/packages/react/src/generators/host/lib/setup-ssr-for-host.ts
index 69b53aa7a79e0..536d191c4ce16 100644
--- a/packages/react/src/generators/host/lib/setup-ssr-for-host.ts
+++ b/packages/react/src/generators/host/lib/setup-ssr-for-host.ts
@@ -21,8 +21,7 @@ export async function setupSsrForHost(
 ) {
   const tasks: GeneratorCallback[] = [];
   let project = readProjectConfiguration(tree, appName);
-  project.targets.serve.executor =
-    '@nrwl/react:module-federation-ssr-dev-server';
+  project.targets.serve.executor = '@nx/react:module-federation-ssr-dev-server';
   updateProjectConfiguration(tree, appName, project);
 
   generateFiles(
diff --git a/packages/react/src/generators/init/init.ts b/packages/react/src/generators/init/init.ts
index 4a4cbb7381cff..59aa332673f19 100755
--- a/packages/react/src/generators/init/init.ts
+++ b/packages/react/src/generators/init/init.ts
@@ -30,10 +30,10 @@ function setDefault(host: Tree) {
   const workspace = readNxJson(host);
 
   workspace.generators = workspace.generators || {};
-  const reactGenerators = workspace.generators['@nrwl/react'] || {};
+  const reactGenerators = workspace.generators['@nx/react'] || {};
   const generators = {
     ...workspace.generators,
-    '@nrwl/react': {
+    '@nx/react': {
       ...reactGenerators,
       application: {
         ...reactGenerators.application,
@@ -46,7 +46,7 @@ function setDefault(host: Tree) {
 }
 
 function updateDependencies(host: Tree, schema: InitSchema) {
-  removeDependenciesFromPackageJson(host, ['@nrwl/react'], []);
+  removeDependenciesFromPackageJson(host, ['@nx/react'], []);
 
   const dependencies = {
     react: reactVersion,
@@ -58,7 +58,7 @@ function updateDependencies(host: Tree, schema: InitSchema) {
   }
 
   return addDependenciesToPackageJson(host, dependencies, {
-    '@nrwl/react': nxVersion,
+    '@nx/react': nxVersion,
     '@types/node': typesNodeVersion,
     '@types/react': typesReactVersion,
     '@types/react-dom': typesReactDomVersion,
diff --git a/packages/react/src/generators/library/files/common/.babelrc__tmpl__ b/packages/react/src/generators/library/files/common/.babelrc__tmpl__
index fccd738e38d84..b4962b709b3c5 100644
--- a/packages/react/src/generators/library/files/common/.babelrc__tmpl__
+++ b/packages/react/src/generators/library/files/common/.babelrc__tmpl__
@@ -1,7 +1,7 @@
 {
   "presets": [
     [
-      "@nrwl/react/babel", {
+      "@nx/react/babel", {
         "runtime": "automatic",
         "useBuiltIns": "usage"
         <% if (style === '@emotion/styled') { %>,"importSource": "@emotion/react"<% } %>
diff --git a/packages/react/src/generators/library/files/common/tsconfig.lib.json__tmpl__ b/packages/react/src/generators/library/files/common/tsconfig.lib.json__tmpl__
index abd7d9d96399c..ab874ef7e8a13 100644
--- a/packages/react/src/generators/library/files/common/tsconfig.lib.json__tmpl__
+++ b/packages/react/src/generators/library/files/common/tsconfig.lib.json__tmpl__
@@ -5,9 +5,9 @@
     "types": ["node"]
   },
   "files": [<% if (style === 'styled-jsx') { %>
-    "<%= offsetFromRoot %>node_modules/@nrwl/react/typings/styled-jsx.d.ts",<% } %>
-    "<%= offsetFromRoot %>node_modules/@nrwl/react/typings/cssmodule.d.ts",
-    "<%= offsetFromRoot %>node_modules/@nrwl/react/typings/image.d.ts"
+    "<%= offsetFromRoot %>node_modules/@nx/react/typings/styled-jsx.d.ts",<% } %>
+    "<%= offsetFromRoot %>node_modules/@nx/react/typings/cssmodule.d.ts",
+    "<%= offsetFromRoot %>node_modules/@nx/react/typings/image.d.ts"
   ],
   "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts", "src/**/*.spec.tsx", "src/**/*.test.tsx", "src/**/*.spec.js", "src/**/*.test.js", "src/**/*.spec.jsx", "src/**/*.test.jsx"],
   "include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"]
diff --git a/packages/react/src/generators/library/files/vite/tsconfig.lib.json__tmpl__ b/packages/react/src/generators/library/files/vite/tsconfig.lib.json__tmpl__
index eddbbe340d88b..9916347319516 100644
--- a/packages/react/src/generators/library/files/vite/tsconfig.lib.json__tmpl__
+++ b/packages/react/src/generators/library/files/vite/tsconfig.lib.json__tmpl__
@@ -5,9 +5,9 @@
     "types": ["node"]
   },
   "files": [<% if (style === 'styled-jsx') { %>
-    "<%= offsetFromRoot %>node_modules/@nrwl/react/typings/styled-jsx.d.ts",<% } %>
-    "<%= offsetFromRoot %>node_modules/@nrwl/react/typings/cssmodule.d.ts",
-    "<%= offsetFromRoot %>node_modules/@nrwl/react/typings/image.d.ts"
+    "<%= offsetFromRoot %>node_modules/@nx/react/typings/styled-jsx.d.ts",<% } %>
+    "<%= offsetFromRoot %>node_modules/@nx/react/typings/cssmodule.d.ts",
+    "<%= offsetFromRoot %>node_modules/@nx/react/typings/image.d.ts"
   ],
   "exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx", "**/*.spec.js", "**/*.test.js", "**/*.spec.jsx", "**/*.test.jsx"],
   "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
diff --git a/packages/react/src/generators/library/lib/add-rollup-build-target.ts b/packages/react/src/generators/library/lib/add-rollup-build-target.ts
index fa82532303dbf..235d313772701 100644
--- a/packages/react/src/generators/library/lib/add-rollup-build-target.ts
+++ b/packages/react/src/generators/library/lib/add-rollup-build-target.ts
@@ -25,7 +25,7 @@ export async function addRollupBuildTarget(
     nxVersion
   );
 
-  // These are used in `@nrwl/react/plugins/bundle-rollup`
+  // These are used in `@nx/react/plugins/bundle-rollup`
   addDependenciesToPackageJson(
     host,
     {},
@@ -47,7 +47,7 @@ export async function addRollupBuildTarget(
   }
 
   targets.build = {
-    executor: '@nrwl/rollup:rollup',
+    executor: '@nx/rollup:rollup',
     outputs: ['{options.outputPath}'],
     options: {
       outputPath:
@@ -58,7 +58,7 @@ export async function addRollupBuildTarget(
       project: `${options.projectRoot}/package.json`,
       entryFile: maybeJs(options, `${options.projectRoot}/src/index.ts`),
       external,
-      rollupConfig: `@nrwl/react/plugins/bundle-rollup`,
+      rollupConfig: `@nx/react/plugins/bundle-rollup`,
       compiler: options.compiler ?? 'babel',
       assets: [
         {
diff --git a/packages/react/src/generators/library/lib/install-common-dependencies.ts b/packages/react/src/generators/library/lib/install-common-dependencies.ts
index 7acfa62645d2f..6759aa6e14679 100644
--- a/packages/react/src/generators/library/lib/install-common-dependencies.ts
+++ b/packages/react/src/generators/library/lib/install-common-dependencies.ts
@@ -22,7 +22,7 @@ export function installCommonDependencies(
   const devDependencies = {};
 
   // Vite requires style preprocessors to be installed manually.
-  // `@nrwl/webpack` installs them automatically for now.
+  // `@nx/webpack` installs them automatically for now.
   // TODO(jack): Once we clean up webpack we can remove this check
   if (options.bundler === 'vite' || options.unitTestRunner === 'vitest') {
     switch (options.style) {
diff --git a/packages/react/src/generators/library/lib/set-defaults.ts b/packages/react/src/generators/library/lib/set-defaults.ts
index 13ad52bb7080a..fabc7412cfc66 100644
--- a/packages/react/src/generators/library/lib/set-defaults.ts
+++ b/packages/react/src/generators/library/lib/set-defaults.ts
@@ -5,9 +5,9 @@ export function setDefaults(host: Tree, options: NormalizedSchema) {
   const nxJson = readNxJson(host);
 
   nxJson.generators = nxJson.generators || {};
-  nxJson.generators['@nrwl/react'] = nxJson.generators['@nrwl/react'] || {};
+  nxJson.generators['@nx/react'] = nxJson.generators['@nx/react'] || {};
 
-  const prev = { ...nxJson.generators['@nrwl/react'] };
+  const prev = { ...nxJson.generators['@nx/react'] };
 
   const libDefaults = {
     ...prev.library,
@@ -16,7 +16,7 @@ export function setDefaults(host: Tree, options: NormalizedSchema) {
 
   nxJson.generators = {
     ...nxJson.generators,
-    '@nrwl/react': {
+    '@nx/react': {
       ...prev,
       library: libDefaults,
     },
diff --git a/packages/react/src/generators/library/library.spec.ts b/packages/react/src/generators/library/library.spec.ts
index 70eedceb07629..fc69b24a87cfc 100644
--- a/packages/react/src/generators/library/library.spec.ts
+++ b/packages/react/src/generators/library/library.spec.ts
@@ -194,7 +194,7 @@ describe('lib', () => {
       expect(eslintJson).toMatchInlineSnapshot(`
         {
           "extends": [
-            "plugin:@nrwl/nx/react",
+            "plugin:@nx/nx/react",
             "../../.eslintrc.json",
           ],
           "ignorePatterns": [
@@ -235,7 +235,7 @@ describe('lib', () => {
         compiler: 'babel',
       });
       expect(tree.read('libs/my-lib/jest.config.ts', 'utf-8')).toContain(
-        "['babel-jest', { presets: ['@nrwl/react/babel'] }]"
+        "['babel-jest', { presets: ['@nx/react/babel'] }]"
       );
     });
   });
@@ -292,7 +292,7 @@ describe('lib', () => {
         compiler: 'babel',
       });
       expect(tree.read('libs/my-dir/my-lib/jest.config.ts', 'utf-8')).toContain(
-        "['babel-jest', { presets: ['@nrwl/react/babel'] }]"
+        "['babel-jest', { presets: ['@nx/react/babel'] }]"
       );
     });
 
@@ -493,7 +493,7 @@ describe('lib', () => {
       const projectsConfigurations = getProjects(tree);
 
       expect(projectsConfigurations.get('my-lib').targets.build).toMatchObject({
-        executor: '@nrwl/rollup:rollup',
+        executor: '@nx/rollup:rollup',
         outputs: ['{options.outputPath}'],
         options: {
           external: ['react/jsx-runtime'],
@@ -501,7 +501,7 @@ describe('lib', () => {
           outputPath: 'dist/libs/my-lib',
           project: 'libs/my-lib/package.json',
           tsConfig: 'libs/my-lib/tsconfig.lib.json',
-          rollupConfig: '@nrwl/react/plugins/bundle-rollup',
+          rollupConfig: '@nx/react/plugins/bundle-rollup',
         },
       });
     });
diff --git a/packages/react/src/generators/remote/files/module-federation-ssr/server.ts__tmpl__ b/packages/react/src/generators/remote/files/module-federation-ssr/server.ts__tmpl__
index 29909841940b2..8b377d7360932 100644
--- a/packages/react/src/generators/remote/files/module-federation-ssr/server.ts__tmpl__
+++ b/packages/react/src/generators/remote/files/module-federation-ssr/server.ts__tmpl__
@@ -34,7 +34,7 @@ const server = app.listen(port, () => {
   console.log(`Express server listening on http://localhost:${port}`);
 
   /**
-   * DO NOT REMOVE IF USING @nrwl/react:module-federation-dev-ssr executor
+   * DO NOT REMOVE IF USING @nx/react:module-federation-dev-ssr executor
    * to serve your Host application with this Remote application.
    * This message allows Nx to determine when the Remote is ready to be
    * consumed by the Host.
diff --git a/packages/react/src/generators/remote/files/module-federation-ssr/webpack.server.config.js__tmpl__ b/packages/react/src/generators/remote/files/module-federation-ssr/webpack.server.config.js__tmpl__
index 36f12af17e390..96b9161c4ac0b 100644
--- a/packages/react/src/generators/remote/files/module-federation-ssr/webpack.server.config.js__tmpl__
+++ b/packages/react/src/generators/remote/files/module-federation-ssr/webpack.server.config.js__tmpl__
@@ -1,6 +1,6 @@
-const { composePlugins, withNx } = require('@nrwl/webpack');
-const { withReact } = require('@nrwl/react');
-const { withModuleFederationForSSR } = require('@nrwl/react/module-federation');
+const { composePlugins, withNx } = require('@nx/webpack');
+const { withReact } = require('@nx/react');
+const { withModuleFederationForSSR } = require('@nx/react/module-federation');
 
 const baseConfig = require("./module-federation.server.config");
 
diff --git a/packages/react/src/generators/remote/files/module-federation/webpack.config.js__tmpl__ b/packages/react/src/generators/remote/files/module-federation/webpack.config.js__tmpl__
index 31055fab95c01..80e9c0cffb279 100644
--- a/packages/react/src/generators/remote/files/module-federation/webpack.config.js__tmpl__
+++ b/packages/react/src/generators/remote/files/module-federation/webpack.config.js__tmpl__
@@ -1,6 +1,6 @@
-const { composePlugins, withNx } = require('@nrwl/webpack');
-const { withReact } = require('@nrwl/react');
-const { withModuleFederation } = require('@nrwl/react/module-federation');
+const { composePlugins, withNx } = require('@nx/webpack');
+const { withReact } = require('@nx/react');
+const { withModuleFederation } = require('@nx/react/module-federation');
 
 const baseConfig = require('./module-federation.config');
 
diff --git a/packages/react/src/generators/remote/lib/update-host-with-remote.ts b/packages/react/src/generators/remote/lib/update-host-with-remote.ts
index e73a34598b5ed..955cd7f97d0d8 100644
--- a/packages/react/src/generators/remote/lib/update-host-with-remote.ts
+++ b/packages/react/src/generators/remote/lib/update-host-with-remote.ts
@@ -52,7 +52,7 @@ export function updateHostWithRemote(
   } else {
     // TODO(jack): Point to the nx.dev guide when ready.
     logger.warn(
-      `Could not find configuration at ${moduleFederationConfigPath}. Did you generate this project with "@nrwl/react:host"?`
+      `Could not find configuration at ${moduleFederationConfigPath}. Did you generate this project with "@nx/react:host"?`
     );
   }
 
@@ -70,7 +70,7 @@ export function updateHostWithRemote(
     );
   } else {
     logger.warn(
-      `Could not find remote definitions at ${remoteDefsPath}. Did you generate this project with "@nrwl/react:host"?`
+      `Could not find remote definitions at ${remoteDefsPath}. Did you generate this project with "@nx/react:host"?`
     );
   }
 
@@ -91,7 +91,7 @@ export function updateHostWithRemote(
     );
   } else {
     logger.warn(
-      `Could not find app component at ${appComponentPath}. Did you generate this project with "@nrwl/react:host"?`
+      `Could not find app component at ${appComponentPath}. Did you generate this project with "@nx/react:host"?`
     );
   }
 }
diff --git a/packages/react/src/generators/remote/remote.spec.ts b/packages/react/src/generators/remote/remote.spec.ts
index 008f1800b2b09..0485415359638 100644
--- a/packages/react/src/generators/remote/remote.spec.ts
+++ b/packages/react/src/generators/remote/remote.spec.ts
@@ -4,7 +4,7 @@ import { Linter } from '@nx/linter';
 import remote from './remote';
 
 describe('remote generator', () => {
-  it('should install @nrwl/web for the file-server executor', async () => {
+  it('should install @nx/web for the file-server executor', async () => {
     const tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
     await remote(tree, {
       name: 'test',
@@ -17,7 +17,7 @@ describe('remote generator', () => {
     });
 
     const packageJson = readJson(tree, 'package.json');
-    expect(packageJson.devDependencies['@nrwl/web']).toBeDefined();
+    expect(packageJson.devDependencies['@nx/web']).toBeDefined();
   });
 
   it('should not set the remote as the default project', async () => {
diff --git a/packages/react/src/generators/setup-ssr/setup-ssr.ts b/packages/react/src/generators/setup-ssr/setup-ssr.ts
index f67e748bd23a9..da710aaa2c05f 100644
--- a/packages/react/src/generators/setup-ssr/setup-ssr.ts
+++ b/packages/react/src/generators/setup-ssr/setup-ssr.ts
@@ -108,7 +108,7 @@ export async function setupSsrGenerator(tree: Tree, options: Schema) {
     ...projectConfig.targets,
     server: {
       dependsOn: ['build'],
-      executor: '@nrwl/webpack:webpack',
+      executor: '@nx/webpack:webpack',
       outputs: ['{options.outputPath}'],
       defaultConfiguration: 'production',
       options: {
@@ -140,7 +140,7 @@ export async function setupSsrGenerator(tree: Tree, options: Schema) {
     },
     'serve-browser': projectConfig.targets.serve,
     'serve-server': {
-      executor: '@nrwl/js:node',
+      executor: '@nx/js:node',
       defaultConfiguration: 'development',
       options: {
         buildTarget: `${options.project}:server:development`,
@@ -156,7 +156,7 @@ export async function setupSsrGenerator(tree: Tree, options: Schema) {
       },
     },
     serve: {
-      executor: '@nrwl/webpack:ssr-dev-server',
+      executor: '@nx/webpack:ssr-dev-server',
       defaultConfiguration: 'development',
       options: {
         browserTarget: `${options.project}:build:development`,
diff --git a/packages/react/src/generators/setup-tailwind/files/tailwind.config.js__tmpl__ b/packages/react/src/generators/setup-tailwind/files/tailwind.config.js__tmpl__
index d00839f6ace91..e218f5aff514f 100644
--- a/packages/react/src/generators/setup-tailwind/files/tailwind.config.js__tmpl__
+++ b/packages/react/src/generators/setup-tailwind/files/tailwind.config.js__tmpl__
@@ -1,4 +1,4 @@
-const { createGlobPatternsForDependencies } = require('@nrwl/react/tailwind');
+const { createGlobPatternsForDependencies } = require('@nx/react/tailwind');
 const { join } = require('path');
 
 /** @type {import('tailwindcss').Config} */
diff --git a/packages/react/src/generators/setup-tailwind/lib/update-project.ts b/packages/react/src/generators/setup-tailwind/lib/update-project.ts
index d9c1d0c244050..19c0c72c1542b 100644
--- a/packages/react/src/generators/setup-tailwind/lib/update-project.ts
+++ b/packages/react/src/generators/setup-tailwind/lib/update-project.ts
@@ -8,7 +8,10 @@ export function updateProject(
   config: ProjectConfiguration,
   options: SetupTailwindOptions
 ) {
-  if (config?.targets?.build?.executor === '@nrwl/webpack:webpack') {
+  if (
+    config?.targets?.build?.executor === '@nx/webpack:webpack' ||
+    config?.targets?.build?.executor === '@nrwl/webpack:webpack'
+  ) {
     config.targets.build.options ??= {};
     config.targets.build.options.postcssConfig = joinPathFragments(
       config.root,
diff --git a/packages/react/src/generators/setup-tailwind/setup-tailwind.spec.ts b/packages/react/src/generators/setup-tailwind/setup-tailwind.spec.ts
index 3efd10f9b10cd..a1bc905d47464 100644
--- a/packages/react/src/generators/setup-tailwind/setup-tailwind.spec.ts
+++ b/packages/react/src/generators/setup-tailwind/setup-tailwind.spec.ts
@@ -49,7 +49,7 @@ describe('setup-tailwind', () => {
       sourceRoot: 'apps/example/src',
       targets: {
         build: {
-          executor: '@nrwl/webpack:webpack',
+          executor: '@nx/webpack:webpack',
           options: {},
         },
       },
diff --git a/packages/react/src/generators/stories/stories.nextjs.spec.ts b/packages/react/src/generators/stories/stories.nextjs.spec.ts
index 8b323a459ccc9..39e95f889da37 100644
--- a/packages/react/src/generators/stories/stories.nextjs.spec.ts
+++ b/packages/react/src/generators/stories/stories.nextjs.spec.ts
@@ -70,8 +70,8 @@ export async function createTestUIApp(name: string): Promise<Tree> {
 
   const config = readProjectConfiguration(tree, name);
   config.sourceRoot = config.root;
-  config.targets.build.executor = '@nrwl/next:build';
-  config.targets.serve.executor = '@nrwl/next:server';
+  config.targets.build.executor = '@nx/next:build';
+  config.targets.serve.executor = '@nx/next:server';
   updateProjectConfiguration(tree, name, config);
 
   return tree;
diff --git a/packages/react/src/generators/storybook-configuration/configuration.spec.ts b/packages/react/src/generators/storybook-configuration/configuration.spec.ts
index fda21288dcfae..3c3ad47666b22 100644
--- a/packages/react/src/generators/storybook-configuration/configuration.spec.ts
+++ b/packages/react/src/generators/storybook-configuration/configuration.spec.ts
@@ -129,7 +129,7 @@ describe('react:storybook-configuration', () => {
     });
 
     // Currently the auto-generate stories feature only picks up components under the 'lib' directory.
-    // In our 'createTestAppLib' function, we call @nrwl/react:component to generate a component
+    // In our 'createTestAppLib' function, we call @nx/react:component to generate a component
     // under the specified 'lib' directory
     expect(
       appTree.exists(
diff --git a/packages/react/src/generators/storybook-configuration/configuration.ts b/packages/react/src/generators/storybook-configuration/configuration.ts
index 1419e84421c87..de5df0d5772a7 100644
--- a/packages/react/src/generators/storybook-configuration/configuration.ts
+++ b/packages/react/src/generators/storybook-configuration/configuration.ts
@@ -44,7 +44,8 @@ export async function storybookConfigurationGenerator(
 
   if (
     projectConfig.projectType === 'application' &&
-    projectConfig.targets['build']?.executor === '@nrwl/vite:build'
+    (projectConfig.targets['build']?.executor === '@nx/vite:build' ||
+      projectConfig.targets['build']?.executor === '@nrwl/vite:build')
   ) {
     bundler = 'vite';
     if (schema.bundler !== 'vite') {
diff --git a/packages/react/src/module-federation/load-config.ts b/packages/react/src/module-federation/load-config.ts
index ff00ee36476de..439eff4e5cfe8 100644
--- a/packages/react/src/module-federation/load-config.ts
+++ b/packages/react/src/module-federation/load-config.ts
@@ -17,7 +17,7 @@ export function loadModuleFederationConfigFromContext(
   } catch {
     // TODO(jack): Add a link to guide
     throw new Error(
-      `Could not load ${moduleFederationConfigPath}. Was this project generated with "@nrwl/react:host"?`
+      `Could not load ${moduleFederationConfigPath}. Was this project generated with "@nx/react:host"?`
     );
   }
 }
diff --git a/packages/react/src/rules/update-module-federation-project.ts b/packages/react/src/rules/update-module-federation-project.ts
index a715634836760..0854f7eeb0742 100644
--- a/packages/react/src/rules/update-module-federation-project.ts
+++ b/packages/react/src/rules/update-module-federation-project.ts
@@ -29,12 +29,12 @@ export function updateModuleFederationProject(
   };
 
   projectConfig.targets.serve.executor =
-    '@nrwl/react:module-federation-dev-server';
+    '@nx/react:module-federation-dev-server';
   projectConfig.targets.serve.options.port = options.devServerPort;
 
   // `serve-static` for remotes that don't need to be in development mode
   projectConfig.targets['serve-static'] = {
-    executor: '@nrwl/web:file-server',
+    executor: '@nx/web:file-server',
     defaultConfiguration: 'development',
     options: {
       buildTarget: `${options.projectName}:build`,
@@ -52,5 +52,5 @@ export function updateModuleFederationProject(
 
   updateProjectConfiguration(host, options.projectName, projectConfig);
 
-  return addDependenciesToPackageJson(host, {}, { '@nrwl/web': nxVersion });
+  return addDependenciesToPackageJson(host, {}, { '@nx/web': nxVersion });
 }
diff --git a/packages/react/src/utils/jest-utils.ts b/packages/react/src/utils/jest-utils.ts
index c44bc73429f70..2000cede4692b 100644
--- a/packages/react/src/utils/jest-utils.ts
+++ b/packages/react/src/utils/jest-utils.ts
@@ -2,10 +2,10 @@ export function updateJestConfigContent(content: string) {
   return content
     .replace(
       'transform: {',
-      "transform: {\n    '^(?!.*\\\\.(js|jsx|ts|tsx|css|json)$)': '@nrwl/react/plugins/jest',"
+      "transform: {\n    '^(?!.*\\\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest',"
     )
     .replace(
       `'babel-jest'`,
-      `['babel-jest', { presets: ['@nrwl/react/babel'] }]`
+      `['babel-jest', { presets: ['@nx/react/babel'] }]`
     );
 }
diff --git a/packages/react/src/utils/lint.ts b/packages/react/src/utils/lint.ts
index f68196d831641..5ccf554aaee04 100644
--- a/packages/react/src/utils/lint.ts
+++ b/packages/react/src/utils/lint.ts
@@ -21,7 +21,7 @@ export const extendReactEslintJson = (json: Linter.Config) => {
   const { extends: pluginExtends, ...config } = json;
 
   return {
-    extends: ['plugin:@nrwl/nx/react', ...(pluginExtends || [])],
+    extends: ['plugin:@nx/nx/react', ...(pluginExtends || [])],
     ...config,
   };
 };
@@ -34,7 +34,7 @@ export const createReactEslintJson = (
   setParserOptionsProject: boolean
 ): Linter.Config => ({
   extends: [
-    'plugin:@nrwl/nx/react',
+    'plugin:@nx/nx/react',
     `${offsetFromRoot(projectRoot)}.eslintrc.json`,
   ],
   ignorePatterns: ['!**/*'],
diff --git a/packages/storybook/src/generators/configuration/configuration.spec.ts b/packages/storybook/src/generators/configuration/configuration.spec.ts
index 030bbb9024f44..4cf20cabadfa7 100644
--- a/packages/storybook/src/generators/configuration/configuration.spec.ts
+++ b/packages/storybook/src/generators/configuration/configuration.spec.ts
@@ -414,7 +414,7 @@ describe('@nx/storybook:configuration', () => {
               "buildTarget": "test-ui-lib:build-storybook:ci",
             },
           },
-          "executor": "@nrwl/web:file-server",
+          "executor": "@nx/web:file-server",
           "options": {
             "buildTarget": "test-ui-lib:build-storybook",
             "staticFilePath": "dist/storybook/test-ui-lib",
@@ -445,7 +445,7 @@ describe('@nx/storybook:configuration', () => {
               "buildTarget": "test-ui-lib:build-storybook:ci",
             },
           },
-          "executor": "@nrwl/web:file-server",
+          "executor": "@nx/web:file-server",
           "options": {
             "buildTarget": "test-ui-lib:build-storybook",
             "staticFilePath": "dist/storybook/test-ui-lib",
diff --git a/packages/storybook/src/generators/init/__snapshots__/init.spec.ts.snap b/packages/storybook/src/generators/init/__snapshots__/init.spec.ts.snap
index 061755c9528a2..8b897f227bd72 100644
--- a/packages/storybook/src/generators/init/__snapshots__/init.spec.ts.snap
+++ b/packages/storybook/src/generators/init/__snapshots__/init.spec.ts.snap
@@ -7,7 +7,7 @@ exports[`@nx/storybook:init dependencies for package.json should add angular rel
   },
   "devDependencies": {
     "@angular/forms": "*",
-    "@nrwl/js": "0.0.1",
+    "@nx/js": "0.0.1",
     "@nx/storybook": "^6.5.15",
     "@storybook/addon-essentials": "^6.5.15",
     "@storybook/angular": "^6.5.15",
diff --git a/packages/storybook/src/generators/init/init.spec.ts b/packages/storybook/src/generators/init/init.spec.ts
index 5d27ccaf6e673..38c1434df580f 100644
--- a/packages/storybook/src/generators/init/init.spec.ts
+++ b/packages/storybook/src/generators/init/init.spec.ts
@@ -399,7 +399,7 @@ describe('@nx/storybook:init', () => {
 
       // check that only the following dependencies have been added
       expect(Object.keys(packageJson.devDependencies)).toEqual([
-        '@nrwl/js',
+        '@nx/js',
         '@nx/storybook',
         '@storybook/addon-essentials',
         '@storybook/builder-webpack5',
diff --git a/packages/vite/src/generators/init/__snapshots__/init.spec.ts.snap b/packages/vite/src/generators/init/__snapshots__/init.spec.ts.snap
index c949e09f43803..8107b2062efe7 100644
--- a/packages/vite/src/generators/init/__snapshots__/init.spec.ts.snap
+++ b/packages/vite/src/generators/init/__snapshots__/init.spec.ts.snap
@@ -6,7 +6,7 @@ exports[`@nx/vite:init dependencies for package.json should add vite packages an
     "existing": "1.0.0",
   },
   "devDependencies": {
-    "@nrwl/js": "0.0.1",
+    "@nx/js": "0.0.1",
     "@nx/vite": "0.0.1",
     "@vitejs/plugin-react": "^3.0.0",
     "@vitest/ui": "^0.25.8",
diff --git a/packages/web/.eslintrc.json b/packages/web/.eslintrc.json
index 4a142b79a6e0f..5f199bc850003 100644
--- a/packages/web/.eslintrc.json
+++ b/packages/web/.eslintrc.json
@@ -12,7 +12,7 @@
       "rules": {
         "no-restricted-imports": [
           "error",
-          "@nrwl/workspace",
+          "@nx/workspace",
           "@angular-devkit/core",
           "@angular-devkit/schematics",
           "@angular-devkit/architect"
diff --git a/packages/web/babel.ts b/packages/web/babel.ts
index 200ce1ebfcbd2..2ca2b2b692d09 100644
--- a/packages/web/babel.ts
+++ b/packages/web/babel.ts
@@ -1,6 +1,6 @@
 const nxJsBabelPreset = require('@nx/js/babel');
 
-/** @deprecated Use `@nrwl/js/babel`. */
+/** @deprecated Use `@nx/js/babel`. */
 module.exports = function (api: any, options: any = {}) {
   console.warn(
     '`@nx/web/babel` has been deprecated. Use `@nx/js/babel` instead in your .babelrc files.'
diff --git a/packages/web/generators.json b/packages/web/generators.json
index eb6791687ec8b..6fe495ef5ceea 100644
--- a/packages/web/generators.json
+++ b/packages/web/generators.json
@@ -1,7 +1,7 @@
 {
   "name": "nx/web",
   "version": "0.1",
-  "extends": ["@nrwl/workspace"],
+  "extends": ["@nx/workspace"],
   "generators": {
     "init": {
       "factory": "./src/generators/init/init#webInitGenerator",
diff --git a/packages/web/src/executors/rollup/rollup.impl.ts b/packages/web/src/executors/rollup/rollup.impl.ts
index d3149dcaf53f3..40d55ca8b8627 100644
--- a/packages/web/src/executors/rollup/rollup.impl.ts
+++ b/packages/web/src/executors/rollup/rollup.impl.ts
@@ -12,7 +12,7 @@ export { WebRollupOptions };
 
 export async function* rollupExecutor(options: any, context: any) {
   logger.warn(
-    '"@nrwl/web:rollup" executor is deprecated. Use "@nrwl/rollup:rollup" instead in your project.json.'
+    '"@nx/web:rollup" executor is deprecated. Use "@nx/rollup:rollup" instead in your project.json.'
   );
   return yield* _rollupExecutor(
     {
diff --git a/packages/web/src/generators/application/application.ts b/packages/web/src/generators/application/application.ts
index dadb76556640d..d4fd45a023936 100644
--- a/packages/web/src/generators/application/application.ts
+++ b/packages/web/src/generators/application/application.ts
@@ -127,7 +127,7 @@ async function setupBundler(tree: Tree, options: NormalizedSchema) {
     // TODO(jack): Flush this out... no bundler should be possible for web but the experience isn't holistic due to missing features (e.g. writing index.html).
     const project = readProjectConfiguration(tree, options.projectName);
     project.targets.build = {
-      executor: `@nrwl/js:${options.compiler}`,
+      executor: `@nx/js:${options.compiler}`,
       outputs: ['{options.outputPath}'],
       options: {
         main,
@@ -166,12 +166,12 @@ async function addProject(tree: Tree, options: NormalizedSchema) {
 function setDefaults(tree: Tree, options: NormalizedSchema) {
   const nxJson = readNxJson(tree);
   nxJson.generators = nxJson.generators || {};
-  nxJson.generators['@nrwl/web:application'] = {
+  nxJson.generators['@nx/web:application'] = {
     style: options.style,
     linter: options.linter,
     unitTestRunner: options.unitTestRunner,
     e2eTestRunner: options.e2eTestRunner,
-    ...nxJson.generators['@nrwl/web:application'],
+    ...nxJson.generators['@nx/web:application'],
   };
   updateNxJson(tree, nxJson);
 }
diff --git a/packages/web/src/generators/application/files/app-vite/.babelrc__tmpl__ b/packages/web/src/generators/application/files/app-vite/.babelrc__tmpl__
index fb3fd65a5ee01..19ebd10e1179b 100644
--- a/packages/web/src/generators/application/files/app-vite/.babelrc__tmpl__
+++ b/packages/web/src/generators/application/files/app-vite/.babelrc__tmpl__
@@ -1,5 +1,5 @@
 {
   "presets": [
-    "@nrwl/js/babel"
+    "@nx/js/babel"
   ]
 }
diff --git a/packages/web/src/generators/application/files/app-vite/src/app/app.element.ts__tmpl__ b/packages/web/src/generators/application/files/app-vite/src/app/app.element.ts__tmpl__
index 5eb68c49472e5..23ab525aeda77 100644
--- a/packages/web/src/generators/application/files/app-vite/src/app/app.element.ts__tmpl__
+++ b/packages/web/src/generators/application/files/app-vite/src/app/app.element.ts__tmpl__
@@ -299,10 +299,10 @@ export class AppElement extends HTMLElement {
               Add UI library
             </summary>
             <pre><span># Generate UI lib</span>
-nx g @nrwl/angular:lib ui
+nx g @nx/angular:lib ui
 
 <span># Add a component</span>
-nx g @nrwl/angular:component button --project ui</pre>
+nx g @nx/angular:component button --project ui</pre>
           </details>
           <details>
             <summary>
diff --git a/packages/web/src/generators/application/files/app-webpack/.babelrc__tmpl__ b/packages/web/src/generators/application/files/app-webpack/.babelrc__tmpl__
index fb3fd65a5ee01..19ebd10e1179b 100644
--- a/packages/web/src/generators/application/files/app-webpack/.babelrc__tmpl__
+++ b/packages/web/src/generators/application/files/app-webpack/.babelrc__tmpl__
@@ -1,5 +1,5 @@
 {
   "presets": [
-    "@nrwl/js/babel"
+    "@nx/js/babel"
   ]
 }
diff --git a/packages/web/src/generators/application/files/app-webpack/src/app/app.element.ts__tmpl__ b/packages/web/src/generators/application/files/app-webpack/src/app/app.element.ts__tmpl__
index 5eb68c49472e5..23ab525aeda77 100644
--- a/packages/web/src/generators/application/files/app-webpack/src/app/app.element.ts__tmpl__
+++ b/packages/web/src/generators/application/files/app-webpack/src/app/app.element.ts__tmpl__
@@ -299,10 +299,10 @@ export class AppElement extends HTMLElement {
               Add UI library
             </summary>
             <pre><span># Generate UI lib</span>
-nx g @nrwl/angular:lib ui
+nx g @nx/angular:lib ui
 
 <span># Add a component</span>
-nx g @nrwl/angular:component button --project ui</pre>
+nx g @nx/angular:component button --project ui</pre>
           </details>
           <details>
             <summary>
diff --git a/packages/web/src/generators/application/files/app-webpack/webpack.config.js__tmpl__ b/packages/web/src/generators/application/files/app-webpack/webpack.config.js__tmpl__
index c083417ac7556..793c7b31eb090 100644
--- a/packages/web/src/generators/application/files/app-webpack/webpack.config.js__tmpl__
+++ b/packages/web/src/generators/application/files/app-webpack/webpack.config.js__tmpl__
@@ -1,4 +1,4 @@
-const { composePlugins, withNx, withWeb } = require('@nrwl/webpack');
+const { composePlugins, withNx, withWeb } = require('@nx/webpack');
 
 // Nx plugins for webpack.
 module.exports = composePlugins(withNx(), withWeb(), (config) => {
diff --git a/packages/web/src/generators/init/init.spec.ts b/packages/web/src/generators/init/init.spec.ts
index 1fdb7f20123c8..17ea3b9d71833 100644
--- a/packages/web/src/generators/init/init.spec.ts
+++ b/packages/web/src/generators/init/init.spec.ts
@@ -24,7 +24,7 @@ describe('init', () => {
     addDependenciesToPackageJson(
       tree,
       {
-        '@nrwl/web': nxVersion,
+        '@nx/web': nxVersion,
         [existing]: existingVersion,
       },
       {
@@ -33,9 +33,9 @@ describe('init', () => {
     );
     await webInitGenerator(tree, {});
     const packageJson = readJson(tree, 'package.json');
-    expect(packageJson.devDependencies['@nrwl/web']).toBeDefined();
+    expect(packageJson.devDependencies['@nx/web']).toBeDefined();
     expect(packageJson.devDependencies[existing]).toBeDefined();
-    expect(packageJson.dependencies['@nrwl/web']).toBeUndefined();
+    expect(packageJson.dependencies['@nx/web']).toBeUndefined();
     expect(packageJson.dependencies[existing]).toBeDefined();
   });
 
diff --git a/packages/web/src/generators/init/init.ts b/packages/web/src/generators/init/init.ts
index f6345149cd67b..4b3f1e804c746 100644
--- a/packages/web/src/generators/init/init.ts
+++ b/packages/web/src/generators/init/init.ts
@@ -19,10 +19,10 @@ import {
 import { Schema } from './schema';
 
 function updateDependencies(tree: Tree, schema: Schema) {
-  removeDependenciesFromPackageJson(tree, ['@nrwl/web'], []);
+  removeDependenciesFromPackageJson(tree, ['@nx/web'], []);
 
   const devDependencies = {
-    '@nrwl/web': nxVersion,
+    '@nx/web': nxVersion,
     '@types/node': typesNodeVersion,
   };
 
diff --git a/packages/web/src/generators/static-serve/static-serve-configuration.spec.ts b/packages/web/src/generators/static-serve/static-serve-configuration.spec.ts
index 8de64e2ea3131..b81d6b96d05fd 100644
--- a/packages/web/src/generators/static-serve/static-serve-configuration.spec.ts
+++ b/packages/web/src/generators/static-serve/static-serve-configuration.spec.ts
@@ -25,7 +25,7 @@ describe('Static serve configuration generator', () => {
     expect(readProjectConfiguration(tree, 'react-app').targets['serve-static'])
       .toMatchInlineSnapshot(`
       {
-        "executor": "@nrwl/web:file-server",
+        "executor": "@nx/web:file-server",
         "options": {
           "buildTarget": "react-app:build",
         },
@@ -39,7 +39,7 @@ describe('Static serve configuration generator', () => {
       readProjectConfiguration(tree, 'angular-app').targets['serve-static']
     ).toMatchInlineSnapshot(`
       {
-        "executor": "@nrwl/web:file-server",
+        "executor": "@nx/web:file-server",
         "options": {
           "buildTarget": "angular-app:build",
         },
@@ -52,7 +52,7 @@ describe('Static serve configuration generator', () => {
     expect(readProjectConfiguration(tree, 'storybook').targets['serve-static'])
       .toMatchInlineSnapshot(`
       {
-        "executor": "@nrwl/web:file-server",
+        "executor": "@nx/web:file-server",
         "options": {
           "buildTarget": "storybook:build-storybook",
           "staticFilePath": "dist/apps/storybook/storybook",
@@ -72,7 +72,7 @@ describe('Static serve configuration generator', () => {
       readProjectConfiguration(tree, 'react-app').targets['serve-static-custom']
     ).toMatchInlineSnapshot(`
       {
-        "executor": "@nrwl/web:file-server",
+        "executor": "@nx/web:file-server",
         "options": {
           "buildTarget": "react-app:build",
         },
@@ -97,7 +97,7 @@ describe('Static serve configuration generator', () => {
       readProjectConfiguration(tree, 'angular-app').targets['serve-static']
     ).toMatchInlineSnapshot(`
       {
-        "executor": "@nrwl/web:file-server",
+        "executor": "@nx/web:file-server",
         "options": {
           "buildTarget": "angular-app:build",
           "staticFilePath": "dist/apps/angular-app",
@@ -136,7 +136,7 @@ function addReactConfig(tree: Tree, name: string) {
     sourceRoot: `apps/${name}/src`,
     targets: {
       build: {
-        executor: '@nrwl/vite:build',
+        executor: '@nx/vite:build',
         outputs: ['{options.outputPath}'],
         defaultConfiguration: 'production',
         options: {
diff --git a/packages/web/src/generators/static-serve/static-serve-configuration.ts b/packages/web/src/generators/static-serve/static-serve-configuration.ts
index 76f7aa40c379b..33fa76d2645fa 100644
--- a/packages/web/src/generators/static-serve/static-serve-configuration.ts
+++ b/packages/web/src/generators/static-serve/static-serve-configuration.ts
@@ -52,7 +52,7 @@ Either rename or remove the existing '${opts.targetName}' target and try again.
 Optionally, you can provide a different name with the --target-name option other than '${opts.targetName}'`);
   }
 
-  // NOTE: @nrwl/web:file-server only looks for the outputPath option
+  // NOTE: @nx/web:file-server only looks for the outputPath option
   if (!buildTargetConfig.options?.outputPath && !opts.outputPath) {
     // attempt to find the suiteable path from the outputs
     let maybeOutputValue: any;
@@ -96,7 +96,7 @@ function addStaticConfig(tree: Tree, opts: NormalizedWebStaticServeSchema) {
   const staticServeOptions: TargetConfiguration<
     Partial<FileServerExecutorSchema>
   > = {
-    executor: '@nrwl/web:file-server',
+    executor: '@nx/web:file-server',
     options: {
       buildTarget: opts.buildTarget,
       staticFilePath: opts.outputPath,
diff --git a/packages/workspace/src/generators/preset/__snapshots__/preset.spec.ts.snap b/packages/workspace/src/generators/preset/__snapshots__/preset.spec.ts.snap
index 8e8505017c0b7..0ba71b522a346 100644
--- a/packages/workspace/src/generators/preset/__snapshots__/preset.spec.ts.snap
+++ b/packages/workspace/src/generators/preset/__snapshots__/preset.spec.ts.snap
@@ -68,7 +68,7 @@ exports[`preset should create files (preset = react-standalone bundler = webpack
     },
   },
   "defaultConfiguration": "development",
-  "executor": "@nrwl/webpack:dev-server",
+  "executor": "@nx/webpack:dev-server",
   "options": {
     "buildTarget": "proj:build",
     "hmr": true,