diff --git a/helpers.json b/helpers.json
index df2f4ed029..33d0f2e95b 100644
--- a/helpers.json
+++ b/helpers.json
@@ -52,7 +52,7 @@
             "In the original game, some items don't spawn until certain conditions are met.",
             "These may be unintuitive to players, so randomizers may want to instead spawn all items at all times, which can be done by removing the 'never' in this helper.",
             "Seven of the eight items in Wrecked Ship only spawn if Phantoon is defeated.",
-            "The item in missile in the Final Missile Room, and the Power Bomb in the Morph Ball Room only spawn if Zebes is awake.",
+            "The item in 230 Missile Room, and the Power Bomb in the Morph Ball Room only spawn if Zebes is awake.",
             "The item in the Pit Room only spawns if both Morph and Missiles have been collected.",
             "In addition, in the original game, Morph will no longer spawn if Zebes is awake; this bug is considered never valuable and the data lists it as always spawned regardless of this helper."
           ]
@@ -264,7 +264,7 @@
           "requires": [ "never" ],
           "devNote": [
             "In Vanilla, there is a bug placing the closing door at the top of the Etecoon Shaft in the wrong location.",
-            "Additionally, the top right door in both Pink Brinstar Power Bomb Room and Halfie Climb Room are immediately closed.",
+            "Additionally, the top right door in both Mission Impossible Room and Halfie Climb Room are immediately closed.",
             "This affects the closing animation and prevents return through the door while in direct G-mode.",
             "This also prevents getting doorstuck, although that doesn't seem to be important in any of these locations."
           ]
diff --git a/region/brinstar/blue/Blue Brinstar Boulder Room.json b/region/brinstar/blue/Blue Brinstar Boulder Room.json
index 9cb6a752ed..e03c241e97 100644
--- a/region/brinstar/blue/Blue Brinstar Boulder Room.json	
+++ b/region/brinstar/blue/Blue Brinstar Boulder Room.json	
@@ -522,7 +522,7 @@
               "speedBooster": "any",
               "obstructions": [[1, 0]],
               "note": [
-                "This applies to Early Supers Room, Shaktool Room, Blue Hopper Room, Bowling Alley (bottom), Dust Torizo Room, and Noob Bridge."
+                "This applies to Early Supers Room, Shaktool Room, Tourian Hopper Room, Bowling Alley (bottom), Dust Torizo Room, and Noob Bridge."
               ],
               "detailNote": ["With this longer amount of runway, the jump has a 2-frame window."]
             },
@@ -533,7 +533,7 @@
               "speedBooster": "any",
               "obstructions": [[1, 0]],
               "note": [
-                "This applies to Bomb Torizo Room, Pink Brinstar Hopper Room, Phantoon's Room, Big Boy Room, and Double Chamber."
+                "This applies to Bomb Torizo Room, Pink Brinstar Wave Gate Room, Phantoon's Room, Big Boy Room, and Double Chamber."
               ]
             }
           ]
diff --git a/region/brinstar/pink/Pink Brinstar Wave Gate Room.json b/region/brinstar/pink/Pink Brinstar Wave Gate Room.json
index cb8087d98a..1f67834449 100644
--- a/region/brinstar/pink/Pink Brinstar Wave Gate Room.json	
+++ b/region/brinstar/pink/Pink Brinstar Wave Gate Room.json	
@@ -1787,7 +1787,7 @@
               "requires": [
                 "canTrickyDashJump"
               ],
