From f73c68bbba5ab86a6cd08e1241e67d2c8c4924f1 Mon Sep 17 00:00:00 2001
From: Brent Kerby <blkerby@gmail.com>
Date: Tue, 1 Jul 2025 15:28:54 -0600
Subject: [PATCH 1/8] Room renames

---
 ...instar Power Bomb Room.json => Mission Impossible Room.json} | 2 +-
 ...nstar Hopper Room.json => Pink Brinstar Wave Gate Room.json} | 2 +-
 region/brinstar/red/{Bat Room.json => Skree Boost Room.json}    | 2 +-
 .../{Crateria Super Room.json => Climb Supers Room.json}        | 2 +-
 .../east/{Bowling Alley Path.json => Puddles Room.json}         | 2 +-
 ...fair Escape Power Bomb Room.json => Lower Norfair Jail.json} | 2 +-
 ... Ball Maze Room.json => Lower Norfair Spring Ball Maze.json} | 2 +-
 .../inner-pink/{East Sand Hole.json => East Sand Pit.json}      | 2 +-
 .../inner-pink/{West Sand Hole.json => West Sand Pit.json}      | 2 +-
 ...est Maridia Bug Room.json => Maridia Swiss Cheese Room.json} | 2 +-
 ...comire Missile Room.json => Post Crocomire Cosine Room.json} | 2 +-
 .../east/{Acid Snakes Tunnel.json => Lava Farm Tunnel.json}     | 2 +-
 ...ky Acid Snakes Tunnel.json => Spiky Lava Snakes Tunnel.json} | 2 +-
 .../{Ice Beam Acid Room.json => Ice Beam Trippers Room.json}    | 2 +-
 .../main/{Blue Hopper Room.json => Tourian Hopper Room.json}    | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)
 rename region/brinstar/pink/{Pink Brinstar Power Bomb Room.json => Mission Impossible Room.json} (99%)
 rename region/brinstar/pink/{Pink Brinstar Hopper Room.json => Pink Brinstar Wave Gate Room.json} (99%)
 rename region/brinstar/red/{Bat Room.json => Skree Boost Room.json} (99%)
 rename region/crateria/central/{Crateria Super Room.json => Climb Supers Room.json} (99%)
 rename region/crateria/east/{Bowling Alley Path.json => Puddles Room.json} (99%)
 rename region/lowernorfair/east/{Lower Norfair Escape Power Bomb Room.json => Lower Norfair Jail.json} (99%)
 rename region/lowernorfair/east/{Lower Norfair Spring Ball Maze Room.json => Lower Norfair Spring Ball Maze.json} (99%)
 rename region/maridia/inner-pink/{East Sand Hole.json => East Sand Pit.json} (99%)
 rename region/maridia/inner-pink/{West Sand Hole.json => West Sand Pit.json} (99%)
 rename region/maridia/inner-yellow/{Northwest Maridia Bug Room.json => Maridia Swiss Cheese Room.json} (99%)
 rename region/norfair/crocomire/{Post Crocomire Missile Room.json => Post Crocomire Cosine Room.json} (99%)
 rename region/norfair/east/{Acid Snakes Tunnel.json => Lava Farm Tunnel.json} (99%)
 rename region/norfair/east/{Spiky Acid Snakes Tunnel.json => Spiky Lava Snakes Tunnel.json} (99%)
 rename region/norfair/west/{Ice Beam Acid Room.json => Ice Beam Trippers Room.json} (99%)
 rename region/tourian/main/{Blue Hopper Room.json => Tourian Hopper Room.json} (99%)

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/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/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/Puddles Room.json
similarity index 99%
rename from region/crateria/east/Bowling Alley Path.json
rename to region/crateria/east/Puddles Room.json
index 0cbadfcc28..cc7d1d5c49 100644
--- a/region/crateria/east/Bowling Alley Path.json	
+++ b/region/crateria/east/Puddles Room.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 33,
-  "name": "Bowling Alley Path",
+  "name": "Puddles Room",
   "area": "Crateria",
   "subarea": "East",
   "roomAddress": "0x79461",
