diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index d0c440ed2..6ddeb2221 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,3 +1,3 @@
-## 🚨 Issues Have Been Transferred to UI5 Tooling Repository
+## 🚨 Issues Have Been Transferred to UI5 CLI Repository
 
-Please create new issues in the UI5 Tooling repository: https://github.com/SAP/ui5-tooling/issues/new/choose
+Please create new issues in the UI5 CLI repository: https://github.com/UI5/cli/issues/new/choose
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index afeecf17b..34df09809 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Report UI5 Tooling Issues or Request a Feature
-    url: https://github.com/SAP/ui5-tooling/issues/new/choose
-    about: Please create new issues in the UI5 Tooling repository
+  - name: Report UI5 CLI Issues or Request a Feature
+    url: https://github.com/UI5/cli/issues/new/choose
+    about: Please create new issues in the UI5 CLI repository
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 1ac733548..b92587f8c 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -3,7 +3,7 @@
 To get it merged faster, kindly review the checklist below:
 
 ## Pull Request Checklist
-- [ ] Reviewed the [Contributing Guidelines](https://github.com/SAP/ui5-tooling/blob/v3/CONTRIBUTING.md#-contributing-code)
-    + Especially the [How to Contribute](https://github.com/SAP/ui5-tooling/blob/v3/CONTRIBUTING.md#how-to-contribute) section 
-- [ ] [No merge commits](https://github.com/SAP/ui5-tooling/blob/v3/docs/Guidelines.md#no-merge-commits)
-- [ ] [Correct commit message style](https://github.com/SAP/ui5-tooling/blob/v3/docs/Guidelines.md#commit-message-style)
+- [ ] Reviewed the [Contributing Guidelines](https://github.com/UI5/cli/blob/v3/CONTRIBUTING.md#-contributing-code)
+    + Especially the [How to Contribute](https://github.com/UI5/cli/blob/v3/CONTRIBUTING.md#how-to-contribute) section 
+- [ ] [No merge commits](https://github.com/UI5/cli/blob/v3/docs/Guidelines.md#no-merge-commits)
+- [ ] [Correct commit message style](https://github.com/UI5/cli/blob/v3/docs/Guidelines.md#commit-message-style)
diff --git a/.reuse/dep5 b/.reuse/dep5
index 8fb107126..276056c97 100644
--- a/.reuse/dep5
+++ b/.reuse/dep5
@@ -25,5 +25,5 @@ Disclaimer: The code in this project may include calls to APIs (“API Calls”)
  parties the right to use of access any SAP External Product, through API Calls.
 
 Files: *
-Copyright: 2018-2024 SAP SE or an SAP affiliate company and UI5 Tooling contributors
+Copyright: 2018-2024 SAP SE or an SAP affiliate company and UI5 CLI contributors
 License: Apache-2.0
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 86911fee4..f9c730ee3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,3 +1,3 @@
-# Contributing to the UI5 Tooling
+# Contributing to the UI5 CLI
 
-See CONTRIBUTING.md in the [SAP/ui5-tooling](https://github.com/SAP/ui5-tooling/blob/v3/CONTRIBUTING.md) repository.
+See CONTRIBUTING.md in the [UI5/cli](https://github.com/UI5/cli/blob/v3/CONTRIBUTING.md) repository.
diff --git a/LICENSE.txt b/LICENSE.txt
index f53be8314..c0d76a0c4 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2018-2024 SAP SE or an SAP affiliate company and UI5 Tooling contributors
+   Copyright 2018-2024 SAP SE or an SAP affiliate company and UI5 CLI contributors
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/README.md b/README.md
index e38137132..ce936f0d8 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-![UI5 icon](https://raw.githubusercontent.com/SAP/ui5-tooling/v3/docs/images/UI5_logo_wide.png)
+![UI5 icon](https://raw.githubusercontent.com/UI5/cli/v3/docs/images/UI5_logo_wide.png)
 
 # ui5-project
 > Modules for building a projects dependency tree, including UI5 specific configuration.  
-> Part of the [UI5 Tooling](https://github.com/SAP/ui5-tooling)
+> Part of the [UI5 CLI](https://github.com/UI5/cli)
 
 [![REUSE status](https://api.reuse.software/badge/github.com/SAP/ui5-project)](https://api.reuse.software/info/github.com/SAP/ui5-project)
 [![Build Status](https://dev.azure.com/sap/opensource/_apis/build/status/SAP.ui5-project?branchName=v3)](https://dev.azure.com/sap/opensource/_build/latest?definitionId=35&branchName=v3)
@@ -10,17 +10,17 @@
 [![Coverage Status](https://coveralls.io/repos/github/SAP/ui5-project/badge.svg)](https://coveralls.io/github/SAP/ui5-project)
 
 ## Documentation
-UI5 Project documentation can be found here: [sap.github.io/ui5-tooling](https://sap.github.io/ui5-tooling/v3/pages/Project/)
+UI5 Project documentation can be found here: [ui5.github.io/cli](https://ui5.github.io/cli/v3/pages/Project/)
 
-The UI5 Project API Reference can be found here: [`@ui5/project`](https://sap.github.io/ui5-tooling/v3/api/)
+The UI5 Project API Reference can be found here: [`@ui5/project`](https://ui5.github.io/cli/v3/api/)
 
 ## Contributing
-Please check our [Contribution Guidelines](https://github.com/SAP/ui5-tooling/blob/v3/CONTRIBUTING.md).
+Please check our [Contribution Guidelines](https://github.com/UI5/cli/blob/v3/CONTRIBUTING.md).
 
 ## Support
-Please follow our [Contribution Guidelines](https://github.com/SAP/ui5-tooling/blob/v3/CONTRIBUTING.md#report-an-issue) on how to report an issue.
+Please follow our [Contribution Guidelines](https://github.com/UI5/cli/blob/v3/CONTRIBUTING.md#report-an-issue) on how to report an issue.
 
-Please report issues in the main [UI5 Tooling](https://github.com/SAP/ui5-tooling) repository.
+Please report issues in the main [UI5 CLI](https://github.com/UI5/cli) repository.
 
 ## Release History
 See [CHANGELOG.md](CHANGELOG.md).
diff --git a/docs/BuildExtensibility.md b/docs/BuildExtensibility.md
index 185d4a804..eaff71e7c 100644
--- a/docs/BuildExtensibility.md
+++ b/docs/BuildExtensibility.md
@@ -1,2 +1,2 @@
 # UI5 Build Extensibility
-This documentation moved to a new place: [sap.github.io/ui5-tooling/pages/extensibility/CustomTasks/](https://sap.github.io/ui5-tooling/pages/extensibility/CustomTasks/)
+This documentation moved to a new place: [ui5.github.io/cli/pages/extensibility/CustomTasks/](https://ui5.github.io/cli/pages/extensibility/CustomTasks/)
diff --git a/docs/Configuration.md b/docs/Configuration.md
index 4f48f5dca..bfc790504 100644
--- a/docs/Configuration.md
+++ b/docs/Configuration.md
@@ -1,4 +1,4 @@
 # Configuration
-This documentation moved to a new place: [sap.github.io/ui5-tooling/pages/Configuration/](https://sap.github.io/ui5-tooling/pages/Configuration/).
+This documentation moved to a new place: [ui5.github.io/cli/pages/Configuration/](https://ui5.github.io/cli/pages/Configuration/).
 
-The **Specification Version Documentation** can be found here: [sap.github.io/ui5-tooling/pages/Configuration/#specification-versions](https://sap.github.io/ui5-tooling/pages/Configuration/#specification-versions)
+The **Specification Version Documentation** can be found here: [ui5.github.io/cli/pages/Configuration/#specification-versions](https://ui5.github.io/cli/pages/Configuration/#specification-versions)
diff --git a/jsdoc.json b/jsdoc.json
index 7f4c88bde..89d5050db 100644
--- a/jsdoc.json
+++ b/jsdoc.json
@@ -25,11 +25,11 @@
 		}
 	},
 	"openGraph": {
-		"title": "UI5 Tooling - API Reference",
+		"title": "UI5 CLI - API Reference",
 		"type": "website",
-		"image": "https://sap.github.io/ui5-tooling/v3/images/UI5_logo_wide.png",
-		"site_name": "UI5 Tooling - API Reference",
-		"url": "https://sap.github.io/ui5-tooling/"
+		"image": "https://ui5.github.io/cli/v3/images/UI5_logo_wide.png",
+		"site_name": "UI5 CLI - API Reference",
+		"url": "https://ui5.github.io/cli/"
 	},
 	"docdash": {
 		"sectionOrder": [
@@ -43,8 +43,8 @@
 			"Interfaces"
 		],
 		"meta": {
-			"title": "UI5 Tooling - API Reference - UI5 Project",
-			"description": "UI5 Tooling - API Reference - UI5 Project",
+			"title": "UI5 CLI - API Reference - UI5 Project",
+			"description": "UI5 CLI - API Reference - UI5 Project",
 			"keyword": "openui5 sapui5 ui5 build development tool api reference"
 		},
 		"search": true,
diff --git a/lib/build/TaskRunner.js b/lib/build/TaskRunner.js
index c4782c6f7..70e7bf32a 100644
--- a/lib/build/TaskRunner.js
+++ b/lib/build/TaskRunner.js
@@ -361,8 +361,8 @@ class TaskRunner {
 					throw new Error(
 						`Standard task ${refTaskName}, referenced by custom task ${newTaskName} ` +
 						`in project ${project.getName()}, ` +
-						`has been removed in this version of UI5 Tooling and can't be referenced anymore. ` +
-						`Please see the migration guide at https://sap.github.io/ui5-tooling/updates/migrate-v3/`);
+						`has been removed in this version of UI5 CLI and can't be referenced anymore. ` +
+						`Please see the migration guide at https://ui5.github.io/cli/updates/migrate-v3/`);
 				}
 				throw new Error(`Could not find task ${refTaskName}, referenced by custom task ${newTaskName}, ` +
 					`to be scheduled for project ${project.getName()}`);
diff --git a/lib/build/helpers/TaskUtil.js b/lib/build/helpers/TaskUtil.js
index 5bd204931..661dc04ae 100644
--- a/lib/build/helpers/TaskUtil.js
+++ b/lib/build/helpers/TaskUtil.js
@@ -23,8 +23,8 @@ import {
  */
 class TaskUtil {
 	/**
-	 * Standard Build Tags. See UI5 Tooling
-	 * [RFC 0008]{@link https://github.com/SAP/ui5-tooling/blob/main/rfcs/0008-resource-tagging-during-build.md}
+	 * Standard Build Tags. See UI5 CLI
+	 * [RFC 0008]{@link https://github.com/UI5/cli/blob/main/rfcs/0008-resource-tagging-during-build.md}
 	 * for details.
 	 *
 	 * @public
@@ -87,7 +87,7 @@ class TaskUtil {
 	setTag(resource, tag, value) {
 		if (typeof resource === "string") {
 			throw new Error("Deprecated parameter: " +
-				"Since UI5 Tooling 3.0, #setTag requires a resource instance. Strings are no longer accepted");
+				"Since UI5 CLI 3.0, #setTag requires a resource instance. Strings are no longer accepted");
 		}
 
 		const collection = this._projectBuildContext.getResourceTagCollection(resource, tag);
@@ -110,7 +110,7 @@ class TaskUtil {
 	getTag(resource, tag) {
 		if (typeof resource === "string") {
 			throw new Error("Deprecated parameter: " +
-				"Since UI5 Tooling 3.0, #getTag requires a resource instance. Strings are no longer accepted");
+				"Since UI5 CLI 3.0, #getTag requires a resource instance. Strings are no longer accepted");
 		}
 		const collection = this._projectBuildContext.getResourceTagCollection(resource, tag);
 		return collection.getTag(resource, tag);
@@ -131,7 +131,7 @@ class TaskUtil {
 	clearTag(resource, tag) {
 		if (typeof resource === "string") {
 			throw new Error("Deprecated parameter: " +
-				"Since UI5 Tooling 3.0, #clearTag requires a resource instance. Strings are no longer accepted");
+				"Since UI5 CLI 3.0, #clearTag requires a resource instance. Strings are no longer accepted");
 		}
 		const collection = this._projectBuildContext.getResourceTagCollection(resource, tag);
 		return collection.clearTag(resource, tag);
diff --git a/lib/config/Configuration.js b/lib/config/Configuration.js
index 91ea4a3d4..c6961d3b4 100644
--- a/lib/config/Configuration.js
+++ b/lib/config/Configuration.js
@@ -98,7 +98,7 @@ class Configuration {
 				config = {};
 			} else {
 				throw new Error(
-					`Failed to read UI5 Tooling configuration from ${filePath}: ${err.message}`, {
+					`Failed to read UI5 CLI configuration from ${filePath}: ${err.message}`, {
 						cause: err
 					});
 			}
@@ -127,7 +127,7 @@ class Configuration {
 			return writeFile(filePath, JSON.stringify(config.toJson()));
 		} catch (err) {
 			throw new Error(
-				`Failed to write UI5 Tooling configuration to ${filePath}: ${err.message}`, {
+				`Failed to write UI5 CLI configuration to ${filePath}: ${err.message}`, {
 					cause: err
 				});
 		}
diff --git a/lib/graph/Workspace.js b/lib/graph/Workspace.js
index 6e0719896..011a916f8 100644
--- a/lib/graph/Workspace.js
+++ b/lib/graph/Workspace.js
@@ -12,7 +12,7 @@ const log = getLogger("graph:Workspace");
 
 /**
  * Workspace configuration. For details, refer to the
- * [UI5 Workspaces documentation]{@link https://sap.github.io/ui5-tooling/v3/pages/Workspace/#configuration}
+ * [UI5 Workspaces documentation]{@link https://ui5.github.io/cli/v3/pages/Workspace/#configuration}
  *
  * @public
  * @typedef {object} @ui5/project/graph/Workspace~Configuration
diff --git a/lib/graph/graph.js b/lib/graph/graph.js
index 892c84068..acd5c2837 100644
--- a/lib/graph/graph.js
+++ b/lib/graph/graph.js
@@ -85,7 +85,7 @@ export async function graphFromPackageDependencies({
  * [@ui5/project/graph/providers/DependencyTree~TreeNode]{@link @ui5/project/graph/providers/DependencyTree~TreeNode}.
  *
  * Documentation:
- * [Static Dependency Definition]{@link https://sap.github.io/ui5-tooling/stable/pages/Overview/#static-dependency-definition}
+ * [Static Dependency Definition]{@link https://ui5.github.io/cli/stable/pages/Overview/#static-dependency-definition}
  *
  * @public
  * @static
diff --git a/lib/graph/projectGraphBuilder.js b/lib/graph/projectGraphBuilder.js
index 069c1f2b1..1376d3d22 100644
--- a/lib/graph/projectGraphBuilder.js
+++ b/lib/graph/projectGraphBuilder.js
@@ -28,13 +28,13 @@ function validateNode(node) {
 	if (node.specVersion) {
 		throw new Error(
 			`Provided node with ID ${node.id} contains a top-level 'specVersion' property. ` +
-			`With UI5 Tooling 3.0, project configuration needs to be provided in a dedicated ` +
+			`With UI5 CLI 3.0, project configuration needs to be provided in a dedicated ` +
 			`'configuration' object`);
 	}
 	if (node.metadata) {
 		throw new Error(
 			`Provided node with ID ${node.id} contains a top-level 'metadata' property. ` +
-			`With UI5 Tooling 3.0, project configuration needs to be provided in a dedicated ` +
+			`With UI5 CLI 3.0, project configuration needs to be provided in a dedicated ` +
 			`'configuration' object`);
 	}
 }
@@ -171,7 +171,7 @@ async function projectGraphBuilder(nodeProvider, workspace) {
 					// Invalidate cache if the cached module is visited through another parent project and did not
 					// resolve to a project or extension(s) before.
 					// The module being visited now might be a different version containing for example
-					// UI5 Tooling configuration, or one of the parent projects could have defined a
+					// UI5 CLI configuration, or one of the parent projects could have defined a
 					// relevant configuration shim meanwhile
 					log.silly(
 						`Cached module ${node.id} did not resolve to any projects or extensions. ` +
diff --git a/lib/specifications/Project.js b/lib/specifications/Project.js
index 2ce1fc8c4..17177b085 100644
--- a/lib/specifications/Project.js
+++ b/lib/specifications/Project.js
@@ -110,7 +110,7 @@ class Project extends Specification {
 
 	/**
 	 * Framework dependency entry of the project configuration.
-	 * Also see [Framework Configuration: Dependencies]{@link https://sap.github.io/ui5-tooling/stable/pages/Configuration/#dependencies}
+	 * Also see [Framework Configuration: Dependencies]{@link https://ui5.github.io/cli/stable/pages/Configuration/#dependencies}
 	 *
 	 * @public
 	 * @typedef {object} @ui5/project/specifications/Project~FrameworkDependency
diff --git a/lib/specifications/Specification.js b/lib/specifications/Specification.js
index 5c2af4142..71553e73a 100644
--- a/lib/specifications/Specification.js
+++ b/lib/specifications/Specification.js
@@ -127,7 +127,7 @@ class Specification {
 				throw new Error(
 					`${config.kind} ${config.metadata.name} defines unsupported Specification Version ` +
 					`${originalSpecVersion}. Please manually upgrade to 3.0 or higher. ` +
-					`For details see https://sap.github.io/ui5-tooling/pages/Configuration/#specification-versions - ` +
+					`For details see https://ui5.github.io/cli/pages/Configuration/#specification-versions - ` +
 					`An attempted migration to a supported specification version failed, ` +
 					`likely due to unrecognized configuration. Check verbose log for details.`);
 			}
diff --git a/lib/specifications/SpecificationVersion.js b/lib/specifications/SpecificationVersion.js
index b8839d3bf..d3670c0ab 100644
--- a/lib/specifications/SpecificationVersion.js
+++ b/lib/specifications/SpecificationVersion.js
@@ -283,7 +283,7 @@ class SpecificationVersion {
 
 function getUnsupportedSpecVersionMessage(specVersion) {
 	return `Unsupported Specification Version ${specVersion} defined. Your UI5 CLI installation might be outdated. ` +
-		`For details, see https://sap.github.io/ui5-tooling/pages/Configuration/#specification-versions`;
+		`For details, see https://ui5.github.io/cli/pages/Configuration/#specification-versions`;
 }
 
 function getSemverCompatibleVersion(specVersion) {
diff --git a/lib/specifications/types/Application.js b/lib/specifications/types/Application.js
index 5ca83a099..a4979a98c 100644
--- a/lib/specifications/types/Application.js
+++ b/lib/specifications/types/Application.js
@@ -147,7 +147,7 @@ class Application extends ComponentProject {
 						`Could not find required manifest.json for project ` +
 						`${this.getName()}: ${manifestJsonError.message}\n\n` +
 						`If you are about to start a new project, please refer to:\n` +
-						`https://sap.github.io/ui5-tooling/v3/pages/GettingStarted/#starting-a-new-project`, {
+						`https://ui5.github.io/cli/v3/pages/GettingStarted/#starting-a-new-project`, {
 							cause: manifestJsonError
 						});
 				}
diff --git a/lib/ui5Framework/AbstractResolver.js b/lib/ui5Framework/AbstractResolver.js
index 7237df0fe..e0f556182 100644
--- a/lib/ui5Framework/AbstractResolver.js
+++ b/lib/ui5Framework/AbstractResolver.js
@@ -40,7 +40,7 @@ class AbstractResolver {
 		}
 
 		// In some CI environments, the homedir might be set explicitly to a relative
-		// path (e.g. "./"), but tooling requires an absolute path
+		// path (e.g. "./"), but UI5 CLI requires an absolute path
 		this._ui5HomeDir = path.resolve(
 			ui5HomeDir || path.join(os.homedir(), ".ui5")
 		);
@@ -230,11 +230,11 @@ class AbstractResolver {
 			if (semver.valid(spec)) {
 				if (this.name === "Sapui5Resolver" && semver.lt(spec, "1.76.0")) {
 					throw new Error(`Could not resolve framework version ${version}. ` +
-						`Note that SAPUI5 framework libraries can only be consumed by the UI5 Tooling ` +
+						`Note that SAPUI5 framework libraries can only be consumed by the UI5 CLI ` +
 						`starting with SAPUI5 v1.76.0`);
 				} else if (this.name === "Openui5Resolver" && semver.lt(spec, "1.52.5")) {
 					throw new Error(`Could not resolve framework version ${version}. ` +
-						`Note that OpenUI5 framework libraries can only be consumed by the UI5 Tooling ` +
+						`Note that OpenUI5 framework libraries can only be consumed by the UI5 CLI ` +
 						`starting with OpenUI5 v1.52.5`);
 				}
 			}
diff --git a/lib/ui5Framework/Sapui5MavenSnapshotResolver.js b/lib/ui5Framework/Sapui5MavenSnapshotResolver.js
index 2d697b413..c3a450ba9 100644
--- a/lib/ui5Framework/Sapui5MavenSnapshotResolver.js
+++ b/lib/ui5Framework/Sapui5MavenSnapshotResolver.js
@@ -174,7 +174,7 @@ class Sapui5MavenSnapshotResolver extends AbstractResolver {
 
 	/**
 	 * Read the Maven repository snapshot endpoint URL from the central
-	 * UI5 Tooling configuration, with a fallback to central Maven configuration (is existing)
+	 * UI5 CLI configuration, with a fallback to central Maven configuration (is existing)
 	 *
 	 * @returns {Promise<string>} The resolved snapshotEndpointUrl
 	 */
@@ -183,12 +183,12 @@ class Sapui5MavenSnapshotResolver extends AbstractResolver {
 		const config = await Configuration.fromFile();
 		let url = config.getMavenSnapshotEndpointUrl();
 		if (url) {
-			log.verbose(`Using UI5 Tooling configuration for mavenSnapshotEndpointUrl: ${url}`);
+			log.verbose(`Using UI5 CLI configuration for mavenSnapshotEndpointUrl: ${url}`);
 		} else {
 			log.verbose(`No mavenSnapshotEndpointUrl configuration found`);
 			url = await Sapui5MavenSnapshotResolver._resolveSnapshotEndpointUrlFromMaven();
 			if (url) {
-				log.verbose(`Updating UI5 Tooling configuration with new mavenSnapshotEndpointUrl: ${url}`);
+				log.verbose(`Updating UI5 CLI configuration with new mavenSnapshotEndpointUrl: ${url}`);
 				const configJson = config.toJson();
 				configJson.mavenSnapshotEndpointUrl = url;
 				await Configuration.toFile(new Configuration(configJson));
diff --git a/lib/ui5Framework/maven/Installer.js b/lib/ui5Framework/maven/Installer.js
index cd004b2cb..836805982 100644
--- a/lib/ui5Framework/maven/Installer.js
+++ b/lib/ui5Framework/maven/Installer.js
@@ -349,7 +349,7 @@ class Installer extends AbstractInstaller {
 				}
 
 				// Do not create target dir itself to prevent EPERM error in following rename operation
-				// (https://github.com/SAP/ui5-tooling/issues/487)
+				// (https://github.com/UI5/cli/issues/487)
 				await mkdirp(path.dirname(targetDir));
 				log.verbose(`Promoting staging directory from ${stagingDir} to ${targetDir}...`);
 				await rename(stagingDir, targetDir);
diff --git a/lib/ui5Framework/npm/Installer.js b/lib/ui5Framework/npm/Installer.js
index 5f9bd0f63..fc757f829 100644
--- a/lib/ui5Framework/npm/Installer.js
+++ b/lib/ui5Framework/npm/Installer.js
@@ -115,7 +115,7 @@ class Installer extends AbstractInstaller {
 					await this.getRegistry().extractPackage(pkgName, version, stagingDir);
 
 					// Do not create target dir itself to prevent EPERM error in following rename operation
-					// (https://github.com/SAP/ui5-tooling/issues/487)
+					// (https://github.com/UI5/cli/issues/487)
 					await mkdirp(path.dirname(targetDir));
 					log.verbose(`Promoting staging directory from ${stagingDir} to ${targetDir}...`);
 					await rename(stagingDir, targetDir);
diff --git a/lib/validation/schema/specVersion/kind/extension.json b/lib/validation/schema/specVersion/kind/extension.json
index 39d65c800..7bc886da2 100644
--- a/lib/validation/schema/specVersion/kind/extension.json
+++ b/lib/validation/schema/specVersion/kind/extension.json
@@ -83,7 +83,7 @@
 					"pattern": "^(?:@[0-9a-z-_.]+\\/)?[a-z][0-9a-z-_.]*$",
 					"title": "Extension Name",
 					"description": "Unique identifier for the extension, for example: ui5-task-fearless-rock",
-					"errorMessage": "Not a valid extension name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://sap.github.io/ui5-tooling/stable/pages/Configuration/#name"
+					"errorMessage": "Not a valid extension name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://ui5.github.io/cli/stable/pages/Configuration/#name"
 				},
 				"copyright": {
 					"type": "string"
diff --git a/lib/validation/schema/specVersion/kind/project.json b/lib/validation/schema/specVersion/kind/project.json
index 48ae92186..bcc942984 100644
--- a/lib/validation/schema/specVersion/kind/project.json
+++ b/lib/validation/schema/specVersion/kind/project.json
@@ -106,7 +106,7 @@
 					"pattern": "^(?:@[0-9a-z-_.]+\\/)?[a-z][0-9a-z-_.]*$",
 					"title": "Project Name",
 					"description": "Unique identifier for the project, for example: organization.product.project",
-					"errorMessage": "Not a valid project name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://sap.github.io/ui5-tooling/stable/pages/Configuration/#name"
+					"errorMessage": "Not a valid project name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://ui5.github.io/cli/stable/pages/Configuration/#name"
 				},
 				"copyright": {
 					"type": "string"
@@ -129,7 +129,7 @@
 			"enum": ["UTF-8", "ISO-8859-1"],
 			"default": "UTF-8",
 			"title": "Encoding of *.properties files",
-			"description": "By default, the UI5 Tooling expects *.properties files to be UTF-8 encoded."
+			"description": "By default, the UI5 CLI expects *.properties files to be UTF-8 encoded."
 		},
 		"builder-resources": {
 			"type": "object",
diff --git a/lib/validation/schema/ui5-workspace.json b/lib/validation/schema/ui5-workspace.json
index 79f7719e0..41bd129ed 100644
--- a/lib/validation/schema/ui5-workspace.json
+++ b/lib/validation/schema/ui5-workspace.json
@@ -2,15 +2,15 @@
 	"$schema": "http://json-schema.org/draft-07/schema",
 	"$id": "http://ui5.sap/schema/ui5-workspace.json",
 	"title": "ui5-workspace.yaml",
-	"description": "Schema for UI5 Tooling Workspace Configuration File (ui5-workspace.yaml)",
-	"$comment": "See https://sap.github.io/ui5-tooling/",
+	"description": "Schema for UI5 CLI Workspace Configuration File (ui5-workspace.yaml)",
+	"$comment": "See https://ui5.github.io/cli/",
 	"type": "object",
 	"required": ["specVersion", "metadata", "dependencyManagement"],
 	"properties": {
 		"additionalProperties": false,
 		"specVersion": {
 			"enum": ["workspace/1.0"],
-			"errorMessage": "Unsupported \"specVersion\"\nYour UI5 CLI installation might be outdated.\nSupported specification versions: \"workspace/1.0\"\nFor details, see: https://sap.github.io/ui5-tooling/stable/pages/Workspace/#workspace-specification-versions"
+			"errorMessage": "Unsupported \"specVersion\"\nYour UI5 CLI installation might be outdated.\nSupported specification versions: \"workspace/1.0\"\nFor details, see: https://ui5.github.io/cli/stable/pages/Workspace/#workspace-specification-versions"
 		},
 		"metadata": {
 			"$ref": "#/definitions/metadata"
@@ -31,8 +31,8 @@
 					"maxLength": 80,
 					"pattern": "^(?:@[0-9a-z-_.]+\\/)?[a-z][0-9a-z-_.]*$",
 					"title": "Workspace Name",
-					"description": "Identifier for the workspace configuration. Workspaces named 'default' will be used automatically by UI5 Tooling",
-					"errorMessage": "Not a valid workspace name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://sap.github.io/ui5-tooling/stable/pages/Workspace/#name"
+					"description": "Identifier for the workspace configuration. Workspaces named 'default' will be used automatically by UI5 CLI",
+					"errorMessage": "Not a valid workspace name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://ui5.github.io/cli/stable/pages/Workspace/#name"
 				}
 			}
 		},
diff --git a/lib/validation/schema/ui5.json b/lib/validation/schema/ui5.json
index a65e85b45..4a4b30727 100644
--- a/lib/validation/schema/ui5.json
+++ b/lib/validation/schema/ui5.json
@@ -2,8 +2,8 @@
 	"$schema": "http://json-schema.org/draft-07/schema",
 	"$id": "http://ui5.sap/schema/ui5.json",
 	"title": "ui5.yaml",
-	"description": "Schema for UI5 Tooling Configuration File (ui5.yaml)",
-	"$comment": "See https://sap.github.io/ui5-tooling/",
+	"description": "Schema for UI5 CLI Configuration File (ui5.yaml)",
+	"$comment": "See https://ui5.github.io/cli/",
 
 	"type": "object",
 	"required": ["specVersion"],
@@ -14,7 +14,7 @@
 				"2.6", "2.5", "2.4", "2.3", "2.2", "2.1", "2.0",
 				"1.1", "1.0", "0.1"
 			],
-			"errorMessage": "Unsupported \"specVersion\"\nYour UI5 CLI installation might be outdated.\nSupported specification versions: \"3.2\", \"3.1\", \"3.0\", \"2.6\", \"2.5\", \"2.4\", \"2.3\", \"2.2\", \"2.1\", \"2.0\", \"1.1\", \"1.0\", \"0.1\"\nFor details, see: https://sap.github.io/ui5-tooling/pages/Configuration/#specification-versions"
+			"errorMessage": "Unsupported \"specVersion\"\nYour UI5 CLI installation might be outdated.\nSupported specification versions: \"3.2\", \"3.1\", \"3.0\", \"2.6\", \"2.5\", \"2.4\", \"2.3\", \"2.2\", \"2.1\", \"2.0\", \"1.1\", \"1.0\", \"0.1\"\nFor details, see: https://ui5.github.io/cli/pages/Configuration/#specification-versions"
 		}
 	},
 
diff --git a/package.json b/package.json
index d5ccbd7b2..edddf85c1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@ui5/project",
 	"version": "3.9.4",
-	"description": "UI5 Tooling - Project ",
+	"description": "UI5 CLI - Project ",
 	"author": {
 		"name": "SAP SE",
 		"email": "openui5@sap.com",
diff --git a/test/fixtures/collection.b/sub-empty/.keep b/test/fixtures/collection.b/sub-empty/.keep
index 6f5514d1d..a550add6a 100644
--- a/test/fixtures/collection.b/sub-empty/.keep
+++ b/test/fixtures/collection.b/sub-empty/.keep
@@ -1,2 +1,2 @@
 This file is a stand-in for an empty project directory.
-This directory, even though matching the npm workspace configuration pattern, should be ignored by UI5 Tooling.
+This directory, even though matching the npm workspace configuration pattern, should be ignored by UI5 CLI.
diff --git a/test/lib/build/TaskRunner.js b/test/lib/build/TaskRunner.js
index e27aeffa7..588ed0d2a 100644
--- a/test/lib/build/TaskRunner.js
+++ b/test/lib/build/TaskRunner.js
@@ -574,8 +574,8 @@ test("_initTasks: Custom tasks with removed beforeTask", async (t) => {
 	});
 	t.is(err.message,
 		`Standard task removedTask, referenced by custom task myTask in project project.b, ` +
-		`has been removed in this version of UI5 Tooling and can't be referenced anymore. ` +
-		`Please see the migration guide at https://sap.github.io/ui5-tooling/updates/migrate-v3/`,
+		`has been removed in this version of UI5 CLI and can't be referenced anymore. ` +
+		`Please see the migration guide at https://ui5.github.io/cli/updates/migrate-v3/`,
 		"Threw with expected error message");
 });
 
diff --git a/test/lib/build/helpers/TaskUtil.js b/test/lib/build/helpers/TaskUtil.js
index fbab87958..694cb84ed 100644
--- a/test/lib/build/helpers/TaskUtil.js
+++ b/test/lib/build/helpers/TaskUtil.js
@@ -97,7 +97,7 @@ test("setTag with resource path is not supported anymore", (t) => {
 		taskUtil.setTag("my resource", "my tag", "my value");
 	});
 	t.is(err.message,
-		"Deprecated parameter: Since UI5 Tooling 3.0, #setTag " +
+		"Deprecated parameter: Since UI5 CLI 3.0, #setTag " +
 		"requires a resource instance. Strings are no longer accepted",
 		"Threw with expected error message");
 });
@@ -111,7 +111,7 @@ test("getTag with resource path is not supported anymore", (t) => {
 		taskUtil.getTag("my resource", "my tag", "my value");
 	});
 	t.is(err.message,
-		"Deprecated parameter: Since UI5 Tooling 3.0, #getTag " +
+		"Deprecated parameter: Since UI5 CLI 3.0, #getTag " +
 		"requires a resource instance. Strings are no longer accepted",
 		"Threw with expected error message");
 });
@@ -125,7 +125,7 @@ test("clearTag with resource path is not supported anymore", (t) => {
 		taskUtil.clearTag("my resource", "my tag", "my value");
 	});
 	t.is(err.message,
-		"Deprecated parameter: Since UI5 Tooling 3.0, #clearTag " +
+		"Deprecated parameter: Since UI5 CLI 3.0, #clearTag " +
 		"requires a resource instance. Strings are no longer accepted",
 		"Threw with expected error message");
 });
diff --git a/test/lib/config/Configuration.js b/test/lib/config/Configuration.js
index 430721f95..7acbadba2 100644
--- a/test/lib/config/Configuration.js
+++ b/test/lib/config/Configuration.js
@@ -140,7 +140,7 @@ test.serial("fromFile: throws", async (t) => {
 	promisifyStub.callsFake(() => responseStub);
 
 	await t.throwsAsync(fromFile(), {
-		message: `Failed to read UI5 Tooling configuration from ~/.ui5rc: Error`
+		message: `Failed to read UI5 CLI configuration from ~/.ui5rc: Error`
 	});
 });
 
@@ -169,6 +169,6 @@ test.serial("toFile: throws", async (t) => {
 	promisifyStub.callsFake(() => responseStub);
 
 	await t.throwsAsync(toFile(new Configuration({})), {
-		message: "Failed to write UI5 Tooling configuration to ~/.ui5rc: Error"
+		message: "Failed to write UI5 CLI configuration to ~/.ui5rc: Error"
 	});
 });
diff --git a/test/lib/graph/projectGraphBuilder.js b/test/lib/graph/projectGraphBuilder.js
index 8229f3103..e5559d06e 100644
--- a/test/lib/graph/projectGraphBuilder.js
+++ b/test/lib/graph/projectGraphBuilder.js
@@ -219,7 +219,7 @@ test("Legacy node with specVersion attribute as root", async (t) => {
 	const err = await t.throwsAsync(projectGraphBuilder(t.context.provider));
 
 	t.is(err.message,
-		"Provided node with ID id1 contains a top-level 'specVersion' property. With UI5 Tooling 3.0, " +
+		"Provided node with ID id1 contains a top-level 'specVersion' property. With UI5 CLI 3.0, " +
 		"project configuration needs to be provided in a dedicated 'configuration' object",
 		"Threw with expected error message");
 });
@@ -236,7 +236,7 @@ test("Legacy node with metadata attribute in dependencies", async (t) => {
 	const err = await t.throwsAsync(projectGraphBuilder(t.context.provider));
 
 	t.is(err.message,
-		"Provided node with ID id2 contains a top-level 'metadata' property. With UI5 Tooling 3.0, " +
+		"Provided node with ID id2 contains a top-level 'metadata' property. With UI5 CLI 3.0, " +
 		"project configuration needs to be provided in a dedicated 'configuration' object",
 		"Threw with expected error message");
 });
diff --git a/test/lib/specifications/Specification.js b/test/lib/specifications/Specification.js
index 3d6621c0e..9871f28b8 100644
--- a/test/lib/specifications/Specification.js
+++ b/test/lib/specifications/Specification.js
@@ -194,7 +194,7 @@ test("Migrate legacy project unexpected configuration", async (t) => {
 
 	t.is(err.message,
 		"project application.a defines unsupported Specification Version 1.0. Please manually upgrade to 3.0 or " +
-		"higher. For details see https://sap.github.io/ui5-tooling/pages/Configuration/#specification-versions - " +
+		"higher. For details see https://ui5.github.io/cli/pages/Configuration/#specification-versions - " +
 		"An attempted migration to a supported specification version failed, likely due to unrecognized " +
 		"configuration. Check verbose log for details.",
 		"Threw with expected error message");
@@ -367,7 +367,7 @@ test("Invalid specVersion", async (t) => {
 	await t.throwsAsync(Specification.create(t.context.basicProjectInput), {
 		message:
 		"Unsupported Specification Version 0.5 defined. Your UI5 CLI installation might be outdated. " +
-		"For details, see https://sap.github.io/ui5-tooling/pages/Configuration/#specification-versions"
+		"For details, see https://ui5.github.io/cli/pages/Configuration/#specification-versions"
 	}, "Threw with expected error message");
 });
 
diff --git a/test/lib/specifications/SpecificationVersion.js b/test/lib/specifications/SpecificationVersion.js
index c2015d10d..0dc7dd299 100644
--- a/test/lib/specifications/SpecificationVersion.js
+++ b/test/lib/specifications/SpecificationVersion.js
@@ -5,7 +5,7 @@ import {__localFunctions__} from "../../../lib/specifications/SpecificationVersi
 
 const unsupportedSpecVersionText = (specVersion) =>
 	`Unsupported Specification Version ${specVersion} defined. Your UI5 CLI installation might be outdated. ` +
-	`For details, see https://sap.github.io/ui5-tooling/pages/Configuration/#specification-versions`;
+	`For details, see https://ui5.github.io/cli/pages/Configuration/#specification-versions`;
 
 test.beforeEach((t) => {
 	t.context.sinon = sinonGlobal.createSandbox();
diff --git a/test/lib/specifications/types/Application.js b/test/lib/specifications/types/Application.js
index 5949d5229..628682c80 100644
--- a/test/lib/specifications/types/Application.js
+++ b/test/lib/specifications/types/Application.js
@@ -529,7 +529,7 @@ test("_getNamespace: Correct error message if fallback to manifest.appdescr_vari
 		"No such stable or directory: manifest.json" +
 		"\n\n" +
 		"If you are about to start a new project, please refer to:\n" +
-		"https://sap.github.io/ui5-tooling/v3/pages/GettingStarted/#starting-a-new-project",
+		"https://ui5.github.io/cli/v3/pages/GettingStarted/#starting-a-new-project",
 		"Rejected with correct error message");
 
 	t.is(_getManifestStub.callCount, 2, "_getManifest called exactly twice");
diff --git a/test/lib/ui5framework/AbstractResolver.js b/test/lib/ui5framework/AbstractResolver.js
index ee068adf2..a43554151 100644
--- a/test/lib/ui5framework/AbstractResolver.js
+++ b/test/lib/ui5framework/AbstractResolver.js
@@ -1106,7 +1106,7 @@ test.serial(
 
 		t.is(error.message,
 			`Could not resolve framework version 1.50.0. Note that OpenUI5 framework libraries can only be ` +
-			`consumed by the UI5 Tooling starting with OpenUI5 v1.52.5`);
+			`consumed by the UI5 CLI starting with OpenUI5 v1.52.5`);
 	});
 
 test.serial(
@@ -1126,7 +1126,7 @@ test.serial(
 
 		t.is(error.message,
 			`Could not resolve framework version 1.75.0. Note that SAPUI5 framework libraries can only be ` +
-			`consumed by the UI5 Tooling starting with SAPUI5 v1.76.0`);
+			`consumed by the UI5 CLI starting with SAPUI5 v1.76.0`);
 	});
 
 test.serial(
diff --git a/test/lib/ui5framework/Openui5Resolver.integration.js b/test/lib/ui5framework/Openui5Resolver.integration.js
index c62f3537d..5bcbcdbe2 100644
--- a/test/lib/ui5framework/Openui5Resolver.integration.js
+++ b/test/lib/ui5framework/Openui5Resolver.integration.js
@@ -178,7 +178,7 @@ test.serial("resolveVersion", async (t) => {
 		});
 		await t.throwsAsync(Openui5Resolver.resolveVersion("1.0.0", options), {
 			message: `Could not resolve framework version 1.0.0. ` +
-				`Note that OpenUI5 framework libraries can only be consumed by the UI5 Tooling ` +
+				`Note that OpenUI5 framework libraries can only be consumed by the UI5 CLI ` +
 				`starting with OpenUI5 v1.52.5`
 		});
 		await t.throwsAsync(Openui5Resolver.resolveVersion("^999", options), {
diff --git a/test/lib/ui5framework/Sapui5MavenSnapshotResolver.js b/test/lib/ui5framework/Sapui5MavenSnapshotResolver.js
index 0d7382d58..2d79a74be 100644
--- a/test/lib/ui5framework/Sapui5MavenSnapshotResolver.js
+++ b/test/lib/ui5framework/Sapui5MavenSnapshotResolver.js
@@ -462,7 +462,7 @@ test.serial("_resolveSnapshotEndpointUrl: From configuration", async (t) => {
 
 	const endpoint = await resolveSnapshotEndpointUrl();
 
-	t.is(endpoint, "config-url", "Returned URL extracted from UI5 Tooling configuration");
+	t.is(endpoint, "config-url", "Returned URL extracted from UI5 CLI configuration");
 	t.is(configFromFile.callCount, 1, "Configuration has been read once");
 	t.is(configToFile.callCount, 0, "Configuration has not been written");
 	t.is(fromMavenStub.callCount, 0, "Maven configuration has not been requested");
diff --git a/test/lib/ui5framework/Sapui5Resolver.integration.js b/test/lib/ui5framework/Sapui5Resolver.integration.js
index d9aa4de54..ab0787455 100644
--- a/test/lib/ui5framework/Sapui5Resolver.integration.js
+++ b/test/lib/ui5framework/Sapui5Resolver.integration.js
@@ -178,7 +178,7 @@ test.serial("resolveVersion", async (t) => {
 		});
 		await t.throwsAsync(Sapui5Resolver.resolveVersion("1.0.0", options), {
 			message: `Could not resolve framework version 1.0.0. ` +
-				`Note that SAPUI5 framework libraries can only be consumed by the UI5 Tooling ` +
+				`Note that SAPUI5 framework libraries can only be consumed by the UI5 CLI ` +
 				`starting with SAPUI5 v1.76.0`
 		});
 		await t.throwsAsync(Sapui5Resolver.resolveVersion("^999", options), {
diff --git a/test/lib/validation/ValidationError.js b/test/lib/validation/ValidationError.js
index 6524ca51c..dd32292ef 100644
--- a/test/lib/validation/ValidationError.js
+++ b/test/lib/validation/ValidationError.js
@@ -860,7 +860,7 @@ test.serial("ValidationError.formatMessage: keyword=errorMessage", (t) => {
 `Unsupported "specVersion"
 Your UI5 CLI installation might be outdated.
 Supported specification versions: "2.0", "1.1", "1.0", "0.1"
-For details, see: https://sap.github.io/ui5-tooling/pages/Configuration/#specification-versions`,
+For details, see: https://ui5.github.io/cli/pages/Configuration/#specification-versions`,
 		params: {
 			errors: [
 				{
@@ -886,7 +886,7 @@ For details, see: https://sap.github.io/ui5-tooling/pages/Configuration/#specifi
 `Unsupported "specVersion"
 Your UI5 CLI installation might be outdated.
 Supported specification versions: "2.0", "1.1", "1.0", "0.1"
-For details, see: https://sap.github.io/ui5-tooling/pages/Configuration/#specification-versions`;
+For details, see: https://ui5.github.io/cli/pages/Configuration/#specification-versions`;
 
 	const errorMessage = ValidationError.formatMessage(error, {});
 	t.is(errorMessage, expectedErrorMessage);
diff --git a/test/lib/validation/schema/__helper__/extension.js b/test/lib/validation/schema/__helper__/extension.js
index 516bc889c..c36624a0f 100644
--- a/test/lib/validation/schema/__helper__/extension.js
+++ b/test/lib/validation/schema/__helper__/extension.js
@@ -105,7 +105,7 @@ export default {
 				}, {
 					dataPath: "/metadata/name",
 					keyword: "errorMessage",
-					message: `Not a valid extension name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://sap.github.io/ui5-tooling/stable/pages/Configuration/#name`,
+					message: `Not a valid extension name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://ui5.github.io/cli/stable/pages/Configuration/#name`,
 					params: {
 						errors: [{
 							dataPath: "/metadata/name",
diff --git a/test/lib/validation/schema/__helper__/project.js b/test/lib/validation/schema/__helper__/project.js
index baddd13c6..cbac64534 100644
--- a/test/lib/validation/schema/__helper__/project.js
+++ b/test/lib/validation/schema/__helper__/project.js
@@ -294,7 +294,7 @@ export default {
 					{
 						dataPath: "/metadata/name",
 						keyword: "errorMessage",
-						message: `Not a valid project name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://sap.github.io/ui5-tooling/stable/pages/Configuration/#name`,
+						message: `Not a valid project name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://ui5.github.io/cli/stable/pages/Configuration/#name`,
 						params: {
 							errors: [{
 								dataPath: "/metadata/name",
diff --git a/test/lib/validation/schema/specVersion/kind/extension/project-shim.js b/test/lib/validation/schema/specVersion/kind/extension/project-shim.js
index dfad329fe..286f3b0bd 100644
--- a/test/lib/validation/schema/specVersion/kind/extension/project-shim.js
+++ b/test/lib/validation/schema/specVersion/kind/extension/project-shim.js
@@ -141,7 +141,7 @@ SpecificationVersion.getVersionsForRange(">=3.0").forEach(function(specVersion)
 		}, [{
 			dataPath: "/metadata/name",
 			keyword: "errorMessage",
-			message: `Not a valid extension name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://sap.github.io/ui5-tooling/stable/pages/Configuration/#name`,
+			message: `Not a valid extension name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://ui5.github.io/cli/stable/pages/Configuration/#name`,
 			params: {
 				errors: [{
 					dataPath: "/metadata/name",
@@ -164,7 +164,7 @@ SpecificationVersion.getVersionsForRange(">=3.0").forEach(function(specVersion)
 		}, [{
 			dataPath: "/metadata/name",
 			keyword: "errorMessage",
-			message: `Not a valid extension name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://sap.github.io/ui5-tooling/stable/pages/Configuration/#name`,
+			message: `Not a valid extension name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://ui5.github.io/cli/stable/pages/Configuration/#name`,
 			params: {
 				errors: [{
 					dataPath: "/metadata/name",
@@ -187,7 +187,7 @@ SpecificationVersion.getVersionsForRange(">=3.0").forEach(function(specVersion)
 		}, [{
 			dataPath: "/metadata/name",
 			keyword: "errorMessage",
-			message: `Not a valid extension name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://sap.github.io/ui5-tooling/stable/pages/Configuration/#name`,
+			message: `Not a valid extension name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://ui5.github.io/cli/stable/pages/Configuration/#name`,
 			params: {
 				errors: [{
 					dataPath: "/metadata/name",
diff --git a/test/lib/validation/schema/specVersion/kind/extension/server-middleware.js b/test/lib/validation/schema/specVersion/kind/extension/server-middleware.js
index 39b5efe6f..ceb1e6dc3 100644
--- a/test/lib/validation/schema/specVersion/kind/extension/server-middleware.js
+++ b/test/lib/validation/schema/specVersion/kind/extension/server-middleware.js
@@ -61,7 +61,7 @@ SpecificationVersion.getVersionsForRange(">=3.0").forEach(function(specVersion)
 		}, [{
 			dataPath: "/metadata/name",
 			keyword: "errorMessage",
-			message: `Not a valid extension name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://sap.github.io/ui5-tooling/stable/pages/Configuration/#name`,
+			message: `Not a valid extension name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://ui5.github.io/cli/stable/pages/Configuration/#name`,
 			params: {
 				errors: [{
 					dataPath: "/metadata/name",
@@ -86,7 +86,7 @@ SpecificationVersion.getVersionsForRange(">=3.0").forEach(function(specVersion)
 		}, [{
 			dataPath: "/metadata/name",
 			keyword: "errorMessage",
-			message: `Not a valid extension name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://sap.github.io/ui5-tooling/stable/pages/Configuration/#name`,
+			message: `Not a valid extension name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://ui5.github.io/cli/stable/pages/Configuration/#name`,
 			params: {
 				errors: [{
 					dataPath: "/metadata/name",
@@ -111,7 +111,7 @@ SpecificationVersion.getVersionsForRange(">=3.0").forEach(function(specVersion)
 		}, [{
 			dataPath: "/metadata/name",
 			keyword: "errorMessage",
-			message: `Not a valid extension name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://sap.github.io/ui5-tooling/stable/pages/Configuration/#name`,
+			message: `Not a valid extension name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://ui5.github.io/cli/stable/pages/Configuration/#name`,
 			params: {
 				errors: [{
 					dataPath: "/metadata/name",
diff --git a/test/lib/validation/schema/specVersion/kind/extension/task.js b/test/lib/validation/schema/specVersion/kind/extension/task.js
index f2a6a1017..e8ad32253 100644
--- a/test/lib/validation/schema/specVersion/kind/extension/task.js
+++ b/test/lib/validation/schema/specVersion/kind/extension/task.js
@@ -61,7 +61,7 @@ SpecificationVersion.getVersionsForRange(">=3.0").forEach(function(specVersion)
 		}, [{
 			dataPath: "/metadata/name",
 			keyword: "errorMessage",
-			message: `Not a valid extension name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://sap.github.io/ui5-tooling/stable/pages/Configuration/#name`,
+			message: `Not a valid extension name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://ui5.github.io/cli/stable/pages/Configuration/#name`,
 			params: {
 				errors: [{
 					dataPath: "/metadata/name",
@@ -86,7 +86,7 @@ SpecificationVersion.getVersionsForRange(">=3.0").forEach(function(specVersion)
 		}, [{
 			dataPath: "/metadata/name",
 			keyword: "errorMessage",
-			message: `Not a valid extension name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://sap.github.io/ui5-tooling/stable/pages/Configuration/#name`,
+			message: `Not a valid extension name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://ui5.github.io/cli/stable/pages/Configuration/#name`,
 			params: {
 				errors: [{
 					dataPath: "/metadata/name",
@@ -111,7 +111,7 @@ SpecificationVersion.getVersionsForRange(">=3.0").forEach(function(specVersion)
 		}, [{
 			dataPath: "/metadata/name",
 			keyword: "errorMessage",
-			message: `Not a valid extension name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://sap.github.io/ui5-tooling/stable/pages/Configuration/#name`,
+			message: `Not a valid extension name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://ui5.github.io/cli/stable/pages/Configuration/#name`,
 			params: {
 				errors: [{
 					dataPath: "/metadata/name",
diff --git a/test/lib/validation/schema/specVersion/kind/project/application.js b/test/lib/validation/schema/specVersion/kind/project/application.js
index 16497d4ce..25f185ded 100644
--- a/test/lib/validation/schema/specVersion/kind/project/application.js
+++ b/test/lib/validation/schema/specVersion/kind/project/application.js
@@ -737,7 +737,7 @@ SpecificationVersion.getVersionsForRange(">=3.0").forEach(function(specVersion)
 		}, [{
 			dataPath: "/metadata/name",
 			keyword: "errorMessage",
-			message: `Not a valid project name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://sap.github.io/ui5-tooling/stable/pages/Configuration/#name`,
+			message: `Not a valid project name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://ui5.github.io/cli/stable/pages/Configuration/#name`,
 			params: {
 				errors: [{
 					dataPath: "/metadata/name",
@@ -758,7 +758,7 @@ SpecificationVersion.getVersionsForRange(">=3.0").forEach(function(specVersion)
 		}, [{
 			dataPath: "/metadata/name",
 			keyword: "errorMessage",
-			message: `Not a valid project name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://sap.github.io/ui5-tooling/stable/pages/Configuration/#name`,
+			message: `Not a valid project name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://ui5.github.io/cli/stable/pages/Configuration/#name`,
 			params: {
 				errors: [{
 					dataPath: "/metadata/name",
@@ -779,7 +779,7 @@ SpecificationVersion.getVersionsForRange(">=3.0").forEach(function(specVersion)
 		}, [{
 			dataPath: "/metadata/name",
 			keyword: "errorMessage",
-			message: `Not a valid project name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://sap.github.io/ui5-tooling/stable/pages/Configuration/#name`,
+			message: `Not a valid project name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://ui5.github.io/cli/stable/pages/Configuration/#name`,
 			params: {
 				errors: [{
 					dataPath: "/metadata/name",
diff --git a/test/lib/validation/schema/specVersion/kind/project/library.js b/test/lib/validation/schema/specVersion/kind/project/library.js
index 8ca82bfdf..029790716 100644
--- a/test/lib/validation/schema/specVersion/kind/project/library.js
+++ b/test/lib/validation/schema/specVersion/kind/project/library.js
@@ -782,7 +782,7 @@ SpecificationVersion.getVersionsForRange(">=3.0").forEach(function(specVersion)
 		}, [{
 			dataPath: "/metadata/name",
 			keyword: "errorMessage",
-			message: `Not a valid project name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://sap.github.io/ui5-tooling/stable/pages/Configuration/#name`,
+			message: `Not a valid project name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://ui5.github.io/cli/stable/pages/Configuration/#name`,
 			params: {
 				errors: [{
 					dataPath: "/metadata/name",
@@ -803,7 +803,7 @@ SpecificationVersion.getVersionsForRange(">=3.0").forEach(function(specVersion)
 		}, [{
 			dataPath: "/metadata/name",
 			keyword: "errorMessage",
-			message: `Not a valid project name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://sap.github.io/ui5-tooling/stable/pages/Configuration/#name`,
+			message: `Not a valid project name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://ui5.github.io/cli/stable/pages/Configuration/#name`,
 			params: {
 				errors: [{
 					dataPath: "/metadata/name",
@@ -824,7 +824,7 @@ SpecificationVersion.getVersionsForRange(">=3.0").forEach(function(specVersion)
 		}, [{
 			dataPath: "/metadata/name",
 			keyword: "errorMessage",
-			message: `Not a valid project name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://sap.github.io/ui5-tooling/stable/pages/Configuration/#name`,
+			message: `Not a valid project name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://ui5.github.io/cli/stable/pages/Configuration/#name`,
 			params: {
 				errors: [{
 					dataPath: "/metadata/name",
diff --git a/test/lib/validation/schema/specVersion/kind/project/module.js b/test/lib/validation/schema/specVersion/kind/project/module.js
index e49b4769c..2899c22a0 100644
--- a/test/lib/validation/schema/specVersion/kind/project/module.js
+++ b/test/lib/validation/schema/specVersion/kind/project/module.js
@@ -361,7 +361,7 @@ SpecificationVersion.getVersionsForRange(">=3.0").forEach(function(specVersion)
 		}, [{
 			dataPath: "/metadata/name",
 			keyword: "errorMessage",
-			message: `Not a valid project name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://sap.github.io/ui5-tooling/stable/pages/Configuration/#name`,
+			message: `Not a valid project name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://ui5.github.io/cli/stable/pages/Configuration/#name`,
 			params: {
 				errors: [{
 					dataPath: "/metadata/name",
@@ -382,7 +382,7 @@ SpecificationVersion.getVersionsForRange(">=3.0").forEach(function(specVersion)
 		}, [{
 			dataPath: "/metadata/name",
 			keyword: "errorMessage",
-			message: `Not a valid project name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://sap.github.io/ui5-tooling/stable/pages/Configuration/#name`,
+			message: `Not a valid project name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://ui5.github.io/cli/stable/pages/Configuration/#name`,
 			params: {
 				errors: [{
 					dataPath: "/metadata/name",
@@ -403,7 +403,7 @@ SpecificationVersion.getVersionsForRange(">=3.0").forEach(function(specVersion)
 		}, [{
 			dataPath: "/metadata/name",
 			keyword: "errorMessage",
-			message: `Not a valid project name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://sap.github.io/ui5-tooling/stable/pages/Configuration/#name`,
+			message: `Not a valid project name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://ui5.github.io/cli/stable/pages/Configuration/#name`,
 			params: {
 				errors: [{
 					dataPath: "/metadata/name",
diff --git a/test/lib/validation/schema/specVersion/kind/project/theme-library.js b/test/lib/validation/schema/specVersion/kind/project/theme-library.js
index eff5bdbf0..19bc8a094 100644
--- a/test/lib/validation/schema/specVersion/kind/project/theme-library.js
+++ b/test/lib/validation/schema/specVersion/kind/project/theme-library.js
@@ -359,7 +359,7 @@ SpecificationVersion.getVersionsForRange(">=3.0").forEach(function(specVersion)
 		}, [{
 			dataPath: "/metadata/name",
 			keyword: "errorMessage",
-			message: `Not a valid project name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://sap.github.io/ui5-tooling/stable/pages/Configuration/#name`,
+			message: `Not a valid project name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://ui5.github.io/cli/stable/pages/Configuration/#name`,
 			params: {
 				errors: [{
 					dataPath: "/metadata/name",
@@ -380,7 +380,7 @@ SpecificationVersion.getVersionsForRange(">=3.0").forEach(function(specVersion)
 		}, [{
 			dataPath: "/metadata/name",
 			keyword: "errorMessage",
-			message: `Not a valid project name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://sap.github.io/ui5-tooling/stable/pages/Configuration/#name`,
+			message: `Not a valid project name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://ui5.github.io/cli/stable/pages/Configuration/#name`,
 			params: {
 				errors: [{
 					dataPath: "/metadata/name",
@@ -401,7 +401,7 @@ SpecificationVersion.getVersionsForRange(">=3.0").forEach(function(specVersion)
 		}, [{
 			dataPath: "/metadata/name",
 			keyword: "errorMessage",
-			message: `Not a valid project name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://sap.github.io/ui5-tooling/stable/pages/Configuration/#name`,
+			message: `Not a valid project name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://ui5.github.io/cli/stable/pages/Configuration/#name`,
 			params: {
 				errors: [{
 					dataPath: "/metadata/name",
diff --git a/test/lib/validation/schema/ui5-workspace.js b/test/lib/validation/schema/ui5-workspace.js
index 1467d639e..3bc587754 100644
--- a/test/lib/validation/schema/ui5-workspace.js
+++ b/test/lib/validation/schema/ui5-workspace.js
@@ -62,7 +62,7 @@ test("Empty config", async (t) => {
 				message: `Unsupported "specVersion"
 Your UI5 CLI installation might be outdated.
 Supported specification versions: "workspace/1.0"
-For details, see: https://sap.github.io/ui5-tooling/stable/pages/Workspace/#workspace-specification-versions`,
+For details, see: https://ui5.github.io/cli/stable/pages/Workspace/#workspace-specification-versions`,
 				params: {
 					errors: [
 						{
@@ -163,7 +163,7 @@ test("Invalid metadata.name: Illegal characters", async (t) => {
 			{
 				dataPath: "/metadata/name",
 				keyword: "errorMessage",
-				message: "Not a valid workspace name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://sap.github.io/ui5-tooling/stable/pages/Workspace/#name",
+				message: "Not a valid workspace name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://ui5.github.io/cli/stable/pages/Workspace/#name",
 				params: {
 					errors: [
 						{
@@ -201,7 +201,7 @@ test("Invalid metadata.name: Too short", async (t) => {
 			{
 				dataPath: "/metadata/name",
 				keyword: "errorMessage",
-				message: "Not a valid workspace name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://sap.github.io/ui5-tooling/stable/pages/Workspace/#name",
+				message: "Not a valid workspace name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://ui5.github.io/cli/stable/pages/Workspace/#name",
 				params: {
 					errors: [
 						{
@@ -240,7 +240,7 @@ test("Invalid metadata.name: Too long", async (t) => {
 			{
 				dataPath: "/metadata/name",
 				keyword: "errorMessage",
-				message: "Not a valid workspace name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://sap.github.io/ui5-tooling/stable/pages/Workspace/#name",
+				message: "Not a valid workspace name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://ui5.github.io/cli/stable/pages/Workspace/#name",
 				params: {
 					errors: [
 						{
@@ -279,7 +279,7 @@ test("Invalid fields", async (t) => {
 				message: `Unsupported "specVersion"
 Your UI5 CLI installation might be outdated.
 Supported specification versions: "workspace/1.0"
-For details, see: https://sap.github.io/ui5-tooling/stable/pages/Workspace/#workspace-specification-versions`,
+For details, see: https://ui5.github.io/cli/stable/pages/Workspace/#workspace-specification-versions`,
 				params: {
 					errors: [
 						{
@@ -297,7 +297,7 @@ For details, see: https://sap.github.io/ui5-tooling/stable/pages/Workspace/#work
 			{
 				dataPath: "/metadata/name",
 				keyword: "errorMessage",
-				message: "Not a valid workspace name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://sap.github.io/ui5-tooling/stable/pages/Workspace/#name",
+				message: "Not a valid workspace name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://ui5.github.io/cli/stable/pages/Workspace/#name",
 				params: {
 					errors: [
 						{
@@ -348,7 +348,7 @@ test("Invalid types", async (t) => {
 				message: `Unsupported "specVersion"
 Your UI5 CLI installation might be outdated.
 Supported specification versions: "workspace/1.0"
-For details, see: https://sap.github.io/ui5-tooling/stable/pages/Workspace/#workspace-specification-versions`,
+For details, see: https://ui5.github.io/cli/stable/pages/Workspace/#workspace-specification-versions`,
 				params: {
 					errors: [
 						{
@@ -366,7 +366,7 @@ For details, see: https://sap.github.io/ui5-tooling/stable/pages/Workspace/#work
 			{
 				dataPath: "/metadata/name",
 				keyword: "errorMessage",
-				message: "Not a valid workspace name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://sap.github.io/ui5-tooling/stable/pages/Workspace/#name",
+				message: "Not a valid workspace name. It must consist of lowercase alphanumeric characters, dash, underscore, and period only. Additionally, it may contain an npm-style package scope. For details, see: https://ui5.github.io/cli/stable/pages/Workspace/#name",
 				params: {
 					errors: [
 						{
diff --git a/test/lib/validation/schema/ui5.js b/test/lib/validation/schema/ui5.js
index 4ac9192c8..f511bf62e 100644
--- a/test/lib/validation/schema/ui5.js
+++ b/test/lib/validation/schema/ui5.js
@@ -104,7 +104,7 @@ test("Invalid specVersion", async (t) => {
 "Your UI5 CLI installation might be outdated.\n" +
 "Supported specification versions: \"3.2\", \"3.1\", \"3.0\", \"2.6\", " +
 "\"2.5\", \"2.4\", \"2.3\", \"2.2\", \"2.1\", \"2.0\", \"1.1\", \"1.0\", \"0.1\"\n" +
-"For details, see: https://sap.github.io/ui5-tooling/pages/Configuration/#specification-versions",
+"For details, see: https://ui5.github.io/cli/pages/Configuration/#specification-versions",
 			params: {
 				errors: [
 					{