diff --git a/README.md b/README.md
index 77999c08..cb67837d 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # Eclipse Xtext Website
 
-This repository contains the websites [xtext.org](https://xtext.org) and [xtend-lang.org](https://xtend-lang.org). For general information about Xtext, see the [main repository](https://github.com/eclipse/xtext).
+This repository contains the websites [xtext.org](https://eclipse.dev/Xtext) and [xtend-lang.org](https://eclipse.dev/Xtext/xtend). For general information about Xtext, see the [main repository](https://github.com/eclipse/xtext).
 
 The [published](https://github.com/eclipse/xtext-website/tree/published) branch corresponds to what is published on the actual websites. Fixes that should be made visible immediately must be committed there. The [main](https://github.com/eclipse/xtext-website/tree/main) branch is used to write documentation and release notes for the next major or minor release of Xtext.
diff --git a/xtend-website/_includes/header.html b/xtend-website/_includes/header.html
index c7aada16..52e93711 100644
--- a/xtend-website/_includes/header.html
+++ b/xtend-website/_includes/header.html
@@ -12,11 +12,11 @@
             <li ><a href="{{ site.baseurl }}/download.html">Download</a></li>
             <li ><a href="{{ site.baseurl }}/documentation/index.html">Documentation</a></li>
             <li ><a href="{{ site.baseurl }}/community.html">Community</a></li>
-            <li ><a href="https://xtext.org">Xtext</a></li>
+            <li ><a href="https://eclipse.dev/Xtext">Xtext</a></li>
             <li ><a href="https://www.eclipse.org">Eclipse.org</a></li>
           </ul>
               <!--div class="btn-group pull-right">
-                <div class="g-plusone" data-href="https://www.xtend-lang.org"></div>
+                <div class="g-plusone" data-href="https://eclipse.dev/Xtext/xtend"></div>
               </div-->
         </div>
         <!--/.nav-collapse -->
diff --git a/xtend-website/_layouts/documentation.html b/xtend-website/_layouts/documentation.html
index 0f29e6f7..f10700c8 100644
--- a/xtend-website/_layouts/documentation.html
+++ b/xtend-website/_layouts/documentation.html
@@ -5,7 +5,7 @@
   <script>
     function startSearch(event) {
         if (event.keyCode == 13) {
-            var q = 'site:eclipse.org/xtend/documentation+' + event.target.value;
+            var q = 'site:eclipse.dev/Xtext/xtend/documentation+' + event.target.value;
             window.open('https://www.google.com/search?q=' + q, "_self");
         }
     }
diff --git a/xtend-website/_posts/releasenotes/2017-01-24-version-2-11-0.md b/xtend-website/_posts/releasenotes/2017-01-24-version-2-11-0.md
index bf170345..9bfdf015 100644
--- a/xtend-website/_posts/releasenotes/2017-01-24-version-2-11-0.md
+++ b/xtend-website/_posts/releasenotes/2017-01-24-version-2-11-0.md
@@ -9,7 +9,7 @@ Xtend version 2.11 comes with a new source repository and plenty of improvements
 
 ## New Source Repository
 
-The Xtend code base has been moved to a dedicated repository [xtext-xtend](https://github.com/eclipse/xtext-xtend) in the course of the restructuring of Xtext (see the [Xtext 2.11.0 Release Notes](https://www.eclipse.org/Xtext/releasenotes.html)).
+The Xtend code base has been moved to a dedicated repository [xtext-xtend](https://github.com/eclipse/xtext-xtend) in the course of the restructuring of Xtext (see the [Xtext 2.11.0 Release Notes](https://www.eclipse.dev/Xtext/releasenotes.html)).
 
 ## The Xtend Language and Library
 
diff --git a/xtend-website/_posts/releasenotes/2019-03-05-version-2-17-0.md b/xtend-website/_posts/releasenotes/2019-03-05-version-2-17-0.md
index aea0be55..c85b79c6 100644
--- a/xtend-website/_posts/releasenotes/2019-03-05-version-2-17-0.md
+++ b/xtend-website/_posts/releasenotes/2019-03-05-version-2-17-0.md
@@ -19,7 +19,7 @@ Xtend is now fully compliant with Java 11. Java 11 can be chosen as runtime VM a
 
 One major pain point with past releases was that the xtend-maven-plugin used ranged dependencies. This lead sometimes to [problems with the plugin execution](https://github.com/eclipse/xtext/issues/1231), which had to be worked around by clients by explicit dependency management.
 
-Solving this problem was one of the main motivations behind the [introduction of the new Maven BOM](https://www.eclipse.org/Xtext/releasenotes.html#/releasenotes/2019/03/05/version-2-17-0). With this BOM all external dependencies of Xtext and its Maven plugins are managed in compatible versions without room for interpretation of dependency version ranges.
+Solving this problem was one of the main motivations behind the [introduction of the new Maven BOM](https://www.eclipse.dev/Xtext/releasenotes.html#/releasenotes/2019/03/05/version-2-17-0). With this BOM all external dependencies of Xtext and its Maven plugins are managed in compatible versions without room for interpretation of dependency version ranges.
 
 ### Upgrade to Maven 3 API
 
diff --git a/xtend-website/_posts/releasenotes/2020-06-02-version-2-22-0.md b/xtend-website/_posts/releasenotes/2020-06-02-version-2-22-0.md
index 2275981e..897bef0a 100644
--- a/xtend-website/_posts/releasenotes/2020-06-02-version-2-22-0.md
+++ b/xtend-website/_posts/releasenotes/2020-06-02-version-2-22-0.md
@@ -14,7 +14,7 @@ As you might have recognized, the number of people contributing to Xtext & Xtend
 
 ## Documentation
 
-The [Xtend community website](https://www.eclipse.org/xtend/community.html) has been updated to list the recently published videos, presentations and blog posts around Xtend. The list is not yet complete, so feel free to contact us if you are also interested in listing your articles there.
+The [Xtend community website](https://www.eclipse.dev/Xtext/xtend/community.html) has been updated to list the recently published videos, presentations and blog posts around Xtend. The list is not yet complete, so feel free to contact us if you are also interested in listing your articles there.
 
 ## Eclipse Integration
 
diff --git a/xtend-website/index.html b/xtend-website/index.html
index caf814f0..474edd32 100644
--- a/xtend-website/index.html
+++ b/xtend-website/index.html
@@ -27,7 +27,7 @@ <h2 class="front-title">
 				<script type="text/javascript">
 				var base = "media/xtend_intro_";
 				if (location.hostname === "localhost" || location.hostname === "127.0.0.1") {
-					base = location.protocol+"//eclipse.org/xtend/media/xtend_intro_";
+					base = location.protocol+"//eclipse.dev/Xtext/xtend/media/xtend_intro_";
 				}
 				var videoList = new Array(base+"720p.mp4",base+"360p.mp4",base+"270p.mp4");
 				var video = document.getElementById('video');
diff --git a/xtext-website/_includes/header.html b/xtext-website/_includes/header.html
index 2cc53eb0..f259e2b0 100644
--- a/xtext-website/_includes/header.html
+++ b/xtext-website/_includes/header.html
@@ -21,7 +21,7 @@
                 <li><a href="https://www.typefox.io/language-engineering/" target="_blank">TypeFox</a></li>
               </ul>
             </li>
-            <li ><a href="https://xtend-lang.org">Xtend</a></li>
+            <li ><a href="https://eclipse.dev/Xtext/xtend">Xtend</a></li>
           </ul>
           <!--div class="nav pull-right">
             <li ><a><iframe src="https://ghbtns.com/github-btn.html?user=eclipse&repo=xtext&type=star&count=true" frameborder="0" scrolling="0" width="170px" height="20px"></iframe></a></li>
diff --git a/xtext-website/_includes/ribbon.html b/xtext-website/_includes/ribbon.html
index 9aa770b3..355b203f 100644
--- a/xtext-website/_includes/ribbon.html
+++ b/xtext-website/_includes/ribbon.html
@@ -1,3 +1,3 @@
 <div class="ribbon-wrapper-red">
-    <div class="ribbon-red"><a href="https://www.eclipse.org/Xtext/news.html">Web and IntelliJ IDEA soon!</a></div>
+    <div class="ribbon-red"><a href="https://www.eclipse.dev/Xtext/news.html">Web and IntelliJ IDEA soon!</a></div>
 </div>
diff --git a/xtext-website/_layouts/documentation.html b/xtext-website/_layouts/documentation.html
index f1cba0ee..01249cd5 100644
--- a/xtext-website/_layouts/documentation.html
+++ b/xtext-website/_layouts/documentation.html
@@ -5,7 +5,7 @@
   <script>
     function startSearch(event) {
         if (event.keyCode == 13) {
-            var q = 'site:eclipse.org/Xtext/documentation+' + event.target.value;
+            var q = 'site:eclipse.dev/Xtext/documentation+' + event.target.value;
             window.open('https://www.google.com/search?q=' + q, "_self");
         }
     }
diff --git a/xtext-website/_posts/releasenotes/2015-11-16-version-2-9-0.md b/xtext-website/_posts/releasenotes/2015-11-16-version-2-9-0.md
index 52f7bdb3..a1fc2fdf 100644
--- a/xtext-website/_posts/releasenotes/2015-11-16-version-2-9-0.md
+++ b/xtext-website/_posts/releasenotes/2015-11-16-version-2-9-0.md
@@ -19,7 +19,7 @@ Check out [this tutorial](https://blogs.itemis.com/xtext/get-started-with-xtext-
 ## Run your Xtext Smart Editor in the Web
 
 With Xtext you can now also have rich text editors for you language in the Web.
-With Version 2.9.0 we already support three different javascript editor frameworks. For more details read the corresponding [section in the documentation](https://www.eclipse.org/Xtext/documentation/310_web_integration.html).
+With Version 2.9.0 we already support three different javascript editor frameworks. For more details read the corresponding [section in the documentation](https://www.eclipse.dev/Xtext/documentation/310_web_integration.html).
 
 ## New Xtext Project Wizard
 
diff --git a/xtext-website/_posts/releasenotes/2017-01-24-version-2-11-0.md b/xtext-website/_posts/releasenotes/2017-01-24-version-2-11-0.md
index be602c72..cd261d6c 100644
--- a/xtext-website/_posts/releasenotes/2017-01-24-version-2-11-0.md
+++ b/xtext-website/_posts/releasenotes/2017-01-24-version-2-11-0.md
@@ -12,13 +12,13 @@ Version 2.11.0 is the first release of Xtext after its big internal restructurin
 Xtext and Xtend used to be one big Git repository containing all sources for Eclipse, IDEA, Web integration etc. As of 2.11, we split that into multiple smaller repository, such that you can choose yourself which ones you need. These are
 
 - [xtext-core](https://github.com/eclipse/xtext-core): The core framework, [Language Server](https://github.com/Microsoft/vscode-languageserver-protocol) support
-- [xtext-lib](https://github.com/eclipse/xtext-lib): Libraries for [Xbase]({{site.baseurl}}/documentation/305_xbase.html) and [Xtend](https://www.xtend-lang.org)
+- [xtext-lib](https://github.com/eclipse/xtext-lib): Libraries for [Xbase]({{site.baseurl}}/documentation/305_xbase.html) and [Xtend](https://eclipse.dev/Xtext/xtend)
 - [xtext-extras](https://github.com/eclipse/xtext-extras): Additional editor-independent features, mostly Java support
 - [xtext-eclipse](https://github.com/eclipse/xtext-eclipse): Plug-ins for [Eclipse](https://eclipse.org)
 - [xtext-idea](https://github.com/eclipse/xtext-idea): Plug-ins for [IntelliJ IDEA](https://www.jetbrains.com/idea/)
 - [xtext-web](https://github.com/eclipse/xtext-web): Support for [Orion](https://eclipse.org/orion/), [Ace](https://ace.c9.io) and [CodeMirror](https://codemirror.net)
 - [xtext-maven](https://github.com/eclipse/xtext-maven): Support for [Maven](https://maven.apache.org)
-- [xtext-xtend](https://github.com/eclipse/xtext-xtend): The [Xtend](https://www.xtend-lang.org) language
+- [xtext-xtend](https://github.com/eclipse/xtext-xtend): The [Xtend](https://eclipse.dev/Xtext/xtend) language
 - [xtext-umbrella](https://github.com/eclipse/xtext-umbrella): Common Eclipse features and P2 update sites
 
 In addition to that, we use Gradle now to build all non-Eclipse artifacts and Maven/Tycho for the Eclipse plug-ins. We have also set up a very sophisticated staged Jenkins build that allows to build from individual branches as well.
diff --git a/xtext-website/_posts/releasenotes/2017-05-26-version-2-12-0.md b/xtext-website/_posts/releasenotes/2017-05-26-version-2-12-0.md
index 0225f5dc..7ed2bfcc 100644
--- a/xtext-website/_posts/releasenotes/2017-05-26-version-2-12-0.md
+++ b/xtext-website/_posts/releasenotes/2017-05-26-version-2-12-0.md
@@ -9,7 +9,7 @@ Xtext 2.12.0 brings several bug fixes and a new API for tracing generated code.
 
 ## New Tracing API for Generators
 
-The new API in the `org.eclipse.xtext.generator.trace` package allows to generate text files along with trace files. These trace files can be used by generic UI such as the "Open Generated File" action as well as domain-specific features such as debugging. It's very easy to add such tracing information to a code generator, e.g. with [Xtend templates](https://www.eclipse.org/xtend/documentation/203_xtend_expressions.html#templates):
+The new API in the `org.eclipse.xtext.generator.trace` package allows to generate text files along with trace files. These trace files can be used by generic UI such as the "Open Generated File" action as well as domain-specific features such as debugging. It's very easy to add such tracing information to a code generator, e.g. with [Xtend templates](https://www.eclipse.dev/Xtext/xtend/documentation/203_xtend_expressions.html#templates):
 
 ```xtend
 class MyDslGenerator extends AbstractGenerator {
@@ -49,7 +49,7 @@ class MyDslGenerator extends AbstractGenerator {
 }
 ```
 
-Here `_name` and `_type` are [extension methods](https://www.eclipse.org/xtend/documentation/202_xtend_classes_members.html#extension-methods) that are generated for the metamodel of the specific language. They generate text and trace it to the respective part of the DSL source. You can find the [full example project on GitHub](https://github.com/TypeFox/tracing_codegen).
+Here `_name` and `_type` are [extension methods](https://www.eclipse.dev/Xtext/xtend/documentation/202_xtend_classes_members.html#extension-methods) that are generated for the metamodel of the specific language. They generate text and trace it to the respective part of the DSL source. You can find the [full example project on GitHub](https://github.com/TypeFox/tracing_codegen).
 
 ## Bug Lists
 
diff --git a/xtext-website/_posts/releasenotes/2019-06-04-version-2-18-0.md b/xtext-website/_posts/releasenotes/2019-06-04-version-2-18-0.md
index 980cb151..2c3007a0 100644
--- a/xtext-website/_posts/releasenotes/2019-06-04-version-2-18-0.md
+++ b/xtext-website/_posts/releasenotes/2019-06-04-version-2-18-0.md
@@ -91,7 +91,7 @@ With [Bug#544852](https://bugs.eclipse.org/bugs/show_bug.cgi?id=544852) a theore
 
 ## New Features in Xtend
 
-Xtend has learned try-with-resources and the ternary operator. See the [Xtend Releasenotes](https://www.eclipse.org/xtend/releasenotes.html#/releasenotes/2019/06/04/version-2-18-0) for details.
+Xtend has learned try-with-resources and the ternary operator. See the [Xtend Releasenotes](https://www.eclipse.dev/Xtext/xtend/releasenotes.html#/releasenotes/2019/06/04/version-2-18-0) for details.
 
 ## Credits
 
diff --git a/xtext-website/_posts/releasenotes/2020-03-03-version-2-21-0.md b/xtext-website/_posts/releasenotes/2020-03-03-version-2-21-0.md
index 6b07c1aa..366306be 100644
--- a/xtext-website/_posts/releasenotes/2020-03-03-version-2-21-0.md
+++ b/xtext-website/_posts/releasenotes/2020-03-03-version-2-21-0.md
@@ -14,7 +14,7 @@ In compliance with general requirements by the Eclipse Foundation the license fo
 
 ## Documentation
 
-The [Xtext community website](https://www.eclipse.org/Xtext/community.html) has been updated to list all the cool projects people are building around Xtext/Xtend.
+The [Xtext community website](https://www.eclipse.dev/Xtext/community.html) has been updated to list all the cool projects people are building around Xtext/Xtend.
 The list is not yet complete, so feel free to contact us if you are also interested in listing your project there.
 
 The documentation about the [release process](https://github.com/eclipse/xtext/blob/master/dev-doc/MaintenanceTasks.md) was improved to enable more people to contribute to this process.
diff --git a/xtext-website/_posts/releasenotes/2020-06-02-version-2-22-0.md b/xtext-website/_posts/releasenotes/2020-06-02-version-2-22-0.md
index c5c33185..59d388d7 100644
--- a/xtext-website/_posts/releasenotes/2020-06-02-version-2-22-0.md
+++ b/xtext-website/_posts/releasenotes/2020-06-02-version-2-22-0.md
@@ -14,7 +14,7 @@ As you might have recognized, the number of people contributing to Xtext on a re
 
 ## Documentation
 
-The [Xtext community website](https://www.eclipse.org/Xtext/community.html) and the [Xtext documentation website](https://www.eclipse.org/Xtext/documentation/index.html) have been updated. New Xtext-based projects have been added, some editor features and the Unit testing / UI testing capabilities have been documented and the embedded code snippets have been updated as well.
+The [Xtext community website](https://www.eclipse.dev/Xtext/community.html) and the [Xtext documentation website](https://www.eclipse.dev/Xtext/documentation/index.html) have been updated. New Xtext-based projects have been added, some editor features and the Unit testing / UI testing capabilities have been documented and the embedded code snippets have been updated as well.
 
 We further enhanced the [Xtext Developer Documentation](https://github.com/eclipse/xtext/tree/master/dev-doc) to enable the community to easily contribute to Xtext.
 
diff --git a/xtext-website/_posts/releasenotes/2021-03-02-version-2-25-0.md b/xtext-website/_posts/releasenotes/2021-03-02-version-2-25-0.md
index a9a2b84d..5b9065c9 100644
--- a/xtext-website/_posts/releasenotes/2021-03-02-version-2-25-0.md
+++ b/xtext-website/_posts/releasenotes/2021-03-02-version-2-25-0.md
@@ -14,7 +14,7 @@ As you might have recognized, the number of people contributing to Xtext on a re
 
 ## Documentation
 
-The [LSP Support](https://www.eclipse.org/Xtext/documentation/340_lsp_support.html) section has been added to the Xtext documentation.
+The [LSP Support](https://www.eclipse.dev/Xtext/documentation/340_lsp_support.html) section has been added to the Xtext documentation.
 
 ## Upgrades
 
diff --git a/xtext-website/documentation/102_domainmodelwalkthrough.md b/xtext-website/documentation/102_domainmodelwalkthrough.md
index 83adf4f0..54ff1342 100644
--- a/xtext-website/documentation/102_domainmodelwalkthrough.md
+++ b/xtext-website/documentation/102_domainmodelwalkthrough.md
@@ -69,7 +69,7 @@ The wizard will automatically open the grammar file *Domainmodel.xtext* in the e
 grammar org.example.domainmodel.Domainmodel with
                                       org.eclipse.xtext.common.Terminals
 
-generate domainmodel "https://www.example.org/domainmodel/Domainmodel"
+generate domainmodel "http://www.example.org/domainmodel/Domainmodel"
 
 Model:
     greetings+=Greeting*;
@@ -84,7 +84,7 @@ Let's now just replace that grammar definition with the one for our entities lan
 grammar org.example.domainmodel.Domainmodel with
                                       org.eclipse.xtext.common.Terminals
 
-generate domainmodel "https://www.example.org/domainmodel/Domainmodel"
+generate domainmodel "http://www.example.org/domainmodel/Domainmodel"
 
 Domainmodel:
     (elements+=Type)*;
@@ -271,7 +271,7 @@ That's all for the grammar. It should now read as
 grammar org.example.domainmodel.Domainmodel with
                                       org.eclipse.xtext.common.Terminals
 
-generate domainmodel "https://www.example.org/domainmodel/Domainmodel"
+generate domainmodel "http://www.example.org/domainmodel/Domainmodel"
 
 Domainmodel:
     (elements+=AbstractElement)*;
diff --git a/xtext-website/documentation/103_domainmodelnextsteps.md b/xtext-website/documentation/103_domainmodelnextsteps.md
index 5569e896..42b68ca1 100644
--- a/xtext-website/documentation/103_domainmodelnextsteps.md
+++ b/xtext-website/documentation/103_domainmodelnextsteps.md
@@ -10,7 +10,7 @@ After you have developed your first own DSL, the question arises how the behavio
 
 ## Writing a Code Generator With Xtend {#tutorial-code-generation}
 
-As soon as you generate the Xtext artifacts from the grammar, a code generator stub is put into the runtime project of your language. Let's dive into [Xtend](https://www.eclipse.org/xtend/) and see how you can integrate your own code generator with Eclipse.
+As soon as you generate the Xtext artifacts from the grammar, a code generator stub is put into the runtime project of your language. Let's dive into [Xtend](https://www.eclipse.dev/Xtext/xtend/) and see how you can integrate your own code generator with Eclipse.
 
 In this lesson you will generate Java Beans for entities that are defined in the domainmodel DSL. For each *Entity*, a Java class is generated and each *Feature* will lead to a private field in that class including public getters and setters. For the sake of simplicity, we will use fully qualified names all over the generated code.
 
@@ -317,7 +317,7 @@ This tutorial is about testing the parser, the linker, the validator and the gen
     }
     ```
     
-    You can further simplify the code by injecting `ParseHelper` and `ValidationTestHelper` as extensions. This feature of Xtend allows to add new methods to a given type without modifying it. You can read more about extension methods in the [Xtend documentation](https://www.eclipse.org/xtend/documentation/202_xtend_classes_members.html#extension-methods). You can rewrite the code as follows:
+    You can further simplify the code by injecting `ParseHelper` and `ValidationTestHelper` as extensions. This feature of Xtend allows to add new methods to a given type without modifying it. You can read more about extension methods in the [Xtend documentation](https://www.eclipse.dev/Xtext/xtend/documentation/202_xtend_classes_members.html#extension-methods). You can rewrite the code as follows:
 
     ```xtend
     @Inject extension ParseHelper<Domainmodel>
diff --git a/xtext-website/documentation/104_jvmdomainmodel.md b/xtext-website/documentation/104_jvmdomainmodel.md
index e6cd992b..09b167c8 100644
--- a/xtext-website/documentation/104_jvmdomainmodel.md
+++ b/xtext-website/documentation/104_jvmdomainmodel.md
@@ -6,7 +6,7 @@ part: Getting Started
 
 # {{page.title}} {#jvm-domain-model}
 
-In this tutorial we will basically implement the [domain model language](https://www.eclipse.org/Xtext/documentation/103_domainmodelnextsteps.html) again, but this time we will make use of the special JVM support shipped with Xtext. This kind of language is really a sweet spot for DSLs, so feel free to use this as a blueprint and add your project specific features later on.
+In this tutorial we will basically implement the [domain model language](https://www.eclipse.dev/Xtext/documentation/103_domainmodelnextsteps.html) again, but this time we will make use of the special JVM support shipped with Xtext. This kind of language is really a sweet spot for DSLs, so feel free to use this as a blueprint and add your project specific features later on.
 
 The revised domain model language supports expressions and cross-links to Java types. It is directly translated to Java source code. The syntax should look very familiar. Here is an example:
 
@@ -79,7 +79,7 @@ The wizard will automatically open the grammar file *Domainmodel.xtext* in the e
 grammar org.example.domainmodel.Domainmodel with
                                       org.eclipse.xtext.xbase.Xbase
 
-generate domainmodel "https://www.example.org/domainmodel/Domainmodel"
+generate domainmodel "http://www.example.org/domainmodel/Domainmodel"
 
 Domainmodel:
     importSection=XImportSection?
@@ -280,7 +280,7 @@ Let's go through the code to get an idea of what is going on. (Please also refer
             boolean isPrelinkingPhase) {
     ```
 
-    Using the dispatch keyword makes sure that the method is called for instances of type *Entity* only. Have a look at the Xtend documentation on [polymorphic dispatch](https://www.eclipse.org/xtend/documentation/202_xtend_classes_members.html#polymorphic-dispatch) to understand Xtend's dispatch functions. Extending [AbstractModelInferrer]({{site.src.xtext}}/org.eclipse.xtext.xbase/src/org/eclipse/xtext/xbase/jvmmodel/AbstractModelInferrer.java) makes sure we don't have to walk the syntax model on our own.
+    Using the dispatch keyword makes sure that the method is called for instances of type *Entity* only. Have a look at the Xtend documentation on [polymorphic dispatch](https://www.eclipse.dev/Xtext/xtend/documentation/202_xtend_classes_members.html#polymorphic-dispatch) to understand Xtend's dispatch functions. Extending [AbstractModelInferrer]({{site.src.xtext}}/org.eclipse.xtext.xbase/src/org/eclipse/xtext/xbase/jvmmodel/AbstractModelInferrer.java) makes sure we don't have to walk the syntax model on our own.
 1.  ```xtend
     acceptor.accept(element.toClass(element.fullyQualifiedName)) [
         ...
@@ -293,7 +293,7 @@ Let's go through the code to get an idea of what is going on. (Please also refer
     documentation = element.documentation
     ```
 
-    Here we assign some JavaDoc to the newly created element. The assignment is translated to an invocation of the method *[JvmTypesBuilder]({{site.src.xtext}}/org.eclipse.xtext.xbase/src/org/eclipse/xtext/xbase/jvmmodel/JvmTypesBuilder.java).setDocumentation([JvmIdentifiableElement]({{site.src.xtext}}/org.eclipse.xtext.common.types/emf-gen/org/eclipse/xtext/common/types/JvmIdentifiableElement.java), String)*, and `element.documentation` is in fact calling the extension method *[JvmTypesBuilder]({{site.src.xtext}}/org.eclipse.xtext.xbase/src/org/eclipse/xtext/xbase/jvmmodel/JvmTypesBuilder.java).getDocumentation([EObject]({{site.src.emf}}/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EObject.java))*. Such extension methods are explained in detail in the [Xtend documentation](https://www.eclipse.org/xtend/documentation/202_xtend_classes_members.html#extension-methods).
+    Here we assign some JavaDoc to the newly created element. The assignment is translated to an invocation of the method *[JvmTypesBuilder]({{site.src.xtext}}/org.eclipse.xtext.xbase/src/org/eclipse/xtext/xbase/jvmmodel/JvmTypesBuilder.java).setDocumentation([JvmIdentifiableElement]({{site.src.xtext}}/org.eclipse.xtext.common.types/emf-gen/org/eclipse/xtext/common/types/JvmIdentifiableElement.java), String)*, and `element.documentation` is in fact calling the extension method *[JvmTypesBuilder]({{site.src.xtext}}/org.eclipse.xtext.xbase/src/org/eclipse/xtext/xbase/jvmmodel/JvmTypesBuilder.java).getDocumentation([EObject]({{site.src.emf}}/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EObject.java))*. Such extension methods are explained in detail in the [Xtend documentation](https://www.eclipse.dev/Xtext/xtend/documentation/202_xtend_classes_members.html#extension-methods).
 1.  ```xtend
     if (element.superType !== null)
         superTypes += entity.superType.cloneWithProxies
diff --git a/xtext-website/documentation/301_grammarlanguage.md b/xtext-website/documentation/301_grammarlanguage.md
index f413041b..117b1f48 100644
--- a/xtext-website/documentation/301_grammarlanguage.md
+++ b/xtext-website/documentation/301_grammarlanguage.md
@@ -36,17 +36,17 @@ Xtext parsers create in-memory object graphs while consuming text. Such object-g
 The easiest way to get started is to let Xtext infer the Ecore model from your grammar. The `generate` declaration in the grammar advises the framework to do so:
 
 ```xtext
-generate domainmodel "https://www.example.org/domainmodel/Domainmodel"
+generate domainmodel "http://www.example.org/domainmodel/Domainmodel"
 ```
 
-That statement could actually be read as: generate an [EPackage]({{site.src.emf}}/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EPackage.java) with the *name* `domainmodel` and the *nsURI* `"https://www.example.org/domainmodel/Domainmodel"`. Xtext will then add [EClasses]({{site.src.emf}}/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EClass.java) with [EAttributes]({{site.src.emf}}/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EAttribute.java) and [EReferences]({{site.src.emf}}/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EReference.java) for the different parser rules in your grammar, as described in [Ecore model inference](301_grammarlanguage.html#metamodel-inference).
+That statement could actually be read as: generate an [EPackage]({{site.src.emf}}/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EPackage.java) with the *name* `domainmodel` and the *nsURI* `"http://www.example.org/domainmodel/Domainmodel"`. Xtext will then add [EClasses]({{site.src.emf}}/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EClass.java) with [EAttributes]({{site.src.emf}}/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EAttribute.java) and [EReferences]({{site.src.emf}}/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EReference.java) for the different parser rules in your grammar, as described in [Ecore model inference](301_grammarlanguage.html#metamodel-inference).
 
 #### EPackage Import {#epackage-import}
 
 If you already have an existing EPackage, you can import it using its namespace URI:
 
 ```xtext
-import "https://www.xtext.org/example/Domainmodel"
+import "http://www.xtext.org/example/Domainmodel"
 ```
 
 A [URI]({{site.src.emf}}/plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/util/URI.java) (Uniform Resource Identifier) provides a simple and extensible means for identifying an abstract or physical resource. It is also possible to import EPackages using resource URIs, but it is strongly recommended to use the namespace URI instead because it is independent from the concrete location in the file system, much more portable across different machines, easier to configure in the workflow, and works better with language mixins. The import via platform URIs or file URIs can be considered deprecated and is only supported for backwards compatibility.
@@ -58,8 +58,8 @@ Using package imports usually requires some [adaptations in the generator workfl
 If you want to use multiple EPackages you need to specify aliases in the following way:
 
 ```xtext
-import "https://www.xtext.org/example/Domainmodel" as dmodel
-import 'https://www.eclipse.org/anotherPackage' as another
+import "http://www.xtext.org/example/Domainmodel" as dmodel
+import 'http://www.eclipse.org/anotherPackage' as another
 ```
 
 When referring to a type somewhere in the grammar you need to qualify the reference using that alias (e.g. `another::SomeType`). Cases where such type references occur are explained below.
@@ -107,7 +107,7 @@ It's almost in any case recommended to use [data type rules](#datatype-rules) in
 Each terminal rule returns an atomic value (an [EDataType]({{site.src.emf}}/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EDataType.java)). By default, it's assumed that an instance of `ecore::EString` should be returned. However, if you want to provide a different type you can specify it. For instance, the rule *INT* is defined as:
 
 ```xtext
-import "https://www.eclipse.org/emf/2002/Ecore" as ecore
+import "http://www.eclipse.org/emf/2002/Ecore" as ecore
 //...
 terminal INT returns ecore::EInt:
     ('0'..'9')+;
@@ -695,7 +695,7 @@ Xtext supports the reuse of existing grammars. Grammars that are created via the
 grammar org.example.domainmodel.Domainmodel
     with org.eclipse.xtext.common.Terminals
 
-generate domainmodel "https://www.example.org/domainmodel/Domainmodel"
+generate domainmodel "http://www.example.org/domainmodel/Domainmodel"
 
 Model:
     greetings+=Greeting*;
@@ -711,7 +711,7 @@ Mixing another grammar into a language makes the rules defined in that grammar r
 ```xtext
 grammar my.SuperGrammar
 
-generate super "https://my.org/super"
+generate super "http://my.org/super"
 
 RuleA: 'a' stuff=RuleB;
 RuleB: '{' name=ID '}';
@@ -720,7 +720,7 @@ RuleB: '{' name=ID '}';
 ```xtext
 grammar my.SubGrammar with my.SuperGrammar
 
-import "https://my.org/super"
+import "http://my.org/super"
 
 Model: (ruleAs+=RuleA)*;
 
@@ -739,7 +739,7 @@ Xtext ships with a default set of predefined, reasonable and often required term
 grammar org.eclipse.xtext.common.Terminals
     hidden(WS, ML_COMMENT, SL_COMMENT)
 
-import "https://www.eclipse.org/emf/2002/Ecore" as ecore
+import "http://www.eclipse.org/emf/2002/Ecore" as ecore
 
 terminal ID:
     '^'?('a'..'z'|'A'..'Z'|'_')('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
diff --git a/xtext-website/documentation/303_runtime_concepts.md b/xtext-website/documentation/303_runtime_concepts.md
index 56fc5bc4..c43b1c11 100644
--- a/xtext-website/documentation/303_runtime_concepts.md
+++ b/xtext-website/documentation/303_runtime_concepts.md
@@ -8,7 +8,7 @@ part: Reference Documentation
 
 This chapter describes the platform-independent language features that are not covered by the [grammar language](301_grammarlanguage.html).
 
-Some code examples in this chapter are given in the Xtend language, as it is much better suited for these tasks than Java. Please refer to the [Xtend documentation](https://www.xtend-lang.org) for further details. For Java developers it's extremely easy to learn, as the basics are similar and you only need to understand the additional powerful concepts.
+Some code examples in this chapter are given in the Xtend language, as it is much better suited for these tasks than Java. Please refer to the [Xtend documentation](https://eclipse.dev/Xtext/xtend) for further details. For Java developers it's extremely easy to learn, as the basics are similar and you only need to understand the additional powerful concepts.
 
 ## Code Generation {#code-generation}
 
@@ -217,7 +217,7 @@ To have a concrete example, let's deal with the following simple grammar.
 grammar org.xtext.example.mydsl.MyScopingDsl with
                                       org.eclipse.xtext.common.Terminals
 
-generate myDsl "https://www.xtext.org/example/mydsl/MyScopingDsl"
+generate myDsl "http://www.xtext.org/example/mydsl/MyScopingDsl"
 
 Root:
     elements+=Element;
diff --git a/xtext-website/documentation/305_xbase.md b/xtext-website/documentation/305_xbase.md
index ae5599f2..aaf4e498 100644
--- a/xtext-website/documentation/305_xbase.md
+++ b/xtext-website/documentation/305_xbase.md
@@ -21,7 +21,7 @@ Using the JVM types model is very simple. First of all, the grammar has to impor
 ```xtext
 grammar org.xtext.example.mydsl.MyDsl with org.eclipse.xtext.xbase.Xtype
 ...
-import "https://www.eclipse.org/xtext/common/JavaVMTypes" as jvmTypes
+import "http://www.eclipse.org/xtext/common/JavaVMTypes" as jvmTypes
 ```
 
 The next step is to actually refer to an imported concept. Let's define a mapping to available Java types for the simple data types in the domain model language. This can be done with a simple cross-reference:
@@ -68,7 +68,7 @@ Because we can express all kinds of Java type references directly now, an indire
 grammar org.eclipse.xtext.example.Domainmodel with
                                       org.eclipse.xtext.xbase.Xbase
 
-generate domainmodel "https://www.eclipse.org/xtext/example/Domainmodel"
+generate domainmodel "http://www.eclipse.org/xtext/example/Domainmodel"
 
 Domainmodel:
   importSection=XImportSection?
@@ -244,7 +244,7 @@ grammar org.xtext.example.mydsl.MyDsl with org.eclipse.xtext.xbase.Xbase
 If you want to refer to [EClassifiers]({{site.src.emf}}/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/EClassifier.java) from the Xbase model, you need to import Xbase first:
 
 ```xtext
-import "https://www.eclipse.org/xtext/xbase/Xbase" as xbase
+import "http://www.eclipse.org/xtext/xbase/Xbase" as xbase
 ```
 
 Now identify the location in your grammar where you want references to Java types and Xbase expressions to appear and call the appropriate rules of the super grammar. Adding Xbase expression to the domainmodel example leads to the additional concept *Operation*: An *Operation*'s parameters are *FullJvmFormalParameters*. The production rule for *FullJvmFormalParameters* expects both the name and the type here. That is reasonable since the type of parameters should not be inferred. The operation's return type is a *JvmTypeReference* and its *body* is an *XBlockExpression*. The final parser rule reads as:
@@ -1226,7 +1226,7 @@ Xbase itself comes with a standard library of such extension methods adding supp
 
 These extension methods are declared in separate Java classes. There are various ways how extension methods can be added. In the simplest case the language designer predefines which extension methods are available. Language users cannot add additional library functions using this mechanism.
 
-Another alternative is to have them looked up by a certain naming convention. Also for more general languages it is possible to let users add extension methods using imports or similar mechanisms. This approach can be seen in the language [Xtend](https://www.eclipse.org/xtend/), where extension methods are lexically imported through static imports or dependency injection.
+Another alternative is to have them looked up by a certain naming convention. Also for more general languages it is possible to let users add extension methods using imports or similar mechanisms. This approach can be seen in the language [Xtend](https://eclipse.dev/Xtext/xtend/), where extension methods are lexically imported through static imports or dependency injection.
 
 The precedence of extension methods is always lower than real member methods, i.e. you cannot override member features. Also the extension methods are not invoked polymorphic. If you have two extension methods on the scope (`foo(Object)` and `foo(String)`) the expression `(foo as Object).foo` would bind and invoke `foo(Object)`.
 
diff --git a/xtext-website/documentation/340_lsp_support.md b/xtext-website/documentation/340_lsp_support.md
index 25260948..357a4731 100644
--- a/xtext-website/documentation/340_lsp_support.md
+++ b/xtext-website/documentation/340_lsp_support.md
@@ -13,7 +13,7 @@ Xtext supports the generation of language servers that comply to the [Language S
 **Step 1:** Create a new Xtext Project with language server support and Maven as the preferred build system.
 ![Xtext project wizard](images/LSP_01_XtextWizardMaven.png)
 
-**Step 2:** Implement the Domainmodel language following the [Xtext - 15 Minutes Tutorial](https://www.eclipse.org/Xtext/documentation/102_domainmodelwalkthrough.html).
+**Step 2:** Implement the Domainmodel language following the [Xtext - 15 Minutes Tutorial](https://www.eclipse.dev/Xtext/documentation/102_domainmodelwalkthrough.html).
 
 **Step 3:** Try out the Domainmodel language server in Eclipse based on [LSP4E](https://projects.eclipse.org/projects/technology.lsp4e).
 
@@ -80,7 +80,7 @@ Xtext supports the generation of language servers that comply to the [Language S
 **Step 1:** Create a new Xtext Project with language server support and Gradle as the preferred build system.
 ![Xtext project wizard](images/LSP_06_XtextWizardGradle.png)
 
-**Step 2:** Implement the Domainmodel language following the [Xtext - 15 Minutes Tutorial](https://www.eclipse.org/Xtext/documentation/102_domainmodelwalkthrough.html).
+**Step 2:** Implement the Domainmodel language following the [Xtext - 15 Minutes Tutorial](https://www.eclipse.dev/Xtext/documentation/102_domainmodelwalkthrough.html).
 
 **Step 3:** Try out the Domainmodel language server in IntelliJ IDEA based on the [gtache LSP plugin](https://github.com/gtache/intellij-lsp).
 
@@ -113,7 +113,7 @@ Currently, Xtext supports the following LSP language features:
 	<thead>
 		<tr>
 			<th><a href="https://microsoft.github.io/language-server-protocol/specifications/specification-current/#version_3_17_0"> LSP 3.17.0 </a> (released on 2022-10-05) <br> <a href="https://github.com/eclipse-lsp4j/lsp4j/blob/main/CHANGELOG.md#v0210-may-2023"> LSP4J 0.21.0 </a>(released on 2023-05-18)</th>
-			<th><a href="https://www.eclipse.org/Xtext/releasenotes.html#/releasenotes/2023/05/29/version-2-31-0"> Xtext 2.31.0 </a> <br> (released on 2023-05-29)</th>
+			<th><a href="https://www.eclipse.dev/Xtext/releasenotes.html#/releasenotes/2023/05/29/version-2-31-0"> Xtext 2.31.0 </a> <br> (released on 2023-05-29)</th>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/xtext-website/index.html b/xtext-website/index.html
index ead3ca9a..48429414 100644
--- a/xtext-website/index.html
+++ b/xtext-website/index.html
@@ -141,7 +141,7 @@ <h4><img src="{{ site.baseurl }}/images/xtext-bullet.png"/>
           Compile to Whatever You Want!</h4>
         <p>You define the target format to which your language is compiled. No matter if it's Java, C, XML,
         comma-separated values, or even a binary format, Xtext&#x2122; does not limit your choice.
-        And in combination with <a href="https://xtend-lang.org" target="_blank">Xtend</a> writing a compiler
+        And in combination with <a href="https://eclipse.dev/Xtext/xtend" target="_blank">Xtend</a> writing a compiler
         becomes easier than ever before.</p>
       </div>
       <div class="span4">