diff --git a/.gitmodules b/.gitmodules
index dcd6adb..da54f13 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,12 @@
 [submodule "matrix-js-sdk"]
 	path = matrix-js-sdk
-	url = https://github.com/SpiritCroc/matrix-js-sdk.git
+	url = https://github.com/SchildiChat/matrix-js-sdk.git
 [submodule "matrix-react-sdk"]
 	path = matrix-react-sdk
-	url = https://github.com/SpiritCroc/matrix-react-sdk.git
+	url = https://github.com/SchildiChat/matrix-react-sdk.git
 [submodule "element-web"]
 	path = element-web
-	url = https://github.com/SpiritCroc/element-web.git
+	url = https://github.com/SchildiChat/element-web.git
 [submodule "element-desktop"]
 	path = element-desktop
-	url = https://github.com/SpiritCroc/element-desktop.git
+	url = https://github.com/SchildiChat/element-desktop.git
diff --git a/README.md b/README.md
index 1e3e23f..9a21964 100644
--- a/README.md
+++ b/README.md
@@ -14,12 +14,12 @@ remaining, and no ways to configure Schildi's features.
 Furthermore, I don't know how much more work I'm going to put into this, but
 if anybody wants to help improving it, contributions are welcome!
 
-Downloads for Desktop: https://github.com/SpiritCroc/schildichat-desktop/releases <br/>
+Downloads for Desktop: https://github.com/SchildiChat/schildichat-desktop/releases <br/>
 Hosted web variant: https://schildiweb.spiritcroc.de/
 
 Feel free to [join the discussion on matrix](https://matrix.to/#/#schildichat-web:matrix.org).
 
-<img src="https://raw.githubusercontent.com/SpiritCroc/schildichat-desktop/sc/screenshots/1.png"/>
+<img src="https://raw.githubusercontent.com/SchildiChat/schildichat-desktop/sc/screenshots/1.png"/>
 
 
 # Building SchildiChat-Desktop
@@ -52,7 +52,7 @@ $ source .bashrc
 ## Initial setup
 
 ```
-git clone --recurse-submodules https://github.com/SpiritCroc/schildichat-desktop.git
+git clone --recurse-submodules https://github.com/SchildiChat/schildichat-desktop.git
 cd schildichat-desktop
 ./setup.sh
 ```
diff --git a/merge_helpers.sh b/merge_helpers.sh
index 64bf4b2..ca2bfa1 100755
--- a/merge_helpers.sh
+++ b/merge_helpers.sh
@@ -10,10 +10,10 @@ add_upstream() {
     local sc_remote="$(git remote -v|grep origin|grep fetch|sed 's|.*\t\(.*\) (fetch)|\1|')"
     if echo "$sc_remote" | grep -q matrix; then
         # matrix.org repo
-        local upstream_remote="$(echo "$sc_remote" | sed 's|SpiritCroc|matrix-org|')"
+        local upstream_remote="$(echo "$sc_remote" | sed 's|SchildiChat|matrix-org|')"
     elif echo "$sc_remote" | grep -q element; then
         # vector-im repo
-        local upstream_remote="$(echo "$sc_remote" | sed 's|SpiritCroc|vector-im|')"
+        local upstream_remote="$(echo "$sc_remote" | sed 's|SchildiChat|vector-im|')"
     else
         echo "Don't know upstream repo for $sc_remote"
         return 1