diff --git a/.github/scripts/deploy-web.sh b/.github/scripts/deploy-web.sh
index 00a490cb5..0b321a2e3 100755
--- a/.github/scripts/deploy-web.sh
+++ b/.github/scripts/deploy-web.sh
@@ -16,4 +16,4 @@
 
 TMP_PASS_FILE="$(mktemp)"
 echo "$SSH_PASS" > $TMP_PASS_FILE
-ssh -i $TMP_PASS_FILE -o StrictHostKeyChecking=no -o LogLevel=error $SSH_HOST "rm -r -f thingweb-playground; git clone https://github.com/thingweb/thingweb-playground.git; cd thingweb-playground; lerna bootstrap; cd ./packages/web; rm -r -f /var/www/html/playground/*; cp -L -r ./* /var/www/html/playground; echo cleaned and copy to webdir; echo CD DONE"
+ssh -i $TMP_PASS_FILE -o StrictHostKeyChecking=no -o LogLevel=error $SSH_HOST "rm -r -f thingweb-playground; git clone https://github.com/eclipse-thingweb/playground.git; cd playground; lerna bootstrap; cd ./packages/web; rm -r -f /var/www/html/playground/*; cp -L -r ./* /var/www/html/playground; echo cleaned and copy to webdir; echo CD DONE"
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 172dc53d1..590160535 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -28,7 +28,7 @@ Thus, before your contribution can be accepted by the project team, contributors
 -   Sign-off every commit using the same email address used for your Eclipse account
     -   Set the Git user email address with `git config user.email "<your Eclipse account email>"`
     -   Add the `-s` flag when you make the commit(s), e.g. `git commit -s -m "feat: add support for magic"`
