From e8c9efb5c5270e530938a1b76a6937b31594ffd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20M=C3=BCller?= <mu.stefan@googlemail.com>
Date: Sun, 19 Apr 2026 16:53:57 +0200
Subject: [PATCH] chore: Rename some occurences of etherpad-lite to etherpad
 (#7552)

* chore: Rename some occurences of etherpad-lite to etherpad

* chore: Adjust etherpad git urls

* chore: Rename more occurences from etherpad-lite to etherpad

* chore: Adjust default text
---
 .github/PULL_REQUEST_TEMPLATE.md |  4 +--
 AGENTS.MD                        |  2 +-
 CONTRIBUTING.md                  |  4 +--
 Dockerfile                       |  6 ++--
 README.md                        | 48 ++++++++++++++++----------------
 best_practices.md                |  2 +-
 bin/createRelease.sh             |  4 +--
 bin/installer.ps1                |  4 +--
 bin/installer.sh                 |  2 +-
 bin/plugins/checkPlugin.ts       |  4 +--
 bin/plugins/lib/CONTRIBUTING.md  |  4 +--
 doc/.vitepress/config.mts        |  2 +-
 doc/api/changeset_library.adoc   |  8 +++---
 doc/api/changeset_library.md     |  6 ++--
 package.json                     |  2 +-
 settings.json.template           |  2 +-
 src/node/hooks/express.ts        |  2 +-
 src/node/utils/Settings.ts       |  2 +-
 src/package.json                 |  2 +-
 19 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index d9f660907..822bd8b74 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,7 +1,7 @@
 <!--
 
-1. If you haven't already, please read https://github.com/ether/etherpad-lite/blob/master/CONTRIBUTING.md#pull-requests .
-2. Run all the tests, both front-end and back-end.  (see https://github.com/ether/etherpad-lite/blob/master/CONTRIBUTING.md#testing)
+1. If you haven't already, please read https://github.com/ether/etherpad/blob/master/CONTRIBUTING.md#pull-requests .
+2. Run all the tests, both front-end and back-end.  (see https://github.com/ether/etherpad/blob/master/CONTRIBUTING.md#testing)
 3. Keep business logic and validation on the server-side.
 4. Update documentation.
 5. Write `fixes #XXXX` in your comment to auto-close an issue.
diff --git a/AGENTS.MD b/AGENTS.MD
index 491c76550..bf8632594 100644
--- a/AGENTS.MD
+++ b/AGENTS.MD
@@ -51,7 +51,7 @@ pnpm --filter ep_etherpad-lite run prod         # Start production server
 - **Commits:** Maintain a linear history (no merge commits). Use meaningful messages in the format: `submodule: description`.
 - **Feature Flags:** New features should be placed behind feature flags and disabled by default.
 - **Deprecation:** Never remove features abruptly; deprecate them first with a `WARN` log.
-- **Forks:** For etherpad-lite changes, commit to `johnmclear/etherpad-lite` fork on a new branch, then PR to `ether/etherpad-lite`. For plugins (`ep_*` repos), committing directly is acceptable.
+- **Forks:** For etherpad-lite changes, commit to `johnmclear/etherpad-lite` fork on a new branch, then PR to `ether/etherpad`. For plugins (`ep_*` repos), committing directly is acceptable.
 
 ### Testing & Validation
 - **Requirement:** Every bug fix MUST include a regression test in the same commit.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2a6f384fc..bf153068e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,5 +1,5 @@
 # Contributor Guidelines
-(Please talk to people on the mailing list before you change this page, see our section on [how to get in touch](https://github.com/ether/etherpad-lite#get-in-touch))
+(Please talk to people on the mailing list before you change this page, see our section on [how to get in touch](https://github.com/ether/etherpad#get-in-touch))
 
 **We have decided that LLM/Agent/AI contributions are fine as long as they are within the instructions set out by this document.**
 
@@ -140,5 +140,5 @@ Etherpad is much more than software.  So if you aren't a developer then worry no
  * Write proposals for grants
  * Co-Author and Publish CVEs
  * Work with SFC to maintain legal side of project
- * Maintain TODO page - https://github.com/ether/etherpad-lite/wiki/TODO#IMPORTANT_TODOS
+ * Maintain TODO page - https://github.com/ether/etherpad/wiki/TODO#IMPORTANT_TODOS
 
diff --git a/Dockerfile b/Dockerfile
index 6ee07c2c6..14fb6d399 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-# Etherpad Lite Dockerfile
+# Etherpad Dockerfile
 #
-# https://github.com/ether/etherpad-lite
+# https://github.com/ether/etherpad
 #
 # Author: muxator
 # Set to "copy" for builds without git metadata (source tarballs, some CI):
@@ -18,7 +18,7 @@ RUN pnpm run build:ui
 
 
 FROM node:lts-alpine AS build
-LABEL maintainer="Etherpad team, https://github.com/ether/etherpad-lite"
+LABEL maintainer="Etherpad team, https://github.com/ether/etherpad"
 
 # Set these arguments when building the image from behind a proxy
 ARG http_proxy=
diff --git a/README.md b/README.md
index 04ce92d38..635ae6889 100644
--- a/README.md
+++ b/README.md
@@ -14,32 +14,32 @@ Etherpad runs on your server, under your governance. No telemetry. No upsells. A
 
 The code is Apache 2.0. The data format is open. It [scales to thousands of simultaneous editors per pad](http://scale.etherpad.org/). Translated into 105 languages. Extended through hundreds of plugins. Used by Wikimedia, governments, public-sector institutions, and self-hosters worldwide since 2009.
 
-[Full data export](https://github.com/ether/etherpad-lite/wiki/Understanding-Etherpad's-Full-Data-Export-capabilities) is built in. The history is yours.
+[Full data export](https://github.com/ether/etherpad/wiki/Understanding-Etherpad's-Full-Data-Export-capabilities) is built in. The history is yours.
 
 ## Try it out
 
-[Try out a public Etherpad instance](https://github.com/ether/etherpad-lite/wiki/Sites-That-Run-Etherpad#sites-that-run-etherpad)
+[Try out a public Etherpad instance](https://github.com/ether/etherpad/wiki/Sites-That-Run-Etherpad#sites-that-run-etherpad)
 
 ## Project Status
 
 Etherpad has been doing the same thing — well — since 2009. No pivots, no acquisitions, no enshittification. Maintained by a small volunteer team.
 
-**We are actively looking for maintainers.** If you have experience with Node.js, real-time systems, or institutional collaboration tooling and you want to work on infrastructure that thousands of organisations quietly depend on, please [open an issue](https://github.com/ether/etherpad-lite/issues) or contact [John McLear](https://github.com/JohnMcLear).
+**We are actively looking for maintainers.** If you have experience with Node.js, real-time systems, or institutional collaboration tooling and you want to work on infrastructure that thousands of organisations quietly depend on, please [open an issue](https://github.com/ether/etherpad/issues) or contact [John McLear](https://github.com/JohnMcLear).
 
 ### Code Quality
 
-[![Code Quality](https://github.com/ether/etherpad-lite/actions/workflows/codeql-analysis.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/codeql-analysis.yml)
+[![Code Quality](https://github.com/ether/etherpad/actions/workflows/codeql-analysis.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad/actions/workflows/codeql-analysis.yml)
 
 ### Testing
 
-[![Backend tests](https://github.com/ether/etherpad-lite/actions/workflows/backend-tests.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/backend-tests.yml)
-[![Simulated Load](https://github.com/ether/etherpad-lite/actions/workflows/load-test.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/load-test.yml)
-[![Rate Limit](https://github.com/ether/etherpad-lite/actions/workflows/rate-limit.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/rate-limit.yml)
-[![Docker file](https://github.com/ether/etherpad-lite/actions/workflows/dockerfile.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/dockerfile.yml)
-[![Frontend admin tests powered by Sauce Labs](https://github.com/ether/etherpad-lite/actions/workflows/frontend-admin-tests.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/frontend-admin-tests.yml)
-[![Frontend tests powered by Sauce Labs](https://github.com/ether/etherpad-lite/actions/workflows/frontend-tests.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/frontend-tests.yml)
+[![Backend tests](https://github.com/ether/etherpad/actions/workflows/backend-tests.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad/actions/workflows/backend-tests.yml)
+[![Simulated Load](https://github.com/ether/etherpad/actions/workflows/load-test.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad/actions/workflows/load-test.yml)
+[![Rate Limit](https://github.com/ether/etherpad/actions/workflows/rate-limit.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad/actions/workflows/rate-limit.yml)
+[![Docker file](https://github.com/ether/etherpad/actions/workflows/docker.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad/actions/workflows/docker.yml)
+[![Frontend admin tests powered by Sauce Labs](https://github.com/ether/etherpad/actions/workflows/frontend-admin-tests.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad/actions/workflows/frontend-admin-tests.yml)
+[![Frontend tests powered by Sauce Labs](https://github.com/ether/etherpad/actions/workflows/frontend-tests.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad/actions/workflows/frontend-tests.yml)
 [![Sauce Test Status](https://saucelabs.com/buildstatus/etherpad.svg)](https://saucelabs.com/u/etherpad)
-[![Windows Build](https://github.com/ether/etherpad-lite/actions/workflows/windows.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/windows.yml)
+[![Windows Build](https://github.com/ether/etherpad/actions/workflows/windows.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad/actions/workflows/windows.yml)
 
 ### Engagement
 
@@ -60,7 +60,7 @@ For more than a decade, Etherpad has quietly underpinned the documents that matt
 - **Newsrooms and investigative journalism teams** — where authorship and editing history matter for legal and editorial integrity.
 - **Tens of thousands of self-hosted instances** worldwide, run by IT teams who chose Etherpad because it is theirs.
 
-If your organisation runs Etherpad and would be willing to be listed publicly, please [add it to the wiki](https://github.com/ether/etherpad-lite/wiki/Sites-That-Run-Etherpad).
+If your organisation runs Etherpad and would be willing to be listed publicly, please [add it to the wiki](https://github.com/ether/etherpad/wiki/Sites-That-Run-Etherpad).
 
 ## Installation
 
@@ -71,13 +71,13 @@ The fastest way to get Etherpad running. Requires `git` and Node.js >= 20.
 **macOS / Linux / WSL:**
 
 ```sh
-curl -fsSL https://raw.githubusercontent.com/ether/etherpad-lite/master/bin/installer.sh | sh
+curl -fsSL https://raw.githubusercontent.com/ether/etherpad/master/bin/installer.sh | sh
 ```
 
 **Windows (PowerShell):**
 
 ```powershell
-irm https://raw.githubusercontent.com/ether/etherpad-lite/master/bin/installer.ps1 | iex
+irm https://raw.githubusercontent.com/ether/etherpad/master/bin/installer.ps1 | iex
 ```
 
 Both installers clone Etherpad into `./etherpad-lite`, install dependencies, and
@@ -93,12 +93,12 @@ To install and start in one go:
 
 ```sh
 # macOS / Linux / WSL
-ETHERPAD_RUN=1 sh -c "$(curl -fsSL https://raw.githubusercontent.com/ether/etherpad-lite/master/bin/installer.sh)"
+ETHERPAD_RUN=1 sh -c "$(curl -fsSL https://raw.githubusercontent.com/ether/etherpad/master/bin/installer.sh)"
 ```
 
 ```powershell
 # Windows
-$env:ETHERPAD_RUN=1; irm https://raw.githubusercontent.com/ether/etherpad-lite/master/bin/installer.ps1 | iex
+$env:ETHERPAD_RUN=1; irm https://raw.githubusercontent.com/ether/etherpad/master/bin/installer.ps1 | iex
 ```
 
 ### Docker-Compose
@@ -200,7 +200,7 @@ pnpm run plugins i ep_${plugin_name}
 ```
 
 Also see [the plugin wiki
-article](https://github.com/ether/etherpad-lite/wiki/Available-Plugins).
+article](https://github.com/ether/etherpad/wiki/Available-Plugins).
 
 ### Suggested Plugins
 
@@ -297,7 +297,7 @@ playing!
 
 ## Helpful resources
 
-The [wiki](https://github.com/ether/etherpad-lite/wiki) is your one-stop
+The [wiki](https://github.com/ether/etherpad/wiki) is your one-stop
 resource for Tutorials and How-to's.
 
 Documentation can be found in `doc/`.
@@ -315,21 +315,21 @@ dependency or upgrading version.
 
 If you want to find out how Etherpad's `Easysync` works (the library that makes
 it really realtime), start with this
-[PDF](https://github.com/ether/etherpad-lite/raw/master/doc/easysync/easysync-full-description.pdf)
+[PDF](https://github.com/ether/etherpad/raw/master/doc/easysync/easysync-full-description.pdf)
 (complex, but worth reading).
 
 ### Contributing
 
 Read our [**Developer
-Guidelines**](https://github.com/ether/etherpad-lite/blob/master/CONTRIBUTING.md)
+Guidelines**](https://github.com/ether/etherpad/blob/master/CONTRIBUTING.md)
 
 ### HTTP API
 
 Etherpad is designed to be easily embeddable and provides a [HTTP
-API](https://github.com/ether/etherpad-lite/wiki/HTTP-API) that allows your web
+API](https://github.com/ether/etherpad/wiki/HTTP-API) that allows your web
 application to manage pads, users and groups. It is recommended to use the
 [available client
-implementations](https://github.com/ether/etherpad-lite/wiki/HTTP-API-client-libraries)
+implementations](https://github.com/ether/etherpad/wiki/HTTP-API-client-libraries)
 in order to interact with this API.
 
 OpenAPI (previously swagger) definitions for the API are exposed under
@@ -357,12 +357,12 @@ send pull request to each plugin individually.
 
 ## FAQ
 
-Visit the **[FAQ](https://github.com/ether/etherpad-lite/wiki/FAQ)**.
+Visit the **[FAQ](https://github.com/ether/etherpad/wiki/FAQ)**.
 
 ## Get in touch
 
 The official channel for contacting the development team is via the [GitHub
-issues](https://github.com/ether/etherpad-lite/issues).
+issues](https://github.com/ether/etherpad/issues).
 
 For **responsible disclosure of vulnerabilities**, please write a mail to the
 maintainers (a.mux@inwind.it and contact@etherpad.org).
diff --git a/best_practices.md b/best_practices.md
index bdfbef4ec..5b1926de8 100644
--- a/best_practices.md
+++ b/best_practices.md
@@ -1,5 +1,5 @@
 # Contributor Guidelines
-(Please talk to people on the mailing list before you change this page, see our section on [how to get in touch](https://github.com/ether/etherpad-lite#get-in-touch))
+(Please talk to people on the mailing list before you change this page, see our section on [how to get in touch](https://github.com/ether/etherpad#get-in-touch))
 
 **We have decided that LLM/Agent/AI contributions are fine as long as they are within the instructions set out by this document.**
 
diff --git a/bin/createRelease.sh b/bin/createRelease.sh
index e3b0eb0d3..9777a1d8c 100755
--- a/bin/createRelease.sh
+++ b/bin/createRelease.sh
@@ -31,7 +31,7 @@ while true; do
     esac
 done
 
-ETHER_REPO="https://github.com/ether/etherpad-lite.git"
+ETHER_REPO="https://github.com/ether/etherpad.git"
 ETHER_WEB_REPO="https://github.com/ether/ether.github.com.git"
 TMP_DIR="/tmp/"
 
@@ -186,7 +186,7 @@ function publish_release {
 
 function todo_notification {
   echo "Release procedure was successful, but you have to do some steps manually:"
-  echo "- Update the wiki at https://github.com/ether/etherpad-lite/wiki"
+  echo "- Update the wiki at https://github.com/ether/etherpad/wiki"
   echo "- Create a pull request on github to merge the master branch back to develop"
   echo "- Announce the new release on the mailing list, blog.etherpad.org and Twitter"
 }
diff --git a/bin/installer.ps1 b/bin/installer.ps1
index f1295b72f..1c4cd0aa5 100644
--- a/bin/installer.ps1
+++ b/bin/installer.ps1
@@ -6,7 +6,7 @@
 # Optional environment variables:
 #   $env:ETHERPAD_DIR     Directory to install into (default: .\etherpad-lite)
 #   $env:ETHERPAD_BRANCH  Branch / tag to clone (default: master)
-#   $env:ETHERPAD_REPO    Repo URL (default: https://github.com/ether/etherpad-lite.git)
+#   $env:ETHERPAD_REPO    Repo URL (default: https://github.com/ether/etherpad.git)
 #   $env:ETHERPAD_RUN     If "1", start Etherpad after install
 #   $env:NO_COLOR         If set, disables coloured output
 
@@ -37,7 +37,7 @@ function Test-Cmd([string]$name) {
 # ---------- defaults ----------
 $EtherpadDir    = if ($env:ETHERPAD_DIR)    { $env:ETHERPAD_DIR }    else { 'etherpad-lite' }
 $EtherpadBranch = if ($env:ETHERPAD_BRANCH) { $env:ETHERPAD_BRANCH } else { 'master' }
-$EtherpadRepo   = if ($env:ETHERPAD_REPO)   { $env:ETHERPAD_REPO }   else { 'https://github.com/ether/etherpad-lite.git' }
+$EtherpadRepo   = if ($env:ETHERPAD_REPO)   { $env:ETHERPAD_REPO }   else { 'https://github.com/ether/etherpad.git' }
 $RequiredNodeMajor = 20
 
 Write-Step 'Etherpad installer'
diff --git a/bin/installer.sh b/bin/installer.sh
index 151aafd50..bd377309e 100755
--- a/bin/installer.sh
+++ b/bin/installer.sh
@@ -33,7 +33,7 @@ is_cmd() { command -v "$1" >/dev/null 2>&1; }
 # ---------- defaults ----------
 ETHERPAD_DIR="${ETHERPAD_DIR:-etherpad-lite}"
 ETHERPAD_BRANCH="${ETHERPAD_BRANCH:-master}"
-ETHERPAD_REPO="${ETHERPAD_REPO:-https://github.com/ether/etherpad-lite.git}"
+ETHERPAD_REPO="${ETHERPAD_REPO:-https://github.com/ether/etherpad.git}"
 REQUIRED_NODE_MAJOR=20
 
 step "Etherpad installer"
diff --git a/bin/plugins/checkPlugin.ts b/bin/plugins/checkPlugin.ts
index 80d24c161..19ad9b145 100644
--- a/bin/plugins/checkPlugin.ts
+++ b/bin/plugins/checkPlugin.ts
@@ -447,10 +447,10 @@ log4js.configure({
   if (files.includes('static')) {
     const staticFiles = await fsp.readdir(`${pluginPath}/static`);
     if (!staticFiles.includes('tests')) {
-      logger.warn('Test files not found, please create tests.  https://github.com/ether/etherpad-lite/wiki/Creating-a-plugin#writing-and-running-front-end-tests-for-your-plugin');
+      logger.warn('Test files not found, please create tests.  https://github.com/ether/etherpad/wiki/Creating-a-plugin#writing-and-running-front-end-tests-for-your-plugin');
     }
   } else {
-    logger.warn('Test files not found, please create tests.  https://github.com/ether/etherpad-lite/wiki/Creating-a-plugin#writing-and-running-front-end-tests-for-your-plugin');
+    logger.warn('Test files not found, please create tests.  https://github.com/ether/etherpad/wiki/Creating-a-plugin#writing-and-running-front-end-tests-for-your-plugin');
   }
 
   // Update all dependencies to their latest compatible versions.
diff --git a/bin/plugins/lib/CONTRIBUTING.md b/bin/plugins/lib/CONTRIBUTING.md
index 347437b22..ed6ce24a0 100644
--- a/bin/plugins/lib/CONTRIBUTING.md
+++ b/bin/plugins/lib/CONTRIBUTING.md
@@ -1,5 +1,5 @@
 # Contributor Guidelines
-(Please talk to people on the mailing list before you change this page, see our section on [how to get in touch](https://github.com/ether/etherpad-lite#get-in-touch))
+(Please talk to people on the mailing list before you change this page, see our section on [how to get in touch](https://github.com/ether/etherpad#get-in-touch))
 
 ## Pull requests
 
@@ -131,5 +131,5 @@ Etherpad is much more than software.  So if you aren't a developer then worry no
  * Write proposals for grants
  * Co-Author and Publish CVEs
  * Work with SFC to maintain legal side of project
- * Maintain TODO page - https://github.com/ether/etherpad-lite/wiki/TODO#IMPORTANT_TODOS
+ * Maintain TODO page - https://github.com/ether/etherpad/wiki/TODO#IMPORTANT_TODOS
 
diff --git a/doc/.vitepress/config.mts b/doc/.vitepress/config.mts
index c96fa3bd3..1b63dd465 100644
--- a/doc/.vitepress/config.mts
+++ b/doc/.vitepress/config.mts
@@ -73,7 +73,7 @@ export default defineConfig({
     },
 
     socialLinks: [
-      { icon: 'github', link: 'https://github.com/ether/etherpad-lite' }
+      { icon: 'github', link: 'https://github.com/ether/etherpad' }
     ]
   }
 })
diff --git a/doc/api/changeset_library.adoc b/doc/api/changeset_library.adoc
index 98f43c0a9..46db79f38 100644
--- a/doc/api/changeset_library.adoc
+++ b/doc/api/changeset_library.adoc
@@ -1,6 +1,6 @@
 == Changeset Library
 
-The https://github.com/ether/etherpad-lite/blob/develop/src/static/js/Changeset.ts[changeset
+The https://github.com/ether/etherpad/blob/develop/src/static/js/Changeset.ts[changeset
 library]
 provides tools to create, read, and apply changesets.
 
@@ -31,7 +31,7 @@ const AttributePool = require('ep_etherpad-lite/static/js/AttributePool');
 ----
 
 Changesets do not include any attribute key–value pairs. Instead, they use
-numeric identifiers that reference attributes kept in an https://github.com/ether/etherpad-lite/blob/develop/src/static/js/AttributePool.ts[attribute pool].
+numeric identifiers that reference attributes kept in an https://github.com/ether/etherpad/blob/develop/src/static/js/AttributePool.ts[attribute pool].
 This attribute interning reduces the transmission overhead of attributes that
 are used many times.
 
@@ -42,5 +42,5 @@ historical attribute used in the pad.
 
 Detailed information about the changesets & Easysync protocol:
 
-* https://github.com/ether/etherpad-lite/blob/develop/doc/easysync/easysync-notes.pdf[Easysync Protocol]
-* https://github.com/ether/etherpad-lite/blob/develop/doc/easysync/easysync-full-description.pdf[Etherpad and EasySync Technical Manual]
+* https://github.com/ether/etherpad/blob/develop/doc/easysync/easysync-notes.pdf[Easysync Protocol]
+* https://github.com/ether/etherpad/blob/develop/doc/easysync/easysync-full-description.pdf[Etherpad and EasySync Technical Manual]
diff --git a/doc/api/changeset_library.md b/doc/api/changeset_library.md
index 91d3cbe0a..9785f2b47 100644
--- a/doc/api/changeset_library.md
+++ b/doc/api/changeset_library.md
@@ -29,7 +29,7 @@ const AttributePool = require('ep_etherpad-lite/static/js/AttributePool');
 
 Changesets do not include any attribute key–value pairs. Instead, they use
 numeric identifiers that reference attributes kept in an [attribute
-pool](https://github.com/ether/etherpad-lite/blob/develop/src/static/js/AttributePool.ts).
+pool](https://github.com/ether/etherpad/blob/develop/src/static/js/AttributePool.ts).
 This attribute interning reduces the transmission overhead of attributes that
 are used many times.
 
@@ -40,5 +40,5 @@ historical attribute used in the pad.
 
 Detailed information about the changesets & Easysync protocol:
 
-* [Easysync Protocol](https://github.com/ether/etherpad-lite/blob/develop/doc/easysync/easysync-notes.pdf)
-* [Etherpad and EasySync Technical Manual](https://github.com/ether/etherpad-lite/blob/develop/doc/easysync/easysync-full-description.pdf)
+* [Easysync Protocol](https://github.com/ether/etherpad/blob/develop/doc/easysync/easysync-notes.pdf)
+* [Etherpad and EasySync Technical Manual](https://github.com/ether/etherpad/blob/develop/doc/easysync/easysync-full-description.pdf)
diff --git a/package.json b/package.json
index 3f7d79d78..9ad81804a 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/ether/etherpad-lite.git"
+    "url": "https://github.com/ether/etherpad.git"
   },
   "engineStrict": true,
   "version": "2.6.1",
diff --git a/settings.json.template b/settings.json.template
index 0d1493c2b..b62a51d2a 100644
--- a/settings.json.template
+++ b/settings.json.template
@@ -225,7 +225,7 @@
   /*
    * An Example of MySQL Configuration (commented out).
    *
-   * See: https://github.com/ether/etherpad-lite/wiki/How-to-use-Etherpad-Lite-with-MySQL
+   * See: https://github.com/ether/etherpad/wiki/How-to-use-Etherpad-Lite-with-MySQL
    */
 
   /*
diff --git a/src/node/hooks/express.ts b/src/node/hooks/express.ts
index ac2b90305..8e6f5b879 100644
--- a/src/node/hooks/express.ts
+++ b/src/node/hooks/express.ts
@@ -65,7 +65,7 @@ const closeServer = async () => {
 };
 
 exports.createServer = async () => {
-  console.log('Report bugs at https://github.com/ether/etherpad-lite/issues');
+  console.log('Report bugs at https://github.com/ether/etherpad/issues');
 
   serverName = `Etherpad ${getGitCommit()} (https://etherpad.org)`;
 
diff --git a/src/node/utils/Settings.ts b/src/node/utils/Settings.ts
index 0b250e494..80449c70c 100644
--- a/src/node/utils/Settings.ts
+++ b/src/node/utils/Settings.ts
@@ -393,7 +393,7 @@ const settings: SettingsType = {
     'This pad text is synchronized as you type, so that everyone viewing this page sees the same ' +
     'text. This allows you to collaborate seamlessly on documents!',
     '',
-    'Etherpad on Github: https://github.com/ether/etherpad-lite',
+    'Etherpad on Github: https://github.com/ether/etherpad',
   ].join('\n'),
   /**
    * The default Pad Settings for a user (Can be overridden by changing the setting
diff --git a/src/package.json b/src/package.json
index 6bdb03d6f..b3c2cab1b 100644
--- a/src/package.json
+++ b/src/package.json
@@ -129,7 +129,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/ether/etherpad-lite.git"
+    "url": "https://github.com/ether/etherpad.git"
   },
   "scripts": {
     "lint": "eslint .",