diff --git a/clubhaus_downstairs.json b/downstairs.json
similarity index 99%
rename from clubhaus_downstairs.json
rename to downstairs.json
index e5c5df9..be0198a 100644
--- a/clubhaus_downstairs.json
+++ b/downstairs.json
@@ -459,7 +459,7 @@
                         {
                          "name":"exitUrl",
                          "type":"string",
-                         "value":"clubhaus_downstairs.json"
+                         "value":"downstairs.json"
                         }],
                  "type":"tilelayer",
                  "visible":true,
@@ -477,7 +477,7 @@
                         {
                          "name":"exitUrl",
                          "type":"string",
-                         "value":"clubhaus.json#start_outside"
+                         "value":"main.json#start_outside"
                         }],
                  "type":"tilelayer",
                  "visible":true,
@@ -495,7 +495,7 @@
                         {
                          "name":"exitUrl",
                          "type":"string",
-                         "value":"clubhaus.json#start_darkroom"
+                         "value":"main.json#start_darkroom"
                         }],
                  "type":"tilelayer",
                  "visible":true,
@@ -513,7 +513,7 @@
                         {
                          "name":"exitUrl",
                          "type":"string",
-                         "value":"clubhaus.json#start_downstairs"
+                         "value":"main.json#start_downstairs"
                         }],
                  "type":"tilelayer",
                  "visible":true,
diff --git a/clubhaus.json b/main.json
similarity index 99%
rename from clubhaus.json
rename to main.json
index 14d2c4b..521fbc9 100644
--- a/clubhaus.json
+++ b/main.json
@@ -734,7 +734,7 @@
                         {
                          "name":"exitUrl",
                          "type":"string",
-                         "value":"clubhaus.json"
+                         "value":"main.json"
                         }],
                  "type":"tilelayer",
                  "visible":true,
@@ -752,7 +752,7 @@
                         {
                          "name":"exitUrl",
                          "type":"string",
-                         "value":"clubhaus_downstairs.json#start_outside"
+                         "value":"downstairs.json#start_outside"
                         }],
                  "type":"tilelayer",
                  "visible":true,
@@ -770,7 +770,7 @@
                         {
                          "name":"exitUrl",
                          "type":"string",
-                         "value":"clubhaus.json#start_street_right"
+                         "value":"main.json#start_street_right"
                         }],
                  "type":"tilelayer",
                  "visible":true,
@@ -788,7 +788,7 @@
                         {
                          "name":"exitUrl",
                          "type":"string",
-                         "value":"clubhaus.json#start_street_left"
+                         "value":"main.json#start_street_left"
                         }],
                  "type":"tilelayer",
                  "visible":true,
@@ -806,7 +806,7 @@
                         {
                          "name":"exitUrl",
                          "type":"string",
-                         "value":"clubhaus_downstairs.json#start_darkroom"
+                         "value":"downstairs.json#start_darkroom"
                         }],
                  "type":"tilelayer",
                  "visible":true,
@@ -824,7 +824,7 @@
                         {
                          "name":"exitUrl",
                          "type":"string",
-                         "value":"clubhaus_downstairs.json#start"
+                         "value":"downstairs.json#start"
                         }],
                  "type":"tilelayer",
                  "visible":true,
@@ -842,7 +842,7 @@
                         {
                          "name":"exitUrl",
                          "type":"string",
-                         "value":"clubhaus_upstairs.json#start"
+                         "value":"upstairs.json#start"
                         }],
                  "type":"tilelayer",
                  "visible":true,
diff --git a/pages/elevator.html b/pages/elevator.html
index 40675e2..a9fa1bf 100644
--- a/pages/elevator.html
+++ b/pages/elevator.html
@@ -67,16 +67,16 @@
   <script>
     let rooms = [
       {
-        'room': 'clubhaus_downstairs.json',
+        'room': 'downstairs.json',
         'name': 'downstairs'
       }, {
-        'room': 'clubhaus.json',
+        'room': 'main.json',
         'name': 'main floor'
       }, {
-        'room': 'clubhaus_upstairs.json',
+        'room': 'upstairs.json',
         'name': 'first floor'
       }, {
-        'room': 'clubhaus_roof.json',
+        'room': 'roof.json',
         'name': 'roof'
       }
     ];
@@ -131,4 +131,4 @@
   </script>
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/clubhaus_roof.json b/roof.json
similarity index 99%
rename from clubhaus_roof.json
rename to roof.json
index 91ea64a..d695d1b 100644
--- a/clubhaus_roof.json
+++ b/roof.json
@@ -270,7 +270,7 @@
                         {
                          "name":"exitUrl",
                          "type":"string",
-                         "value":"clubhaus_roof.json"
+                         "value":"roof.json"
                         }],
                  "type":"tilelayer",
                  "visible":true,
@@ -288,7 +288,7 @@
                         {
                          "name":"exitUrl",
                          "type":"string",
-                         "value":"clubhaus_roof_place.json#start"
+                         "value":"roof_place.json#start"
                         }],
                  "type":"tilelayer",
                  "visible":true,
@@ -306,7 +306,7 @@
                         {
                          "name":"exitUrl",
                          "type":"string",
-                         "value":"clubhaus_upstairs.json#start_roof"
+                         "value":"upstairs.json#start_roof"
                         }],
                  "type":"tilelayer",
                  "visible":true,
diff --git a/clubhaus_roof_place.json b/roof_place.json
similarity index 99%
rename from clubhaus_roof_place.json
rename to roof_place.json
index d8cc67b..4ffedf0 100644
--- a/clubhaus_roof_place.json
+++ b/roof_place.json
@@ -227,7 +227,7 @@
                         {
                          "name":"exitUrl",
                          "type":"string",
-                         "value":"clubhaus.json#start_lib_chimney"
+                         "value":"main.json#start_lib_chimney"
                         }],
                  "type":"tilelayer",
                  "visible":true,
@@ -245,7 +245,7 @@
                         {
                          "name":"exitUrl",
                          "type":"string",
-                         "value":"clubhaus_roof.json#start_place"
+                         "value":"roof.json#start_place"
                         }],
                  "type":"tilelayer",
                  "visible":true,
diff --git a/clubhaus_upstairs.json b/upstairs.json
similarity index 99%
rename from clubhaus_upstairs.json
rename to upstairs.json
index 5167309..883b7ad 100644
--- a/clubhaus_upstairs.json
+++ b/upstairs.json
@@ -834,7 +834,7 @@
                         {
                          "name":"exitUrl",
                          "type":"string",
-                         "value":"clubhaus_upstairs.json"
+                         "value":"upstairs.json"
                         }],
                  "type":"tilelayer",
                  "visible":true,
@@ -852,7 +852,7 @@
                         {
                          "name":"exitUrl",
                          "type":"string",
-                         "value":"clubhaus_roof.json#start"
+                         "value":"roof.json#start"
                         }],
                  "type":"tilelayer",
                  "visible":true,
@@ -870,7 +870,7 @@
                         {
                          "name":"exitUrl",
                          "type":"string",
-                         "value":"clubhaus.json#start_upstairs"
+                         "value":"main.json#start_upstairs"
                         }],
                  "type":"tilelayer",
                  "visible":true,