diff --git a/region/brinstar/green/Green Brinstar Main Shaft Save Room.json b/region/brinstar/green/Green Brinstar Save Room.json
similarity index 97%
rename from region/brinstar/green/Green Brinstar Main Shaft Save Room.json
rename to region/brinstar/green/Green Brinstar Save Room.json
index cec00770f0..f72451e3ad 100644
--- a/region/brinstar/green/Green Brinstar Main Shaft Save Room.json	
+++ b/region/brinstar/green/Green Brinstar Save Room.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 314,
-  "name": "Green Brinstar Main Shaft Save Room",
+  "name": "Green Brinstar Save Room",
   "area": "Brinstar",
   "subarea": "Green",
   "roomAddress": "0x7A201",
diff --git a/region/brinstar/pink/Pink Brinstar Power Bomb Room.json b/region/brinstar/pink/Mission Impossible Room.json
similarity index 99%
rename from region/brinstar/pink/Pink Brinstar Power Bomb Room.json
rename to region/brinstar/pink/Mission Impossible Room.json
index 9fcbe15cfe..9a0e305be2 100644
--- a/region/brinstar/pink/Pink Brinstar Power Bomb Room.json	
+++ b/region/brinstar/pink/Mission Impossible Room.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 60,
-  "name": "Pink Brinstar Power Bomb Room",
+  "name": "Mission Impossible Room",
   "area": "Brinstar",
   "subarea": "Pink",
   "roomAddress": "0x79E11",
diff --git a/region/brinstar/pink/Pink Brinstar Hopper Room.json b/region/brinstar/pink/Pink Brinstar Wave Gate Room.json
similarity index 99%
rename from region/brinstar/pink/Pink Brinstar Hopper Room.json
rename to region/brinstar/pink/Pink Brinstar Wave Gate Room.json
index 857f3e462f..e8065f86d8 100644
--- a/region/brinstar/pink/Pink Brinstar Hopper Room.json	
+++ b/region/brinstar/pink/Pink Brinstar Wave Gate Room.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 61,
-  "name": "Pink Brinstar Hopper Room",
+  "name": "Pink Brinstar Wave Gate Room",
   "area": "Brinstar",
   "subarea": "Pink",
   "roomAddress": "0x7A130",
diff --git a/region/brinstar/pink/Hopper Energy Tank Room.json b/region/brinstar/pink/Wave Gate Energy Tank Room.json
similarity index 97%
rename from region/brinstar/pink/Hopper Energy Tank Room.json
rename to region/brinstar/pink/Wave Gate Energy Tank Room.json
index 1aa31229cd..29a78cbdc7 100644
--- a/region/brinstar/pink/Hopper Energy Tank Room.json	
+++ b/region/brinstar/pink/Wave Gate Energy Tank Room.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 62,
-  "name": "Hopper Energy Tank Room",
+  "name": "Wave Gate Energy Tank Room",
   "area": "Brinstar",
   "subarea": "Pink",
   "roomAddress": "0x7A15B",
diff --git a/region/brinstar/red/Bat Room.json b/region/brinstar/red/Skree Boost Room.json
similarity index 99%
rename from region/brinstar/red/Bat Room.json
rename to region/brinstar/red/Skree Boost Room.json
index 9d5f0106af..501d3458c5 100644
--- a/region/brinstar/red/Bat Room.json	
+++ b/region/brinstar/red/Skree Boost Room.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 69,
-  "name": "Bat Room",
+  "name": "Skree Boost Room",
   "area": "Brinstar",
   "subarea": "Red",
   "roomAddress": "0x7A3DD",
diff --git a/region/crateria/central/The Final Missile.json b/region/crateria/central/230 Missile Room.json
similarity index 98%
rename from region/crateria/central/The Final Missile.json
rename to region/crateria/central/230 Missile Room.json
index 8fabd979f1..4f5f66be59 100644
--- a/region/crateria/central/The Final Missile.json	
+++ b/region/crateria/central/230 Missile Room.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 17,
-  "name": "The Final Missile",
+  "name": "230 Missile Room",
   "area": "Crateria",
   "subarea": "Central",
   "roomAddress": "0x79A90",
