diff --git a/data/basepatch.bsdiff b/data/basepatch.bsdiff
index db3ad35..3dbbdc4 100644
Binary files a/data/basepatch.bsdiff and b/data/basepatch.bsdiff differ
diff --git a/locations.py b/locations.py
index f53130c..94b7882 100644
--- a/locations.py
+++ b/locations.py
@@ -155,10 +155,10 @@ def __init__(self, reg, id):
 }
 
 mzm_location_name_groups = {
-    "Brinstar": {name for name, id in brinstar_location_table.items() if id is not None},
-    "Kraid": {name for name, id in kraid_location_table.items() if id is not None},
+    "Brinstar": {name for name, id in brinstar_location_table.items() if id.code is not None},
+    "Kraid": {name for name, id in kraid_location_table.items() if id.code is not None},
     "Upper Norfair": {
-        "Norfair Power Grip Missile",
+        "Norfair Hallway to Crateria",
         "Norfair Under Crateria Elevator",
         "Norfair Bomb Trap",
         "Norfair Heated Room Under Brinstar Elevator",
@@ -167,43 +167,43 @@ def __init__(self, reg, id):
         "Norfair Hi-Jump",
         "Norfair Big Room",
         "Norfair Behind Top Chozo Statue",
-        "Norfair Right Shaft Lower",
+        "Norfair Right Shaft Near Hi-Jump",
     },
     "Lower Norfair": {
-        "Norfair Lava Power Bomb",
-        "Norfair Lava Missile",
+        "Norfair Lava Dive Left",
+        "Norfair Lava Dive Right",
         "Norfair Screw Attack",
-        "Norfair Screw Attack Missile",
+        "Norfair Next to Screw Attack",
         "Norfair Wave Beam",
-        "Norfair Bottom Heated Room First",
-        "Norfair Bottom Heated Room Second",
-        "Norfair Space Boost Missile",
-        "Norfair Space Boost Super Missile",
-        "Norfair Larva Ceiling E-tank",
+        "Norfair Heated Room Below Wave - Right",
+        "Norfair Heated Room Below Wave - Left",
+        "Norfair Behind Lower Super Missile Door - Right",
+        "Norfair Behind Lower Super Missile Door - Left",
+        "Norfair Larva Ceiling",
         "Norfair Right Shaft Bottom",
     },
-    "Ridley": {name for name, id in ridley_location_table.items() if id is not None},
-    "Tourian": {name for name, id in tourian_location_table.items() if id is not None},
-    "Crateria": {name for name, id in crateria_location_table.items() if id is not None},
+    "Ridley": {name for name, id in ridley_location_table.items() if id.code is not None},
+    "Tourian": {name for name, id in tourian_location_table.items() if id.code is not None},
+    "Crateria": {name for name, id in crateria_location_table.items() if id.code is not None},
     "Chozo Ruins": {
         "Chozodia Upper Crateria Door",
-        "Chozodia Ruins Near Upper Crateria Door",
+        "Chozodia Ruins East of Upper Crateria Door",
         "Chozodia Chozo Ghost Area Morph Tunnel Above Water",
         "Chozodia Chozo Ghost Area Underwater",
-        "Chozodia Under Chozo Ghost Area Water",
-        "Chozodia Lava Super",
+        "Chozodia Triple Crawling Pirates",
+        "Chozodia Lava Dive",
     },
     "Mother Ship": {
         "Chozodia Bomb Maze",
         "Chozodia Zoomer Maze",
-        "Chozodia Glass Tube E-Tank",
+        "Chozodia Left of Glass Tube",
         "Chozodia Original Power Bomb",
         "Chozodia Next to Original Power Bomb",
-        "Chozodia Glass Tube Power Bomb",
+        "Chozodia Right of Glass Tube",
         "Chozodia Chozo Ghost Area Long Shinespark",
-        "Chozodia Shortcut Super",
-        "Chozodia Workbot Super",
-        "Chozodia Mothership Ceiling Near ZSS Start",
+        "Chozodia Pirate Pitfall Trap",
+        "Chozodia Behind Workbot",
+        "Chozodia Ceiling Near Map Station",
         "Chozodia Under Mecha Ridley Hallway",
         "Chozodia Southeast Corner In Hull",
     },
@@ -211,14 +211,14 @@ def __init__(self, reg, id):
         "Brinstar Long Beam",
         "Brinstar Varia Suit",
         "Brinstar Bomb",
-        "Kraid Space Jump/Unknown Item 2",
+        "Kraid Unknown Item Statue",
         "Kraid Speed Booster",
         "Norfair Screw Attack",
         "Norfair Wave Beam",
         "Norfair Ice Beam",
         "Norfair Hi-Jump",
-        "Ridley Gravity Suit/Unknown Item 3",
-        "Crateria Plasma Beam/Unknown Item 1",
+        "Ridley Unknown Item Statue",
+        "Crateria Unknown Item Statue",
     },
     "Freestanding Items": {
         "Brinstar Morph Ball",
@@ -227,15 +227,15 @@ def __init__(self, reg, id):
     },
     "Energy Tanks": {
         "Brinstar Ceiling E-Tank",
-        "Brinstar Post-Hive E-Tank",
+        "Brinstar Post-Hive Pillar",
         "Brinstar Acid near Varia",
-        "Kraid Worm E-Tank",
+        "Kraid Zipline Activator Room",
         "Kraid Speed Jump",
-        "Norfair Larva Ceiling E-tank",
-        "Ridley E-Tank behind Gravity",
-        "Ridley Fake Floor E-Tank",
-        "Ridley Owl E-Tank",
-        "Chozodia Glass Tube E-Tank",
+        "Norfair Larva Ceiling",
+        "Ridley Behind Unknown Statue",
+        "Ridley Fake Floor",
+        "Ridley Under Owls",
+        "Chozodia Left of Glass Tube",
         "Chozodia Chozo Ghost Area Long Shinespark",
         "Chozodia Under Mecha Ridley Hallway",
     },