diff --git a/region/lowernorfair/east/Lower Norfair Escape Power Bomb Room.json b/region/lowernorfair/east/Lower Norfair Jail.json
similarity index 99%
rename from region/lowernorfair/east/Lower Norfair Escape Power Bomb Room.json
rename to region/lowernorfair/east/Lower Norfair Jail.json
index dabc606a24..7e5cd50dbe 100644
--- a/region/lowernorfair/east/Lower Norfair Escape Power Bomb Room.json	
+++ b/region/lowernorfair/east/Lower Norfair Jail.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 147,
-  "name": "Lower Norfair Escape Power Bomb Room",
+  "name": "Lower Norfair Jail",
   "area": "Norfair",
   "subarea": "Lower",
   "subsubarea": "East",
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/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 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/norfair/crocomire/Post Crocomire Missile Room.json b/region/norfair/crocomire/Post Crocomire Cosine Room.json
similarity index 99%
rename from region/norfair/crocomire/Post Crocomire Missile Room.json
rename to region/norfair/crocomire/Post Crocomire Cosine Room.json
index 8e4236c2a0..50480e5e9c 100644
--- a/region/norfair/crocomire/Post Crocomire Missile Room.json	
+++ b/region/norfair/crocomire/Post Crocomire Cosine Room.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 126,
-  "name": "Post Crocomire Missile Room",
+  "name": "Post Crocomire Cosine Room",
   "area": "Norfair",
   "subarea": "Upper",
   "subsubarea": "Crocomire",
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/Spiky Lava Snakes Tunnel.json
similarity index 99%
rename from region/norfair/east/Spiky Acid Snakes Tunnel.json
rename to region/norfair/east/Spiky Lava Snakes Tunnel.json
index 9e668a9707..5fdbbb2e87 100644
--- a/region/norfair/east/Spiky Acid Snakes Tunnel.json	
+++ b/region/norfair/east/Spiky Lava Snakes Tunnel.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 112,
-  "name": "Spiky Acid Snakes Tunnel",
+  "name": "Spiky Lava Snakes 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",

From e43776e6403ba51e75fa5827beac9cc195d369f0 Mon Sep 17 00:00:00 2001
From: Brent Kerby <blkerby@gmail.com>
Date: Wed, 2 Jul 2025 08:46:22 -0600
Subject: [PATCH 2/8] second batch of room renames

---
 .../{The Final Missile.json => The Final Missile Room.json}     | 2 +-
 ...air Spring Ball Maze.json => Hotarubi Spring Ball Maze.json} | 2 +-
 .../{West Sand Hall Tunnel.json => Lonely Crab Room.json}       | 2 +-
 .../{East Cactus Alley Room.json => East Cactus Alley.json}     | 2 +-
 .../{West Cactus Alley Room.json => West Cactus Alley.json}     | 2 +-
 .../{Pseudo Plasma Spark Room.json => The Beach.json}           | 2 +-
 region/maridia/outer/{Crab Tunnel.json => Crab Gateway.json}    | 2 +-
 ...{Glass Tunnel Save Room.json => Maridia Tube Save Room.json} | 2 +-
 region/maridia/outer/{Glass Tunnel.json => Maridia Tube.json}   | 2 +-
 .../{Post Crocomire Jump Room.json => Indiana Jones Room.json}  | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)
 rename region/crateria/central/{The Final Missile.json => The Final Missile Room.json} (98%)
 rename region/lowernorfair/east/{Lower Norfair Spring Ball Maze.json => Hotarubi Spring Ball Maze.json} (99%)
 rename region/maridia/inner-green/{West Sand Hall Tunnel.json => Lonely Crab Room.json} (99%)
 rename region/maridia/inner-pink/{East Cactus Alley Room.json => East Cactus Alley.json} (99%)
 rename region/maridia/inner-pink/{West Cactus Alley Room.json => West Cactus Alley.json} (99%)
 rename region/maridia/inner-yellow/{Pseudo Plasma Spark Room.json => The Beach.json} (99%)
 rename region/maridia/outer/{Crab Tunnel.json => Crab Gateway.json} (99%)
 rename region/maridia/outer/{Glass Tunnel Save Room.json => Maridia Tube Save Room.json} (97%)
 rename region/maridia/outer/{Glass Tunnel.json => Maridia Tube.json} (99%)
 rename region/norfair/crocomire/{Post Crocomire Jump Room.json => Indiana Jones Room.json} (99%)

diff --git a/region/crateria/central/The Final Missile.json b/region/crateria/central/The Final Missile Room.json
similarity index 98%
rename from region/crateria/central/The Final Missile.json
rename to region/crateria/central/The Final Missile Room.json
index 8fabd979f1..6bd2c5a55a 100644
--- a/region/crateria/central/The Final Missile.json	
+++ b/region/crateria/central/The Final Missile Room.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 17,
-  "name": "The Final Missile",
+  "name": "The Final Missile Room",
   "area": "Crateria",
   "subarea": "Central",
   "roomAddress": "0x79A90",
