diff --git a/docs/shared/recipes/rescope.md b/docs/shared/recipes/rescope.md
index 5813786f37b55..58702b3555754 100644
--- a/docs/shared/recipes/rescope.md
+++ b/docs/shared/recipes/rescope.md
@@ -65,4 +65,4 @@ All other packages keep the same name, but change scope from `@nrwl` to `@nx`.
 
 ## @nrwl Scope End of Life
 
-Starting in version 17, the `@nrwl` scoped packages will no longer be published to npm. Only the `@nx` scoped packages will be available on the npm registry.
+Starting in version 18, the `@nrwl` scoped packages will no longer be published to npm. Only the `@nx` scoped packages will be available on the npm registry.
diff --git a/packages-legacy/angular/README.md b/packages-legacy/angular/README.md
index 9d89392d8f817..8afa16816cd75 100644
--- a/packages-legacy/angular/README.md
+++ b/packages-legacy/angular/README.md
@@ -4,7 +4,7 @@
 
 [Read more here](https://nx.dev/recipes/other/rescope)
 
-@nrwl/angular will no longer be published in Nx v17.
+@nrwl/angular will no longer be published in Nx v18.
 
 <p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
 
diff --git a/packages-legacy/cypress/README.md b/packages-legacy/cypress/README.md
index 6cde43d0c991a..d8c86924c9e9e 100644
--- a/packages-legacy/cypress/README.md
+++ b/packages-legacy/cypress/README.md
@@ -4,7 +4,7 @@
 
 [Read more here](https://nx.dev/recipes/other/rescope)
 
-@nrwl/cypress will no longer be published in Nx v17.
+@nrwl/cypress will no longer be published in Nx v18.
 
 <p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
 
diff --git a/packages-legacy/detox/README.md b/packages-legacy/detox/README.md
index 3fc167a444c15..e364d8c47c4ca 100644
--- a/packages-legacy/detox/README.md
+++ b/packages-legacy/detox/README.md
@@ -4,7 +4,7 @@
 
 [Read more here](https://nx.dev/recipes/other/rescope)
 
-@nrwl/detox will no longer be published in Nx v17.
+@nrwl/detox will no longer be published in Nx v18.
 
 <p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
 
diff --git a/packages-legacy/devkit/README.md b/packages-legacy/devkit/README.md
index 03cb2d17f61cc..feceb0c6dc8a9 100644
--- a/packages-legacy/devkit/README.md
+++ b/packages-legacy/devkit/README.md
@@ -4,7 +4,7 @@
 
 [Read more here](https://nx.dev/recipes/other/rescope)
 
-@nrwl/devkit will no longer be published in Nx v17.
+@nrwl/devkit will no longer be published in Nx v18.
 
 <p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
 
diff --git a/packages-legacy/esbuild/README.md b/packages-legacy/esbuild/README.md
index 766722f31c125..1e941af91ffa6 100644
--- a/packages-legacy/esbuild/README.md
+++ b/packages-legacy/esbuild/README.md
@@ -4,7 +4,7 @@
 
 [Read more here](https://nx.dev/recipes/other/rescope)
 
-@nrwl/esbuild will no longer be published in Nx v17.
+@nrwl/esbuild will no longer be published in Nx v18.
 
 <p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
 
diff --git a/packages-legacy/eslint-plugin-nx/README.md b/packages-legacy/eslint-plugin-nx/README.md
index af3e2ae865332..6d56525e5e995 100644
--- a/packages-legacy/eslint-plugin-nx/README.md
+++ b/packages-legacy/eslint-plugin-nx/README.md
@@ -4,7 +4,7 @@
 
 [Read more here](https://nx.dev/recipes/other/rescope)
 
-@nrwl/eslint-plugin-nx will no longer be published in Nx v17.
+@nrwl/eslint-plugin-nx will no longer be published in Nx v18.
 
 <p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
 
diff --git a/packages-legacy/expo/README.md b/packages-legacy/expo/README.md
index ae848e3638533..8fbda081f97b6 100644
--- a/packages-legacy/expo/README.md
+++ b/packages-legacy/expo/README.md
@@ -4,7 +4,7 @@
 
 [Read more here](https://nx.dev/recipes/other/rescope)
 
-@nrwl/expo will no longer be published in Nx v17.
+@nrwl/expo will no longer be published in Nx v18.
 
 <p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
 
diff --git a/packages-legacy/express/README.md b/packages-legacy/express/README.md
index 664281868026f..aff6377d9dabf 100644
--- a/packages-legacy/express/README.md
+++ b/packages-legacy/express/README.md
@@ -4,7 +4,7 @@
 
 [Read more here](https://nx.dev/recipes/other/rescope)
 
-@nrwl/express will no longer be published in Nx v17.
+@nrwl/express will no longer be published in Nx v18.
 
 <p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
 
diff --git a/packages-legacy/jest/README.md b/packages-legacy/jest/README.md
index a275b72b093a2..fe7ffd297d44b 100644
--- a/packages-legacy/jest/README.md
+++ b/packages-legacy/jest/README.md
@@ -4,7 +4,7 @@
 
 [Read more here](https://nx.dev/recipes/other/rescope)
 
-@nrwl/jest will no longer be published in Nx v17.
+@nrwl/jest will no longer be published in Nx v18.
 
 <p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
 
diff --git a/packages-legacy/js/README.md b/packages-legacy/js/README.md
index d12098908be4c..c03ca12d39009 100644
--- a/packages-legacy/js/README.md
+++ b/packages-legacy/js/README.md
@@ -4,7 +4,7 @@
 
 [Read more here](https://nx.dev/recipes/other/rescope)
 
-@nrwl/js will no longer be published in Nx v17.
+@nrwl/js will no longer be published in Nx v18.
 
 <p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
 
diff --git a/packages-legacy/linter/README.md b/packages-legacy/linter/README.md
index 05c8e44b786ae..21919b6072a3d 100644
--- a/packages-legacy/linter/README.md
+++ b/packages-legacy/linter/README.md
@@ -4,7 +4,7 @@
 
 [Read more here](https://nx.dev/recipes/other/rescope)
 
-@nrwl/linter will no longer be published in Nx v17.
+@nrwl/linter will no longer be published in Nx v18.
 
 <p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
 
diff --git a/packages-legacy/nest/README.md b/packages-legacy/nest/README.md
index 49d95d0f473f9..72739b45a8916 100644
--- a/packages-legacy/nest/README.md
+++ b/packages-legacy/nest/README.md
@@ -4,7 +4,7 @@
 
 [Read more here](https://nx.dev/recipes/other/rescope)
 
-@nrwl/nest will no longer be published in Nx v17.
+@nrwl/nest will no longer be published in Nx v18.
 
 <p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
 
diff --git a/packages-legacy/next/README.md b/packages-legacy/next/README.md
index 92e4b70314d9a..beb2291f7ad64 100644
--- a/packages-legacy/next/README.md
+++ b/packages-legacy/next/README.md
@@ -4,7 +4,7 @@
 
 [Read more here](https://nx.dev/recipes/other/rescope)
 
-@nrwl/next will no longer be published in Nx v17.
+@nrwl/next will no longer be published in Nx v18.
 
 <p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
 
diff --git a/packages-legacy/node/README.md b/packages-legacy/node/README.md
index 64583be671a6a..704abaffa86f6 100644
--- a/packages-legacy/node/README.md
+++ b/packages-legacy/node/README.md
@@ -4,7 +4,7 @@
 
 [Read more here](https://nx.dev/recipes/other/rescope)
 
-@nrwl/node will no longer be published in Nx v17.
+@nrwl/node will no longer be published in Nx v18.
 
 <p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
 
diff --git a/packages-legacy/nx-plugin/README.md b/packages-legacy/nx-plugin/README.md
index 59e589e8112ed..c75e87c7146e7 100644
--- a/packages-legacy/nx-plugin/README.md
+++ b/packages-legacy/nx-plugin/README.md
@@ -4,7 +4,7 @@
 
 [Read more here](https://nx.dev/recipes/other/rescope)
 
-@nrwl/nx-plugin will no longer be published in Nx v17.
+@nrwl/nx-plugin will no longer be published in Nx v18.
 
 <p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
 
diff --git a/packages-legacy/react-native/README.md b/packages-legacy/react-native/README.md
index 09868c7632918..68eec265adf90 100644
--- a/packages-legacy/react-native/README.md
+++ b/packages-legacy/react-native/README.md
@@ -4,7 +4,7 @@
 
 [Read more here](https://nx.dev/recipes/other/rescope)
 
-@nrwl/react-native will no longer be published in Nx v17.
+@nrwl/react-native will no longer be published in Nx v18.
 
 <p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
 
diff --git a/packages-legacy/react/README.md b/packages-legacy/react/README.md
index a1a25ae576fe4..5541bd039573d 100644
--- a/packages-legacy/react/README.md
+++ b/packages-legacy/react/README.md
@@ -4,7 +4,7 @@
 
 [Read more here](https://nx.dev/recipes/other/rescope)
 
-@nrwl/react will no longer be published in Nx v17.
+@nrwl/react will no longer be published in Nx v18.
 
 <p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
 
diff --git a/packages-legacy/rollup/README.md b/packages-legacy/rollup/README.md
index ad0325cc7e108..53f692c9db32f 100644
--- a/packages-legacy/rollup/README.md
+++ b/packages-legacy/rollup/README.md
@@ -4,7 +4,7 @@
 
 [Read more here](https://nx.dev/recipes/other/rescope)
 
-@nrwl/rollup will no longer be published in Nx v17.
+@nrwl/rollup will no longer be published in Nx v18.
 
 <p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
 
diff --git a/packages-legacy/storybook/README.md b/packages-legacy/storybook/README.md
index 47f9c4bbde96d..9b4905f687485 100644
--- a/packages-legacy/storybook/README.md
+++ b/packages-legacy/storybook/README.md
@@ -4,7 +4,7 @@
 
 [Read more here](https://nx.dev/recipes/other/rescope)
 
-@nrwl/storybook will no longer be published in Nx v17.
+@nrwl/storybook will no longer be published in Nx v18.
 
 <p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
 
diff --git a/packages-legacy/vite/README.md b/packages-legacy/vite/README.md
index 678f1abcba9a8..a7607b26ab734 100644
--- a/packages-legacy/vite/README.md
+++ b/packages-legacy/vite/README.md
@@ -4,7 +4,7 @@
 
 [Read more here](https://nx.dev/recipes/other/rescope)
 
-@nrwl/vite will no longer be published in Nx v17.
+@nrwl/vite will no longer be published in Nx v18.
 
 <p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
 
diff --git a/packages-legacy/web/README.md b/packages-legacy/web/README.md
index 6ef1e21767684..c5cc39fe9d276 100644
--- a/packages-legacy/web/README.md
+++ b/packages-legacy/web/README.md
@@ -4,7 +4,7 @@
 
 [Read more here](https://nx.dev/recipes/other/rescope)
 
-@nrwl/web will no longer be published in Nx v17.
+@nrwl/web will no longer be published in Nx v18.
 
 <p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
 
diff --git a/packages-legacy/webpack/README.md b/packages-legacy/webpack/README.md
index 3b39f025d3003..01e98e4ac3334 100644
--- a/packages-legacy/webpack/README.md
+++ b/packages-legacy/webpack/README.md
@@ -4,7 +4,7 @@
 
 [Read more here](https://nx.dev/recipes/other/rescope)
 
-@nrwl/webpack will no longer be published in Nx v17.
+@nrwl/webpack will no longer be published in Nx v18.
 
 <p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
 
diff --git a/packages-legacy/workspace/README.md b/packages-legacy/workspace/README.md
index dbc8e723748a8..a64298ecbf743 100644
--- a/packages-legacy/workspace/README.md
+++ b/packages-legacy/workspace/README.md
@@ -4,7 +4,7 @@
 
 [Read more here](https://nx.dev/recipes/other/rescope)
 
-@nrwl/workspace will no longer be published in Nx v17.
+@nrwl/workspace will no longer be published in Nx v18.
 
 <p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
 
diff --git a/packages/nx/src/command-line/report/report.ts b/packages/nx/src/command-line/report/report.ts
index f6378cc1c3874..311ae546f24e9 100644
--- a/packages/nx/src/command-line/report/report.ts
+++ b/packages/nx/src/command-line/report/report.ts
@@ -270,7 +270,7 @@ export function findInstalledCommunityPlugins(): PackageJson[] {
 }
 export function findInstalledPackagesWeCareAbout() {
   const packagesWeMayCareAbout: Record<string, string> = {};
-  // TODO (v17): Remove workaround for hiding @nrwl packages when matching @nx package is found.
+  // TODO (v18): Remove workaround for hiding @nrwl packages when matching @nx package is found.
   const packageChangeMap: Record<string, string> = {
     '@nrwl/nx-plugin': '@nx/plugin',
     '@nx/plugin': '@nrwl/nx-plugin',
diff --git a/packages/nx/src/utils/print-help.ts b/packages/nx/src/utils/print-help.ts
index 2e070dbd0683c..d5dbb4d24e8fe 100644
--- a/packages/nx/src/utils/print-help.ts
+++ b/packages/nx/src/utils/print-help.ts
@@ -324,7 +324,7 @@ function generateExamplesOutput(schema: Schema): string {
   return ui.toString();
 }
 
-// TODO: generalize link generation so it works for non @nrwl plugins as well
+// TODO: generalize link generation so it works for non @nx plugins as well
 function generateLinkOutput({
   pluginName,
   name,
diff --git a/packages/tao/README.md b/packages/tao/README.md
index 9df8ab8b6490b..d4e79f36205e5 100644
--- a/packages/tao/README.md
+++ b/packages/tao/README.md
@@ -4,7 +4,7 @@
 
 [Read more here](https://nx.dev/recipes/other/rescope)
 
-@nrwl/tao will no longer be published in Nx v17.
+@nrwl/tao will no longer be published in Nx v18.
 
 <p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>