diff --git a/region/crateria/central/Crateria Super Room.json b/region/crateria/central/Climb Supers Room.json
similarity index 99%
rename from region/crateria/central/Crateria Super Room.json
rename to region/crateria/central/Climb Supers Room.json
index dcb85a9138..f0ec8c576c 100644
--- a/region/crateria/central/Crateria Super Room.json	
+++ b/region/crateria/central/Climb Supers Room.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 29,
-  "name": "Crateria Super Room",
+  "name": "Climb Supers Room",
   "area": "Crateria",
   "subarea": "Central",
   "roomAddress": "0x799F9",
diff --git a/region/crateria/east/Bowling Alley Path.json b/region/crateria/east/Pancakes and Wavers Room.json
similarity index 99%
rename from region/crateria/east/Bowling Alley Path.json
rename to region/crateria/east/Pancakes and Wavers Room.json
index 0cbadfcc28..a377c1944d 100644
--- a/region/crateria/east/Bowling Alley Path.json	
+++ b/region/crateria/east/Pancakes and Wavers Room.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 33,
-  "name": "Bowling Alley Path",
+  "name": "Pancakes and Wavers Room",
   "area": "Crateria",
   "subarea": "East",
   "roomAddress": "0x79461",
diff --git a/region/lowernorfair/east/Lower Norfair Spring Ball Maze Room.json b/region/lowernorfair/east/Lower Norfair Spring Ball Maze.json
similarity index 99%
rename from region/lowernorfair/east/Lower Norfair Spring Ball Maze Room.json
rename to region/lowernorfair/east/Lower Norfair Spring Ball Maze.json
index 567380dd29..ac2c6ddc3a 100644
--- a/region/lowernorfair/east/Lower Norfair Spring Ball Maze Room.json	
+++ b/region/lowernorfair/east/Lower Norfair Spring Ball Maze.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 146,
-  "name": "Lower Norfair Spring Ball Maze Room",
+  "name": "Lower Norfair Spring Ball Maze",
   "area": "Norfair",
   "subarea": "Lower",
   "subsubarea": "East",
diff --git a/region/lowernorfair/east/Lower Norfair Escape Power Bomb Room.json b/region/lowernorfair/east/The Jail.json
similarity index 99%
rename from region/lowernorfair/east/Lower Norfair Escape Power Bomb Room.json
rename to region/lowernorfair/east/The Jail.json
index dabc606a24..5def0c1dfd 100644
--- a/region/lowernorfair/east/Lower Norfair Escape Power Bomb Room.json	
+++ b/region/lowernorfair/east/The Jail.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 147,
-  "name": "Lower Norfair Escape Power Bomb Room",
+  "name": "The Jail",
   "area": "Norfair",
   "subarea": "Lower",
   "subsubarea": "East",
diff --git a/region/maridia/inner-green/West Sand Hall Tunnel.json b/region/maridia/inner-green/Lonely Crab Room.json
similarity index 99%
rename from region/maridia/inner-green/West Sand Hall Tunnel.json
rename to region/maridia/inner-green/Lonely Crab Room.json
index 59c49017b4..db0db8a16c 100644
--- a/region/maridia/inner-green/West Sand Hall Tunnel.json	
+++ b/region/maridia/inner-green/Lonely Crab Room.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 202,
-  "name": "West Sand Hall Tunnel",
+  "name": "Lonely Crab Room",
   "area": "Maridia",
   "subarea": "Inner",
   "subsubarea": "Green",
diff --git a/region/maridia/inner-pink/East Cactus Alley Room.json b/region/maridia/inner-pink/East Cactus Alley.json
similarity index 99%
rename from region/maridia/inner-pink/East Cactus Alley Room.json
rename to region/maridia/inner-pink/East Cactus Alley.json
index d967fe1f0f..28d4aa47cc 100644
--- a/region/maridia/inner-pink/East Cactus Alley Room.json	
+++ b/region/maridia/inner-pink/East Cactus Alley.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 196,
-  "name": "East Cactus Alley Room",
+  "name": "East Cactus Alley",
   "area": "Maridia",
   "subarea": "Inner",
   "subsubarea": "Pink",
