diff --git a/client/package.json b/client/package.json
index 263b6137..da35d796 100644
--- a/client/package.json
+++ b/client/package.json
@@ -8,16 +8,16 @@
     "osm",
     "facilmap"
   ],
-  "homepage": "https://github.com/FacilMap/facilmap2",
+  "homepage": "https://github.com/FacilMap/facilmap",
   "bugs": {
-    "url": "https://github.com/FacilMap/facilmap2/issues"
+    "url": "https://github.com/FacilMap/facilmap/issues"
   },
   "license": "AGPL-3.0",
   "author": "Candid Dauth <cdauth@cdauth.eu>",
   "main": "./dist/client.js",
   "repository": {
     "type": "git",
-    "url": "https://github.com/FacilMap/facilmap2.git"
+    "url": "https://github.com/FacilMap/facilmap.git"
   },
   "scripts": {
     "build": "webpack",
diff --git a/docker-compose.yml b/docker-compose.yml
index a7e4adee..67ae8cf2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: "2"
 services:
     facilmap:
         build: .
-        image: facilmap/facilmap2
+        image: facilmap/facilmap
         ports:
             - "127.0.0.1:8080:8080"
         environment:
diff --git a/docs/package.json b/docs/package.json
index 90e5162f..63372b6e 100755
--- a/docs/package.json
+++ b/docs/package.json
@@ -5,7 +5,7 @@
   "author": "Candid Dauth <cdauth@cdauth.eu>",
   "repository": {
     "type": "git",
-    "url": "https://github.com/FacilMap/facilmap2.git"
+    "url": "https://github.com/FacilMap/facilmap.git"
   },
   "license": "AGPL-3.0",
   "scripts": {
diff --git a/frontend/package.json b/frontend/package.json
index 0179ab19..c566dc50 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -7,15 +7,15 @@
     "maps",
     "osm"
   ],
-  "homepage": "https://github.com/FacilMap/facilmap2",
+  "homepage": "https://github.com/FacilMap/facilmap",
   "bugs": {
-    "url": "https://github.com/FacilMap/facilmap2/issues"
+    "url": "https://github.com/FacilMap/facilmap/issues"
   },
   "license": "AGPL-3.0",
   "author": "Candid Dauth <cdauth@cdauth.eu>",
   "repository": {
     "type": "git",
-    "url": "https://github.com/FacilMap/facilmap2.git"
+    "url": "https://github.com/FacilMap/facilmap.git"
   },
   "main": "./entry.js",
   "scripts": {
diff --git a/leaflet/package.json b/leaflet/package.json
index 2ed2a1f1..720cad01 100644
--- a/leaflet/package.json
+++ b/leaflet/package.json
@@ -9,9 +9,9 @@
     "facilmap",
     "leaflet"
   ],
-  "homepage": "https://github.com/FacilMap/facilmap2",
+  "homepage": "https://github.com/FacilMap/facilmap",
   "bugs": {
-    "url": "https://github.com/FacilMap/facilmap2/issues"
+    "url": "https://github.com/FacilMap/facilmap/issues"
   },
   "license": "AGPL-3.0",
   "author": "Candid Dauth <cdauth@cdauth.eu>",
@@ -19,7 +19,7 @@
   "types": "./dist/index.d.ts",
   "repository": {
     "type": "git",
-    "url": "https://github.com/FacilMap/facilmap2.git"
+    "url": "https://github.com/FacilMap/facilmap.git"
   },
   "scripts": {
     "build": "webpack",
diff --git a/server/package.json b/server/package.json
index e61bf69f..a68648c0 100644
--- a/server/package.json
+++ b/server/package.json
@@ -7,15 +7,15 @@
     "maps",
     "osm"
   ],
-  "homepage": "https://github.com/FacilMap/facilmap2",
+  "homepage": "https://github.com/FacilMap/facilmap",
   "bugs": {
-    "url": "https://github.com/FacilMap/facilmap2/issues"
+    "url": "https://github.com/FacilMap/facilmap/issues"
   },
   "license": "AGPL-3.0",
   "author": "Candid Dauth <cdauth@cdauth.eu>",
   "repository": {
     "type": "git",
-    "url": "https://github.com/FacilMap/facilmap2.git"
+    "url": "https://github.com/FacilMap/facilmap.git"
   },
   "scripts": {
     "start": "npm run deps && npm run server",
diff --git a/types/package.json b/types/package.json
index 9450f9c4..a96356df 100644
--- a/types/package.json
+++ b/types/package.json
@@ -2,16 +2,16 @@
   "name": "facilmap-types",
   "version": "3.0.0-beta3",
   "description": "Typescript typings for the FacilMap communication between client and server.",
-  "homepage": "https://github.com/FacilMap/facilmap2",
+  "homepage": "https://github.com/FacilMap/facilmap",
   "bugs": {
-    "url": "https://github.com/FacilMap/facilmap2/issues"
+    "url": "https://github.com/FacilMap/facilmap/issues"
   },
   "license": "AGPL-3.0",
   "author": "Candid Dauth <cdauth@cdauth.eu>",
   "main": "./src/index.ts",
   "repository": {
     "type": "git",
-    "url": "https://github.com/FacilMap/facilmap2.git"
+    "url": "https://github.com/FacilMap/facilmap.git"
   },
   "dependencies": {
     "@types/geojson": "^7946.0.7"
diff --git a/utils/package.json b/utils/package.json
index ec9d7fcd..58a2731e 100644
--- a/utils/package.json
+++ b/utils/package.json
@@ -6,16 +6,16 @@
     "webpack",
     "facilmap"
   ],
-  "homepage": "https://github.com/FacilMap/facilmap2",
+  "homepage": "https://github.com/FacilMap/facilmap",
   "bugs": {
-    "url": "https://github.com/FacilMap/facilmap2/issues"
+    "url": "https://github.com/FacilMap/facilmap/issues"
   },
   "license": "AGPL-3.0",
   "author": "Candid Dauth <cdauth@cdauth.eu>",
   "main": "./src/index.ts",
   "repository": {
     "type": "git",
-    "url": "https://github.com/FacilMap/facilmap2.git"
+    "url": "https://github.com/FacilMap/facilmap.git"
   },
   "scripts": {
     "types": "tsc --noEmit src/*",