diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5b267b8cf..c5ce64f45 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -61,7 +61,7 @@ In this section we are going to start a new workspace to work on che-theia. The
 The devfile could be started using `chectl`:
 
 ```
-chectl workspace:start -f https://raw.githubusercontent.com/eclipse/che-theia/master/devfiles/che-theia-all.devfile.yaml
+chectl workspace:start -f https://raw.githubusercontent.com/eclipse-che/che-theia/master/devfiles/che-theia-all.devfile.yaml
 ```
 At workspace start, Che will clone Theia and Che-theia.
 
@@ -123,7 +123,7 @@ $ node /projects/theia/production/src-gen/backend/main.js /tmp/theiadev_projects
 ```
 
 You can then access to your modified Che-theia from the Container view `theia-dev` endpoint
-![Che-Theia-dev-endpoint](https://raw.githubusercontent.com/eclipse/che-theia/assets/theia-dev-endpoint.png)
+![Che-Theia-dev-endpoint](https://raw.githubusercontent.com/eclipse-che/che-theia/assets/theia-dev-endpoint.png)
 
 ### Step 7bis: Run che-theia + plugin in dev mode
 In this section we show how to run the che-theia assembly but in `dev mode`: keeping all the information for debugging.
@@ -134,7 +134,7 @@ You can use the che command `run ... DEV yarn start ... che-theia + workspace-pl
 To start che-theia in `dev-mode` with yarn (not using the production che-theia generated). It would keep things like the ability to source map.
 
 Running dev theia would be located in the che-dev container and `theia-dev-flow` endpoint:
-![Che-Theia-dev-endpoint](https://raw.githubusercontent.com/eclipse/che-theia/assets/theia-dev-flow-endpoint.png)
+![Che-Theia-dev-endpoint](https://raw.githubusercontent.com/eclipse-che/che-theia/assets/theia-dev-flow-endpoint.png)
 
 ### Just want to build the plugin and run with the existing Theia image
 If you do not have any changes on Theia or Che-theia extension, you could just build the plugins with `build ... containers-plugin` or `build ... workspace-plugin`
@@ -153,7 +153,7 @@ In comparing with `/projects`, temporary directory is not persisted and is clear
 
 Use the badge to create a workspace using factory
 
-[![Try it on che.openshift.io](https://img.shields.io/static/v1?label=che&message=openshift.io&color=orange)](https://che.openshift.io/f?url=https://raw.githubusercontent.com/eclipse/che-theia/master/devfiles/hosted-che-dogfooding.devfile.yaml)
+[![Try it on che.openshift.io](https://img.shields.io/static/v1?label=che&message=openshift.io&color=orange)](https://che.openshift.io/f?url=https://raw.githubusercontent.com/eclipse-che/che-theia/master/devfiles/hosted-che-dogfooding.devfile.yaml)
 
 ### Step 1: Initialize Che-Theia in `/tmp/theia` directory
 
diff --git a/README.md b/README.md
index 39925a5f1..2ebd76fd7 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 <br/>
 <div id="che-theia-logo" align="center" style="vertical-align: middle">
 
-<img src="https://raw.githubusercontent.com/eclipse/che-theia/master/extensions/eclipse-che-theia-about/src/browser/style/che-logo-light.svg?sanitize=true" alt="Che Logo" width="200" height="60" />
+<img src="https://raw.githubusercontent.com/eclipse-che/che-theia/master/extensions/eclipse-che-theia-about/src/browser/style/che-logo-light.svg?sanitize=true" alt="Che Logo" width="200" height="60" />
 
 <img src="https://raw.githubusercontent.com/eclipse-theia/theia/master/logo/theia-logo.svg?sanitize=true" alt="Theia Logo" width="150" height="60"/>
 
@@ -13,7 +13,7 @@
 <div id="badges" align="center">
 
   [![Build Status](https://github.com/eclipse-che/che-theia/workflows/Build%20&%20Publish%20%60next%60/badge.svg)](https://github.com/eclipse-che/che-theia/actions?query=workflow%3A%22Build+%26+Publish+%60next%60%22)
-  [![Test Coverage](https://img.shields.io/codecov/c/github/eclipse/che-theia)](https://codecov.io/gh/eclipse/che-theia)
+  [![Test Coverage](https://img.shields.io/codecov/c/github/eclipse-che/che-theia)](https://codecov.io/gh/eclipse-che/che-theia)
   [![mattermost](https://img.shields.io/badge/chat-on%20mattermost-blue.svg)](https://mattermost.eclipse.org/eclipse/channels/eclipse-che)
   [![Open questions](https://img.shields.io/badge/Open-questions-blue.svg?style=flat-curved)](https://github.com/eclipse/che/issues?utf8=%E2%9C%93&q=is%3Aopen+label%3Aarea%2Feditor%2Fche-theia+label%3Akind%2Fquestion+)
   [![Open bugs](https://img.shields.io/badge/Open-bugs-red.svg?style=flat-curved)](https://github.com/eclipse/che/issues?utf8=%E2%9C%93&q=is%3Aopen+label%3Aarea%2Feditor%2Fche-theia+label%3Akind%2Fbug+)
@@ -22,7 +22,7 @@
 
 <div style='margin:0 auto;width:80%;'>
 
-![Che-Theia](https://raw.githubusercontent.com/eclipse/che-theia/master/che-theia-screenshot.png)
+![Che-Theia](https://raw.githubusercontent.com/eclipse-che/che-theia/master/che-theia-screenshot.png)
 
 </div>
 
diff --git a/generator/src/init-sources.ts b/generator/src/init-sources.ts
index 8c36de828..9eaae9264 100644
--- a/generator/src/init-sources.ts
+++ b/generator/src/init-sources.ts
@@ -32,7 +32,7 @@ export class InitSources {
     public static readonly PREFIX_PACKAGES_EXTENSIONS = '@che-';
 
     public static readonly DEFAULT_EXTENSIONS_URI =
-        'https://raw.githubusercontent.com/eclipse/che-theia/master/che-theia-init-sources.yml';
+        'https://raw.githubusercontent.com/eclipse-che/che-theia/master/che-theia-init-sources.yml';
     static argBuilder = (theYargs: yargs.Argv) =>
         theYargs
             .option('config', {