--   Open a [Pull Request](https://github.com/eclipse/thingweb.td-playground/pulls)
+-   Open a [Pull Request](https://github.com/eclipse-thingweb/playground/pulls)
 
 For more information, please see the Eclipse Committer Handbook:
 https://www.eclipse.org/projects/handbook/#resources-commit
diff --git a/README.md b/README.md
index faee9f94d..92b394777 100644
--- a/README.md
+++ b/README.md
@@ -62,15 +62,15 @@ Examples are included in the [core](./packages/core/examples) and in the [exampl
 
 ## Batch Testing
 
-Please have a look at the `cli` [package](https://github.com/eclipse/thingweb.td-playground/tree/master/packages/cli#batch-testing) for batch testing of Thing Descriptions.
+Please have a look at the `cli` [package](https://github.com/eclipse-thingweb/playground/tree/master/packages/cli#batch-testing) for batch testing of Thing Descriptions.
 
 ## Script based Assertion Tester
 
-Please have a look at the `cli` [package](https://github.com/eclipse/thingweb.td-playground/tree/master/packages/cli#script-based-assertion-tester--a-parameter) for script based assertion testing, or at the `assertions` package, if you're planning to integrate the assertion testing as a dependency in your own NPM modules.
+Please have a look at the `cli` [package](https://github.com/eclipse-thingweb/playground/tree/master/packages/cli#script-based-assertion-tester--a-parameter) for script based assertion testing, or at the `assertions` package, if you're planning to integrate the assertion testing as a dependency in your own NPM modules.
 
 ## Script based Thing Description Validation
 
-Please have look at the `cli` [package](https://github.com/eclipse/thingweb.td-playground/tree/master/packages/cli#script-based-thing-description-validation) for script based TD validation, or at the `core` package, if you're planning to integrate the TD validation as a dependency in your own NPM modules.
+Please have look at the `cli` [package](https://github.com/eclipse-thingweb/playground/tree/master/packages/cli#script-based-thing-description-validation) for script based TD validation, or at the `core` package, if you're planning to integrate the TD validation as a dependency in your own NPM modules.
 
 ## License
 
diff --git a/package-lock.json b/package-lock.json
index f400117b8..9cf888e20 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,10 +1,10 @@
 {
-    "name": "thingweb.td-playground",
+    "name": "thingweb.playground",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
-            "name": "thingweb.td-playground",
+            "name": "thingweb.playground",
             "hasInstallScript": true,
             "license": "EPL-2.0 OR W3C-20150513",
             "devDependencies": {
diff --git a/package.json b/package.json
index 91252aa82..d533fd9bb 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,12 @@
 {
-    "name": "thingweb.td-playground",
+    "name": "thingweb.playground",
     "description": "W3C Web of Things (WoT) Thing Description tooling (root project, not published)",
     "private": true,
     "author": "Eclipse Thingweb <thingweb-dev@eclipse.org> (https://thingweb.io/)",
     "license": "EPL-2.0 OR W3C-20150513",
     "repository": {
         "type": "git",
-        "url": "https://github.com/eclipse/thingweb.td-playground.git"
+        "url": "https://github.com/eclipse-thingweb/playground.git"
     },
     "devDependencies": {
         "@microsoft/eslint-formatter-sarif": "^2.1.7",
diff --git a/packages/assertions/README.md b/packages/assertions/README.md
index 188fddd9e..6be81b327 100644
--- a/packages/assertions/README.md
+++ b/packages/assertions/README.md
@@ -1,7 +1,7 @@
 # @thing-description-playground/**ASSERTIONS**
 
 This package provides the assertion testing functionality for the Web of Things Playground.
-You can find more information about the Thingweb-Playground [here](https://github.com/eclipse/thingweb.td-playground).
+You can find more information about the Thingweb-Playground [here](https://github.com/eclipse-thingweb/playground).
 
 Validation tool for W3C WoT Thing Descriptions. Your Thing Descriptions should be written according to the W3C standard found [here](https://w3c.github.io/wot-thing-description/#).
 
@@ -125,20 +125,20 @@ You can contribute by providing new JSON Schemas for assertions or by correcting
 Some assertions cannot be verified just by a schema, even when the complex schemas are used.
 Examples are checking that all multi language definitions like titles and descriptions contain the same language tags.
 
-When a new one is added, it is advised to add it to the [shared.js](https://github.com/eclipse/thingweb.td-playground/blob/master/packages/core/shared.js) since such checks can be used by the core package as well.
+When a new one is added, it is advised to add it to the [shared.js](https://github.com/eclipse-thingweb/playground/blob/master/packages/core/shared.js) since such checks can be used by the core package as well.
 
 After adding the function, you should do the following:
 
 1. Add it to the exports of `shared.js`
 2. Add it to the exports of `index.js` of the core package
 3. Add its name to the details object in `index.js` and its description to the detailComments of the `index.js`
-4. In the assertions package, adding it to the imports at the [assertionTests.js](https://github.com/eclipse/thingweb.td-playground/blob/master/packages/assertions/assertionTests.js)
+4. In the assertions package, adding it to the imports at the [assertionTests.js](https://github.com/eclipse-thingweb/playground/blob/master/packages/assertions/assertionTests.js)
 5. In the same file, calling it whenever needed. The other ones are done at around line 80.
 6. Adding it to the expected results of the tests (refResults) at the core package.
 
 ## Known Bugs
 
--   td-json-open assertion exists multiple times, [see issue 124](https://github.com/eclipse/thingweb.td-playground/issues/124)
+-   td-json-open assertion exists multiple times, [see issue 124](https://github.com/eclipse-thingweb/playground/issues/124)
 
-[web]: https://github.com/eclipse/thingweb.td-playground/tree/master/packages/web
-[cli]: https://github.com/eclipse/thingweb.td-playground/tree/master/packages/cli
+[web]: https://github.com/eclipse-thingweb/playground/tree/master/packages/web
+[cli]: https://github.com/eclipse-thingweb/playground/tree/master/packages/cli
diff --git a/packages/assertions/package.json b/packages/assertions/package.json
index 162a76a6c..71c49e2ae 100644
--- a/packages/assertions/package.json
+++ b/packages/assertions/package.json
@@ -4,13 +4,13 @@
     "license": "EPL-2.0 OR W3C-20150513",
     "version": "1.5.0",
     "description": "Provides the assertion testing functionality for the Web of Things - Thing Description Playground.",
-    "homepage": "https://github.com/eclipse/thingweb.td-playground#readme",
+    "homepage": "https://github.com/eclipse-thingweb/playground#readme",
     "bugs": {
-        "url": "https://github.com/eclipse/thingweb.td-playground/issues"
+        "url": "https://github.com/eclipse-thingweb/playground/issues"
     },
     "repository": {
         "type": "git",
-        "url": "https://github.com/eclipse/thingweb.td-playground.git",
+        "url": "https://github.com/eclipse-thingweb/playground.git",
         "directory": "packages/assertions"
     },
     "main": "index.js",
diff --git a/packages/cli/README.md b/packages/cli/README.md
index 2d3c74e72..2e955ae38 100644
--- a/packages/cli/README.md
+++ b/packages/cli/README.md
@@ -1,7 +1,7 @@
 # @thing-description-playground/**CLI**
 
 This package provides a Command Line Interface (CLI) for the Web of Things Playground.
-You can find more information about the Thingweb-Playground [here](https://github.com/eclipse/thingweb.td-playground).
+You can find more information about the Thingweb-Playground [here](https://github.com/eclipse-thingweb/playground).
 
 You can validate whether one, or several given TDs are valid.
 Furthermore you can generate an assertion test report (`-a`) to see which assertions are implemented in your TD.
@@ -100,7 +100,7 @@ The core validation report is an object, which contains three objects (as you ca
 
 ## Known Bugs
 
--   td-json-open assertion exists multiple times, [see issue 124](https://github.com/eclipse/thingweb.td-playground/issues/124)
+-   td-json-open assertion exists multiple times, [see issue 124](https://github.com/eclipse-thingweb/playground/issues/124)
 
 ## Parameters
 
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 60482ca54..f5be98b2e 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -4,9 +4,9 @@
     "license": "EPL-2.0 OR W3C-20150513",
     "version": "1.6.0",
     "description": "Provides a Command Line Interface for the Web of Things - Thing Description Playground.",
-    "homepage": "https://github.com/eclipse/thingweb.td-playground#readme",
+    "homepage": "https://github.com/eclipse-thingweb/playground#readme",
     "bugs": {
-        "url": "https://github.com/eclipse/thingweb.td-playground/issues"
+        "url": "https://github.com/eclipse-thingweb/playground/issues"
     },
     "repository": {
         "type": "git",
diff --git a/packages/core/README.md b/packages/core/README.md
index fc2a04580..c70a34ece 100644
--- a/packages/core/README.md
+++ b/packages/core/README.md
@@ -1,7 +1,7 @@
 # @thing-description-playground/**CORE**
 
 This package provides the main functionality of the Web of Things Playground, i.e., validating given Thing Descriptions.
-You can find more information about the Thingweb-Playground [here](https://github.com/eclipse/thingweb.td-playground).
+You can find more information about the Thingweb-Playground [here](https://github.com/eclipse-thingweb/playground).
 
 Limitations:
 
@@ -115,8 +115,8 @@ The core validation report is an object, which contains three objects (as you ca
 -   The `details` object contains the results of the additional checks. The keywords can have the same values as in report.
 -   The `detailComments` explains the meaning of every additional check.
 
-[web]: https://github.com/eclipse/thingweb.td-playground/tree/master/packages/web
-[cli]: https://github.com/eclipse/thingweb.td-playground/tree/master/packages/cli
+[web]: https://github.com/eclipse-thingweb/playground/tree/master/packages/web
+[cli]: https://github.com/eclipse-thingweb/playground/tree/master/packages/cli
 
 ## Test Usage
 
diff --git a/packages/core/package.json b/packages/core/package.json
index e6be2e717..8774eecd1 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -4,14 +4,14 @@
     "license": "EPL-2.0 OR W3C-20150513",
     "version": "1.4.0",
     "description": "Provides the validation functionality for the Web of Things - Thing Description Playground.",
-    "homepage": "https://github.com/eclipse/thingweb.td-playground#readme",
+    "homepage": "https://github.com/eclipse-thingweb/playground#readme",
     "bugs": {
-        "url": "https://github.com/eclipse/thingweb.td-playground/issues"
+        "url": "https://github.com/eclipse-thingweb/playground/issues"
     },
     "main": "index.js",
     "repository": {
         "type": "git",
-        "url": "https://github.com/eclipse/thingweb.td-playground.git",
+        "url": "https://github.com/eclipse-thingweb/playground.git",
         "directory": "packages/core"
     },
     "scripts": {
diff --git a/packages/defaults/README.md b/packages/defaults/README.md
index 26152df3d..af7b3cc6d 100644
--- a/packages/defaults/README.md
+++ b/packages/defaults/README.md
@@ -2,7 +2,7 @@
 
 The package adds/removes defaults according to the Thing Description (TD) specification for every property with a default that is not filled with a value.
 Currently using [this](https://www.w3.org/TR/2020/REC-wot-thing-description-20200409/) version of the TD specification.
-It is part of the Thingweb-Playground, you can find more information about the Thingweb-Playground [here](https://github.com/eclipse/thingweb.td-playground).
+It is part of the Thingweb-Playground, you can find more information about the Thingweb-Playground [here](https://github.com/eclipse-thingweb/playground).
 
 ## License
 
@@ -75,5 +75,5 @@ You can use this package to integrate TD default value adding/removing in your a
     #20 | }
     ```
 
-[web]: https://github.com/eclipse/thingweb.td-playground/tree/master/packages/web
-[cli]: https://github.com/eclipse/thingweb.td-playground/tree/master/packages/cli
+[web]: https://github.com/eclipse-thingweb/playground/tree/master/packages/web
+[cli]: https://github.com/eclipse-thingweb/playground/tree/master/packages/cli
diff --git a/packages/defaults/package.json b/packages/defaults/package.json
index 23075facb..2baa3dd8a 100644
--- a/packages/defaults/package.json
+++ b/packages/defaults/package.json
@@ -4,14 +4,14 @@
     "license": "EPL-2.0 OR W3C-20150513",
     "version": "1.4.0",
     "description": "Adds/removes defaults for Thing Descriptions in the Web of Things - Thing Description Playground.",
-    "homepage": "https://github.com/eclipse/thingweb.td-playground#readme",
+    "homepage": "https://github.com/eclipse-thingweb/playground#readme",
     "bugs": {
-        "url": "https://github.com/eclipse/thingweb.td-playground/issues"
+        "url": "https://github.com/eclipse-thingweb/playground/issues"
     },
     "main": "index.js",
     "repository": {
         "type": "git",
-        "url": "https://github.com/eclipse/thingweb.td-playground.git",
+        "url": "https://github.com/eclipse-thingweb/playground.git",
         "directory": "packages/defaults"
     },
     "scripts": {
diff --git a/packages/json-spell-checker/README.md b/packages/json-spell-checker/README.md
index b7b0a5ead..096b8e993 100644
--- a/packages/json-spell-checker/README.md
+++ b/packages/json-spell-checker/README.md
@@ -1,7 +1,7 @@
 # @thing-description-playground/**JSON-SPELL-CHECKER**
 
 This package provides spell-checking support for JSON files when a JSON Schema is given.
-You can find more information about the Thingweb-Playground [here](https://github.com/eclipse/thingweb.td-playground).
+You can find more information about the Thingweb-Playground [here](https://github.com/eclipse-thingweb/playground).
 
 Limitations:
 
diff --git a/packages/json-spell-checker/package.json b/packages/json-spell-checker/package.json
index e2ab86a63..a62af25bb 100644
--- a/packages/json-spell-checker/package.json
+++ b/packages/json-spell-checker/package.json
@@ -4,14 +4,14 @@
     "license": "EPL-2.0 OR W3C-20150513",
     "version": "1.0.1",
     "description": "Checks the spelling of a JSON file depending on the JSON schema",
-    "homepage": "https://github.com/eclipse/thingweb.td-playground#readme",
+    "homepage": "https://github.com/eclipse-thingweb/playground#readme",
     "bugs": {
-        "url": "https://github.com/eclipse/thingweb.td-playground/issues"
+        "url": "https://github.com/eclipse-thingweb/playground/issues"
     },
     "main": "index.js",
     "repository": {
         "type": "git",
-        "url": "https://github.com/eclipse/thingweb.td-playground.git",
+        "url": "https://github.com/eclipse-thingweb/playground.git",
         "directory": "packages/json-spell-checker"
     },
     "scripts": {
diff --git a/packages/td_to_asyncapi/README.md b/packages/td_to_asyncapi/README.md
index 1fa201ebf..383b55fab 100644
--- a/packages/td_to_asyncapi/README.md
+++ b/packages/td_to_asyncapi/README.md
@@ -66,5 +66,5 @@ You can use this package to integrate AsyncAPI instance generation from a TD in
 
 Licensed under the MIT license, see [License](../../LICENSE.md).
 
-[web]: https://github.com/eclipse/thingweb.td-playground/tree/master/packages/web
-[cli]: https://github.com/eclipse/thingweb.td-playground/tree/master/packages/cli
+[web]: https://github.com/eclipse-thingweb/playground/tree/master/packages/web
+[cli]: https://github.com/eclipse-thingweb/playground/tree/master/packages/cli
diff --git a/packages/td_to_asyncapi/package.json b/packages/td_to_asyncapi/package.json
index 775c3dc14..35a71a667 100644
--- a/packages/td_to_asyncapi/package.json
+++ b/packages/td_to_asyncapi/package.json
@@ -4,14 +4,14 @@
     "license": "EPL-2.0 OR W3C-20150513",
     "version": "1.1.1",
     "description": "Provides AsyncAPI instance generation for Thing Descriptions in the Web of Things - Thing Description Playground.",
-    "homepage": "https://github.com/eclipse/thingweb.td-playground#readme",
+    "homepage": "https://github.com/eclipse-thingweb/playground#readme",
     "bugs": {
-        "url": "https://github.com/eclipse/thingweb.td-playground/issues"
+        "url": "https://github.com/eclipse-thingweb/playground/issues"
     },
     "main": "index.js",
     "repository": {
         "type": "git",
-        "url": "https://github.com/eclipse/thingweb.td-playground.git",
+        "url": "https://github.com/eclipse-thingweb/playground.git",
         "directory": "packages/td_to_asyncapi"
     },
     "scripts": {
diff --git a/packages/td_to_openAPI/README.md b/packages/td_to_openAPI/README.md
index 898cb55d0..9558d38d0 100644
--- a/packages/td_to_openAPI/README.md
+++ b/packages/td_to_openAPI/README.md
@@ -60,5 +60,5 @@ You can use this package to integrate OpenAPI instance generation from a TD in y
 
 Licensed under the MIT license, see [License](../../LICENSE.md).
 
-[web]: https://github.com/eclipse/thingweb.td-playground/tree/master/packages/web
-[cli]: https://github.com/eclipse/thingweb.td-playground/tree/master/packages/cli
+[web]: https://github.com/eclipse-thingweb/playground/tree/master/packages/web
+[cli]: https://github.com/eclipse-thingweb/playground/tree/master/packages/cli
diff --git a/packages/td_to_openAPI/package.json b/packages/td_to_openAPI/package.json
index 1f8f005f9..c4f6f3ae7 100644
--- a/packages/td_to_openAPI/package.json
+++ b/packages/td_to_openAPI/package.json
@@ -4,14 +4,14 @@
     "license": "EPL-2.0 OR W3C-20150513",
     "version": "1.3.1",
     "description": "Provides openAPI instance generation for Thing Descriptions in the Web of Things - Thing Description Playground.",
-    "homepage": "https://github.com/eclipse/thingweb.td-playground#readme",
+    "homepage": "https://github.com/eclipse-thingweb/playground#readme",
     "bugs": {
-        "url": "https://github.com/eclipse/thingweb.td-playground/issues"
+        "url": "https://github.com/eclipse-thingweb/playground/issues"
     },
     "main": "index.js",
     "repository": {
         "type": "git",
-        "url": "https://github.com/eclipse/thingweb.td-playground.git",
+        "url": "https://github.com/eclipse-thingweb/playground.git",
         "directory": "packages/td_to_openAPI"
     },
     "scripts": {
diff --git a/packages/web/README.md b/packages/web/README.md
index 23e8c1e38..bd2d9ed2c 100644
--- a/packages/web/README.md
+++ b/packages/web/README.md
@@ -2,7 +2,7 @@
 
 This package provides the web interface of the Web of Things Thing Desciption Playground.
 It uses the functionality of the `core` package to validate Thing Descriptions and `assertions` to generate an assertion Test report.
-You can find more information about the Thingweb-Playground [here](https://github.com/eclipse/thingweb.td-playground).
+You can find more information about the Thingweb-Playground [here](https://github.com/eclipse-thingweb/playground).
 
 The TDs can be exported as URLs which can be copied anywhere and reopened here.
 
diff --git a/packages/web/index.html b/packages/web/index.html
index a148ca6f8..d1d257e30 100644
--- a/packages/web/index.html
+++ b/packages/web/index.html
@@ -16,7 +16,7 @@
 <html lang="en">
     <head>
         <meta charset="utf-8" />
-        <title>Thing Description Playground - Validate your W3C Thing Description</title>
+        <title>Eclipse Thingweb Playground | Validate and play with W3C Thing Descriptions</title>
         <link rel="shortcut icon" type="image/x-icon" href="./media/favlogo.png" />
         <link rel="stylesheet" type="text/css" href="node_modules/bootstrap-css-only/css/bootstrap.min.css" />
         <link rel="stylesheet" type="text/css" href="./style.css" />
@@ -161,12 +161,12 @@ <h3>Thing Description Playground</h3>
 
                 <div class="col-4 navcol">
                     <nav class="navbar navbar-dark bg-info">
-                        <a class="navbar-brand btn" href="https://github.com/eclipse/thingweb.td-playground/issues/new"
+                        <a class="navbar-brand btn" href="https://github.com/eclipse-thingweb/playground/issues/new"
                             >Create Issue</a
                         >
                         <a
                             class="navbar-brand btn"
-                            href="https://github.com/eclipse/thingweb.td-playground/tree/master/packages/cli"
+                            href="https://github.com/eclipse-thingweb/playground/tree/master/packages/cli"
                             >Playground CLI</a
                         >
                     </nav>
diff --git a/packages/web/package.json b/packages/web/package.json
index 3b28652ed..bc23c3916 100644
--- a/packages/web/package.json
+++ b/packages/web/package.json
@@ -4,14 +4,14 @@
     "license": "EPL-2.0 OR W3C-20150513",
     "version": "1.6.0",
     "description": "Provides a browser GUI for the Web of Things - Thing Description Playground.",
-    "homepage": "https://github.com/eclipse/thingweb.td-playground#readme",
+    "homepage": "https://github.com/eclipse-thingweb/playground#readme",
     "bugs": {
-        "url": "https://github.com/eclipse/thingweb.td-playground/issues"
+        "url": "https://github.com/eclipse-thingweb/playground/issues"
     },
     "main": "index.js",
     "repository": {
         "type": "git",
-        "url": "https://github.com/eclipse/thingweb.td-playground.git",
+        "url": "https://github.com/eclipse-thingweb/playground.git",
         "directory": "packages/web"
     },
     "scripts": {