diff --git a/region/maridia/inner-pink/East Sand Hole.json b/region/maridia/inner-pink/East Sand Pit.json
similarity index 99%
rename from region/maridia/inner-pink/East Sand Hole.json
rename to region/maridia/inner-pink/East Sand Pit.json
index 321582ace1..9ea0bc7fbc 100644
--- a/region/maridia/inner-pink/East Sand Hole.json	
+++ b/region/maridia/inner-pink/East Sand Pit.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 208,
-  "name": "East Sand Hole",
+  "name": "East Sand Pit",
   "area": "Maridia",
   "subarea": "Inner",
   "subsubarea": "Pink",
diff --git a/region/maridia/inner-pink/West Cactus Alley Room.json b/region/maridia/inner-pink/West Cactus Alley.json
similarity index 99%
rename from region/maridia/inner-pink/West Cactus Alley Room.json
rename to region/maridia/inner-pink/West Cactus Alley.json
index ee71e2eb39..3ddd2686cc 100644
--- a/region/maridia/inner-pink/West Cactus Alley Room.json	
+++ b/region/maridia/inner-pink/West Cactus Alley.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 195,
-  "name": "West Cactus Alley Room",
+  "name": "West Cactus Alley",
   "area": "Maridia",
   "subarea": "Inner",
   "subsubarea": "Pink",
diff --git a/region/maridia/inner-pink/West Sand Hole.json b/region/maridia/inner-pink/West Sand Pit.json
similarity index 99%
rename from region/maridia/inner-pink/West Sand Hole.json
rename to region/maridia/inner-pink/West Sand Pit.json
index 2ead371760..18ecb2eb4b 100644
--- a/region/maridia/inner-pink/West Sand Hole.json	
+++ b/region/maridia/inner-pink/West Sand Pit.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 209,
-  "name": "West Sand Hole",
+  "name": "West Sand Pit",
   "area": "Maridia",
   "subarea": "Inner",
   "subsubarea": "Pink",
diff --git a/region/maridia/inner-yellow/Northwest Maridia Bug Room.json b/region/maridia/inner-yellow/Maridia Swiss Cheese Room.json
similarity index 99%
rename from region/maridia/inner-yellow/Northwest Maridia Bug Room.json
rename to region/maridia/inner-yellow/Maridia Swiss Cheese Room.json
index 503611cb84..4d5fcaa9db 100644
--- a/region/maridia/inner-yellow/Northwest Maridia Bug Room.json	
+++ b/region/maridia/inner-yellow/Maridia Swiss Cheese Room.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 180,
-  "name": "Northwest Maridia Bug Room",
+  "name": "Maridia Swiss Cheese Room",
   "area": "Maridia",
   "subarea": "Inner",
   "subsubarea": "Yellow",
diff --git a/region/maridia/inner-yellow/Pseudo Plasma Spark Room.json b/region/maridia/inner-yellow/The Beach.json
similarity index 99%
rename from region/maridia/inner-yellow/Pseudo Plasma Spark Room.json
rename to region/maridia/inner-yellow/The Beach.json
index cf60261715..0085bad225 100644
--- a/region/maridia/inner-yellow/Pseudo Plasma Spark Room.json	
+++ b/region/maridia/inner-yellow/The Beach.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 179,
-  "name": "Pseudo Plasma Spark Room",
+  "name": "The Beach",
   "area": "Maridia",
   "subarea": "Inner",
   "subsubarea": "Yellow",
diff --git a/region/maridia/inner-yellow/Bug Sand Hole.json b/region/maridia/inner-yellow/Yoink Room.json
similarity index 99%
rename from region/maridia/inner-yellow/Bug Sand Hole.json
rename to region/maridia/inner-yellow/Yoink Room.json
index bfd2ae4e47..3178933565 100644
--- a/region/maridia/inner-yellow/Bug Sand Hole.json	
+++ b/region/maridia/inner-yellow/Yoink Room.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 211,
-  "name": "Bug Sand Hole",
+  "name": "Yoink Room",
   "area": "Maridia",
   "subarea": "Inner",
   "subsubarea": "Yellow",