-              "note": ["This applies to Shaktool Room, Blue Hopper Room, and Bowling Alley (bottom)."],
+              "note": ["This applies to Shaktool Room, Tourian Hopper Room, and Bowling Alley (bottom)."],
               "detailNote": [
                 "This needs extra run speed $2.0 or $2.1,",
                 "being sure to maintain forward momentum while performing the mid-air jump to boost its height."
@@ -1811,7 +1811,7 @@
                 "canTrickyDashJump"
               ],
               "note": [
-                "This applies to Bomb Torizo Room, Pink Brinstar Hopper Room, Phantoon's Room, Fish Tank, Botwoon's Room, and Big Boy Room."
+                "This applies to Bomb Torizo Room, Pink Brinstar Wave Gate Room, Phantoon's Room, Fish Tank, Botwoon's Room, and Big Boy Room."
               ],
               "detailNote": [
                 "This needs extra run speed $2.0 or $2.1,",
@@ -2054,7 +2054,7 @@
       "requires": [
         "canTrickyGrappleJump"
       ],
-      "devNote": ["This appears not to be possible from Crateria Super Room?"]
+      "devNote": ["This appears not to be possible from Climb Supers Room?"]
     },
     {
       "id": 84,
diff --git a/region/brinstar/red/Caterpillar Room.json b/region/brinstar/red/Caterpillar Room.json
index 06117c8f11..9596ad0357 100644
--- a/region/brinstar/red/Caterpillar Room.json	
+++ b/region/brinstar/red/Caterpillar Room.json	
@@ -1283,7 +1283,7 @@
       "entranceCondition": {
         "comeInWithGrappleSwing": {
           "blocks": [
-            {"position": [6, 2], "note": "Spiky Acid Snakes Tunnel"},
+            {"position": [6, 2], "note": "Lava Grapple Tunnel"},
             {
               "position": [5, 2],
               "note": "The Moat, Double Chamber, Wrecked Ship Energy Tank Room"
diff --git a/region/brinstar/red/Skree Boost Room.json b/region/brinstar/red/Skree Boost Room.json
index 2be3a1804c..2fc63c659a 100644
--- a/region/brinstar/red/Skree Boost Room.json	
+++ b/region/brinstar/red/Skree Boost Room.json	
@@ -38,7 +38,7 @@
   "enemies": [
     {
       "id": "e1",
-      "groupName": "Bat Room Skrees",
+      "groupName": "Skree Boost Skrees",
       "enemyName": "Skree",
       "quantity": 2,
       "homeNodes": [2]
diff --git a/region/brinstar/roomDiagrams/green_GreenBrinstarMainShaftSaveRoom_314.png b/region/brinstar/roomDiagrams/green_GreenBrinstarSaveRoom_314.png
similarity index 100%
rename from region/brinstar/roomDiagrams/green_GreenBrinstarMainShaftSaveRoom_314.png
rename to region/brinstar/roomDiagrams/green_GreenBrinstarSaveRoom_314.png
diff --git a/region/brinstar/roomDiagrams/pink_PinkBrinstarHopperRoom_61.png b/region/brinstar/roomDiagrams/pink_PinkBrinstarWaveGateRoom_61.png
similarity index 100%
rename from region/brinstar/roomDiagrams/pink_PinkBrinstarHopperRoom_61.png
rename to region/brinstar/roomDiagrams/pink_PinkBrinstarWaveGateRoom_61.png
diff --git a/region/brinstar/roomDiagrams/pink_HopperEnergyTankRoom_62.png b/region/brinstar/roomDiagrams/pink_WaveGateEnergyTankRoom_62.png
similarity index 100%
rename from region/brinstar/roomDiagrams/pink_HopperEnergyTankRoom_62.png
rename to region/brinstar/roomDiagrams/pink_WaveGateEnergyTankRoom_62.png
diff --git a/region/brinstar/roomDiagrams/red_BatRoom_69.png b/region/brinstar/roomDiagrams/red_SkreeBoostRoom_69.png
similarity index 100%
rename from region/brinstar/roomDiagrams/red_BatRoom_69.png
rename to region/brinstar/roomDiagrams/red_SkreeBoostRoom_69.png
diff --git a/region/crateria/central/230 Missile Room.json b/region/crateria/central/230 Missile Room.json
index 4f5f66be59..07cded3dc3 100644
--- a/region/crateria/central/230 Missile Room.json	
+++ b/region/crateria/central/230 Missile Room.json	
@@ -31,7 +31,7 @@
       "nodeAddress": "0x78486",
       "locks": [
         {
-          "name": "Final Missile Spawn Lock",
+          "name": "230 Missile Spawn Lock",
           "lockType": "gameFlag",
           "unlockStrats": [
             {
diff --git a/region/crateria/central/Climb Supers Room.json b/region/crateria/central/Climb Supers Room.json
index 4a08d09e7f..8f46953b8a 100644
--- a/region/crateria/central/Climb Supers Room.json	
+++ b/region/crateria/central/Climb Supers Room.json	
@@ -168,7 +168,7 @@
   "enemies": [
     {
       "id": "e1",
-      "groupName": "Crateria Supers Boyons",
+      "groupName": "Climb Supers Boyons",
       "enemyName": "Boyon",
       "quantity": 4,
       "homeNodes": [2]
diff --git a/region/crateria/central/Climb.json b/region/crateria/central/Climb.json
index 9f0a1b5282..9ba2bb3d86 100644
--- a/region/crateria/central/Climb.json
+++ b/region/crateria/central/Climb.json
@@ -84,7 +84,7 @@
       "doorEnvironments": [{"physics": "air"}],
       "locks": [
         {
-          "name": "Climb Top Right Gray Lock (to Crateria Supers Top)",
+          "name": "Climb Top Right Gray Lock (to Climb Supers Top)",
           "lockType": "permanent",
           "unlockStrats": [
             {
@@ -118,7 +118,7 @@
       "doorEnvironments": [{"physics": "air"}],
       "locks": [
         {
-          "name": "Climb Middle Right Escape Lock (to Crateria supers Bottom)",
+          "name": "Climb Middle Right Escape Lock (to Climb supers Bottom)",
           "lockType": "escapeFunnel",
           "lock": ["f_ZebesSetAblaze"],
           "unlockStrats": [
diff --git a/region/crateria/east/Pancakes and Wavers Room.json b/region/crateria/east/Pancakes and Wavers Room.json
index cacb7d960b..b23a8460e9 100644
--- a/region/crateria/east/Pancakes and Wavers Room.json	
+++ b/region/crateria/east/Pancakes and Wavers Room.json	
@@ -38,14 +38,14 @@
   "enemies": [
     {
       "id": "e1",
-      "groupName": "Bowling Alley Path Wavers",
+      "groupName": "Pancakes and Wavers Wavers",
       "enemyName": "Waver",
       "quantity": 3,
       "homeNodes": [1, 2]
     },
     {
       "id": "e2",
-      "groupName": "Bowling Alley Path Choots",
+      "groupName": "Pancakes and Wavers Choots",
       "enemyName": "Choot",
       "quantity": 3,
       "homeNodes": [1]
diff --git a/region/crateria/east/West Ocean.json b/region/crateria/east/West Ocean.json
index ca9073de0a..b9e8ab186f 100644
--- a/region/crateria/east/West Ocean.json	
+++ b/region/crateria/east/West Ocean.json	
@@ -395,9 +395,9 @@
           "devNote": [
             "It's possible to stop half-way by shooting open the door that appears to lead to Bowling Alley",
             "This has limited usefulness, because this door actually leads to the same transition as the bottom right door (to the Wrecked Ship Entrance).",
-            "Likewise the door on the left, which appears to lead to Bowling Alley Path, actually leads to the same transition as the bottom left door (to the Moat).",
+            "Likewise the door on the left, which appears to lead to Pancakes and Wavers Room, actually leads to the same transition as the bottom left door (to the Moat).",
             "There is a potential application by using this runway to the right, as it is longer than the one in front of the bottom right door.",
-            "FIXME: add nodes to represent the doors that appear to lead left and right to Bowling Alley Path and Bowling Alley, and add a similar strat leading there."
+            "FIXME: add nodes to represent the doors that appear to lead left and right to Pancakes and Wavers Room and Bowling Alley, and add a similar strat leading there."
           ]
         },
         {"id": 15},
@@ -3279,5 +3279,5 @@
   ],
   "nextStratId": 145,
   "nextNotableId": 14,
-  "note": "The section between Bowling Alley Path and Bowling Alley is excluded from West Ocean and considered as its own room instead (Homing Geemer Room)"
+  "note": "The section between Pancakes and Wavers Room and Bowling Alley is excluded from West Ocean and considered as its own room instead (Homing Geemer Room)"
 }
\ No newline at end of file
diff --git a/region/crateria/roomDiagrams.json b/region/crateria/roomDiagrams.json
index f1aed60d22..32e1d740db 100644
--- a/region/crateria/roomDiagrams.json
+++ b/region/crateria/roomDiagrams.json
@@ -99,7 +99,7 @@
     "height": 6,
     "covers": [
       {
-        "name": "Bowling Alley Path/Homing Geemer Room",
+        "name": "Pancakes and Wavers Room/Homing Geemer Room",
         "origin": [3, 2],
         "width": 3
       }
diff --git a/region/crateria/roomDiagrams/central_TheFinalMissile_17.png b/region/crateria/roomDiagrams/central_230MissileRoom_17.png
similarity index 100%
rename from region/crateria/roomDiagrams/central_TheFinalMissile_17.png
rename to region/crateria/roomDiagrams/central_230MissileRoom_17.png
diff --git a/region/crateria/roomDiagrams/central_CrateriaSuperRoom_29.png b/region/crateria/roomDiagrams/central_ClimbSupersRoom_29.png
similarity index 100%
rename from region/crateria/roomDiagrams/central_CrateriaSuperRoom_29.png
rename to region/crateria/roomDiagrams/central_ClimbSupersRoom_29.png
diff --git a/region/crateria/roomDiagrams/east_BowlingAlleyPath_33.png b/region/crateria/roomDiagrams/east_PancakesAndWaversRoom_33.png
similarity index 100%
rename from region/crateria/roomDiagrams/east_BowlingAlleyPath_33.png
rename to region/crateria/roomDiagrams/east_PancakesAndWaversRoom_33.png
diff --git a/region/lowernorfair/east/Fast Pillars Setup Room.json b/region/lowernorfair/east/Fast Pillars Setup Room.json
index b51960842d..72d91d0baa 100644
--- a/region/lowernorfair/east/Fast Pillars Setup Room.json	
+++ b/region/lowernorfair/east/Fast Pillars Setup Room.json	
@@ -933,7 +933,7 @@
             {"position": [8, 3], "note": "Grapple Beam Room"},
             {"position": [7, 3], "note": "Colosseum"},
             {"position": [6, 4], "note": "Grapple Tutorial Room 2"},
-            {"position": [6, 2], "note": "Spiky Acid Snakes Tunnel"}
+            {"position": [6, 2], "note": "Lava Grapple Tunnel"}
           ]
         }
       },
diff --git a/region/lowernorfair/east/Ridley's Room.json b/region/lowernorfair/east/Ridley's Room.json
index e31979690e..fc8e55963a 100644
--- a/region/lowernorfair/east/Ridley's Room.json	
+++ b/region/lowernorfair/east/Ridley's Room.json	
@@ -388,7 +388,7 @@
         "comeInWithGrappleSwing": {
           "blocks": [
             {"position": [6, 4], "note": "Grapple Tutorial Room 2"},
-            {"position": [6, 2], "note": "Spiky Acid Snakes Tunnel"},
+            {"position": [6, 2], "note": "Lava Grapple Tunnel"},
             {
               "position": [5, 2],
               "note": "The Moat, Double Chamber, Wrecked Ship Energy Tank Room"
diff --git a/region/lowernorfair/roomDiagrams.json b/region/lowernorfair/roomDiagrams.json
index 8dbda6aa07..c05f0361eb 100644
--- a/region/lowernorfair/roomDiagrams.json
+++ b/region/lowernorfair/roomDiagrams.json
@@ -86,7 +86,7 @@
     "height": 6,
     "covers": [
       {
-        "name": "LNorf Escape Power Bombs",
+        "name": "The Jail",
         "origin": [2, 0],
         "height": 2
       },
diff --git a/region/lowernorfair/roomDiagrams/east_LowerNorfairSpringBallMazeRoom_146.png b/region/lowernorfair/roomDiagrams/east_LowerNorfairSpringBallMaze_146.png
similarity index 100%
rename from region/lowernorfair/roomDiagrams/east_LowerNorfairSpringBallMazeRoom_146.png
rename to region/lowernorfair/roomDiagrams/east_LowerNorfairSpringBallMaze_146.png
diff --git a/region/lowernorfair/roomDiagrams/east_LowerNorfairEscapePowerBombRoom_147.png b/region/lowernorfair/roomDiagrams/east_TheJail_147.png
similarity index 100%
rename from region/lowernorfair/roomDiagrams/east_LowerNorfairEscapePowerBombRoom_147.png
rename to region/lowernorfair/roomDiagrams/east_TheJail_147.png
diff --git a/region/maridia/inner-green/Lonely Crab Room.json b/region/maridia/inner-green/Lonely Crab Room.json
index ec1d1e43ac..021004c8d4 100644
--- a/region/maridia/inner-green/Lonely Crab Room.json	
+++ b/region/maridia/inner-green/Lonely Crab Room.json	
@@ -59,7 +59,7 @@
   "enemies": [
     {
       "id": "e1",
-      "groupName": "West Sand Hall Tunnel Sciser",
+      "groupName": "Lonely Crab Room Sciser",
       "enemyName": "Sciser",
       "quantity": 1,
       "homeNodes": [1, 2]
diff --git a/region/maridia/inner-green/Oasis.json b/region/maridia/inner-green/Oasis.json
index 681724bc73..e50f7b42c5 100644
--- a/region/maridia/inner-green/Oasis.json
+++ b/region/maridia/inner-green/Oasis.json
@@ -1339,7 +1339,7 @@
               "speedBooster": true,
               "obstructions": [[1, 0]],
               "note": [
-                "Applies to Early Super Room, Bowling Alley (Bottom), Blue Hopper Room, Dust Torizo Room, and Noob Bridge."
+                "Applies to Early Super Room, Bowling Alley (Bottom), Tourian Hopper Room, Dust Torizo Room, and Noob Bridge."
               ]
             },
             {
@@ -1352,7 +1352,7 @@
                 "canInsaneJump"
               ],
               "note": [
-                "Applies to Bowling Alley (Bottom), Blue Hopper Room, Dust Torizo Room, and Noob Bridge.",
+                "Applies to Bowling Alley (Bottom), Tourian Hopper Room, Dust Torizo Room, and Noob Bridge.",
                 "Without Speed Booster, this requires specific positioning to align Samus to just barely clear the door ledge."
               ]
             },
@@ -1363,7 +1363,7 @@
               "speedBooster": "any",
               "obstructions": [[1, 0]],
               "note": [
-                "Applies to Bomb Torizo Room, Pink Brinstar Hopper Room, Phantoon's Room, Big Boy Room, Double Chamber."
+                "Applies to Bomb Torizo Room, Pink Brinstar Wave Gate Room, Phantoon's Room, Big Boy Room, Double Chamber."
               ]
             },
             {
@@ -1373,7 +1373,7 @@
               "speedBooster": true,
               "obstructions": [[1, 0], [3, 2]],
               "note": [
-                "Applies to Bomb Torizo Room, Pink Brinstar Hopper Room, Phantoon's Room, Big Boy Room, Double Chamber, and Metal Pirates Room.",
+                "Applies to Bomb Torizo Room, Pink Brinstar Wave Gate Room, Phantoon's Room, Big Boy Room, Double Chamber, and Metal Pirates Room.",
                 "With extra run speed exactly $1.2, this works without collision oscillation.",
                 "Extra run speed up through $1.8 also work but with collision oscillation giving a 50% failure rate, as with most other setups."
               ]
diff --git a/region/maridia/inner-pink/Colosseum.json b/region/maridia/inner-pink/Colosseum.json
index 8cf70a42a8..08317152dc 100644
--- a/region/maridia/inner-pink/Colosseum.json
+++ b/region/maridia/inner-pink/Colosseum.json
@@ -1394,7 +1394,7 @@
                 "canTrickySpringBallJump",
                 "canTrickyJump"
               ],
-              "note": "Applies to Early Supers Room, Blue Hopper Room, Bowling Alley (bottom), Dust Torizo Room, and Noob Bridge"
+              "note": "Applies to Early Supers Room, Tourian Hopper Room, Bowling Alley (bottom), Dust Torizo Room, and Noob Bridge"
             },
             {
               "minHeight": 3,
@@ -1406,7 +1406,7 @@
                 "canTrickySpringBallJump",
                 "canTrickyJump"
               ],
-              "note": "Applies to Bomb Torizo Room, Pink Brinstar Hopper Room, Phantoon's Room, Big Boy Room, and Double Chamber."
+              "note": "Applies to Bomb Torizo Room, Pink Brinstar Wave Gate Room, Phantoon's Room, Big Boy Room, and Double Chamber."
             },
             {
               "minHeight": 3,
diff --git a/region/maridia/inner-pink/Crab Shaft.json b/region/maridia/inner-pink/Crab Shaft.json
index 1dfe1af1f2..1e936fcebf 100644
--- a/region/maridia/inner-pink/Crab Shaft.json	
+++ b/region/maridia/inner-pink/Crab Shaft.json	
@@ -1037,7 +1037,7 @@
         "comeInWithGrappleSwing": {
           "blocks": [
             {"position": [6, 4], "note": "Grapple Tutorial Room 2"},
-            {"position": [6, 2], "note": "Spiky Acid Snakes Tunnel"},
+            {"position": [6, 2], "note": "Lava Grapple Tunnel"},
             {
               "position": [5, 2],
               "note": "The Moat, Double Chamber, Wrecked Ship Energy Tank Room"
diff --git a/region/maridia/inner-pink/Draygon's Room.json b/region/maridia/inner-pink/Draygon's Room.json
index a439c5d748..509bddb9be 100644
--- a/region/maridia/inner-pink/Draygon's Room.json	
+++ b/region/maridia/inner-pink/Draygon's Room.json	
@@ -981,7 +981,7 @@
       "name": "Precise Grapple Jump",
       "entranceCondition": {
         "comeInWithGrappleSwing": {
-          "blocks": [{"position": [6, 2], "note": "Spiky Acid Snakes Tunnel"}]
+          "blocks": [{"position": [6, 2], "note": "Lava Grapple Tunnel"}]
         }
       },
       "requires": [
diff --git a/region/maridia/inner-pink/East Cactus Alley.json b/region/maridia/inner-pink/East Cactus Alley.json
index 946bd34e5c..34e35d7a85 100644
--- a/region/maridia/inner-pink/East Cactus Alley.json	
+++ b/region/maridia/inner-pink/East Cactus Alley.json	
@@ -1149,7 +1149,7 @@
             },
             {
               "position": [9, 2],
-              "note": "Crateria Super Room, Bubble Mountain, Spiky Acid Snakes Tunnel"
+              "note": "Climb Supers Room, Bubble Mountain, Lava Grapple Tunnel"
             }
           ]
         }
diff --git a/region/maridia/inner-pink/The Precious Room.json b/region/maridia/inner-pink/The Precious Room.json
index 18ce5aed3c..e8c6ab331a 100644
--- a/region/maridia/inner-pink/The Precious Room.json	
+++ b/region/maridia/inner-pink/The Precious Room.json	
@@ -717,7 +717,7 @@
             {"position": [8, 3], "note": "Grapple Beam Room"},
             {"position": [7, 3], "note": "Colosseum"},
             {"position": [6, 4], "note": "Grapple Tutorial Room 2"},
-            {"position": [6, 2], "note": "Spiky Acid Snakes Tunnel"},
+            {"position": [6, 2], "note": "Lava Grapple Tunnel"},
             {
               "position": [5, 2],
               "note": "The Moat, Double Chamber, Wrecked Ship Energy Tank Room"
diff --git a/region/maridia/inner-pink/West Sand Pit.json b/region/maridia/inner-pink/West Sand Pit.json
index 211a44e9e8..29d92b5ed4 100644
--- a/region/maridia/inner-pink/West Sand Pit.json	
+++ b/region/maridia/inner-pink/West Sand Pit.json	
@@ -96,7 +96,7 @@
   "enemies": [
     {
       "id": "e1",
-      "groupName": "West Sand Hole Boulders",
+      "groupName": "West Sand Pit Boulders",
       "enemyName": "Boulder",
       "quantity": 2,
       "homeNodes": [7]
diff --git a/region/maridia/inner-yellow/Kassiuz Room.json b/region/maridia/inner-yellow/Kassiuz Room.json
index 668964c04a..3d4f504520 100644
--- a/region/maridia/inner-yellow/Kassiuz Room.json	
+++ b/region/maridia/inner-yellow/Kassiuz Room.json	
@@ -414,7 +414,7 @@
       "entranceCondition": {
         "comeInWithGrappleSwing": {
           "blocks": [
-            {"position": [6, 2], "note": "Spiky Acid Snakes Tunnel"},
+            {"position": [6, 2], "note": "Lava Grapple Tunnel"},
             {
               "position": [5, 2],
               "note": "The Moat, Double Chamber, Wrecked Ship Energy Tank Room"
@@ -445,7 +445,7 @@
           "blocks": [
             {"position": [8, 3], "note": "Grapple Beam Room"},
             {"position": [7, 3], "note": "Colosseum"},
-            {"position": [6, 2], "note": "Spiky Acid Snakes Tunnel"},
+            {"position": [6, 2], "note": "Lava Grapple Tunnel"},
             {
               "position": [5, 2],
               "note": "The Moat, Double Chamber, Wrecked Ship Energy Tank Room"
diff --git a/region/maridia/inner-yellow/Maridia Elevator Room.json b/region/maridia/inner-yellow/Maridia Elevator Room.json
index c6ba1c97d8..ed956d115a 100644
--- a/region/maridia/inner-yellow/Maridia Elevator Room.json	
+++ b/region/maridia/inner-yellow/Maridia Elevator Room.json	
@@ -626,7 +626,7 @@
       "entranceCondition": {
         "comeInWithGrappleSwing": {
           "blocks": [
-            {"position": [6, 2], "note": "Spiky Acid Snakes Tunnel"},
+            {"position": [6, 2], "note": "Lava Grapple Tunnel"},
             {
               "position": [5, 2],
               "note": "The Moat, Double Chamber, Wrecked Ship Energy Tank Room"
diff --git a/region/maridia/inner-yellow/Maridia Swiss Cheese Room.json b/region/maridia/inner-yellow/Maridia Swiss Cheese Room.json
index af14faf897..9978705667 100644
--- a/region/maridia/inner-yellow/Maridia Swiss Cheese Room.json	
+++ b/region/maridia/inner-yellow/Maridia Swiss Cheese Room.json	
@@ -59,28 +59,28 @@
   "enemies": [
     {
       "id": "e1",
-      "groupName": "Maridia Bug Room Left Owtches",
+      "groupName": "Maridia Swiss Cheese Room Left Owtches",
       "enemyName": "Owtch",
       "quantity": 4,
       "homeNodes": [1]
     },
     {
       "id": "e2",
-      "groupName": "Maridia Bug Room Left Menus",
+      "groupName": "Maridia Swiss Cheese Room Left Menus",
       "enemyName": "Menu",
       "quantity": 3,
       "homeNodes": [1]
     },
     {
       "id": "e3",
-      "groupName": "Maridia Bug Room Right Owtches",
+      "groupName": "Maridia Swiss Cheese Room Right Owtches",
       "enemyName": "Owtch",
       "quantity": 3,
       "homeNodes": [2]
     },
     {
       "id": "e4",
-      "groupName": "Maridia Bug Room Right Menus",
+      "groupName": "Maridia Swiss Cheese Room Right Menus",
       "enemyName": "Menu",
       "quantity": 2,
       "homeNodes": [2]
diff --git a/region/maridia/inner-yellow/The Beach.json b/region/maridia/inner-yellow/The Beach.json
index de3799f30d..156c0dffbf 100644
--- a/region/maridia/inner-yellow/The Beach.json	
+++ b/region/maridia/inner-yellow/The Beach.json	
@@ -70,21 +70,21 @@
   "enemies": [
     {
       "id": "e1",
-      "groupName": "Pseudo Plasma Spark Room Choots",
+      "groupName": "The Beach Choots",
       "enemyName": "Choot",
       "quantity": 6,
       "homeNodes": [1]
     },
     {
       "id": "e2",
-      "groupName": "Pseudo Plasma Spark Room Skulteras",
+      "groupName": "The Beach Skulteras",
       "enemyName": "Skultera",
       "quantity": 2,
       "homeNodes": [2]
     },
     {
       "id": "e3",
-      "groupName": "Pseudo Plasma Spark Room Owtch",
+      "groupName": "The Beach Owtch",
       "enemyName": "Owtch",
       "quantity": 1,
       "homeNodes": [2]
@@ -572,7 +572,7 @@
         "Hold left through the transition to initiate a turn-around while entering the room.",
         "Land on the small platform at the top of the room."
       ],
-      "devNote": "This strat is applicable only with the Post Crocomire Jump Room."
+      "devNote": "This strat is applicable only with the Indiana Jones Room."
     },
     {
       "id": 23,
@@ -599,7 +599,7 @@
         "Hold left through the transition to initiate a turn-around while entering the room.",
         "Land on the small platform at the top of the room."
       ],
-      "devNote": "This strat is applicable with Crocomire's Room and the Post Crocomire Jump Room."
+      "devNote": "This strat is applicable with Crocomire's Room and the Indiana Jones Room."
     },
     {
       "id": 69,
@@ -967,7 +967,7 @@
         "Perform a momentum-conserving turn-around to make it around the corner of the ledge above.",
         "With limited runway for gaining horizontal speed, the timing of the jump and turn-around may be very precise."
       ],
-      "devNote": ["This applies to Warehouse Zeela Room and Blue Hopper Room."]
+      "devNote": ["This applies to Warehouse Zeela Room and Tourian Hopper Room."]
     },
     {
       "id": 44,
@@ -1093,7 +1093,7 @@
       "note": [
         "Run left-to-right and spin jump from the platform in the room below, passing through the transition without bonking the door."
       ],
-      "devNote": ["This is applicable using the Power Bomb block platform in PCJR."]
+      "devNote": ["This is applicable using the Power Bomb block platform in Indiana Jones Room."]
     },
     {
       "id": 49,
@@ -1238,8 +1238,8 @@
         "It may be necessary to use less runway than is available, to avoid getting too much vertical speed."
       ],
       "devNote": [
-        "This strat is applicable in Crocomire's Room and the Post Crocomire Jump Room.",
-        "Sufficient vertical speed could be obtained with fewer tiles, but it would require jumping further to the right (i.e., increasing minRightPosition) which would not work in PCJR unless the PB blocks are broken;",
+        "This strat is applicable in Crocomire's Room and the Indiana Jones Room.",
+        "Sufficient vertical speed could be obtained with fewer tiles, but it would require jumping further to the right (i.e., increasing minRightPosition) which would not work in Indiana Jones Room unless the PB blocks are broken;",
         "since there doesn't yet appear to be any application, we don't add a separate case for that."
       ]
     },
@@ -1267,7 +1267,7 @@
         "Perform a mid-air wiggle to make into onto either ledge."
       ],
       "devNote": [
-        "This strat is applicable in Crocomire's Room and the Post Crocomire Jump Room."
+        "This strat is applicable in Crocomire's Room and the Indiana Jones Room."
       ]
     },
     {
@@ -1291,7 +1291,7 @@
         "Run left-to-right in the room below using SpeedBooster over a specific distance, and jump up through the door."
       ],
       "devNote": [
-        "This strat is applicable to Acid Snakes Tunnel, and to Lower Norfair Escape Power Bomb Room with the left pillar broken."
+        "This strat is applicable to Lava Farm Tunnel, and to The Jail with the left pillar broken."
       ]
     },
     {
diff --git a/region/maridia/inner-yellow/Yoink Room.json b/region/maridia/inner-yellow/Yoink Room.json
index 6a1fa28728..33becb6905 100644
--- a/region/maridia/inner-yellow/Yoink Room.json	
+++ b/region/maridia/inner-yellow/Yoink Room.json	
@@ -72,14 +72,14 @@
   "enemies": [
     {
       "id": "e1",
-      "groupName": "Bug Sand Hole Zoa",
+      "groupName": "Yoink Room Zoa",
       "enemyName": "Zoa",
       "quantity": 1,
       "homeNodes": [1, 3]
     },
     {
       "id": "e2",
-      "groupName": "Bug Sand Hole Yapping Maws",
+      "groupName": "Yoink Room Yapping Maws",
       "enemyName": "Yapping Maw",
       "quantity": 2,
       "homeNodes": [4, 5]
diff --git a/region/maridia/outer/Crab Gate Room.json b/region/maridia/outer/Crab Gate Room.json
index 077e48e332..1ef3b326ad 100644
--- a/region/maridia/outer/Crab Gate Room.json	
+++ b/region/maridia/outer/Crab Gate Room.json	
@@ -45,14 +45,14 @@
   "enemies": [
     {
       "id": "e1",
-      "groupName": "Crab Tunnel Left Sciser",
+      "groupName": "Crab Gate Room Left Sciser",
       "enemyName": "Sciser",
       "quantity": 1,
       "homeNodes": [1]
     },
     {
       "id": "e2",
-      "groupName": "Crab Tunnel Right Scisers",
+      "groupName": "Crab Gate Room Right Scisers",
       "enemyName": "Sciser",
       "quantity": 5,
       "homeNodes": [2]
diff --git a/region/maridia/outer/Crab Hole.json b/region/maridia/outer/Crab Hole.json
index 4481c53c62..b2acac430f 100644
--- a/region/maridia/outer/Crab Hole.json	
+++ b/region/maridia/outer/Crab Hole.json	
@@ -1705,7 +1705,7 @@
       "entranceCondition": {
         "comeInWithGrappleSwing": {
           "blocks": [
-            {"position": [6, 2], "note": "Spiky Acid Snakes Tunnel"},
+            {"position": [6, 2], "note": "Lava Grapple Tunnel"},
             {
               "position": [5, 2],
               "note": "The Moat, Double Chamber, Wrecked Ship Energy Tank Room"
@@ -2980,7 +2980,7 @@
                 "canMomentumConservingTurnaround"
               ],
               "note": [
-                "This applies to Blue Hopper Room, Bowling Alley (bottom), Dust Torizo Room, and Noob Bridge."
+                "This applies to Tourian Hopper Room, Bowling Alley (bottom), Dust Torizo Room, and Noob Bridge."
               ]
             },
             {
@@ -2993,7 +2993,7 @@
                 "canMomentumConservingTurnaround"
               ],
               "note": [
-                "This applies to Bomb Torizo Room, Pink Brinstar Hopper Room, Phantoon's Room, Big Boy Room, and Double Chamber."
+                "This applies to Bomb Torizo Room, Pink Brinstar Wave Gate Room, Phantoon's Room, Big Boy Room, and Double Chamber."
               ]
             },
             {
@@ -3194,7 +3194,7 @@
             },
             {
               "position": [9, 2],
-              "note": "Crateria Super Room, Bubble Mountain, Spiky Acid Snakes Tunnel"
+              "note": "Climb Supers Room, Bubble Mountain, Lava Grapple Tunnel"
             }
           ]
         }
diff --git a/region/maridia/outer/Fish Tank.json b/region/maridia/outer/Fish Tank.json
index bf4b155231..b154887fd1 100644
--- a/region/maridia/outer/Fish Tank.json	
+++ b/region/maridia/outer/Fish Tank.json	
@@ -680,7 +680,7 @@
             {"position": [8, 3], "note": "Grapple Beam Room"},
             {"position": [7, 3], "note": "Colosseum"},
             {"position": [6, 4], "note": "Grapple Tutorial Room 2"},
-            {"position": [6, 2], "note": "Spiky Acid Snakes Tunnel"},
+            {"position": [6, 2], "note": "Lava Grapple Tunnel"},
             {
               "position": [5, 2],
               "note": "The Moat, Double Chamber, Wrecked Ship Energy Tank Room"
@@ -1213,7 +1213,7 @@
       "entranceCondition": {
         "comeInWithGrappleSwing": {
           "blocks": [
-            {"position": [6, 2], "note": "Spiky Acid Snakes Tunnel"},
+            {"position": [6, 2], "note": "Lava Grapple Tunnel"},
             {
               "position": [5, 2],
               "note": "The Moat, Double Chamber, Wrecked Ship Energy Tank Room"
diff --git a/region/maridia/outer/Main Street.json b/region/maridia/outer/Main Street.json
index 32894cc46c..060c730517 100644
--- a/region/maridia/outer/Main Street.json	
+++ b/region/maridia/outer/Main Street.json	
@@ -899,7 +899,7 @@
         "This is done by turning around and then canceling spin, e.g. by shooting.",
         "Stay to the right of the fish as you go up."
       ],
-      "devNote": "This strat is applicable with Crocomire's Room and Post Crocomire Jump Room."
+      "devNote": "This strat is applicable with Crocomire's Room and Indiana Jones Room."
     },
     {
       "id": 16,
@@ -923,7 +923,7 @@
         "Jump against the left side of the door frame to cancel horizontal momentum before passing through the transition.",
         "Stay to the right of the fish as you go up."
       ],
-      "devNote": "This strat is applicable only with Post Crocomire Jump Room (after clearing the Power Bomb blocks)."
+      "devNote": "This strat is applicable only with Indiana Jones Room (after clearing the Power Bomb blocks)."
     },
     {
       "id": 17,
@@ -1953,7 +1953,7 @@
             },
             {
               "position": [9, 2],
-              "note": "Crateria Super Room, Bubble Mountain, Spiky Acid Snakes Tunnel"
+              "note": "Climb Supers Room, Bubble Mountain, Lava Grapple Tunnel"
             }
           ]
         }
@@ -2159,7 +2159,7 @@
             },
             {
               "position": [9, 2],
-              "note": "Crateria Super Room, Bubble Mountain, Spiky Acid Snakes Tunnel"
+              "note": "Climb Supers Room, Bubble Mountain, Lava Grapple Tunnel"
             }
           ]
         }
diff --git a/region/maridia/outer/Maridia Tube.json b/region/maridia/outer/Maridia Tube.json
index 7c31761157..5c83d3592c 100644
--- a/region/maridia/outer/Maridia Tube.json	
+++ b/region/maridia/outer/Maridia Tube.json	
@@ -852,7 +852,7 @@
             {"position": [8, 3], "note": "Grapple Beam Room"},
             {"position": [7, 3], "note": "Colosseum"},
             {"position": [6, 4], "note": "Grapple Tutorial Room 2"},
-            {"position": [6, 2], "note": "Spiky Acid Snakes Tunnel"},
+            {"position": [6, 2], "note": "Lava Grapple Tunnel"},
             {
               "position": [5, 2],
               "note": "The Moat, Double Chamber, Wrecked Ship Energy Tank Room"
@@ -1676,7 +1676,7 @@
               "note": "Applies to Noob Bridge.",
               "devNote": [
                 "FIXME: This (and other cases) can leave with enough vertical momentum to make it to the middle door of Main Street,",
-                "if the top door of Glass Tunnel connects to the bottom of Main Street."
+                "if the top door of Maridia Tube connects to the bottom of Main Street."
               ]
             },
             {
@@ -1779,7 +1779,7 @@
             },
             {
               "position": [9, 2],
-              "note": "Crateria Super Room, Bubble Mountain, Spiky Acid Snakes Tunnel"
+              "note": "Climb Supers Room, Bubble Mountain, Lava Grapple Tunnel"
             }
           ]
         }
@@ -2739,7 +2739,7 @@
           "blocks": [
             {
               "position": [9, 2],
-              "note": "Crateria Super Room, Bubble Mountain, Spiky Acid Snakes Tunnel"
+              "note": "Climb Supers Room, Bubble Mountain, Lava Grapple Tunnel"
             }
           ]
         }
diff --git a/region/maridia/outer/Mt. Everest.json b/region/maridia/outer/Mt. Everest.json
index 8ef651eb0e..d7983e52d4 100644
--- a/region/maridia/outer/Mt. Everest.json	
+++ b/region/maridia/outer/Mt. Everest.json	
@@ -1222,9 +1222,9 @@
         "if shot is pressed for more than one frame, then a shot will be fired horizontally, and the cooldown will prevent you from firing diagonally in time."
       ],
       "devNote": [
-        "This strat applies only with Post Crocomire Jump Room below.",
+        "This strat applies only with Indiana Jones Room below.",
         "In Crocomire's Room, the different platform height affects which vertical speeds are obtainable, and apparently none of them work.",
-        "FIXME: Check if this strat works through Toilet (either from PCJR or Crocomire's Room)"
+        "FIXME: Check if this strat works through Toilet (either from Indiana Jones Room or Crocomire's Room)"
       ]
     },
     {
@@ -1703,7 +1703,7 @@
         "After the transition, as you reach the wall, begin holding right.",
         "Land on the small platform below the top door."
       ],
-      "devNote": ["This strat applies with Post Crocomire Jump Room or Crocomire's Room below."]
+      "devNote": ["This strat applies with Indiana Jones Room or Crocomire's Room below."]
     },
     {
       "id": 58,
@@ -2015,7 +2015,7 @@
         "Make it all the way up to the top right door."
       ],
       "devNote": [
-        "This strat is applicable in Crocomire's Room and the Post Crocomire Jump Room (with Power Bomb blocks broken)."
+        "This strat is applicable in Crocomire's Room and the Indiana Jones Room (with Power Bomb blocks broken)."
       ]
     },
     {
@@ -2168,8 +2168,8 @@
         "Hold left through the transition to avoid hitting the crab."
       ],
       "devNote": [
-        "This strat is applicable in Crocomire's Room and the Post Crocomire Jump Room.",
-        "Sufficient vertical speed could be obtained with fewer tiles, but it would require jumping further to the right (i.e., increasing minRightPosition) which would not work in PCJR unless the PB blocks are broken."
+        "This strat is applicable in Crocomire's Room and the Indiana Jones Room.",
+        "Sufficient vertical speed could be obtained with fewer tiles, but it would require jumping further to the right (i.e., increasing minRightPosition) which would not work in Indiana Jones Room unless the PB blocks are broken."
       ]
     },
     {
@@ -2194,7 +2194,7 @@
         "Hold left through the transition to avoid hitting the crab."
       ],
       "devNote": [
-        "This strat is applicable to Lower Norfair Escape Power Bomb Room with the left pillar broken.",
+        "This strat is applicable to The Jail with the left pillar broken.",
         "It is much easier to do if the right pillar is unbroken."
       ]
     },
@@ -2437,7 +2437,7 @@
         "Immediately after jumping, break spin and turn left to allow you to run longer and to avoid hitting the crab."
       ],
       "devNote": [
-        "This strat is applicable in Crocomire's Room and the Post Crocomire Jump Room (with Power Bomb blocks broken)."
+        "This strat is applicable in Crocomire's Room and the Indiana Jones Room (with Power Bomb blocks broken)."
       ]
     },
     {
diff --git a/region/maridia/outer/Red Fish Room.json b/region/maridia/outer/Red Fish Room.json
index 7ae4f837f8..0cdf22d634 100644
--- a/region/maridia/outer/Red Fish Room.json	
+++ b/region/maridia/outer/Red Fish Room.json	
@@ -575,8 +575,8 @@
         "Using SpeedBooster in the room below, run left-to-right and jump, pressing against the right side of the door frame through the transition."
       ],
       "devNote": [
-        "This strat is applicable in Crocomire's Room and the Post Crocomire Jump Room.",
-        "Sufficient vertical speed could be obtained with fewer tiles, but it would require jumping further to the right (i.e., increasing minRightPosition) which would not work in PCJR unless the PB blocks are broken;",
+        "This strat is applicable in Crocomire's Room and the Indiana Jones Room.",
+        "Sufficient vertical speed could be obtained with fewer tiles, but it would require jumping further to the right (i.e., increasing minRightPosition) which would not work in Indiana Jones Room unless the PB blocks are broken;",
         "since there doesn't yet appear to be any application, we don't add a separate case for that.",
         "Speed jumps from the right side would also be possible, but again there don't yet appear to be any applications."
       ]
@@ -602,7 +602,7 @@
         "Run left-to-right in the room below using SpeedBooster over a specific distance, and jump up through the door."
       ],
       "devNote": [
-        "This strat is applicable to Acid Snakes Tunnel, and to Lower Norfair Escape Power Bomb Room with the left pillar broken."
+        "This strat is applicable to Lava Farm Tunnel, and to The Jail with the left pillar broken."
       ]
     },
     {
@@ -626,7 +626,7 @@
         "Run right-to-left in the room below using SpeedBooster over a very precise distance, jump, immediately turn back right, and break spin before reaching the transition."
       ],
       "devNote": [
-        "This strat is applicable to Acid Snakes Tunnel and Spore Spawn Kihunter Room."
+        "This strat is applicable to Lava Farm Tunnel and Spore Spawn Kihunter Room."
       ]
     },
     {
diff --git a/region/maridia/roomDiagrams.json b/region/maridia/roomDiagrams.json
index 154dc5b680..e885158b40 100644
--- a/region/maridia/roomDiagrams.json
+++ b/region/maridia/roomDiagrams.json
@@ -227,7 +227,7 @@
         "width": 2
       },
       {
-        "name": "Crab Tunnel",
+        "name": "Crab Gate Room",
         "origin": [2, 7]
       }
     ]
diff --git a/region/maridia/roomDiagrams/inner-green_WestSandHallTunnel_202.png b/region/maridia/roomDiagrams/inner-green_LonelyCrabRoom_202.png
similarity index 100%
rename from region/maridia/roomDiagrams/inner-green_WestSandHallTunnel_202.png
rename to region/maridia/roomDiagrams/inner-green_LonelyCrabRoom_202.png
diff --git a/region/maridia/roomDiagrams/inner-pink_EastCactusAlleyRoom_196.png b/region/maridia/roomDiagrams/inner-pink_EastCactusAlley_196.png
similarity index 100%
rename from region/maridia/roomDiagrams/inner-pink_EastCactusAlleyRoom_196.png
rename to region/maridia/roomDiagrams/inner-pink_EastCactusAlley_196.png
diff --git a/region/maridia/roomDiagrams/inner-pink_EastSandHole_208.png b/region/maridia/roomDiagrams/inner-pink_EastSandPit_208.png
similarity index 100%
rename from region/maridia/roomDiagrams/inner-pink_EastSandHole_208.png
rename to region/maridia/roomDiagrams/inner-pink_EastSandPit_208.png
diff --git a/region/maridia/roomDiagrams/inner-pink_WestCactusAlleyRoom_195.png b/region/maridia/roomDiagrams/inner-pink_WestCactusAlley_195.png
similarity index 100%
rename from region/maridia/roomDiagrams/inner-pink_WestCactusAlleyRoom_195.png
rename to region/maridia/roomDiagrams/inner-pink_WestCactusAlley_195.png
diff --git a/region/maridia/roomDiagrams/inner-pink_WestSandHole_209.png b/region/maridia/roomDiagrams/inner-pink_WestSandPit_209.png
similarity index 100%
rename from region/maridia/roomDiagrams/inner-pink_WestSandHole_209.png
rename to region/maridia/roomDiagrams/inner-pink_WestSandPit_209.png
diff --git a/region/maridia/roomDiagrams/inner-yellow_NorthwestMaridiaBugRoom_180.png b/region/maridia/roomDiagrams/inner-yellow_MaridiaSwissCheeseRoom_180.png
similarity index 100%
rename from region/maridia/roomDiagrams/inner-yellow_NorthwestMaridiaBugRoom_180.png
rename to region/maridia/roomDiagrams/inner-yellow_MaridiaSwissCheeseRoom_180.png
diff --git a/region/maridia/roomDiagrams/inner-yellow_PseudoPlasmaSparkRoom_179.png b/region/maridia/roomDiagrams/inner-yellow_TheBeach_179.png
similarity index 100%
rename from region/maridia/roomDiagrams/inner-yellow_PseudoPlasmaSparkRoom_179.png
rename to region/maridia/roomDiagrams/inner-yellow_TheBeach_179.png
diff --git a/region/maridia/roomDiagrams/inner-yellow_BugSandHole_211.png b/region/maridia/roomDiagrams/inner-yellow_YoinkRoom_211.png
similarity index 100%
rename from region/maridia/roomDiagrams/inner-yellow_BugSandHole_211.png
rename to region/maridia/roomDiagrams/inner-yellow_YoinkRoom_211.png
diff --git a/region/maridia/roomDiagrams/outer_CrabTunnel_176.png b/region/maridia/roomDiagrams/outer_CrabGateRoom_176.png
similarity index 100%
rename from region/maridia/roomDiagrams/outer_CrabTunnel_176.png
rename to region/maridia/roomDiagrams/outer_CrabGateRoom_176.png
diff --git a/region/maridia/roomDiagrams/outer_GlassTunnelSaveRoom_171.png b/region/maridia/roomDiagrams/outer_MaridiaTubeSaveRoom_171.png
similarity index 100%
rename from region/maridia/roomDiagrams/outer_GlassTunnelSaveRoom_171.png
rename to region/maridia/roomDiagrams/outer_MaridiaTubeSaveRoom_171.png
diff --git a/region/maridia/roomDiagrams/outer_GlassTunnel_170.png b/region/maridia/roomDiagrams/outer_MaridiaTube_170.png
similarity index 100%
rename from region/maridia/roomDiagrams/outer_GlassTunnel_170.png
rename to region/maridia/roomDiagrams/outer_MaridiaTube_170.png
diff --git a/region/maridia/roomDiagrams/outer_WestGlassTubeTunnel_169.png b/region/maridia/roomDiagrams/outer_WestMaridiaTubeTunnel_169.png
similarity index 100%
rename from region/maridia/roomDiagrams/outer_WestGlassTubeTunnel_169.png
rename to region/maridia/roomDiagrams/outer_WestMaridiaTubeTunnel_169.png
diff --git a/region/norfair/crocomire/Indiana Jones Room.json b/region/norfair/crocomire/Indiana Jones Room.json
index 469538f3ed..dadb3ce778 100644
--- a/region/norfair/crocomire/Indiana Jones Room.json	
+++ b/region/norfair/crocomire/Indiana Jones Room.json	
@@ -87,14 +87,14 @@
   "enemies": [
     {
       "id": "e1",
-      "groupName": "Post Crocomire Jump Room Rippers 2s",
+      "groupName": "Indiana Jones Room Rippers 2s",
       "enemyName": "Ripper 2 (green)",
       "quantity": 4,
       "betweenNodes": [1, 3]
     },
     {
       "id": "e2",
-      "groupName": "Post Crocomire Jump Room Mellas",
+      "groupName": "Indiana Jones Room Mellas",
       "enemyName": "Mella",
       "quantity": 5,
       "homeNodes": [2]
@@ -988,7 +988,7 @@
         }
       },
       "devNote": [
-        "With HiJump this can be used coming up Main Street, the bottom left of Mt. Everest, and Pseudo Plasma Spark Room.",
+        "With HiJump this can be used coming up Main Street, the bottom left of Mt. Everest, and The Beach.",
         "We could add other Power Bomb block platforms too (e.g. the lower ones, and on the right side), but they don't yet appear to have any application."
       ]
     },
diff --git a/region/norfair/crocomire/Post Crocomire Shaft.json b/region/norfair/crocomire/Post Crocomire Shaft.json
index b5fa3d6ed4..37f2c83c8a 100644
--- a/region/norfair/crocomire/Post Crocomire Shaft.json	
+++ b/region/norfair/crocomire/Post Crocomire Shaft.json	
@@ -810,7 +810,7 @@
       "requires": [
         "canTrickyGrappleJump"
       ],
-      "devNote": ["This appears not to be possible from Crateria Super Room?"]
+      "devNote": ["This appears not to be possible from Climb Supers Room?"]
     },
     {
       "id": 30,
diff --git a/region/norfair/east/Bubble Mountain.json b/region/norfair/east/Bubble Mountain.json
index 03d87bed02..91125765d8 100644
--- a/region/norfair/east/Bubble Mountain.json	
+++ b/region/norfair/east/Bubble Mountain.json	
@@ -1097,7 +1097,7 @@
         "comeInWithGrappleSwing": {
           "blocks": [
             {"position": [6, 4], "note": "Grapple Tutorial Room 2"},
-            {"position": [6, 2], "note": "Spiky Acid Snakes Tunnel"},
+            {"position": [6, 2], "note": "Lava Grapple Tunnel"},
             {
               "position": [5, 2],
               "note": "The Moat, Double Chamber, Wrecked Ship Energy Tank Room"
@@ -1904,7 +1904,7 @@
         "comeInWithGrappleSwing": {
           "blocks": [
             {"position": [6, 4], "note": "Grapple Tutorial Room 2"},
-            {"position": [6, 2], "note": "Spiky Acid Snakes Tunnel"},
+            {"position": [6, 2], "note": "Lava Grapple Tunnel"},
             {
               "position": [5, 2],
               "note": "The Moat, Double Chamber, Wrecked Ship Energy Tank Room"
diff --git a/region/norfair/east/Double Chamber.json b/region/norfair/east/Double Chamber.json
index f6b7ce1cdf..51b21cbd9e 100644
--- a/region/norfair/east/Double Chamber.json	
+++ b/region/norfair/east/Double Chamber.json	
@@ -1013,7 +1013,7 @@
             {"position": [8, 3], "note": "Grapple Beam Room"},
             {"position": [7, 3], "note": "Colosseum"},
             {"position": [6, 4], "note": "Grapple Tutorial Room 2"},
-            {"position": [6, 2], "note": "Spiky Acid Snakes Tunnel"},
+            {"position": [6, 2], "note": "Lava Grapple Tunnel"},
             {
               "position": [5, 2],
               "note": "The Moat, Double Chamber, Wrecked Ship Energy Tank Room"
diff --git a/region/norfair/east/Green Bubbles Tunnel.json b/region/norfair/east/Green Bubbles Tunnel.json
index 42401b2931..f4985b9204 100644
--- a/region/norfair/east/Green Bubbles Tunnel.json	
+++ b/region/norfair/east/Green Bubbles Tunnel.json	
@@ -50,7 +50,7 @@
   "enemies": [
     {
       "id": "e1",
-      "groupName": "Green Bubbles Missile Room Geruta",
+      "groupName": "Green Bubbles Tunnel Geruta",
       "enemyName": "Geruta",
       "quantity": 1,
       "homeNodes": [2, 3]
diff --git a/region/norfair/east/Lava Farm Tunnel.json b/region/norfair/east/Lava Farm Tunnel.json
index b7dfdddb93..d4b7e318c8 100644
--- a/region/norfair/east/Lava Farm Tunnel.json	
+++ b/region/norfair/east/Lava Farm Tunnel.json	
@@ -60,14 +60,14 @@
   "enemies": [
     {
       "id": "e1",
-      "groupName": "Acid Snakes Tunnel Gamets",
+      "groupName": "Lava Farm Tunnel Gamets",
       "enemyName": "Gamet",
       "quantity": 5,
       "homeNodes": [4]
     },
     {
       "id": "e2",
-      "groupName": "Acid Snakes Tunnel Dragons",
+      "groupName": "Lava Farm Tunnel Dragons",
       "enemyName": "Dragon",
       "quantity": 2,
       "homeNodes": [4, 2],
diff --git a/region/norfair/east/Lava Grapple Tunnel.json b/region/norfair/east/Lava Grapple Tunnel.json
index a4a3429072..9472210c45 100644
--- a/region/norfair/east/Lava Grapple Tunnel.json	
+++ b/region/norfair/east/Lava Grapple Tunnel.json	
@@ -39,7 +39,7 @@
   "enemies": [
     {
       "id": "e1",
-      "groupName": "Spiky Acid Snakes Tunnel Yapping Maws",
+      "groupName": "Lava Grapple Tunnel Yapping Maws",
       "enemyName": "Yapping Maw",
       "quantity": 3,
       "betweenNodes": [1, 2]
diff --git a/region/norfair/roomDiagrams/crocomire_PostCrocomireMissileRoom_126.png b/region/norfair/roomDiagrams/crocomire_CosineRoom_126.png
similarity index 100%
rename from region/norfair/roomDiagrams/crocomire_PostCrocomireMissileRoom_126.png
rename to region/norfair/roomDiagrams/crocomire_CosineRoom_126.png
diff --git a/region/norfair/roomDiagrams/crocomire_PostCrocomireJumpRoom_127.png b/region/norfair/roomDiagrams/crocomire_IndianaJonesRoom_127.png
similarity index 100%
rename from region/norfair/roomDiagrams/crocomire_PostCrocomireJumpRoom_127.png
rename to region/norfair/roomDiagrams/crocomire_IndianaJonesRoom_127.png
diff --git a/region/norfair/roomDiagrams/east_GreenBubblesMissileRoom_98.png b/region/norfair/roomDiagrams/east_GreenBubblesTunnel_98.png
similarity index 100%
rename from region/norfair/roomDiagrams/east_GreenBubblesMissileRoom_98.png
rename to region/norfair/roomDiagrams/east_GreenBubblesTunnel_98.png
diff --git a/region/norfair/roomDiagrams/east_AcidSnakesTunnel_119.png b/region/norfair/roomDiagrams/east_LavaFarmTunnel_119.png
similarity index 100%
rename from region/norfair/roomDiagrams/east_AcidSnakesTunnel_119.png
rename to region/norfair/roomDiagrams/east_LavaFarmTunnel_119.png
diff --git a/region/norfair/roomDiagrams/east_SpikyAcidSnakesTunnel_112.png b/region/norfair/roomDiagrams/east_LavaGrappleTunnel_112.png
similarity index 100%
rename from region/norfair/roomDiagrams/east_SpikyAcidSnakesTunnel_112.png
rename to region/norfair/roomDiagrams/east_LavaGrappleTunnel_112.png
diff --git a/region/norfair/west/Crocomire Speedway.json b/region/norfair/west/Crocomire Speedway.json
index 6f909733e7..6149e3afc8 100644
--- a/region/norfair/west/Crocomire Speedway.json	
+++ b/region/norfair/west/Crocomire Speedway.json	
@@ -938,7 +938,7 @@
         {"heatFrames": 505}
       ],
       "devNote": [
-        "This strat is applicable only with Crocomire's Room and Post Crocomire Jump Room."
+        "This strat is applicable only with Crocomire's Room and Indiana Jones Room."
       ]
     },
     {
diff --git a/region/norfair/west/Ice Beam Trippers Room.json b/region/norfair/west/Ice Beam Trippers Room.json
index 4295e92298..92fdcf8421 100644
--- a/region/norfair/west/Ice Beam Trippers Room.json	
+++ b/region/norfair/west/Ice Beam Trippers Room.json	
@@ -39,7 +39,7 @@
   "enemies": [
     {
       "id": "e1",
-      "groupName": "Ice Beam Acid Room Trippers",
+      "groupName": "Ice Beam Trippers Room Trippers",
       "enemyName": "Tripper",
       "quantity": 3,
       "homeNodes": [1, 2]
diff --git a/region/tourian/main/Dust Torizo Room.json b/region/tourian/main/Dust Torizo Room.json
index e73a4263aa..24f58543d1 100644
--- a/region/tourian/main/Dust Torizo Room.json	
+++ b/region/tourian/main/Dust Torizo Room.json	
@@ -32,7 +32,7 @@
       "doorEnvironments": [{"physics": "air"}],
       "locks": [
         {
-          "name": "Dust Torizo Gray Lock (to Blue Hoppers)",
+          "name": "Dust Torizo Gray Lock (to Tourian Hoppers)",
           "lockType": "permanent",
           "unlockStrats": [
             {
diff --git a/region/tourian/main/Metroid Room 4.json b/region/tourian/main/Metroid Room 4.json
index c87951655c..90f6056834 100644
--- a/region/tourian/main/Metroid Room 4.json	
+++ b/region/tourian/main/Metroid Room 4.json	
@@ -34,7 +34,7 @@
       "doorEnvironments": [{"physics": "air"}],
       "locks": [
         {
-          "name": "Metroid Room 4 Gray Lock (to Blue Hoppers)",
+          "name": "Metroid Room 4 Gray Lock (to Tourian Hoppers)",
           "lockType": "killEnemies",
           "unlockStrats": [
             {
diff --git a/region/tourian/main/Tourian Hopper Room.json b/region/tourian/main/Tourian Hopper Room.json
index c71c3d9283..fc594800c7 100644
--- a/region/tourian/main/Tourian Hopper Room.json	
+++ b/region/tourian/main/Tourian Hopper Room.json	
@@ -49,7 +49,7 @@
   "enemies": [
     {
       "id": "e1",
-      "groupName": "Blue Hoppers",
+      "groupName": "Tourian Hoppers",
       "enemyName": "Blue Sidehopper",
       "quantity": 2,
       "homeNodes": [1, 2]
@@ -474,7 +474,7 @@
         "canTrickyDodgeEnemies"
       ],
       "note": [
-        "Time Samus' movement carefully to roll underneath a Blue Hopper and also race it to the far door.",
+        "Time Samus' movement carefully to roll underneath a Tourian Hopper and also race it to the far door.",
         "Enter the room morphed and let the hoppers jump against the wall a couple of times.",
         "After the lower hopper has long enough time between jumps, roll under and run to the door."
       ]
@@ -972,7 +972,7 @@
       "id": 3,
       "name": "Roll Under Hoppers",
       "note": [
-        "Time Samus' movement carefully to roll underneath a Blue Hopper and also race it to the far door.",
+        "Time Samus' movement carefully to roll underneath a Tourian Hopper and also race it to the far door.",
         "Enter the room morphed and let the hoppers jump against the wall a couple of times.",
         "After the lower hopper has long enough time between jumps, roll under and run to the door."
       ]
diff --git a/region/tourian/roomDiagrams/main_BlueHopperRoom_230.png b/region/tourian/roomDiagrams/main_TourianHopperRoom_230.png
similarity index 100%
rename from region/tourian/roomDiagrams/main_BlueHopperRoom_230.png
rename to region/tourian/roomDiagrams/main_TourianHopperRoom_230.png
diff --git a/region/wreckedship/main/Attic.json b/region/wreckedship/main/Attic.json
index 83f6e3ad33..67eb5086c1 100644
--- a/region/wreckedship/main/Attic.json
+++ b/region/wreckedship/main/Attic.json
@@ -77,7 +77,7 @@
       "doorEnvironments": [{"physics": "air"}],
       "locks": [
         {
-          "name": "Attic Right Gray Lock (to Assembly Line)",
+          "name": "Attic Right Gray Lock (to Robot Assembly Line)",
           "lockType": "killEnemies",
           "unlockStrats": [
             {
diff --git a/region/wreckedship/main/Robot Assembly Line.json b/region/wreckedship/main/Robot Assembly Line.json
index b2b6265f4f..7ecd042c0a 100644
--- a/region/wreckedship/main/Robot Assembly Line.json	
+++ b/region/wreckedship/main/Robot Assembly Line.json	
@@ -55,7 +55,7 @@
   "enemies": [
     {
       "id": "e1",
-      "groupName": "Assembly Line Workrobot",
+      "groupName": "Robot Assembly Line Workrobot",
       "enemyName": "Workrobot",
       "quantity": 3,
       "homeNodes": [1, 2],
diff --git a/region/wreckedship/roomDiagrams/main_AssemblyLine_168.png b/region/wreckedship/roomDiagrams/main_RobotAssemblyLine_168.png
similarity index 100%
rename from region/wreckedship/roomDiagrams/main_AssemblyLine_168.png
rename to region/wreckedship/roomDiagrams/main_RobotAssemblyLine_168.png
diff --git a/strats.md b/strats.md
index f03de2dc8f..3398d41183 100644
--- a/strats.md
+++ b/strats.md
@@ -421,7 +421,7 @@ A `leaveWithGMode` object has the following property:
 
 For most doors in the game, it is possible to enter the room with a G-mode setup and then immediately exit back through the same door. This is because in direct G-mode the door does not close behind Samus. To avoid the need to write out tedious boilerplate, these strats are understood to be included implicitly, as described [here](#implicit-carry-g-mode-back-through).
 
-Aside from the implicit strats, there are a limited amount of `leaveWithGMode` strats possible. Normally entering a room with G-mode (or a G-mode setup) and then leaving with G-mode through a different door is not possible, since door shells cannot be opened while in G-mode. However, some door transitions do not have door shells (e.g. in Crateria Tube, Glass Tunnel, Crab Hole, Big Pink; also elevators and sand transitions), and some door shells are possible to bypass using glitches, so `leaveWithGMode` can be used in these situations.
+Aside from the implicit strats, there are a limited amount of `leaveWithGMode` strats possible. Normally entering a room with G-mode (or a G-mode setup) and then leaving with G-mode through a different door is not possible, since door shells cannot be opened while in G-mode. However, some door transitions do not have door shells (e.g. in Crateria Tube, Maridia Tube, Crab Hole, Big Pink; also elevators and sand transitions), and some door shells are possible to bypass using glitches, so `leaveWithGMode` can be used in these situations.
 
 ### Leave With Door Frame Below
 
@@ -452,7 +452,7 @@ A `leaveWithPlatformBelow` exit condition represents that that Samus can go up t
 
 A `leaveWithPlatformBelow` object has the following properties:
 
-- _height_: The number of tiles between the door transition and the platform, not including the transition tiles or platform itself. A horizontal slope tile (as in Blue Hopper Room) counts as a half tile.
+- _height_: The number of tiles between the door transition and the platform, not including the transition tiles or platform itself. A horizontal slope tile (as in Tourian Hopper Room) counts as a half tile.
 - _leftPosition_: This indicates the position of the furthest left usable tile of the platform, relative to the center of the door. A negative values indicates a position to the left of the door center, while a positive value indicates a position to the right of the door center. An open end, if applicable, is represented by an extra half tile.
 - _rightPosition_: This indicates the position of the furthest right usable tile of the platform, relative to the center of the door. A negative values indicates a position to the left of the door center, while a positive value indicates a position to the right of the door center. An open end, if applicable, is represented by an extra half tile.
 
diff --git a/tech.json b/tech.json
index 03ef038cdc..9030972390 100644
--- a/tech.json
+++ b/tech.json
@@ -2628,7 +2628,7 @@
             "The planet is awakened by unlocking any gray door locked by killing enemies in the room (not including bosses or minibosses).",
             "Pit Room and Baby Kraid Room are two examples where this can be done.",
             "Awakening the planet causes enemies to spawn in Parlor, Climb, Morph Ball Room, Construction Zone, and Blue Brinstar Energy Tank Room.",
-            "It also causes the item in the left side of Morph Ball Room and in The Final Missile to spawn.",
+            "It also causes the item in the left side of Morph Ball Room and in 230 Missile Room to spawn.",
             "The item and enemies in Pit Room do not spawn until entering with Morph and Missiles collected, regardless of whether the planet is awake."
           ],
           "devNote": [