diff --git a/region/lowernorfair/east/Lower Norfair Spring Ball Maze.json b/region/lowernorfair/east/Hotarubi Spring Ball Maze.json
similarity index 99%
rename from region/lowernorfair/east/Lower Norfair Spring Ball Maze.json
rename to region/lowernorfair/east/Hotarubi Spring Ball Maze.json
index ac2c6ddc3a..cedf8005f3 100644
--- a/region/lowernorfair/east/Lower Norfair Spring Ball Maze.json	
+++ b/region/lowernorfair/east/Hotarubi Spring Ball Maze.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 146,
-  "name": "Lower Norfair Spring Ball Maze",
+  "name": "Hotarubi Spring Ball Maze",
   "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/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-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/outer/Crab Tunnel.json b/region/maridia/outer/Crab Gateway.json
similarity index 99%
rename from region/maridia/outer/Crab Tunnel.json
rename to region/maridia/outer/Crab Gateway.json
index 1d36eb618e..579736299d 100644
--- a/region/maridia/outer/Crab Tunnel.json	
+++ b/region/maridia/outer/Crab Gateway.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 176,
-  "name": "Crab Tunnel",
+  "name": "Crab Gateway",
   "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/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 cbbf53f67c..7e1c7cebfc 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",

From bc9c41f55f929746540910174d2ff45929da2708 Mon Sep 17 00:00:00 2001
From: Brent Kerby <blkerby@gmail.com>
Date: Wed, 2 Jul 2025 10:58:14 -0600
Subject: [PATCH 3/8] third batch of room renames

---
 ...er Energy Tank Room.json => Wave Gate Energy Tank Room.json} | 2 +-
 ...est Glass Tube Tunnel.json => West Maridia Tube Tunnel.json} | 2 +-
 ...reen Bubbles Missile Room.json => Green Bubbles Tunnel.json} | 2 +-
 .../main/{Assembly Line.json => Robot Assembly Line.json}       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename region/brinstar/pink/{Hopper Energy Tank Room.json => Wave Gate Energy Tank Room.json} (97%)
 rename region/maridia/outer/{West Glass Tube Tunnel.json => West Maridia Tube Tunnel.json} (99%)
 rename region/norfair/east/{Green Bubbles Missile Room.json => Green Bubbles Tunnel.json} (99%)
 rename region/wreckedship/main/{Assembly Line.json => Robot Assembly Line.json} (99%)

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/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/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/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",

From a73a71a0d3a94a56b158d197157f25ef5ff8866b Mon Sep 17 00:00:00 2001
From: Brent Kerby <blkerby@gmail.com>
Date: Wed, 2 Jul 2025 13:38:47 -0600
Subject: [PATCH 4/8] shorten to Cosine Room

---
 .../{Post Crocomire Cosine Room.json => Cosine Room.json}       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename region/norfair/crocomire/{Post Crocomire Cosine Room.json => Cosine Room.json} (99%)

diff --git a/region/norfair/crocomire/Post Crocomire Cosine Room.json b/region/norfair/crocomire/Cosine Room.json
similarity index 99%
rename from region/norfair/crocomire/Post Crocomire Cosine Room.json
rename to region/norfair/crocomire/Cosine Room.json
index 50480e5e9c..511066969e 100644
--- a/region/norfair/crocomire/Post Crocomire Cosine Room.json	
+++ b/region/norfair/crocomire/Cosine Room.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 126,
-  "name": "Post Crocomire Cosine Room",
+  "name": "Cosine Room",
   "area": "Norfair",
   "subarea": "Upper",
   "subsubarea": "Crocomire",

From 8d2e73953be0d5c84af122e69a6d6be0f7e2bee8 Mon Sep 17 00:00:00 2001
From: Brent Kerby <blkerby@gmail.com>
Date: Wed, 2 Jul 2025 14:05:39 -0600
Subject: [PATCH 5/8] shortened name Green Brinstar Save Room

---
 ... Main Shaft Save Room.json => Green Brinstar Save Room.json} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename region/brinstar/green/{Green Brinstar Main Shaft Save Room.json => Green Brinstar Save Room.json} (97%)

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",