diff --git a/region/maridia/outer/Crab Tunnel.json b/region/maridia/outer/Crab Gate Room.json
similarity index 99%
rename from region/maridia/outer/Crab Tunnel.json
rename to region/maridia/outer/Crab Gate Room.json
index 1d36eb618e..0519345965 100644
--- a/region/maridia/outer/Crab Tunnel.json	
+++ b/region/maridia/outer/Crab Gate Room.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 176,
-  "name": "Crab Tunnel",
+  "name": "Crab Gate Room",
   "area": "Maridia",
   "subarea": "Outer",
   "roomAddress": "0x7D08A",
diff --git a/region/maridia/outer/Glass Tunnel Save Room.json b/region/maridia/outer/Maridia Tube Save Room.json
similarity index 97%
rename from region/maridia/outer/Glass Tunnel Save Room.json
rename to region/maridia/outer/Maridia Tube Save Room.json
index 1271176b76..f22b2744e7 100644
--- a/region/maridia/outer/Glass Tunnel Save Room.json	
+++ b/region/maridia/outer/Maridia Tube Save Room.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 171,
-  "name": "Glass Tunnel Save Room",
+  "name": "Maridia Tube Save Room",
   "area": "Maridia",
   "subarea": "Outer",
   "roomAddress": "0x7CED2",
diff --git a/region/maridia/outer/Glass Tunnel.json b/region/maridia/outer/Maridia Tube.json
similarity index 99%
rename from region/maridia/outer/Glass Tunnel.json
rename to region/maridia/outer/Maridia Tube.json
index a6c03463bc..b010d234db 100644
--- a/region/maridia/outer/Glass Tunnel.json	
+++ b/region/maridia/outer/Maridia Tube.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 170,
-  "name": "Glass Tunnel",
+  "name": "Maridia Tube",
   "area": "Maridia",
   "subarea": "Outer",
   "roomAddress": "0x7CEFB",
diff --git a/region/maridia/outer/West Glass Tube Tunnel.json b/region/maridia/outer/West Maridia Tube Tunnel.json
similarity index 99%
rename from region/maridia/outer/West Glass Tube Tunnel.json
rename to region/maridia/outer/West Maridia Tube Tunnel.json
index c940736675..4be94f8e0a 100644
--- a/region/maridia/outer/West Glass Tube Tunnel.json	
+++ b/region/maridia/outer/West Maridia Tube Tunnel.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 169,
-  "name": "West Glass Tube Tunnel",
+  "name": "West Maridia Tube Tunnel",
   "area": "Maridia",
   "subarea": "Outer",
   "roomAddress": "0x7CF54",
diff --git a/region/norfair/crocomire/Post Crocomire Missile Room.json b/region/norfair/crocomire/Cosine Room.json
similarity index 99%
rename from region/norfair/crocomire/Post Crocomire Missile Room.json
rename to region/norfair/crocomire/Cosine Room.json
index 8e4236c2a0..511066969e 100644
--- a/region/norfair/crocomire/Post Crocomire Missile Room.json	
+++ b/region/norfair/crocomire/Cosine Room.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 126,
-  "name": "Post Crocomire Missile Room",
+  "name": "Cosine Room",
   "area": "Norfair",
   "subarea": "Upper",
   "subsubarea": "Crocomire",
diff --git a/region/norfair/crocomire/Post Crocomire Jump Room.json b/region/norfair/crocomire/Indiana Jones Room.json
similarity index 99%
rename from region/norfair/crocomire/Post Crocomire Jump Room.json
rename to region/norfair/crocomire/Indiana Jones Room.json
index 14ad0e7763..c5fb8db4a5 100644
--- a/region/norfair/crocomire/Post Crocomire Jump Room.json	
+++ b/region/norfair/crocomire/Indiana Jones Room.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 127,
-  "name": "Post Crocomire Jump Room",
+  "name": "Indiana Jones Room",
   "area": "Norfair",
   "subarea": "Upper",
   "subsubarea": "Crocomire",
