diff --git a/tools/build_release.py b/tools/build_release.py
index da9c710f5a..fc5e39236a 100644
--- a/tools/build_release.py
+++ b/tools/build_release.py
@@ -238,6 +238,10 @@ def load_port(port_dir, manifest, registered, port_status, quick_build=False):
                 error(port_dir.name, f"Bad port directory {dir_name[:-1]!r}, recommended name is {name_cleaner(dir_name[:-1])!r}")
                 broken = True
 
+    else:
+        # Another bug :D
+        port_data['port_json']['name'] = name_cleaner(port_data['port_json']['name'])
+
     # This is an abomination. :D
     if (port_check_bf & (1<<PORT_JSON)) == 0:
         port_json_files = list(port_dir.glob('**/*.port.json'))
diff --git a/tools/prepare_repo.sh b/tools/prepare_repo.sh
index d077c0abc8..f298ac9dc0 100755
--- a/tools/prepare_repo.sh
+++ b/tools/prepare_repo.sh
@@ -1,12 +1,19 @@
 #!/bin/bash
 
+if [ ! -f "SOURCE_SETUP.txt" ]; then
+    echo "run in root directory as tools/prepare_repo.sh"
+    exit 255
+fi
+
+source SOURCE_SETUP.txt
+
 cd releases/
 rm -f *.json
 rm -f images.zip
-wget "https://github.com/PortsMaster/PortMaster-New/releases/latest/download/ports.json"
-wget "https://github.com/PortsMaster/PortMaster-New/releases/latest/download/ports_status.json"
-wget "https://github.com/PortsMaster/PortMaster-New/releases/latest/download/manifest.json"
-wget "https://github.com/PortsMaster/PortMaster-New/releases/latest/download/images.zip"
+wget "https://github.com/${RELEASE_ORG}/${RELEASE_REPO}/releases/latest/download/ports.json"
+wget "https://github.com/${RELEASE_ORG}/${RELEASE_REPO}/releases/latest/download/ports_status.json"
+wget "https://github.com/${RELEASE_ORG}/${RELEASE_REPO}/releases/latest/download/manifest.json"
+wget "https://github.com/${RELEASE_ORG}/${RELEASE_REPO}/releases/latest/download/images.zip"
 cd ..
 
 python3 tools/build_data.py