From a8effd124afe31ec3c4faecf1d3f20b4bc8ae477 Mon Sep 17 00:00:00 2001
From: Brent Kerby <blkerby@gmail.com>
Date: Wed, 2 Jul 2025 19:03:01 -0600
Subject: [PATCH 6/8] NobodyNada suggested names: 230 Missile, No Snakes, Spiky
 Snakes

---
 .../{The Final Missile Room.json => 230 Missile Room.json}      | 2 +-
 .../east/{Lava Farm Tunnel.json => No Snakes Tunnel.json}       | 2 +-
 .../{Spiky Lava Snakes Tunnel.json => Spiky Snakes Tunnel.json} | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename region/crateria/central/{The Final Missile Room.json => 230 Missile Room.json} (98%)
 rename region/norfair/east/{Lava Farm Tunnel.json => No Snakes Tunnel.json} (99%)
 rename region/norfair/east/{Spiky Lava Snakes Tunnel.json => Spiky Snakes Tunnel.json} (99%)

diff --git a/region/crateria/central/The Final Missile Room.json b/region/crateria/central/230 Missile Room.json
similarity index 98%
rename from region/crateria/central/The Final Missile Room.json
rename to region/crateria/central/230 Missile Room.json
index 6bd2c5a55a..4f5f66be59 100644
--- a/region/crateria/central/The Final Missile Room.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 Room",
+  "name": "230 Missile Room",
   "area": "Crateria",
   "subarea": "Central",
   "roomAddress": "0x79A90",
diff --git a/region/norfair/east/Lava Farm Tunnel.json b/region/norfair/east/No Snakes Tunnel.json
similarity index 99%
rename from region/norfair/east/Lava Farm Tunnel.json
rename to region/norfair/east/No Snakes Tunnel.json
index b7dfdddb93..2dad220042 100644
--- a/region/norfair/east/Lava Farm Tunnel.json	
+++ b/region/norfair/east/No Snakes Tunnel.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 119,
-  "name": "Lava Farm Tunnel",
+  "name": "No Snakes Tunnel",
   "area": "Norfair",
   "subarea": "Upper",
   "subsubarea": "East",
diff --git a/region/norfair/east/Spiky Lava Snakes Tunnel.json b/region/norfair/east/Spiky Snakes Tunnel.json
similarity index 99%
rename from region/norfair/east/Spiky Lava Snakes Tunnel.json
rename to region/norfair/east/Spiky Snakes Tunnel.json
index 5fdbbb2e87..56066dfc57 100644
--- a/region/norfair/east/Spiky Lava Snakes Tunnel.json	
+++ b/region/norfair/east/Spiky Snakes Tunnel.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 112,
-  "name": "Spiky Lava Snakes Tunnel",
+  "name": "Spiky Snakes Tunnel",
   "area": "Norfair",
   "subarea": "Upper",
   "subsubarea": "East",

From 271926dc81201b97ab632302b810bf7916203b5f Mon Sep 17 00:00:00 2001
From: Brent Kerby <blkerby@gmail.com>
Date: Thu, 3 Jul 2025 10:50:20 -0600
Subject: [PATCH 7/8] Yoink Room, Lava Grapple Tunnel, Lava Farm Tunnel

---
 .../inner-yellow/{Bug Sand Hole.json => Yoink Room.json}        | 2 +-
 .../east/{No Snakes Tunnel.json => Lava Farm Tunnel.json}       | 2 +-
 .../east/{Spiky Snakes Tunnel.json => Lava Grapple Tunnel.json} | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename region/maridia/inner-yellow/{Bug Sand Hole.json => Yoink Room.json} (99%)
 rename region/norfair/east/{No Snakes Tunnel.json => Lava Farm Tunnel.json} (99%)
 rename region/norfair/east/{Spiky Snakes Tunnel.json => Lava Grapple Tunnel.json} (99%)

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 f9e0a7bb73..f1de2a96f7 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/norfair/east/No Snakes Tunnel.json b/region/norfair/east/Lava Farm Tunnel.json
similarity index 99%
rename from region/norfair/east/No Snakes Tunnel.json
rename to region/norfair/east/Lava Farm Tunnel.json
index 2dad220042..b7dfdddb93 100644
--- a/region/norfair/east/No Snakes Tunnel.json	
+++ b/region/norfair/east/Lava Farm Tunnel.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 119,
-  "name": "No Snakes Tunnel",
+  "name": "Lava Farm Tunnel",
   "area": "Norfair",
   "subarea": "Upper",
   "subsubarea": "East",