diff --git a/region/norfair/east/Green Bubbles Missile Room.json b/region/norfair/east/Green Bubbles Tunnel.json
similarity index 99%
rename from region/norfair/east/Green Bubbles Missile Room.json
rename to region/norfair/east/Green Bubbles Tunnel.json
index 8e78f73b94..9184c7a697 100644
--- a/region/norfair/east/Green Bubbles Missile Room.json	
+++ b/region/norfair/east/Green Bubbles Tunnel.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 98,
-  "name": "Green Bubbles Missile Room",
+  "name": "Green Bubbles Tunnel",
   "area": "Norfair",
   "subarea": "Upper",
   "subsubarea": "East",
diff --git a/region/norfair/east/Acid Snakes Tunnel.json b/region/norfair/east/Lava Farm Tunnel.json
similarity index 99%
rename from region/norfair/east/Acid Snakes Tunnel.json
rename to region/norfair/east/Lava Farm Tunnel.json
index 6c82c4450e..b7dfdddb93 100644
--- a/region/norfair/east/Acid Snakes Tunnel.json	
+++ b/region/norfair/east/Lava Farm Tunnel.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 119,
-  "name": "Acid Snakes Tunnel",
+  "name": "Lava Farm Tunnel",
   "area": "Norfair",
   "subarea": "Upper",
   "subsubarea": "East",
diff --git a/region/norfair/east/Spiky Acid Snakes Tunnel.json b/region/norfair/east/Lava Grapple Tunnel.json
similarity index 99%
rename from region/norfair/east/Spiky Acid Snakes Tunnel.json
rename to region/norfair/east/Lava Grapple Tunnel.json
index 9e668a9707..a4a3429072 100644
--- a/region/norfair/east/Spiky Acid Snakes Tunnel.json	
+++ b/region/norfair/east/Lava Grapple Tunnel.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 112,
-  "name": "Spiky Acid Snakes Tunnel",
+  "name": "Lava Grapple Tunnel",
   "area": "Norfair",
   "subarea": "Upper",
   "subsubarea": "East",
diff --git a/region/norfair/west/Ice Beam Acid Room.json b/region/norfair/west/Ice Beam Trippers Room.json
similarity index 99%
rename from region/norfair/west/Ice Beam Acid Room.json
rename to region/norfair/west/Ice Beam Trippers Room.json
index 4c4f2fb48c..4295e92298 100644
--- a/region/norfair/west/Ice Beam Acid Room.json	
+++ b/region/norfair/west/Ice Beam Trippers Room.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 107,
-  "name": "Ice Beam Acid Room",
+  "name": "Ice Beam Trippers Room",
   "area": "Norfair",
   "subarea": "Upper",
   "subsubarea": "West",
diff --git a/region/tourian/main/Blue Hopper Room.json b/region/tourian/main/Tourian Hopper Room.json
similarity index 99%
rename from region/tourian/main/Blue Hopper Room.json
rename to region/tourian/main/Tourian Hopper Room.json
index 96b25de1ba..cdcf7be2dd 100644
--- a/region/tourian/main/Blue Hopper Room.json	
+++ b/region/tourian/main/Tourian Hopper Room.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 230,
-  "name": "Blue Hopper Room",
+  "name": "Tourian Hopper Room",
   "area": "Tourian",
   "subarea": "Main",
   "roomAddress": "0x7DC19",
diff --git a/region/wreckedship/main/Assembly Line.json b/region/wreckedship/main/Robot Assembly Line.json
similarity index 99%
rename from region/wreckedship/main/Assembly Line.json
rename to region/wreckedship/main/Robot Assembly Line.json
index 9473ad762b..b2b6265f4f 100644
--- a/region/wreckedship/main/Assembly Line.json	
+++ b/region/wreckedship/main/Robot Assembly Line.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 168,
-  "name": "Assembly Line",
+  "name": "Robot Assembly Line",
   "area": "Wrecked Ship",
   "subarea": "Main",
   "roomAddress": "0x7CAAE",