diff --git a/region/norfair/east/Spiky Snakes Tunnel.json b/region/norfair/east/Lava Grapple Tunnel.json
similarity index 99%
rename from region/norfair/east/Spiky Snakes Tunnel.json
rename to region/norfair/east/Lava Grapple Tunnel.json
index 56066dfc57..a4a3429072 100644
--- a/region/norfair/east/Spiky 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 Snakes Tunnel",
+  "name": "Lava Grapple Tunnel",
   "area": "Norfair",
   "subarea": "Upper",
   "subsubarea": "East",

From fe7d86f6ff09ca1c1d446f56aa23d5b27dbd1955 Mon Sep 17 00:00:00 2001
From: Brent Kerby <blkerby@gmail.com>
Date: Mon, 7 Jul 2025 15:24:50 -0600
Subject: [PATCH 8/8] adjustments based on feedback/polls

---
 .../east/{Puddles Room.json => Pancakes and Wavers Room.json}   | 2 +-
 ...pring Ball Maze.json => Lower Norfair Spring Ball Maze.json} | 2 +-
 .../east/{Lower Norfair Jail.json => The Jail.json}             | 2 +-
 region/maridia/outer/{Crab Gateway.json => Crab Gate Room.json} | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename region/crateria/east/{Puddles Room.json => Pancakes and Wavers Room.json} (99%)
 rename region/lowernorfair/east/{Hotarubi Spring Ball Maze.json => Lower Norfair Spring Ball Maze.json} (99%)
 rename region/lowernorfair/east/{Lower Norfair Jail.json => The Jail.json} (99%)
 rename region/maridia/outer/{Crab Gateway.json => Crab Gate Room.json} (99%)

diff --git a/region/crateria/east/Puddles Room.json b/region/crateria/east/Pancakes and Wavers Room.json
similarity index 99%
rename from region/crateria/east/Puddles Room.json
rename to region/crateria/east/Pancakes and Wavers Room.json
index cc7d1d5c49..a377c1944d 100644
--- a/region/crateria/east/Puddles Room.json	
+++ b/region/crateria/east/Pancakes and Wavers Room.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 33,
-  "name": "Puddles Room",
+  "name": "Pancakes and Wavers Room",
   "area": "Crateria",
   "subarea": "East",
   "roomAddress": "0x79461",
diff --git a/region/lowernorfair/east/Hotarubi Spring Ball Maze.json b/region/lowernorfair/east/Lower Norfair Spring Ball Maze.json
similarity index 99%
rename from region/lowernorfair/east/Hotarubi Spring Ball Maze.json
rename to region/lowernorfair/east/Lower Norfair Spring Ball Maze.json
index cedf8005f3..ac2c6ddc3a 100644
--- a/region/lowernorfair/east/Hotarubi Spring Ball Maze.json	
+++ b/region/lowernorfair/east/Lower Norfair Spring Ball Maze.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 146,
-  "name": "Hotarubi Spring Ball Maze",
+  "name": "Lower Norfair Spring Ball Maze",
   "area": "Norfair",
   "subarea": "Lower",
   "subsubarea": "East",
diff --git a/region/lowernorfair/east/Lower Norfair Jail.json b/region/lowernorfair/east/The Jail.json
similarity index 99%
rename from region/lowernorfair/east/Lower Norfair Jail.json
rename to region/lowernorfair/east/The Jail.json
index 7e5cd50dbe..5def0c1dfd 100644
--- a/region/lowernorfair/east/Lower Norfair Jail.json	
+++ b/region/lowernorfair/east/The Jail.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 147,
-  "name": "Lower Norfair Jail",
+  "name": "The Jail",
   "area": "Norfair",
   "subarea": "Lower",
   "subsubarea": "East",
diff --git a/region/maridia/outer/Crab Gateway.json b/region/maridia/outer/Crab Gate Room.json
similarity index 99%
rename from region/maridia/outer/Crab Gateway.json
rename to region/maridia/outer/Crab Gate Room.json
index 579736299d..0519345965 100644
--- a/region/maridia/outer/Crab Gateway.json	
+++ b/region/maridia/outer/Crab Gate Room.json	
@@ -1,7 +1,7 @@
 {
   "$schema": "../../../schema/m3-room.schema.json",
   "id": 176,
-  "name": "Crab Gateway",
+  "name": "Crab Gate Room",
   "area": "Maridia",
   "subarea": "Outer",
   "roomAddress": "0x7D08A",