491 files changed, 798 insertions, 692 deletions

@@ -105,7 +105,7 @@ class Lingo2PlayerLogic:
         # before we calculate any access requirements.
         for door in world.static_logic.objects.doors:
             if door.type in [data_pb2.DoorType.STANDARD, data_pb2.DoorType.ITEM_ONLY] and self.world.options.shuffle_doors:
-                door_item_name = self.world.static_logic.get_door_item_name(door.id)
+                door_item_name = self.world.static_logic.get_door_item_name(door)
                 self.item_by_door[door.id] = door_item_name
                 self.real_items.append(door_item_name)
 
@@ -18,11 +18,11 @@ class Lingo2StaticLogic:
 
         for door in self.objects.doors:
             if door.type in [data_pb2.DoorType.STANDARD, data_pb2.DoorType.LOCATION_ONLY, data_pb2.DoorType.GRAVESTONE]:
-                location_name = f"{self.get_map_object_map_name(door)} - {door.name}"
+                location_name = self.get_door_location_name(door)
                 self.location_id_to_name[door.ap_id] = location_name
 
             if door.type not in [data_pb2.DoorType.EVENT, data_pb2.DoorType.LOCATION_ONLY, data_pb2.DoorType.GRAVESTONE]:
-                item_name = self.get_door_item_name(door.id)
+                item_name = self.get_door_item_name(door)
                 self.item_id_to_name[door.ap_id] = item_name
 
         for letter in self.objects.letters:
@@ -46,10 +46,77 @@ class Lingo2StaticLogic:
         self.item_name_to_id = {name: ap_id for ap_id, name in self.item_id_to_name.items()}
         self.location_name_to_id = {name: ap_id for ap_id, name in self.location_id_to_name.items()}
 
-    def get_door_item_name(self, door_id: int) -> str:
-        door = self.objects.doors[door_id]
+    def get_door_item_name(self, door: data_pb2.Door) -> str:
         return f"{self.get_map_object_map_name(door)} - {door.name}"
 
+    def get_door_item_name_by_id(self, door_id: int) -> str:
+        door = self.objects.doors[door_id]
+        return self.get_door_item_name(door_id)
+
+    def get_door_location_name(self, door: data_pb2.Door) -> str:
+        game_map = self.objects.maps[door.map_id]
+        room = self.objects.rooms[door.room_id]
+
+        if room.HasField("panel_display_name"):
+            map_part = f"{game_map.display_name} ({room.panel_display_name})"
+        else:
+            map_part = game_map.display_name
+
+        if door.HasField("location_name"):
+            return f"{map_part} - {door.location_name}"
+
+        generated_location_name = self.get_generated_door_location_name(door)
+        if generated_location_name is not None:
+            return generated_location_name
+
+        return f"{map_part} - {door.name}"
+
+    def get_generated_door_location_name(self, door: data_pb2.Door) -> str | None:
+        if door.type != data_pb2.DoorType.STANDARD:
+            return None
+
+        if len(door.keyholders) > 0 or len(door.endings) > 0:
+            return None
+
+        if len(door.panels) > 4:
+            return None
+
+        map_areas = set()
+        for panel_id in door.panels:
+            panel = self.objects.panels[panel_id.panel]
+            panel_room = self.objects.rooms[panel.room_id]
+            # It's okay if panel_display_name is not present because then it's coalesced with other unnamed areas.
+            map_areas.add(panel_room.panel_display_name)
+
+        if len(map_areas) > 1:
+            return None
+
+        game_map = self.objects.maps[door.map_id]
+        map_area = map_areas.pop()
+        if map_area == "":
+            map_part = game_map.display_name
+        else:
+            map_part = f"{game_map.display_name} ({map_area})"
+
+        def get_panel_display_name(panel: data_pb2.ProxyIdentifier) -> str:
+            panel_data = self.objects.panels[panel.panel]
+            panel_name = panel_data.display_name if panel_data.HasField("display_name") else panel_data.name
+
+            if panel.HasField("answer"):
+                return f"{panel_name}/{panel.answer.upper()}"
+            else:
+                return panel_name
+
+        panel_names = [get_panel_display_name(panel_id)
+                       for panel_id in door.panels]
+        panel_names.sort()
+
+        return f"{map_part} - {", ".join(panel_names)}"
+
+    def get_door_location_name_by_id(self, door_id: int) -> str:
+        door = self.objects.doors[door_id]
+        return self.get_door_location_name(door)
+
     def get_room_region_name(self, room_id: int) -> str:
         room = self.objects.rooms[room_id]
         return f"{self.get_map_object_map_name(room)} - {room.name}"
@@ -1037,6 +1037,7 @@ maps:
       Near Sweet Blue Door: 1573
       Near Sweet Brown Door: 1561
       Near Yellow Room Door: 1565
+      North Castle Panel: 2742
       O2 Room Back Door: 1485
       Orange Rainbow Panel: 2267
       Orange Rainbow Room: 1535
@@ -1064,6 +1065,7 @@ maps:
       Purple NW Vestibule: 1459
       Purple Rainbow Panel: 2271
       Purple Rainbow Room: 1539
+      Purple Room: 2741
       Purple Room East Entrance: 1472
       Purple Room North Entrance: 1469
       Purple Room South Entrance: 1470
@@ -1088,6 +1090,7 @@ maps:
       Snake Room Entrance: 1514
       South Castle Area Back Door: 1574
       South Castle Area Entrance: 1575
+      South Castle Panel: 2744
       Southwest Area Intersection: 1475
       Splintering Exit Left Door: 1449
       Splintering Exit Right Door: 1450
@@ -1109,6 +1112,7 @@ maps:
       U2 Room Shortcut: 1493
       Welcome Back Door: 1435
       Welcome Back Secret Door: 1434
+      West Castle Panel: 2743
       White Hallway From Entry: 1488
       Wonderland Left Door: 1520
       Wonderland Right Door: 1504
@@ -3641,6 +3645,7 @@ maps:
       Black Alcove: 2265
       Brown Alcove: 1255
       Digital Entrance: 1257
+      East Room 1: 2740
       East Room 1 Entrance: 1251
       Hero Room Entrance: 1252
       Jay Painting: 1253
@@ -109,6 +109,7 @@ doors {
   keyholders { room: "Main Area" name: "3" key: "r" }
   keyholders { room: "Main Area" name: "4" key: "e" }
   location_room: "Main Area"
+  location_name: "Keyword MORE"
 }
 doors {
   name: "Perceptive From Outside"
@@ -132,6 +133,7 @@ doors {
   keyholders { room: "Main Area" name: "3" key: "r" }
   keyholders { room: "Main Area" name: "4" key: "o" }
   location_room: "Main Area"
+  location_name: "Keyword ZERO"
 }
 doors {
   name: "Between Door"
@@ -188,11 +188,10 @@ doors {
 }
 doors {
   name: "Welcome Back Secret Door"
-  type: STANDARD
+  type: ITEM_ONLY
   receivers: "Components/Doors/Entry/entry_13"
   panels { room: "Welcome Back Area" name: "FAREWELL LITTLE LAMB" }
   panels { room: "West Spire" name: "BYE" }
-  location_room: "West Spire"
 }
 doors {
   name: "Welcome Back Door"
@@ -296,6 +295,7 @@ doors {
   panels { room: "Black Hex" name: "CLUES" }
   panels { room: "Black Hex" name: "SECRET" }
   location_room: "Black Hex"
+  location_name: "Black Hex"
 }
 doors {
   name: "Splintering Exit Left Door"
@@ -382,6 +382,7 @@ doors {
   panels { room: "Z2 Room" name: "CAPE" }
   panels { room: "Z2 Room" name: "GLANCE" }
   location_room: "Z2 Room"
+  location_name: "West Puzzles"
 }
 doors {
   name: "Z2 Room Northwest Door"
@@ -413,6 +414,7 @@ doors {
   panels { room: "Z2 Room" name: "DISCORD" }
   panels { room: "Z2 Room" name: "CAT" }
   location_room: "Z2 Room"
+  location_name: "East Puzzles"
 }
 doors {
   name: "Z2 Room Southeast Door"
@@ -491,6 +493,7 @@ doors {
   panels { room: "Outside House" name: "WALLS" }
   panels { room: "Outside House" name: "LOCK" }
   location_room: "Outside House"
+  location_name: "North Purple Vestibules"
 }
 doors {
   name: "Purple NW Vestibule"
@@ -517,6 +520,7 @@ doors {
   panels { room: "Outside House" name: "BLITHELY" }
   panels { room: "Purple Room South" name: "THESE" }
   location_room: "Outside House"
+  location_name: "West Purple Vestibules"
 }
 doors {
   name: "Purple West Area South Door"
@@ -545,6 +549,7 @@ doors {
   panels { room: "Godot Room" name: "TRAIN" }
   panels { room: "Godot Room" name: "RECORDING" }
   location_room: "Godot Room"
+  location_name: "Godot Room"
 }
 doors {
   name: "Beehalls Intersection"
@@ -576,6 +581,7 @@ doors {
   panels { room: "Purple Room South" name: "ANY" }
   panels { room: "Outside House" name: "A" }
   location_room: "Outside House"
+  location_name: "East Purple Vestibules"
 }
 doors {
   name: "Purple East Area North Door"
@@ -593,6 +599,7 @@ doors {
   panels { room: "Outside House" name: "BLITHELY" }
   panels { room: "Purple Room South" name: "THESE" }
   location_room: "Outside House"
+  location_name: "Purple Vestibules"
 }
 doors {
   name: "Purple Room South Entrance"
@@ -622,6 +629,20 @@ doors {
   panels { room: "Purple Room South" name: "THESE" }
 }
 doors {
+  name: "Purple Room"
+  type: LOCATION_ONLY
+  panels { room: "Purple Room" name: "HOIST" }
+  panels { room: "Purple Room" name: "CORE" }
+  panels { room: "Purple Room" name: "FISH" }
+  panels { room: "Purple Room" name: "ALLOW" }
+  panels { room: "Purple Room" name: "BIRD" }
+  panels { room: "Purple Room" name: "HONK" }
+  panels { room: "Purple Room" name: "APE" }
+  panels { room: "Purple Room" name: "APATHY" }
+  location_room: "Purple Room"
+  location_name: "Puzzles"
+}
+doors {
   name: "Hedges Tower"
   type: LOCATION_ONLY
   # TODO: Not making this an item right now in order to force the player to
@@ -676,6 +697,7 @@ doors {
   panels { room: "Blue Room" name: "CELEBRATORY" }
   panels { room: "Blue Room" name: "DETECTIVE" }
   location_room: "Blue Room"
+  location_name: "Puzzles"
 }
 doors {
   name: "O2 Prize"
@@ -734,6 +756,7 @@ doors {
   panels { room: "Composite Room S" name: "BLEAKCARD" }
   panels { room: "Composite Room S" name: "MISSIONMISSION" }
   location_room: "Composite Room S"
+  location_name: "East Rooms"
 }
 doors {
   name: "Composite Room North Door"
@@ -762,6 +785,7 @@ doors {
   panels { room: "Composite Room NW" name: "OUTGARDEN" }
   panels { room: "Composite Room NW" name: "HELLOTALE" }
   location_room: "Composite Room NE"
+  location_name: "North Rooms"
 }
 doors {
   name: "Composite Room West Door"
@@ -792,6 +816,7 @@ doors {
   panels { room: "Composite Room S" name: "OUTEAT" }
   panels { room: "Composite Room S" name: "SUMMERIN" }
   location_room: "Composite Room NW"
+  location_name: "West Rooms"
 }
 doors {
   name: "Composite Room NW Entrance"
@@ -829,6 +854,7 @@ doors {
   panels { room: "Composite Room S" name: "OUTEAT" }
   panels { room: "Composite Room S" name: "SUMMERIN" }
   location_room: "Composite Room S"
+  location_name: "South Rooms"
 }
 doors {
   name: "O2 Room Back Door"
@@ -1004,6 +1030,7 @@ doors {
   panels { room: "Wonderland" name: "ARTS" }
   panels { room: "Wonderland" name: "SONG" }
   location_room: "Wonderland"
+  location_name: "Wonderland"
 }
 doors {
   name: "Pyramid Entrance"
@@ -1034,6 +1061,7 @@ doors {
   panels { room: "Orange Room" name: "COAL" }
   panels { room: "Orange Room" name: "OWED" }
   location_room: "Orange Room"
+  location_name: "Puzzles"
 }
 doors {
   name: "Hedges Entrance"
@@ -1389,7 +1417,7 @@ doors {
 }
 doors {
   name: "Roof Access"
-  type: STANDARD
+  type: ITEM_ONLY
   receivers: "Components/Doors/Castle/entry_stairs_big"
   receivers: "Components/Doors/Castle/entry_stairs_big2"
   receivers: "Meshes/Stairs/staircase31/teleportListener"
@@ -1398,6 +1426,23 @@ doors {
   panels { room: "North Castle Area" name: "A SUMMER PLACE" }
   panels { room: "West Castle Area" name: "SONG FACE" }
   panels { room: "South Castle Area" name: "AN OFFER VILLAGE BEFORE LAIR" }
+}
+doors {
+  name: "North Castle Panel"
+  type: LOCATION_ONLY
+  panels { room: "North Castle Area" name: "A SUMMER PLACE" }
+  location_room: "North Castle Area"
+}
+doors {
+  name: "West Castle Panel"
+  type: LOCATION_ONLY
+  panels { room: "West Castle Area" name: "SONG FACE" }
+  location_room: "West Castle Area"
+}
+doors {
+  name: "South Castle Panel"
+  type: LOCATION_ONLY
+  panels { room: "South Castle Area" name: "AN OFFER VILLAGE BEFORE LAIR" }
   location_room: "South Castle Area"
 }
 doors {
@@ -1414,6 +1459,7 @@ doors {
   panels { room: "West Spire" name: "CUT" }
   panels { room: "West Spire" name: "STONES" }
   location_room: "West Spire"
+  location_name: "Pairs Room Puzzles"
 }
 doors {
   name: "Pairs Room West Door"
@@ -1711,6 +1757,7 @@ doors {
   panels { room: "Cyan Room" name: "COLD" }
   panels { room: "Cyan Room" name: "WORDWORD" }
   location_room: "Cyan Room"
+  location_name: "Puzzles"
 }
 doors {
   name: "Green Room Entrance"
@@ -1734,6 +1781,7 @@ doors {
   panels { room: "Green Room" name: "DOUBLE" }
   panels { room: "Green Room" name: "BADMINTON" }
   location_room: "Green Room"
+  location_name: "Puzzles"
 }
 doors {
   name: "Blue Hallway South Divider"
@@ -1772,6 +1820,7 @@ doors {
   panels { room: "Red Room" name: "TESTAMENT" }
   panels { room: "Red Room" name: "TAKEOUT" }
   location_room: "Red Room"
+  location_name: "Puzzles"
 }
 doors {
   name: "Blue Hallway To Red Room"
@@ -1785,6 +1834,7 @@ doors {
   panels { room: "Blue Hallway" name: "CHOP" }
   panels { room: "Blue Hallway Tall Side" name: "TALL" }
   location_room: "Blue Hallway Tall Side"
+  location_name: "CHOP, TALL"
 }
 doors {
   name: "Near Yellow Room Door"
@@ -1797,6 +1847,7 @@ doors {
   panels { room: "Blue Hallway Tall Side" name: "CHILD" }
   panels { room: "Blue Hallway Tall Side" name: "NEW" }
   location_room: "Blue Hallway Tall Side"
+  location_name: "Pink Hex"
 }
 doors {
   name: "House Side Door"
@@ -1833,6 +1884,7 @@ doors {
   panels { room: "Yellow Room" name: "PROTON" }
   panels { room: "Yellow Room" name: "SPIRIT" }
   location_room: "Yellow Room"
+  location_name: "Puzzles"
 }
 doors {
   name: "Dark Light Room Entrance"
@@ -1887,6 +1939,7 @@ doors {
   # Not technically true; it's complete_at=11 with both rooms, but you couldn't
   # get to the other side in vanilla doors anyway.
   location_room: "Dark Light Room"
+  location_name: "Main Puzzles"
 }
 doors {
   name: "Near Sweet Blue Door"
@@ -1899,6 +1952,7 @@ doors {
   panels { room: "Gray Color Backside" name: "LAST" }
   panels { room: "Gray Color Backside" name: "RISE" }
   location_room: "Gray Color Backside"
+  location_name: "Light Green Hex"
 }
 doors {
   name: "South Castle Area Back Door"
@@ -1938,6 +1992,7 @@ doors {
   panels { room: "Plum Room" name: "SNAKE" }
   panels { room: "Plum Room" name: "CENTER" }
   location_room: "Plum Room"
+  location_name: "Plum Room"
 }
 doors {
   name: "D Keyholder Blocker"
@@ -2039,6 +2094,7 @@ doors {
   panels { room: "Computer Room" name: "MOUSE (2)" }
   panels { room: "Computer Room" name: "KEYBOARD (2)" }
   location_room: "Computer Room"
+  location_name: "Main Puzzles"
 }
 doors {
   name: "Computer Room Entrance"
@@ -2051,6 +2107,7 @@ doors {
   panels { room: "Rainbow Color Doors" name: "MISCHIEF" }
   panels { room: "Rainbow Color Doors" name: "CASUAL" }
   location_room: "Rainbow Color Doors"
+  location_name: "Red Tower"
 }
 doors {
   name: "C Keyholder Blocker"
@@ -2118,6 +2175,7 @@ doors {
   panels { room: "Book Room" name: "BOOK (11)" }
   panels { room: "Book Room" name: "BOOK (12)" }
   location_room: "Book Room"
+  location_name: "Book Room"
 }
 doors {
   name: "Sticks And Stones Door"
@@ -2144,6 +2202,7 @@ doors {
   panels { room: "Black Hex" name: "BARK" }
   panels { room: "Zoo N" name: "LEAF" }
   location_room: "Zoo N"
+  location_name: "BARK, LEAF"
 }
 doors {
   name: "Zoo East Entrance"
@@ -1,5 +1,5 @@
 name: "After Bee Room"
-display_name: "North Area"
+panel_display_name: "North Area"
 panels {
   name: "GAS"
   path: "Panels/Beehalls/beehalls_2"
@@ -1,5 +1,5 @@
 name: "Amber North 2"
-display_name: "West Area"
+panel_display_name: "West Area"
 panels {
   name: "SONG"
   path: "Panels/Amber/amber_north_2"
@@ -1,5 +1,5 @@
 name: "Bee Room Obverse"
-display_name: "Bee Room"
+panel_display_name: "Bee Room"
 panels {
   name: "SINGLE"
   path: "Panels/Bee Room/bee_1"
@@ -1,5 +1,5 @@
 name: "Bee Room Reverse"
-display_name: "Bee Room"
+panel_display_name: "Bee Room"
 panels {
   name: "POCKET"
   path: "Panels/Bee Room/bee_9"
@@ -1,5 +1,5 @@
 name: "Beehalls Intersection"
-display_name: "North Area"
+panel_display_name: "North Area"
 panels {
   name: "CLOUDS"
   path: "Panels/Halls/beehalls_4"
@@ -1,5 +1,5 @@
 name: "Black Hex"
-display_name: "Northwest Area"
+panel_display_name: "Northwest Area"
 panels {
   name: "HIDE"
   path: "Panels/Hexes/black_1"
@@ -1,5 +1,5 @@
 name: "Blue Hallway Cut Side"
-display_name: "South Area"
+panel_display_name: "South Area"
 panels {
   name: "CUT"
   path: "Panels/Halls/halls_6"
@@ -1,5 +1,5 @@
 name: "Blue Hallway Tall Side"
-display_name: "Northeast Area"
+panel_display_name: "Northeast Area"
 panels {
   name: "TALL"
   path: "Panels/Halls/halls_9"
@@ -1,5 +1,5 @@
 name: "Blue Hallway"
-display_name: "South Area"
+panel_display_name: "South Area"
 panels {
   name: "CHOP"
   path: "Panels/Halls/halls_10"
@@ -1,5 +1,5 @@
 name: "Blue Room"
-display_name: "East Area"
+panel_display_name: "Blue Room"
 panels {
   name: "RED"
   path: "Panels/Blue Room/panel_1"
@@ -1,5 +1,5 @@
 name: "Blue Smiley Annex"
-display_name: "South Area"
+panel_display_name: "South Area"
 panels {
   name: "ORANGE (1)"
   path: "Panels/Miscellaneous/yellow"
@@ -1,5 +1,5 @@
 name: "Blue Smiley"
-display_name: "South Area"
+panel_display_name: "South Area"
 panels {
   name: "SMILE"
   path: "Panels/Smiley Rooms/blue"
@@ -1,5 +1,5 @@
 name: "Book Room"
-display_name: "Southwest Area"
+panel_display_name: "Southwest Area"
 panels {
   name: "BOOK (1)"
   path: "Panels/Book Room/book_1"
@@ -1,9 +1,10 @@
 name: "Bow Side"
-display_name: "Rainbow"
+panel_display_name: "Rainbow"
 panels {
   name: "?"
   path: "Panels/Smiley Rooms/bow"
   clue: ""
   answer: "bow"
   symbols: QUESTION
+  display_name: "? (2)"
 }
@@ -1,5 +1,5 @@
 name: "Brown Smiley"
-display_name: "Rainbow"
+panel_display_name: "Rainbow"
 panels {
   name: "OTHERS"
   path: "Panels/Smiley Rooms/rainbow2"
@@ -1,5 +1,5 @@
 name: "C Keyholder"
-display_name: "North Area"
+panel_display_name: "North Area"
 keyholders {
   name: "C"
   path: "Components/KeyHolders/keyHolderC"
@@ -1,5 +1,5 @@
 name: "Castle"
-display_name: "Castle"
+panel_display_name: "Castle"
 panels {
   name: "REVERSE"
   path: "Panels/Castle Interior/panel_flip"
@@ -1,5 +1,5 @@
 name: "Coin Tower"
-display_name: "Northeast Area"
+panel_display_name: "Northeast Area"
 panels {
   name: "RAIN"
   path: "Panels/Entry/db_2"
@@ -1,5 +1,5 @@
 name: "Composite Room NE"
-display_name: "Composite Room"
+panel_display_name: "Composite Room"
 panels {
   name: "<-"
   path: "Panels/Combo Room NE/panel_1"
@@ -1,5 +1,5 @@
 name: "Composite Room NW"
-display_name: "Composite Room"
+panel_display_name: "Composite Room"
 panels {
   name: "BEHOUSE"
   path: "Panels/Combo Room NW/panel_1"
@@ -1,5 +1,5 @@
 name: "Composite Room S"
-display_name: "Composite Room"
+panel_display_name: "Composite Room"
 panels {
   name: "CONCAVE"
   path: "Panels/Combo Room SW/panel_1"
@@ -1,5 +1,5 @@
 name: "Computer Room Seal"
-display_name: "Computer Room"
+panel_display_name: "Computer Room"
 panels {
   name: "SCROLL"
   path: "Panels/Computer/computer_11"
@@ -1,5 +1,5 @@
 name: "Computer Room"
-display_name: "Computer Room"
+panel_display_name: "Computer Room"
 panels {
   name: "MONITOR (1)"
   path: "Panels/Computer/computer_1"
@@ -1,5 +1,5 @@
 name: "Cyan Room"
-display_name: "West Area"
+panel_display_name: "Cyan Room"
 panels {
   name: "LIFE"
   path: "Panels/Brown Room/panel_1"
@@ -1,5 +1,5 @@
 name: "D Keyholder"
-display_name: "Plum Room"
+panel_display_name: "Plum Room"
 keyholders {
   name: "D"
   path: "Components/KeyHolders/keyHolderD"
@@ -1,5 +1,5 @@
 name: "D2 Room"
-display_name: "Intense Room"
+panel_display_name: "Intense Room"
 letters {
   key: "d"
   level2: true
@@ -1,5 +1,5 @@
 name: "Dark Light Exit"
-display_name: "Outside Pumpkin"
+panel_display_name: "Outside Pumpkin"
 panels {
   name: "GASKET"
   path: "Panels/Dark Light Room/dark_7"
@@ -1,5 +1,5 @@
 name: "Dark Light Room"
-display_name: "Outside Pumpkin"
+panel_display_name: "Outside Pumpkin"
 panels {
   name: "COIN (1)"
   path: "Panels/Dark Light Room/dark_1"
@@ -1,5 +1,5 @@
 name: "Ending"
-display_name: "Castle"
+panel_display_name: "Castle"
 endings {
   name: "ORANGE"
   path: "Components/Triggers/orange_ending"
@@ -1,11 +1,12 @@
 name: "Entry Shortcut"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
   name: "WELCOME"
   path: "Panels/Entry/entry_3"
   clue: "welcome"
   answer: "back"
   symbols: QUESTION
+  display_name: "WELCOME (Red/Blue)"
 }
 ports {
   name: "ENTRY"
@@ -1,5 +1,5 @@
 name: "Eye Painting"
-display_name: "Temple of the Eyes"
+panel_display_name: "Temple of the Eyes"
 panels {
   name: "REVILED"
   path: "Panels/Entry/entry_5"
@@ -1,5 +1,5 @@
 name: "Eye Temple 1F Side"
-display_name: "Temple of the Eyes"
+panel_display_name: "Temple of the Eyes"
 paintings {
   name: "EYEREDSIDE1"
   path: "Components/Paintings/Temple of the Eyes/eyeRedSide1"
@@ -1,5 +1,5 @@
 name: "Eye Temple 1F"
-display_name: "Temple of the Eyes"
+panel_display_name: "Temple of the Eyes"
 paintings {
   name: "EYEREDTOEXITMAIN2"
   path: "Components/Paintings/Temple of the Eyes/eyeRedToExitMain2"
@@ -1,5 +1,5 @@
 name: "Eye Temple 2F Side"
-display_name: "Temple of the Eyes"
+panel_display_name: "Temple of the Eyes"
 paintings {
   name: "EYEREDTOEXITMAIN4"
   path: "Components/Paintings/Temple of the Eyes/eyeRedToExitMain4"
@@ -1,5 +1,5 @@
 name: "Eye Temple 2F"
-display_name: "Temple of the Eyes"
+panel_display_name: "Temple of the Eyes"
 paintings {
   name: "EYEREDEXITTOP1"
   path: "Components/Paintings/Temple of the Eyes/eyeRedExitTop1"
@@ -1,5 +1,5 @@
 name: "Eye Temple Pillar 1"
-display_name: "Temple of the Eyes"
+panel_display_name: "Temple of the Eyes"
 paintings {
   name: "EYEREDEXITPILLAR1"
   path: "Components/Paintings/Temple of the Eyes/eyeRedExitPillar1"
@@ -1,5 +1,5 @@
 name: "Eye Temple Pillar 2"
-display_name: "Temple of the Eyes"
+panel_display_name: "Temple of the Eyes"
 paintings {
   name: "EYEREDEXITPILLAR2"
   path: "Components/Paintings/Temple of the Eyes/eyeRedExitPillar2"
@@ -1,5 +1,5 @@
 name: "F Keyholder"
-display_name: "West Area"
+panel_display_name: "West Area"
 keyholders {
   name: "F"
   path: "Components/KeyHolders/keyHolderF"
@@ -1,5 +1,5 @@
 name: "F2 Prize"
-display_name: "F2 Room"
+panel_display_name: "F2 Room"
 letters {
   key: "f"
   level2: true
@@ -1,5 +1,5 @@
 name: "F2 Room"
-display_name: "F2 Room"
+panel_display_name: "F2 Room"
 panels {
   name: "DULLS"
   path: "Panels/The Big F/o_1"
@@ -1,5 +1,5 @@
 name: "Flip Painting Destination"
-display_name: "Central"
+panel_display_name: "Central"
 paintings {
   name: "FLIP"
   path: "Components/Paintings/Group2/flip"
@@ -1,5 +1,5 @@
 name: "Flip Painting Hidden Panel"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
   name: "HIDDEN"
   path: "Panels/Halls/halls_2"
@@ -8,4 +8,5 @@ panels {
   symbols: SUN
   proxies { answer: "covert" path: "Panels/Halls/secret_proxy_1" }
   proxies { answer: "secret" path: "Panels/Halls/secret_proxy_2" }
+  display_name: "HIDDEN (East)"
 }
@@ -1,5 +1,5 @@
 name: "Flip Painting"
-display_name: "West Area"
+panel_display_name: "West Area"
 paintings {
   name: "FLIP2"
   path: "Components/Paintings/Group2/flip2"
@@ -1,5 +1,5 @@
 name: "Gallery Entrance"
-display_name: "Central"
+panel_display_name: "Central"
 paintings {
   name: "GALLERY"
   path: "Components/Warps/eyeWorldport"
@@ -1,5 +1,5 @@
 name: "Globe Room"
-display_name: "Southwest Area"
+panel_display_name: "Southwest Area"
 panels {
   name: "NORTH"
   path: "Panels/Halls/directions_1"
@@ -1,5 +1,5 @@
 name: "Godot Room"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
   name: "MOTORCYCLE"
   path: "Panels/Southwest Room/sw_1"
@@ -1,5 +1,5 @@
 name: "Gray Color Backside"
-display_name: "Outside Pumpkin"
+panel_display_name: "Outside Pumpkin"
 panels {
   name: "ORANGE"
   path: "Panels/Hexes/lightgreen_1"
@@ -1,5 +1,5 @@
 name: "Gray Color Door"
-display_name: "Outside Pumpkin"
+panel_display_name: "Outside Pumpkin"
 panels {
   name: "PATCH"
   path: "Panels/Halls/halls_3"
@@ -1,5 +1,5 @@
 name: "Green Color Door"
-display_name: "Outside Pumpkin"
+panel_display_name: "Outside Pumpkin"
 panels {
   name: "OLD (1)"
   path: "Panels/Halls/halls_20"
@@ -1,5 +1,5 @@
 name: "Green Room"
-display_name: "Green Room"
+panel_display_name: "Green Room"
 panels {
   name: "TIMESCALE"
   path: "Panels/Green Room/panel_1"
@@ -1,5 +1,5 @@
 name: "Green Smiley"
-display_name: "Southwest Area"
+panel_display_name: "Southwest Area"
 panels {
   name: "SMILE"
   path: "Panels/Smiley Rooms/green"
@@ -1,5 +1,5 @@
 name: "Hedges Tower"
-display_name: "Hedges"
+panel_display_name: "Hedges"
 ports {
   name: "TENACIOUS"
   path: "Components/Warps/Worldports/worldport13"
@@ -1,5 +1,5 @@
 name: "Hedges"
-display_name: "Hedges"
+panel_display_name: "Hedges"
 panels {
   name: "SOLVE"
   path: "Panels/Tower Maze/maze_1"
@@ -1,5 +1,5 @@
 name: "Hotel"
-display_name: "Southwest Area"
+panel_display_name: "Southwest Area"
 # TODO: Something has to be changed in-game so that the puzzles don't disappear
 # and thus cause them to become unsolvable.
 panels {
@@ -1,5 +1,5 @@
 name: "House Entrance"
-display_name: "Maze"
+panel_display_name: "Maze"
 panels {
   name: "ADULT"
   path: "Panels/Entry/entry_6"
@@ -1,5 +1,5 @@
 name: "House"
-display_name: "House"
+panel_display_name: "House"
 panels {
   name: "GOAT"
   path: "Panels/Theos House/panel_1"
@@ -1,5 +1,5 @@
 name: "I2 Room"
-display_name: "Temple of the Eyes"
+panel_display_name: "Temple of the Eyes"
 letters {
   key: "i"
   level2: true
@@ -1,5 +1,5 @@
 name: "Intense Room"
-display_name: "Intense Room"
+panel_display_name: "Intense Room"
 panels {
   name: "BRILLIANT"
   path: "Panels/Intense Room/intense_1"
@@ -1,5 +1,5 @@
 name: "J2 Room"
-display_name: "Southwest Area"
+panel_display_name: "Southwest Area"
 letters {
   key: "j"
   level2: true
@@ -1,9 +1,10 @@
 name: "J2 Vestibule"
-display_name: "Southwest Area"
+panel_display_name: "Southwest Area"
 panels {
   name: "COLORFUL"
   path: "Panels/Entry/hotel_entry2"
   clue: "colorful"
   answer: "vivid"
   symbols: SUN
+  display_name: "COLORFUL (2)"
 }
@@ -1,5 +1,5 @@
 name: "Magic Room"
-display_name: "Maze"
+panel_display_name: "Maze"
 panels {
   name: "1"
   path: "Panels/Magic Maze/maze_1"
@@ -1,5 +1,5 @@
 name: "Maze Paintings Area"
-display_name: "Maze"
+panel_display_name: "Maze"
 panels {
   name: "Paintings"
   path: "Panels/Halls/halls_28"
@@ -1,2 +1,2 @@
 name: "Maze"
-display_name: "Maze"
+panel_display_name: "Maze"
@@ -1,5 +1,5 @@
 name: "Moat"
-display_name: "East Area"
+panel_display_name: "East Area"
 paintings {
   name: "CASTLE"
   path: "Components/Paintings/Group1/castle"
@@ -1,5 +1,5 @@
 name: "North Castle Area"
-display_name: "North Area"
+panel_display_name: "North Area"
 panels {
   name: "A"
   path: "Panels/Castle Entrance/castle_north_helper"
@@ -1,5 +1,5 @@
 name: "Number Paintings Area"
-display_name: "Northwest Area"
+panel_display_name: "Northwest Area"
 panels {
   name: "GOING"
   path: "Panels/Entry/g_hedge_1"
@@ -1,5 +1,5 @@
 name: "Nursery"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
   name: "Paintings"
   path: "Panels/Entry/entry_2"
@@ -12,6 +12,7 @@ panels {
   path: "Panels/Halls/halls_17"
   clue: ""
   answer: "welcome"
+  display_name: "Nursery Behind"
 }
 paintings {
   name: "ARE"
@@ -1,5 +1,5 @@
 name: "O2 Prize"
-display_name: "O2 Room"
+panel_display_name: "O2 Room"
 letters {
   key: "o"
   level2: true
@@ -1,5 +1,5 @@
 name: "O2 Room"
-display_name: "O2 Room"
+panel_display_name: "O2 Room"
 panels {
   name: "LISTEN"
   path: "Panels/The Big O/o_1"
@@ -1,5 +1,5 @@
 name: "Orange Room"
-display_name: "East Area"
+panel_display_name: "Orange Room"
 panels {
   name: "FRANCE"
   path: "Panels/Orange Room/panel_1"
@@ -1,5 +1,5 @@
 name: "Outside Book Room"
-display_name: "Southwest Area"
+panel_display_name: "Southwest Area"
 # This is behind a teal wall.
 panels {
   name: "TEAL"
@@ -1,5 +1,5 @@
 name: "Outside Eye Temple"
-display_name: "Temple of the Eyes"
+panel_display_name: "Temple of the Eyes"
 panels {
   name: "Entrance"
   path: "Panels/Halls/eye_temple_entry_1"
@@ -1,5 +1,5 @@
 name: "Outside Hedges"
-display_name: "Hedges"
+panel_display_name: "Hedges"
 panels {
   name: "GOURD (1)"
   path: "Panels/Halls/halls_11"
@@ -1,9 +1,10 @@
 name: "Outside Hotel"
-display_name: "Southwest Area"
+panel_display_name: "Southwest Area"
 panels {
   name: "COLORFUL"
   path: "Panels/Entry/hotel_entry"
   clue: "colorful"
   answer: "bright"
   symbols: SUN
+  display_name: "COLORFUL (1)"
 }
@@ -1,5 +1,5 @@
 name: "Outside House"
-display_name: "Maze"
+panel_display_name: "Maze"
 panels {
   name: "WHISPER"
   path: "Panels/Beehalls/beehalls_1"
@@ -1,5 +1,5 @@
 name: "Outside Magic Room"
-display_name: "Maze"
+panel_display_name: "Maze"
 panels {
   name: "WIZARD"
   path: "Panels/Magic Maze/maze_entry_1"
@@ -1,5 +1,5 @@
 name: "Outside Orange Room"
-display_name: "East Area"
+panel_display_name: "East Area"
 panels {
   name: "SMILE"
   path: "Panels/Smiley Rooms/orange"
@@ -1,5 +1,5 @@
 name: "Outside Pyramid"
-display_name: "Pyramid"
+panel_display_name: "Pyramid"
 panels {
   name: "PEER"
   path: "Panels/Pyramid/pyramid_entry"
@@ -1,5 +1,5 @@
 name: "Outside Red Room"
-display_name: "Red Room"
+panel_display_name: "Red Room"
 panels {
   name: "ROCK"
   path: "Panels/Red Room/red_entry"
@@ -1,9 +1,10 @@
 name: "Outside Salt Room"
-display_name: "Southwest Area"
+panel_display_name: "Southwest Area"
 panels {
   name: "Colors"
   path: "Panels/Color Reading/cr_1"
   clue: ""
   answer: "rob"
   symbols: LINGO
+  display_name: "Colors (White)"
 }
@@ -1,5 +1,5 @@
 name: "Outside Snake Room"
-display_name: "West Area"
+panel_display_name: "West Area"
 panels {
   name: "TONGUE"
   path: "Panels/Pairs Room/pairs_7"
@@ -1,5 +1,5 @@
 name: "Pains Room"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
   name: "MOO"
   path: "Panels/Gold/gold_1"
@@ -1,2 +1,2 @@
 name: "Pairs Room"
-display_name: "West Area"
+panel_display_name: "West Area"
@@ -1,9 +1,10 @@
 name: "Pepper Room"
-display_name: "Southwest Area"
+panel_display_name: "Southwest Area"
 panels {
   name: "SEASONING"
   path: "Panels/Color Reading/cr_4"
   clue: "seasoning"
   answer: "pepper"
   symbols: EXAMPLE
+  display_name: "SEASONING (Black)"
 }
@@ -1,5 +1,5 @@
 name: "Plum Room"
-display_name: "Plum Room"
+panel_display_name: "Plum Room"
 panels {
   name: "GOD"
   path: "Panels/Plum Room/plum_1"
@@ -1,2 +1,2 @@
 name: "Post Orange Smiley Three Way"
-display_name: "West Area"
+panel_display_name: "West Area"
@@ -1,5 +1,5 @@
 name: "Pumpkin Entrance"
-display_name: "East Area"
+panel_display_name: "East Area"
 panels {
   name: "JACK"
   path: "Panels/Pumpkin Room/pumpkin_2"
@@ -1,5 +1,5 @@
 name: "Pumpkin Room"
-display_name: "East Area"
+panel_display_name: "East Area"
 panels {
   name: "BONE"
   path: "Panels/Pumpkin Room/pumpkin_3"
@@ -1,5 +1,5 @@
 name: "Purple Hallway From Great"
-display_name: "South Area"
+panel_display_name: "South Area"
 ports {
   name: "GREAT"
   path: "Components/Warps/Worldports/worldport17"
@@ -1,5 +1,5 @@
 name: "Purple NW Vestibule"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
   name: "MESSAGES"
   path: "Panels/Purple Exterior/purple_8"
@@ -1,2 +1,2 @@
 name: "Purple Room East"
-display_name: "Central"
+panel_display_name: "Central"
@@ -1,5 +1,5 @@
 name: "Purple Room South"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
   name: "LITTLE"
   path: "Panels/Halls/hof_1"
@@ -1,2 +1,2 @@
 name: "Purple Room West"
-display_name: "Central"
+panel_display_name: "Central"
@@ -1,5 +1,5 @@
 name: "Purple Room"
-display_name: "Central"
+panel_display_name: "Purple Room"
 panels {
   name: "HOIST"
   path: "Panels/Purple Room/purple_1"
@@ -1,5 +1,5 @@
 name: "Purple SE Vestibule"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
   name: "RUN"
   path: "Panels/Purple Exterior/purple_1"
@@ -1,5 +1,5 @@
 name: "Purple SW Vestibule"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
   name: "LETTERS"
   path: "Panels/Purple Exterior/purple_11"
@@ -1,5 +1,5 @@
 name: "Purple Smiley"
-display_name: "Northeast Area"
+panel_display_name: "Northeast Area"
 panels {
   name: "SMILE"
   path: "Panels/Smiley Rooms/purple"
@@ -1,5 +1,5 @@
 name: "Pyramid 3"
-display_name: "Pyramid"
+panel_display_name: "Pyramid"
 panels {
   name: "VEHICLE"
   path: "Panels/Pyramid/pyramid_3"
@@ -1,5 +1,5 @@
 name: "Pyramid 4"
-display_name: "Pyramid"
+panel_display_name: "Pyramid"
 panels {
   name: "CAT"
   path: "Panels/Pyramid/pyramid_4"
@@ -1,5 +1,5 @@
 name: "Pyramid 5"
-display_name: "Pyramid"
+panel_display_name: "Pyramid"
 panels {
   name: "ROYAL"
   path: "Panels/Pyramid/pyramid_5"
@@ -1,5 +1,5 @@
 name: "Pyramid 6"
-display_name: "Pyramid"
+panel_display_name: "Pyramid"
 panels {
   name: "TEA"
   path: "Panels/Pyramid/pyramid_6"
@@ -1,5 +1,5 @@
 name: "Pyramid 7"
-display_name: "Pyramid"
+panel_display_name: "Pyramid"
 panels {
   name: "ARTIST"
   path: "Panels/Pyramid/pyramid_7"
@@ -1,9 +1,10 @@
 name: "Pyramid 8"
-display_name: "Pyramid"
+panel_display_name: "Pyramid"
 panels {
   name: "INSTRUMENT"
   path: "Panels/Pyramid/pyramid_8"
   clue: "instrument"
   answer: "drum"
   symbols: EXAMPLE
+  display_name: "INSTRUMENT (1F)"
 }
@@ -1,5 +1,5 @@
 name: "Pyramid Entry"
-display_name: "Pyramid"
+panel_display_name: "Pyramid"
 panels {
   name: "TREE"
   path: "Panels/Pyramid/pyramid_1"
@@ -1,5 +1,5 @@
 name: "Pyramid Second Floor"
-display_name: "Pyramid"
+panel_display_name: "Pyramid"
 panels {
   name: "TOOL"
   path: "Panels/Pyramid/pyramid_10"
@@ -36,6 +36,7 @@ panels {
   answer: "organ"
   symbols: EXAMPLE
   required_door { name: "Pyramid 13 Blocker" }
+  display_name: "INSTRUMENT (2F)"
 }
 panels {
   name: "BEVERAGE"
@@ -1,5 +1,5 @@
 name: "Pyramid Top"
-display_name: "Pyramid"
+panel_display_name: "Pyramid"
 letters {
   key: "r"
   level2: true
@@ -1,5 +1,5 @@
 name: "Quiet Entrance"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
   name: "HIDDEN"
   path: "Panels/Halls/halls_7"
@@ -8,6 +8,7 @@ panels {
   symbols: SUN
   proxies { answer: "covert" path: "Panels/Halls/secret_proxy_3" }
   proxies { answer: "secret" path: "Panels/Halls/secret_proxy_4" }
+  display_name: "HIDDEN (West)"
 }
 paintings {
   name: "PLANET2"
@@ -1,11 +1,12 @@
 name: "Rain Side"
-display_name: "Rainbow"
+panel_display_name: "Rainbow"
 panels {
   name: "?"
   path: "Panels/Smiley Rooms/rain"
   clue: ""
   answer: "rain"
   symbols: QUESTION
+  display_name: "? (1)"
 }
 ports {
   name: "BEARER"
@@ -1,9 +1,10 @@
 name: "Rainbow Blue"
-display_name: "Rainbow"
+panel_display_name: "Rainbow"
 panels {
   name: "THEME"
   path: "Panels/Smiley Rooms/blue2"
   clue: "theme"
   answer: "seasonings"
   symbols: QUESTION
+  display_name: "THEME (Blue)"
 }
@@ -1,5 +1,5 @@
 name: "Rainbow Color Backside"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
   name: "BACKSIDE"
   path: "Panels/Halls/halls_1"
@@ -11,4 +11,5 @@ panels {
   path: "Panels/Halls/halls_4"
   clue: ""
   answer: "side"
+  display_name: "Backside Behind"
 }
@@ -1,5 +1,5 @@
 name: "Rainbow Color Doors"
-display_name: "East Area"
+panel_display_name: "East Area"
 panels {
   name: "CROW"
   path: "Panels/Blue Room/panel_entry"
@@ -1,9 +1,10 @@
 name: "Rainbow Cyan"
-display_name: "Rainbow"
+panel_display_name: "Rainbow"
 panels {
   name: "THEME"
   path: "Panels/Smiley Rooms/cyan"
   clue: "theme"
   answer: "apocalypse"
   symbols: QUESTION
+  display_name: "THEME (Cyan)"
 }
@@ -1,5 +1,5 @@
 name: "Rainbow End"
-display_name: "Rainbow"
+panel_display_name: "Rainbow"
 panels {
   name: "POT"
   path: "Components/Warps/gold"
@@ -1,9 +1,10 @@
 name: "Rainbow Green"
-display_name: "Rainbow"
+panel_display_name: "Rainbow"
 panels {
   name: "THEME"
   path: "Panels/Smiley Rooms/green2"
   clue: "theme"
   answer: "tea"
   symbols: QUESTION
+  display_name: "THEME (Green)"
 }
@@ -1,9 +1,10 @@
 name: "Rainbow Orange"
-display_name: "Rainbow"
+panel_display_name: "Rainbow"
 panels {
   name: "THEME"
   path: "Panels/Smiley Rooms/orange2"
   clue: "theme"
   answer: "fish"
   symbols: QUESTION
+  display_name: "THEME (Orange)"
 }
@@ -1,9 +1,10 @@
 name: "Rainbow Purple"
-display_name: "Rainbow"
+panel_display_name: "Rainbow"
 panels {
   name: "THEME"
   path: "Panels/Smiley Rooms/purple2"
   clue: "theme"
   answer: "fruit"
   symbols: QUESTION
+  display_name: "THEME (Purple)"
 }
@@ -1,9 +1,10 @@
 name: "Rainbow Red"
-display_name: "Rainbow"
+panel_display_name: "Rainbow"
 panels {
   name: "THEME"
   path: "Panels/Smiley Rooms/red2"
   clue: "theme"
   answer: "names"
   symbols: QUESTION
+  display_name: "THEME (Red)"
 }
@@ -1,5 +1,5 @@
 name: "Rainbow Start"
-display_name: "Rainbow"
+panel_display_name: "Rainbow"
 panels {
   name: "PAINTING"
   path: "Panels/Smiley Rooms/rainbow"
@@ -1,9 +1,10 @@
 name: "Rainbow Yellow"
-display_name: "Rainbow"
+panel_display_name: "Rainbow"
 panels {
   name: "THEME"
   path: "Panels/Smiley Rooms/yellow2"
   clue: "theme"
   answer: "music"
   symbols: QUESTION
+  display_name: "THEME (Yellow)"
 }
@@ -1,5 +1,5 @@
 name: "Red Color Door"
-display_name: "Southwest Area"
+panel_display_name: "Southwest Area"
 panels {
   name: "Left"
   path: "Panels/Halls/wb_1"
@@ -67,4 +67,5 @@ panels {
   clue: ""
   answer: "bank"
   symbols: LINGO
+  display_name: "Colors (Black)"
 }
@@ -1,5 +1,5 @@
 name: "Red Room"
-display_name: "Red Room"
+panel_display_name: "Red Room"
 panels {
   name: "BLINDING"
   path: "Panels/Red Room/red_1"
@@ -1,5 +1,5 @@
 name: "Red Smiley"
-display_name: "Northwest Area"
+panel_display_name: "Northwest Area"
 panels {
   name: "SMILE"
   path: "Panels/Smiley Rooms/red"
@@ -1,9 +1,10 @@
 name: "Salt Room"
-display_name: "Southwest Area"
+panel_display_name: "Southwest Area"
 panels {
   name: "SEASONING"
   path: "Panels/Color Reading/cr_3"
   clue: "seasoning"
   answer: "salt"
   symbols: EXAMPLE
+  display_name: "SEASONING (White)"
 }
@@ -1,5 +1,5 @@
 name: "Seasoning Room"
-display_name: "Southwest Area"
+panel_display_name: "Southwest Area"
 panels {
   name: "PARITY"
   path: "Panels/Color Reading/cr_5"
@@ -1,5 +1,5 @@
 name: "Snake Room"
-display_name: "West Area"
+panel_display_name: "West Area"
 panels {
   name: "HISS"
   path: "Panels/Snake Room/snake_1"
@@ -1,5 +1,5 @@
 name: "South Castle Area"
-display_name: "Outside Pumpkin"
+panel_display_name: "Outside Pumpkin"
 # There is a teal wall in the middle of this room.
 panels {
   name: "AN"
@@ -1,5 +1,5 @@
 name: "Starting Room"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
   name: "ENTRANCE"
   path: "Panels/Entry/entry_1"
@@ -1,5 +1,5 @@
 name: "Sweet Foyer"
-display_name: "South Area"
+panel_display_name: "South Area"
 panels {
   name: "QUALITY"
   path: "Panels/Sweet Foyer/panel_1"
@@ -1,5 +1,5 @@
 name: "Tree Entrance"
-display_name: "Outside Pumpkin"
+panel_display_name: "Outside Pumpkin"
 panels {
   name: "RAT"
   path: "Panels/Hexes/lime_1"
@@ -1,5 +1,5 @@
 name: "U2 Prize"
-display_name: "U2 Room"
+panel_display_name: "U2 Room"
 letters {
   key: "u"
   level2: true
@@ -1,5 +1,5 @@
 name: "U2 Room"
-display_name: "U2 Room"
+panel_display_name: "U2 Room"
 panels {
   name: "DREAMSCAPE"
   path: "Panels/The Big U/o_1"
@@ -1,5 +1,5 @@
 name: "Unkempt Entrance"
-display_name: "O2 Room"
+panel_display_name: "O2 Room"
 ports {
   name: "UNKEMPT"
   path: "Components/Warps/Worldports/worldport6"
@@ -1,5 +1,5 @@
 name: "Welcome Back Area"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
   name: "FAREWELL LITTLE LAMB"
   path: "Panels/Entry/wb_2"
@@ -1,5 +1,5 @@
 name: "Welcome Back Exit"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
   name: "WELCOME"
   path: "Panels/Entry/wb_1"
@@ -7,4 +7,5 @@ panels {
   answer: "welcome"
   symbols: QUESTION
   proxies { answer: "back" path: "Panels/Entry/wb_proxy" }
+  display_name: "WELCOME (White)"
 }
@@ -1,5 +1,5 @@
 name: "West Castle Area"
-display_name: "West Area"
+panel_display_name: "West Area"
 panels {
   name: "SONG (1)"
   path: "Panels/Castle Entrance/castle_west_helper"
@@ -1,5 +1,5 @@
 name: "West Spire"
-display_name: "West Area"
+panel_display_name: "West Area"
 panels {
   name: "MISSING"
   path: "Panels/Entry/wb_5"
@@ -1,5 +1,5 @@
 name: "White Hallway From Entry"
-display_name: "Southwest Area"
+panel_display_name: "Southwest Area"
 # Not exactly sure what to do with this yet. In unshuffled connections, the door
 # here should be paired with the door on the other end (which is vanilla) even
 # if control center color doors are shuffled. But when connections are shuffled
@@ -1,5 +1,5 @@
 name: "Wisdom Panel"
-display_name: "Castle"
+panel_display_name: "Castle"
 panels {
   name: "INTELLIGENCE"
   path: "Components/Warps/numbers"
@@ -1,5 +1,5 @@
 name: "Wonderland"
-display_name: "Northwest Area"
+panel_display_name: "Northwest Area"
 # TODO: There's a warp from The Entry into here.
 panels {
   name: "APRIL"
@@ -1,5 +1,5 @@
 name: "Yellow Color Backside"
-display_name: "Northeast Area"
+panel_display_name: "Northeast Area"
 panels {
   name: "WINDS"
   path: "Panels/Halls/halls_24"
@@ -1,5 +1,5 @@
 name: "Yellow Color Door"
-display_name: "Northeast Area"
+panel_display_name: "Northeast Area"
 panels {
   name: "SUN"
   path: "Panels/Yellow Room/panel_entry"
@@ -1,5 +1,5 @@
 name: "Yellow Room"
-display_name: "Northeast Area"
+panel_display_name: "Yellow Room"
 panels {
   name: "FREE"
   path: "Panels/Yellow Room/panel_1"
@@ -1,5 +1,5 @@
 name: "Yellow Smiley Annex"
-display_name: "Hedges"
+panel_display_name: "Hedges"
 panels {
   name: "COW"
   path: "Panels/Miscellaneous/plum1"
@@ -1,5 +1,5 @@
 name: "Z2 Prize"
-display_name: "Northwest Area"
+panel_display_name: "Z2 Room"
 letters {
   key: "z"
   level2: true
@@ -1,5 +1,5 @@
 name: "Z2 Room"
-display_name: "Northwest Area"
+panel_display_name: "Z2 Room"
 panels {
   name: "EXHIBIT"
   path: "Panels/V Maze/entry"
@@ -1,5 +1,5 @@
 name: "Zoo Center"
-display_name: "Zoo"
+panel_display_name: "Zoo"
 letters {
   key: "v"
   level2: true
@@ -1,5 +1,5 @@
 name: "Zoo E"
-display_name: "Zoo"
+panel_display_name: "Zoo"
 panels {
   name: "WING"
   path: "Panels/V Maze/four_1"
@@ -1,5 +1,5 @@
 name: "Zoo N"
-display_name: "Zoo"
+panel_display_name: "Zoo"
 panels {
   name: "BILL"
   path: "Panels/V Maze/four_13"
@@ -13,6 +13,7 @@ panels {
   clue: "fin"
   answer: "whale"
   symbols: BOXES
+  display_name: "FIN (N)"
 }
 panels {
   name: "BLOWHOLE"
@@ -1,5 +1,5 @@
 name: "Zoo NE"
-display_name: "Zoo"
+panel_display_name: "Zoo"
 panels {
   name: "FANG"
   path: "Panels/V Maze/four_5"
@@ -1,5 +1,5 @@
 name: "Zoo S"
-display_name: "Zoo"
+panel_display_name: "Zoo"
 panels {
   name: "SHELL"
   path: "Panels/V Maze/four_9"
@@ -13,6 +13,7 @@ panels {
   clue: "fin"
   answer: "fish"
   symbols: BOXES
+  display_name: "FIN (S)"
 }
 panels {
   name: "PINCER"
@@ -1,2 +1,2 @@
 name: "Zoo SE"
-display_name: "Zoo"
+panel_display_name: "Zoo"
@@ -11,6 +11,7 @@ doors {
   panels { room: "Intensify Room" name: "INJURY" }
   panels { room: "Intensify Room" name: "SWAY" }
   location_room: "Intensify Room"
+  location_name: "Intensify Room"
 }
 doors {
   name: "Examples Door"
@@ -25,6 +26,7 @@ doors {
   panels { room: "Examples Room" name: "URN" }
   panels { room: "Examples Room" name: "ART" }
   location_room: "Examples Room"
+  location_name: "Examples Room"
 }
 doors {
   name: "Synonyms Door"
@@ -39,6 +41,7 @@ doors {
   panels { room: "Synonyms Room" name: "SERIOUS" }
   panels { room: "Synonyms Room" name: "FURY" }
   location_room: "Synonyms Room"
+  location_name: "Synonyms Room"
 }
 doors {
   name: "Time Door"
@@ -53,6 +56,7 @@ doors {
   panels { room: "Time Room" name: "HOLE" }
   panels { room: "Time Room" name: "RHYTHM" }
   location_room: "Time Room"
+  location_name: "Time Room"
 }
 doors {
   name: "A2 Door"
@@ -1,5 +1,4 @@
 name: "A2 Room"
-display_name: "Hallway"
 letters {
   key: "a"
   level2: true
@@ -1,5 +1,4 @@
 name: "Examples Room"
-display_name: "Examples Room"
 panels {
   name: "SIZE (1)"
   path: "Panels/Room 2 Examples/entry_1"
@@ -1,5 +1,4 @@
 name: "Hallway"
-display_name: "Hallway"
 panels {
   name: "SUSPICION"
   path: "Panels/Reward Room/reward_1"
@@ -1,5 +1,4 @@
 name: "Intensify Room"
-display_name: "Intensify Room"
 panels {
   name: "SMALL"
   path: "Panels/Room 1 Intensify/entry_1"
@@ -1,5 +1,4 @@
 name: "Keyholder Room"
-display_name: "Hallway"
 keyholders {
   name: "A"
   path: "Components/KeyHolders/keyHolderA"
@@ -1,5 +1,4 @@
 name: "Synonyms Room"
-display_name: "Synonyms Room"
 panels {
   name: "MINUTE"
   path: "Panels/Room 3 Synonyms/entry_1"
@@ -1,5 +1,4 @@
 name: "Time Room"
-display_name: "Time Room"
 panels {
   name: "BROODING"
   path: "Panels/Room 4 Time/entry_1"
@@ -1,5 +1,4 @@
 name: "Ending"
-display_name: "Ending"
 endings {
   name: "GREEN"
   path: "Components/Ending/green_ending"
@@ -1,5 +1,4 @@
 name: "Inside"
-display_name: "Inside"
 panels {
   name: "COLOR"
   path: "Panels/panel_2"
@@ -1,5 +1,4 @@
 name: "Outside"
-display_name: "Outside"
 panels {
   name: "THIS"
   path: "Panels/panel_1"
@@ -211,7 +211,7 @@ doors {
 }
 doors {
   name: "Q2 Door"
-  type: STANDARD
+  type: EVENT
   receivers: "Components/Doors/entry_3"
   panels { room: "Entry" name: "SQUISH" }
   panels { room: "Entry" name: "MANE" }
@@ -237,7 +237,6 @@ doors {
   panels { room: "Red Vegetable" name: "CARD" }
   panels { room: "Yellow Planet" name: "ZEUS" }
   panels { room: "Yellow Vegetable" name: "CAKE" }
-  location_room: "Entry"
 }
 doors {
   name: "Control Center Brown Door"
@@ -1,5 +1,4 @@
 name: "Back Area"
-display_name: "Back Area"
 panels {
   name: "COLOR"
   path: "Panels/Entry/panel_3"
@@ -1,5 +1,4 @@
 name: "Blue Animal (View)"
-display_name: "Main Area"
 panels {
   name: "HALF"
   path: "Panels/Blue/panel_2"
@@ -1,2 +1 @@
 name: "Blue Animal"
-display_name: "Main Area"
@@ -1,5 +1,4 @@
 name: "Blue Planet (View)"
-display_name: "Main Area"
 panels {
   name: "TUNE"
   path: "Panels/Blue/panel_4"
@@ -1,2 +1 @@
 name: "Blue Planet"
-display_name: "Main Area"
@@ -1,5 +1,4 @@
 name: "Blue Town (View)"
-display_name: "Main Area"
 panels {
   name: "LICE"
   path: "Panels/Blue/panel_3"
@@ -1,2 +1 @@
 name: "Blue Town"
-display_name: "Main Area"
@@ -1,5 +1,4 @@
 name: "Blue Vegetable (View)"
-display_name: "Main Area"
 panels {
   name: "THORN"
   path: "Panels/Blue/panel_1"
@@ -1,2 +1 @@
 name: "Blue Vegetable"
-display_name: "Main Area"
@@ -1,5 +1,4 @@
 name: "Butterfly Room"
-display_name: "Back Area"
 panels {
   name: "VIBRANT"
   path: "Panels/Entry/panel_4"
@@ -1,5 +1,4 @@
 name: "Entry"
-display_name: "Main Area"
 panels {
   name: "VIEW"
   path: "Panels/Entry/panel_1"
@@ -1,2 +1 @@
 name: "Green Animal"
-display_name: "Main Area"
@@ -1,5 +1,4 @@
 name: "Green Planet (View)"
-display_name: "Main Area"
 panels {
   name: "SOIL"
   path: "Panels/Green/panel_4"
@@ -1,2 +1 @@
 name: "Green Planet"
-display_name: "Main Area"
@@ -1,2 +1 @@
 name: "Green Town"
-display_name: "Main Area"
@@ -1,5 +1,4 @@
 name: "Green Vegetable (View)"
-display_name: "Main Area"
 panels {
   name: "SPIN"
   path: "Panels/Green/panel_1"
@@ -1,2 +1 @@
 name: "Green Vegetable"
-display_name: "Main Area"
@@ -1,5 +1,4 @@
 name: "Orange Planet"
-display_name: "Main Area"
 panels {
   name: "MAR"
   path: "Panels/Red/panel_4"
@@ -1,5 +1,4 @@
 name: "Orange Vegetable"
-display_name: "Main Area"
 panels {
   name: "POTATO"
   path: "Panels/Red/panel_1"
@@ -1,2 +1 @@
 name: "Overlook"
-display_name: "Main Area"
@@ -1,5 +1,4 @@
 name: "Purple Animal (View)"
-display_name: "Main Area"
 panels {
   name: "SUNBASS"
   path: "Panels/Purple/panel_2"
@@ -1,2 +1 @@
 name: "Purple Animal"
-display_name: "Main Area"
@@ -1,5 +1,4 @@
 name: "Purple Planet (View)"
-display_name: "Main Area"
 panels {
   name: "DOG"
   path: "Panels/Purple/panel_4"
@@ -1,2 +1 @@
 name: "Purple Planet"
-display_name: "Main Area"
@@ -1,5 +1,4 @@
 name: "Purple Town (View)"
-display_name: "Main Area"
 panels {
   name: "GRACEFUL"
   path: "Panels/Purple/panel_3"
@@ -1,2 +1 @@
 name: "Purple Town"
-display_name: "Main Area"
@@ -1,5 +1,4 @@
 name: "Purple Vegetable (View)"
-display_name: "Main Area"
 panels {
   name: "AUBERGINE"
   path: "Panels/Purple/panel_1"
@@ -1,2 +1 @@
 name: "Purple Vegetable"
-display_name: "Main Area"
@@ -1,5 +1,4 @@
 name: "Q2 Room"
-display_name: "Back Area"
 letters {
   key: "q"
   level2: true
@@ -1,5 +1,4 @@
 name: "Red Animal"
-display_name: "Main Area"
 panels {
   name: "FOOLSHARK"
   path: "Panels/Orange/panel_2"
@@ -1,5 +1,4 @@
 name: "Red Planet"
-display_name: "Main Area"
 panels {
   name: "FUEL"
   path: "Panels/Red/panel_3"
@@ -1,5 +1,4 @@
 name: "Red Town"
-display_name: "Main Area"
 panels {
   name: "DESTRUCTION"
   path: "Panels/Orange/panel_3"
@@ -1,5 +1,4 @@
 name: "Red Vegetable"
-display_name: "Main Area"
 panels {
   name: "CARD"
   path: "Panels/Red/panel_2"
@@ -1,5 +1,4 @@
 name: "Yellow Planet"
-display_name: "Main Area"
 panels {
   name: "ZEUS"
   path: "Panels/Orange/panel_4"
@@ -1,5 +1,4 @@
 name: "Yellow Vegetable"
-display_name: "Main Area"
 panels {
   name: "CAKE"
   path: "Panels/Orange/panel_1"
@@ -1,5 +1,4 @@
 name: "B2 Back Room"
-display_name: "B2 Room"
 letters {
   key: "b"
   level2: true
@@ -1,5 +1,4 @@
 name: "B2 Front Room"
-display_name: "B2 Room"
 paintings {
   name: "EYES"
   path: "Components/Paintings/eyes"
@@ -1,5 +1,4 @@
 name: "Control Center Side"
-display_name: "Control Center Side"
 panels {
   name: "RIGHT"
   path: "Panels/Helpers/panel_1"
@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Main Area"
 panels {
   name: "NEW"
   path: "Panels/Room 1/panel_1"
@@ -1,5 +1,4 @@
 name: "Plaza Entrance"
-display_name: "Main Area"
 ports {
   name: "PLAZA"
   path: "Components/Warps/worldport4"
@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Main Area"
 panels {
   name: "SPECIES"
   path: "Panels/Room_1/panel_1"
@@ -1,5 +1,4 @@
 name: "Mastery"
-display_name: "Main Area"
 masteries {
   name: "MASTERY"
   path: "Components/Collectables/collectable"
@@ -1,5 +1,4 @@
 name: "Black Room"
-display_name: "Black Room"
 panels {
   name: "STARK"
   path: "Panels/Hallway/panel_2"
@@ -1,5 +1,4 @@
 name: "Blue Room"
-display_name: "Blue Room"
 panels {
   name: "VINE"
   path: "Panels/Hallway/panel_4"
@@ -1,5 +1,4 @@
 name: "Brown Room"
-display_name: "Brown Room"
 panels {
   name: "FIRE"
   path: "Panels/Hallway/panel_9"
@@ -1,5 +1,4 @@
 name: "Cyan Hallway"
-display_name: "Cyan Hallway"
 panels {
   name: "KOI"
   path: "Panels/Extra/panel_12"
@@ -1,5 +1,4 @@
 name: "Cyan Room"
-display_name: "Cyan Room"
 panels {
   name: "BROTHER"
   path: "Panels/Cyan/panel_cyan_1"
@@ -1,5 +1,4 @@
 name: "Ending"
-display_name: "Ending"
 endings {
   name: "GRAY"
   path: "Components/Endings/gray_ending"
@@ -1,5 +1,4 @@
 name: "Gray Room"
-display_name: "Gray Room"
 panels {
   name: "MEND"
   path: "Panels/Hallway/panel_11"
@@ -1,5 +1,4 @@
 name: "Green Room"
-display_name: "Green Room"
 panels {
   name: "MOTHER"
   path: "Panels/Hallway/panel_5"
@@ -1,5 +1,4 @@
 name: "Orange Room"
-display_name: "Orange Room"
 panels {
   name: "CLOUD"
   path: "Panels/Hallway/panel_8"
@@ -1,5 +1,4 @@
 name: "P2 Room"
-display_name: "Cyan Room"
 letters {
   key: "p"
   level2: true
@@ -1,5 +1,4 @@
 name: "Purple Room"
-display_name: "Purple Room"
 panels {
   name: "FISH"
   path: "Panels/Hallway/panel_7"
@@ -1,5 +1,4 @@
 name: "Red Room"
-display_name: "Red Room"
 panels {
   name: "SANDWICH"
   path: "Panels/Hallway/panel_3"
@@ -1,5 +1,4 @@
 name: "White Room"
-display_name: "White Room"
 panels {
   name: "BRIGHT"
   path: "Panels/Hallway/panel_1"
@@ -1,5 +1,4 @@
 name: "Window Room"
-display_name: "Window Room"
 panels {
   name: "FADING"
   path: "Panels/Hallway/panel_10"
@@ -1,5 +1,4 @@
 name: "Yellow Room"
-display_name: "Yellow Room"
 panels {
   name: "CIRCLE"
   path: "Panels/Hallway/panel_6"
@@ -17,6 +17,7 @@ doors {
   panels { room: "Main Area" name: "LABS (1)" }
   panels { room: "Main Area" name: "LABS (2)" }
   location_room: "Main Area"
+  location_name: "Obverse Cyan Large Room"
 }
 doors {
   name: "Flipped Yellow Door"
@@ -33,6 +34,7 @@ doors {
   panels { room: "Flipped Magenta Room" name: "LUST" }
   panels { room: "Flipped Magenta Room" name: "LAND" }
   location_room: "Flipped Magenta Room"
+  location_name: "Flipped Magenta Room"
 }
 doors {
   name: "C Keyholder Blocker"
@@ -47,6 +49,7 @@ doors {
   panels { room: "Flipped Yellow Room" name: "CAVE (1)" }
   panels { room: "Flipped Yellow Room" name: "CAVE (2)" }
   location_room: "Flipped Yellow Room"
+  location_name: "Flipped Yellow Room"
 }
 doors {
   name: "C2 Door"
@@ -59,6 +62,7 @@ doors {
     key: "c"
   }
   location_room: "C Keyholder"
+  location_name: "C Keyholder"
 }
 doors {
   name: "Obverse Yellow Door"
@@ -111,6 +115,7 @@ doors {
     key: "g"
   }
   location_room: "G Keyholder"
+  location_name: "G Keyholder"
 }
 doors {
   name: "T Keyholder Blocker"
@@ -1,5 +1,4 @@
 name: "C Keyholder"
-display_name: "Main Area"
 keyholders {
   name: "C"
   path: "Components/KeyHolders/keyHolder"
@@ -1,5 +1,4 @@
 name: "C2 Room"
-display_name: "Main Area"
 letters {
   key: "c"
   level2: true
@@ -1,5 +1,4 @@
 name: "Flipped Magenta Room"
-display_name: "Flipped Magenta Room"
 panels {
   name: "LOOK"
   path: "Panels/Side Up 1/panel_1"
@@ -1,5 +1,4 @@
 name: "Flipped Yellow Room"
-display_name: "Flipped Yellow Room"
 panels {
   name: "DANCER"
   path: "Panels/Back 1/panel_1"
@@ -1,5 +1,4 @@
 name: "G Keyholder"
-display_name: "Obverse Yellow Room"
 keyholders {
   name: "G"
   path: "Components/KeyHolders/keyHolder2"
@@ -1,5 +1,4 @@
 name: "G2 Room"
-display_name: "Main Area"
 letters {
   key: "g"
   level2: true
@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Main Area"
 panels {
   name: "LANE (1)"
   path: "Panels/Main/panel_1"
@@ -1,5 +1,4 @@
 name: "Obverse Magenta Room"
-display_name: "Obverse Magenta Room"
 # TODO: Should these two maybe not be randomizable because they hint the keyholder?
 paintings {
   name: "TEA"
@@ -1,5 +1,4 @@
 name: "Obverse Yellow Room"
-display_name: "Obverse Yellow Room"
 panels {
   name: "CIVIL"
   path: "Panels/Main/panel_6"
@@ -1,5 +1,4 @@
 name: "T Keyholder"
-display_name: "Obverse Magenta Room"
 keyholders {
   name: "T"
   path: "Components/KeyHolders/keyHolderT"
@@ -44,6 +44,7 @@ doors {
   panels { room: "First Room" name: "KOI" }
   panels { room: "First Room" name: "TUNA" }
   location_room: "First Room"
+  location_name: "All Puzzles"
 }
 doors {
   name: "Congruent Entrance"
@@ -55,6 +56,7 @@ doors {
   panels { room: "Second Room" name: "KOI" }
   panels { room: "Second Room" name: "TUNA" }
   location_room: "Second Room"
+  location_name: "All Puzzles"
 }
 doors {
   name: "Double Sided Entrance"
@@ -1,5 +1,5 @@
 name: "First Room"
-display_name: "First Room"
+panel_display_name: "First Room"
 panels {
   name: "BISON"
   path: "Panels/Room 1/panel_1"
@@ -1,5 +1,4 @@
 name: "S Room"
-display_name: "Third Room"
 letters {
   key: "s"
   path: "Components/Collectables/collectable"
@@ -1,5 +1,5 @@
 name: "Second Room"
-display_name: "Second Room"
+panel_display_name: "Second Room"
 panels {
   name: "BISON"
   path: "Panels/Room 2/panel_1"
@@ -1,5 +1,5 @@
 name: "Third Room"
-display_name: "Third Room"
+panel_display_name: "Third Room"
 panels {
   name: "CULTS"
   path: "Panels/Room 3/panel_1"
@@ -1,5 +1,4 @@
 name: "C Room"
-display_name: "Chamber"
 letters {
   key: "c"
   path: "Components/Collectables/c"
@@ -1,5 +1,4 @@
 name: "Chamber"
-display_name: "Chamber"
 panels {
   name: "I"
   path: "Panels/c1"
@@ -1,5 +1,4 @@
 name: "Gallery Maze"
-display_name: "Main Area"
 ports {
   name: "GALLERY"
   path: "Components/Warps/worldport4"
@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Main Area"
 panels {
   name: "HIT"
   path: "Panels/open_c"
@@ -1,5 +1,4 @@
 name: "Tree Area"
-display_name: "Main Area"
 panels {
   name: "TREE"
   path: "Panels/open_tree"
@@ -1,5 +1,4 @@
 name: "U Room"
-display_name: "Chamber"
 letters {
   key: "u"
   path: "Components/Collectables/u"
@@ -1,5 +1,4 @@
 name: "Ending"
-display_name: "Main Area"
 endings {
   name: "PLUM"
   path: "Components/plum_ending"
@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Main Area"
 panels {
   name: "HAIR"
   path: "Panels/Room_1/panel"
@@ -1,5 +1,4 @@
 name: "Brown Area"
-display_name: "Maze"
 masteries {
   name: "MASTERY"
   path: "Components/Collectables/smiley"
@@ -1,5 +1,4 @@
 name: "Flipped Black Area"
-display_name: "Maze"
 panels {
   name: "SEAPLANE"
   path: "Panels/Maze/panel_15"
@@ -1,5 +1,4 @@
 name: "Flipped Blue Area"
-display_name: "Maze"
 panels {
   name: "SKY"
   path: "Panels/Maze/panel_5"
@@ -1,5 +1,4 @@
 name: "Flipped Green Area"
-display_name: "Maze"
 panels {
   name: "HIGH"
   path: "Panels/Maze/panel_3"
@@ -1,5 +1,4 @@
 name: "Flipped Orange Area"
-display_name: "Maze"
 panels {
   name: "HEAVEN"
   path: "Panels/Maze/panel_6"
@@ -1,2 +1 @@
 name: "Flipped Pink Area"
-display_name: "Maze"
@@ -1,5 +1,4 @@
 name: "Flipped Purple Area"
-display_name: "Maze"
 panels {
   name: "CEILING"
   path: "Panels/Maze/panel_8"
@@ -1,5 +1,4 @@
 name: "Flipped Red Area"
-display_name: "Maze"
 panels {
   name: "RAISED"
   path: "Panels/Maze/panel_12"
@@ -1,5 +1,4 @@
 name: "Flipped Yellow Back Area"
-display_name: "Maze"
 panels {
   name: "ANGELS"
   path: "Panels/Maze/panel_13"
@@ -1,2 +1 @@
 name: "Flipped Yellow Front Area"
-display_name: "Maze"
@@ -1,5 +1,4 @@
 name: "Obverse Black Area"
-display_name: "Maze"
 panels {
   name: "MOUNTAIN"
   path: "Panels/Maze/panel_16"
@@ -1,2 +1 @@
 name: "Obverse Blue Area"
-display_name: "Maze"
@@ -1,5 +1,4 @@
 name: "Obverse Green Area"
-display_name: "Maze"
 panels {
   name: "UPSIDE"
   path: "Panels/Maze/panel_7"
@@ -1,5 +1,4 @@
 name: "Obverse Orange Back Area"
-display_name: "Maze"
 panels {
   name: "OVER"
   path: "Panels/Maze/panel_2b"
@@ -1,5 +1,4 @@
 name: "Obverse Orange Front Area"
-display_name: "Maze"
 panels {
   name: "UP"
   path: "Panels/Maze/panel_2"
@@ -1,5 +1,4 @@
 name: "Obverse Orange Isolated Section"
-display_name: "Maze"
 panels {
   name: "TOP"
   path: "Panels/Maze/panel_4"
@@ -1,5 +1,4 @@
 name: "Obverse Pink Area"
-display_name: "Maze"
 panels {
   name: "CLOUD"
   path: "Panels/Maze/panel_14"
@@ -1,5 +1,4 @@
 name: "Obverse Purple Area"
-display_name: "Maze"
 panels {
   name: "DRAGON"
   path: "Panels/Maze/panel_18"
@@ -1,2 +1 @@
 name: "Obverse Red Area"
-display_name: "Maze"
@@ -1,2 +1 @@
 name: "Obverse Yellow Area"
-display_name: "Maze"
@@ -1,5 +1,4 @@
 name: "Start"
-display_name: "Maze"
 panels {
   name: "ATTIC"
   path: "Panels/Maze/panel_11"
@@ -113,10 +113,9 @@ doors {
 }
 doors {
   name: "Right Eye Entrance"
-  type: STANDARD
+  type: ITEM_ONLY
   receivers: "Components/Doors/third_right"
   panels { room: "Trick Room" name: "INK" }
-  location_room: "Trick Room"
 }
 doors {
   name: "Red Blue Area Left Door"
@@ -1,5 +1,5 @@
 name: "Blue Alcove"
-display_name: "Red Blue Area"
+panel_display_name: "Red Blue Area"
 panels {
   name: "BLUE"
   path: "Panels/Back Right/br_11"
@@ -1,5 +1,5 @@
 name: "Colored Doors Area"
-display_name: "Colored Doors Area"
+panel_display_name: "Colored Doors Area"
 panels {
   name: "OPEN"
   path: "Panels/Back Left/backleft_proxying_1"
@@ -1,5 +1,5 @@
 name: "Composite Room Entrance"
-display_name: "Starting Room"
+panel_display_name: "Starting Room"
 ports {
   name: "COMPOSITE"
   path: "Components/Warps/worldport12"
@@ -1,5 +1,5 @@
 name: "Ctrl Tutorial"
-display_name: "Colored Doors Area"
+panel_display_name: "Colored Doors Area"
 panels {
   name: "RIGHT"
   path: "Panels/Back Left/backleft_proxying_2"
@@ -1,5 +1,5 @@
 name: "D Room Final"
-display_name: "D Room"
+panel_display_name: "D Room"
 letters {
   key: "d"
   path: "Components/Collectables/d"
@@ -1,5 +1,5 @@
 name: "D Room"
-display_name: "D Room"
+panel_display_name: "D Room"
 panels {
   name: "BASEBALL"
   path: "Panels/D/d_2"
@@ -1,5 +1,5 @@
 name: "Daedalus Entrance"
-display_name: "Starting Room"
+panel_display_name: "Starting Room"
 ports {
   name: "DAEDALUS"
   path: "Components/Warps/worldport6"
@@ -1,5 +1,5 @@
 name: "Digital Entrance"
-display_name: "Starting Room"
+panel_display_name: "Starting Room"
 ports {
   name: "DIGITAL"
   path: "Components/Warps/worldport"
@@ -1,5 +1,5 @@
 name: "Entry Exit"
-display_name: "Starting Room"
+panel_display_name: "Starting Room"
 ports {
   name: "GREAT"
   path: "Components/Warps/worldport2"
@@ -1,5 +1,5 @@
 name: "Eye Room"
-display_name: "Eye Room"
+panel_display_name: "Eye Room"
 panels {
   name: "I"
   path: "Panels/Entry/eyes_1"
@@ -1,18 +1,19 @@
 name: "Flipped Link Area"
-display_name: "Pyramid Area"
+panel_display_name: "Pyramid Area"
 panels {
   name: "WANDER"
   path: "Panels/Pilgrimage/cream_4"
   clue: "wander"
   answer: "roam"
   symbols: SUN
+  display_name: "WANDER (Flipped)"
 }
 paintings {
   name: "NEAR"
   path: "Components/Paintings/aches2"
   orientation: "north"
   gravity: Y_PLUS
-  display_name: "Flipper Near Painting"
+  display_name: "Flipped Near Painting"
 }
 paintings {
   name: "FAR"
@@ -1,5 +1,5 @@
 name: "Flipped Pyramid Area"
-display_name: "Pyramid Area"
+panel_display_name: "Pyramid Area"
 panels {
   name: "TURN (1)"
   path: "Panels/Entry/l_opener_3"
@@ -1,5 +1,5 @@
 name: "Flipped Right Eye"
-display_name: "Flip Area"
+panel_display_name: "Flip Area"
 panels {
   name: "WHERE"
   path: "Panels/Pilgrimage/cream_5"
@@ -1,5 +1,5 @@
 name: "Flipped Second Room"
-display_name: "Flip Area"
+panel_display_name: "Flip Area"
 panels {
   name: "CLUE"
   path: "Panels/Entry/second_right_top"
@@ -1,5 +1,5 @@
 name: "Gallery Return"
-display_name: "Starting Room"
+panel_display_name: "Gallery Return"
 panels {
   name: "RETURN"
   path: "Panels/Entry/gallery_return"
@@ -1,5 +1,5 @@
 name: "Least Blue Last"
-display_name: "Red Blue Area"
+panel_display_name: "Red Blue Area"
 panels {
   name: "CAPABLE (1)"
   path: "Panels/LBL/lbl_1"
@@ -1,5 +1,5 @@
 name: "Lime Room"
-display_name: "Colored Doors Area"
+panel_display_name: "Colored Doors Area"
 panels {
   name: "HIDE"
   path: "Panels/Back Left/backleft_proxying_3"
@@ -1,11 +1,12 @@
 name: "Link Area"
-display_name: "Pyramid Area"
+panel_display_name: "Pyramid Area"
 panels {
   name: "WANDER"
   path: "Panels/Pilgrimage/cream_3"
   clue: "wander"
   answer: "amble"
   symbols: SUN
+  display_name: "WANDER (Obverse)"
 }
 paintings {
   name: "NEAR"
@@ -1,5 +1,5 @@
 name: "Parthenon Return"
-display_name: "Starting Room"
+panel_display_name: "Parthenon Return"
 panels {
   name: "RETURN"
   path: "Panels/Back Left/backleft_return"
@@ -1,5 +1,5 @@
 name: "Rabbit Hole"
-display_name: "Red Blue Area"
+panel_display_name: "Red Blue Area"
 panels {
   name: "PUZZLE"
   path: "Panels/Back Right/br_6"
@@ -1,5 +1,5 @@
 name: "Red Alcove"
-display_name: "Red Blue Area"
+panel_display_name: "Red Blue Area"
 panels {
   name: "BROW"
   path: "Panels/Back Right/br_10"
@@ -1,5 +1,5 @@
 name: "Red Blue Halls"
-display_name: "Red Blue Area"
+panel_display_name: "Red Blue Area"
 panels {
   name: "CENTER"
   path: "Panels/Back Right/br_1"
@@ -1,5 +1,5 @@
 name: "Repetitive Entrance"
-display_name: "Starting Room"
+panel_display_name: "Starting Room"
 ports {
   name: "REPETITIVE"
   path: "Components/Warps/worldport7"
@@ -1,5 +1,5 @@
 name: "Right Eye"
-display_name: "Right Eye Area"
+panel_display_name: "Right Eye Area"
 panels {
   name: "EYE"
   path: "Panels/Entry/front_2"
@@ -1,5 +1,5 @@
 name: "Shop Entrance"
-display_name: "Starting Room"
+panel_display_name: "Starting Room"
 panels {
   name: "TURN"
   path: "Panels/Entry/l_opener_2"
@@ -1,5 +1,5 @@
 name: "Starting Room"
-display_name: "Starting Room"
+panel_display_name: "Starting Room"
 panels {
   name: "HI"
   path: "Panels/Entry/entry_proxying_1"
@@ -1,5 +1,5 @@
 name: "Trick Room"
-display_name: "Starting Room"
+panel_display_name: "Starting Room"
 panels {
   name: "INK"
   path: "Panels/Entry/l_opener_1"
@@ -1,5 +1,5 @@
 name: "White Hallway To Daedalus"
-display_name: "Colored Doors Area"
+panel_display_name: "Colored Doors Area"
 ports {
   name: "DAEDALUS"
   path: "Components/Warps/worldport11"
@@ -1,5 +1,5 @@
 name: "Wrath Room"
-display_name: "Red Blue Area"
+panel_display_name: "Red Blue Area"
 panels {
   name: "RABBIT"
   path: "Panels/Back Right/br_4"
@@ -1,5 +1,5 @@
 name: "X Area"
-display_name: "Starting Room"
+panel_display_name: "Starting Room"
 letters {
   key: "x"
   path: "Components/Collectables/x"
@@ -1,5 +1,4 @@
 name: "E Room"
-display_name: "3"
 letters {
   key: "e"
   path: "Components/Collectables/e"
@@ -1,5 +1,4 @@
 name: "Engine Room"
-display_name: "Engine Room"
 panels {
   name: "ENGINE"
   path: "Panels/panel_8"
@@ -1,5 +1,4 @@
 name: "Hat Chamber"
-display_name: "3"
 panels {
   name: "BRIM"
   path: "Panels/panel_14"
@@ -1,5 +1,4 @@
 name: "X Minus Middle Leg"
-display_name: "W"
 panels {
   name: "ANTENNA"
   path: "Panels/panel_7"
@@ -1,5 +1,4 @@
 name: "X Minus Right Leg"
-display_name: "W"
 panels {
   name: "ROWBOAT"
   path: "Panels/panel_13"
@@ -1,5 +1,4 @@
 name: "X Minus"
-display_name: "W"
 panels {
   name: "DUO"
   path: "Panels/panel_1"
@@ -1,5 +1,4 @@
 name: "X Plus Middle Leg"
-display_name: "M"
 panels {
   name: "COLONY"
   path: "Panels/panel_10"
@@ -1,5 +1,4 @@
 name: "X Plus Right Leg"
-display_name: "M"
 panels {
   name: "HEAD"
   path: "Panels/panel_4"
@@ -1,5 +1,4 @@
 name: "X Plus"
-display_name: "M"
 panels {
   name: "ROSE"
   path: "Panels/panel_16"
@@ -1,5 +1,4 @@
 name: "Y Minus First Floor"
-display_name: "3"
 panels {
   name: "RHINO"
   path: "Panels/panel_2"
@@ -1,5 +1,4 @@
 name: "Y Minus Second Floor"
-display_name: "3"
 panels {
   name: "COMPASS"
   path: "Panels/panel_5"
@@ -1,5 +1,4 @@
 name: "Y Minus Third Floor"
-display_name: "3"
 panels {
   name: "WHISKERS"
   path: "Panels/panel_11"
@@ -1,5 +1,4 @@
 name: "Y Plus First Floor"
-display_name: "E"
 paintings {
   name: "UNDUE"
   path: "Components/Paintings/undue4"
@@ -1,6 +1,5 @@
 name: "Y Plus Third Floor"
 # It's the second floor too...
-display_name: "E"
 panels {
   name: "CACTUS"
   path: "Panels/panel_6"
@@ -1,5 +1,4 @@
 name: "Back Room"
-display_name: "Back Room"
 panels {
   name: "UNYIELDING"
   path: "Panels/entry_2"
@@ -1,5 +1,4 @@
 name: "Daedalus Extension"
-display_name: "Daedalus Extension"
 panels {
   name: "WHERE"
   path: "Panels/entry_1"
@@ -1,5 +1,4 @@
 name: "Ending"
-display_name: "Back Room"
 endings {
   name: "YELLOW"
   path: "Components/Endings/yellow_ending"
@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Main Area"
 keyholders {
   name: "P"
   path: "Components/KeyHolders/keyHolderP"
@@ -1,5 +1,4 @@
 name: "The Whole Thing"
-display_name: "The Whole Thing"
 panels {
   name: "PANEL"
   path: "Panels/Room_1/panel_1"
@@ -1,5 +1,4 @@
 name: "Inside"
-display_name: "Inside"
 panels {
   name: "REMEMBER"
   path: "Panels/panel_3"
@@ -1,5 +1,4 @@
 name: "Outside"
-display_name: "Outside"
 panels {
   name: "FOOT"
   path: "Panels/panel_1"
@@ -142,6 +142,7 @@ doors {
   panels { room: "Pillar Room" name: "CAUGHT" }
   panels { room: "Pillar Room" name: "TEN" }
   location_room: "Pillar Room"
+  location_name: "Pillar Room"
 }
 doors {
   name: "North Landscape Entrance"
@@ -396,6 +397,7 @@ doors {
   panels { room: "Question Room When" name: "QUESTION" answer: "why" }
   panels { room: "Question Room Who" name: "QUESTION" answer: "why" }
   location_room: "Question Room Who"
+  location_name: "Whys"
 }
 doors {
   name: "Talented Entrance"
@@ -1,5 +1,5 @@
 name: "Back Area"
-display_name: "Back Area"
+panel_display_name: "Back Area"
 panels {
   name: "PLANT"
   path: "Panels/General/entry_14"
@@ -1,5 +1,5 @@
 name: "Behind Question Area"
-display_name: "Main Area"
+panel_display_name: "Question Room"
 panels {
   name: "DEW"
   path: "Panels/General/uc_4"
@@ -1,5 +1,5 @@
 name: "Colorful Entrance"
-display_name: "Pillar Room"
+panel_display_name: "Pillar Room"
 ports {
   name: "COLORFUL"
   path: "Meshes/Blocks/Warps/worldport13"
@@ -1,5 +1,5 @@
 name: "Daedalus Entrance"
-display_name: "Main Area"
+panel_display_name: "Main Area"
 panels {
   name: "MISSING"
   path: "Panels/General/entry_2"
@@ -1,5 +1,5 @@
 name: "East Landscape"
-display_name: "East Landscape"
+panel_display_name: "East Landscape"
 panels {
   name: "COLOR"
   path: "Panels/General/entry_10"
@@ -1,5 +1,5 @@
 name: "G Room"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 letters {
   key: "g"
   path: "Components/Collectables/g"
@@ -1,5 +1,5 @@
 name: "Hive Entrance"
-display_name: "West Side"
+panel_display_name: "West Side"
 panels {
   name: "LOST"
   path: "Panels/Hive Room/hive_1"
@@ -1,5 +1,5 @@
 name: "Jail Part 1"
-display_name: "Jail"
+panel_display_name: "Jail"
 panels {
   name: "FLAP"
   path: "Panels/Throat/throat_1"
@@ -1,5 +1,5 @@
 name: "Jail Part 2"
-display_name: "Jail"
+panel_display_name: "Jail"
 panels {
   name: "DIGEST"
   path: "Panels/Bowels3/bowels_1"
@@ -1,5 +1,5 @@
 name: "Jubilant Entrance"
-display_name: "West Side"
+panel_display_name: "West Side"
 ports {
   name: "JUBILANT"
   path: "Meshes/Blocks/Warps/worldport12"
@@ -1,5 +1,5 @@
 name: "Magnet Room"
-display_name: "Magnet Room"
+panel_display_name: "Magnet Room"
 panels {
   name: "AIRPLANE"
   path: "Panels/Magnet Room/magnet_2"
@@ -1,5 +1,5 @@
 name: "Main Area"
-display_name: "Main Area"
+panel_display_name: "Main Area"
 panels {
   name: "INTRO"
   path: "Panels/General/entry_8"
@@ -1,5 +1,5 @@
 name: "Maze Center"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "POOR"
   path: "Panels/Maze/maze_7"
@@ -1,5 +1,5 @@
 name: "Maze Cold Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "COLD"
   path: "Panels/Maze/maze_11"
@@ -1,2 +1,2 @@
 name: "Maze Empty Vestibule"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
@@ -1,5 +1,5 @@
 name: "Maze In Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "IN"
   path: "Panels/Maze/maze_3"
@@ -1,5 +1,5 @@
 name: "Maze Moon Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "MOON"
   path: "Panels/Maze/maze_9"
@@ -1,5 +1,5 @@
 name: "Maze Off Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "OFF"
   path: "Panels/Maze/maze_14"
@@ -1,5 +1,5 @@
 name: "Maze Slice Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "SLICE"
   path: "Panels/Maze/maze_4"
@@ -1,5 +1,5 @@
 name: "Maze Smooth Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "SMOOTH"
   path: "Panels/Maze/maze_5"
@@ -1,5 +1,5 @@
 name: "Maze South Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "SOUTH"
   path: "Panels/Maze/maze_2"
@@ -1,5 +1,5 @@
 name: "Maze Start"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "OUT"
   path: "Panels/Maze/maze_1"
@@ -1,5 +1,5 @@
 name: "Maze Tower"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "FEEL"
   path: "Panels/Maze/maze_12"
@@ -1,5 +1,5 @@
 name: "Maze Up Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "UP"
   path: "Panels/Maze/maze_15"
@@ -1,5 +1,5 @@
 name: "Maze Wreck Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
   name: "WRECK"
   path: "Panels/Maze/maze_8"
@@ -1,5 +1,5 @@
 name: "Nature Room"
-display_name: "North Landscape"
+panel_display_name: "North Landscape"
 panels {
   name: "SEVERE"
   path: "Panels/General/nature_2"
@@ -1,5 +1,5 @@
 name: "North Landscape"
-display_name: "North Landscape"
+panel_display_name: "North Landscape"
 panels {
   name: "WEATHER"
   path: "Panels/General/platforms_1"
@@ -1,5 +1,5 @@
 name: "Outside Jail"
-display_name: "Jail"
+panel_display_name: "Jail"
 panels {
   name: "GUT"
   path: "Panels/Head/head_1"
@@ -1,5 +1,5 @@
 name: "Pillar Room"
-display_name: "Pillar Room"
+panel_display_name: "Pillar Room"
 panels {
   name: "EYE"
   path: "Panels/Impressive/entry_2"
@@ -1,5 +1,5 @@
 name: "Purple Room"
-display_name: "Main Area"
+panel_display_name: "Main Area"
 ports {
   name: "DAEDALUS"
   path: "Meshes/Blocks/Warps/worldport18"
@@ -1,5 +1,5 @@
 name: "Question Room How"
-display_name: "Question Room"
+panel_display_name: "Question Room"
 panels {
   name: "QUESTION"
   path: "Panels/Questions/question_3"
@@ -12,6 +12,7 @@ panels {
   proxies { answer: "what" path: "Panels/Question Proxies/question_3_proxied4" }
   proxies { answer: "when" path: "Panels/Question Proxies/question_3_proxied5" }
   proxies { answer: "where" path: "Panels/Question Proxies/question_3_proxied6" }
+  display_name: "QUESTION (How)"
 }
 paintings {
   name: "WHY"
@@ -1,5 +1,5 @@
 name: "Question Room What"
-display_name: "Question Room"
+panel_display_name: "Question Room"
 panels {
   name: "QUESTION"
   path: "Panels/Questions/question_4"
@@ -12,4 +12,5 @@ panels {
   proxies { answer: "how" path: "Panels/Question Proxies/question_4_proxied4" }
   proxies { answer: "what" path: "Panels/Question Proxies/question_4_proxied5" }
   proxies { answer: "when" path: "Panels/Question Proxies/question_4_proxied6" }
+  display_name: "QUESTION (What)"
 }
@@ -1,5 +1,5 @@
 name: "Question Room When"
-display_name: "Question Room"
+panel_display_name: "Question Room"
 panels {
   name: "QUESTION"
   path: "Panels/Questions/question_1"
@@ -12,6 +12,7 @@ panels {
   proxies { answer: "who" path: "Panels/Question Proxies/question_1_proxied4" }
   proxies { answer: "how" path: "Panels/Question Proxies/question_1_proxied5" }
   proxies { answer: "where" path: "Panels/Question Proxies/question_1_proxied6" }
+  display_name: "QUESTION (When)"
 }
 paintings {
   name: "WHY"
@@ -1,5 +1,5 @@
 name: "Question Room Who"
-display_name: "Question Room"
+panel_display_name: "Question Room"
 panels {
   name: "QUESTION"
   path: "Panels/Questions/question_2"
@@ -12,4 +12,5 @@ panels {
   proxies { answer: "how" path: "Panels/Question Proxies/question_2_proxied4" }
   proxies { answer: "what" path: "Panels/Question Proxies/question_2_proxied5" }
   proxies { answer: "when" path: "Panels/Question Proxies/question_2_proxied6" }
+  display_name: "QUESTION (Who)"
 }
@@ -1,5 +1,5 @@
 name: "Salmon Room"
-display_name: "Main Area"
+panel_display_name: "Main Area"
 ports {
   name: "BETWEEN"
   path: "Meshes/Blocks/Warps/worldport11"
@@ -1,5 +1,5 @@
 name: "Talented Entrance"
-display_name: "Question Room"
+panel_display_name: "Question Room"
 ports {
   name: "TALENTED"
   path: "Meshes/Blocks/Warps/worldport14"
@@ -1,5 +1,5 @@
 name: "Under Question Room"
-display_name: "Question Room"
+panel_display_name: "Question Room"
 panels {
   name: "QUESTION"
   path: "Panels/General/question_1"
@@ -8,4 +8,5 @@ panels {
   symbols: EXAMPLE
   proxies { answer: "which" path: "Panels/General/question_1_proxy_1" }
   proxies { answer: "where" path: "Panels/General/question_1_proxy_2" }
+  display_name: "QUESTION (Where)"
 }
@@ -1,5 +1,5 @@
 name: "West Side"
-display_name: "West Side"
+panel_display_name: "West Side"
 panels {
   name: "ERASE"
   path: "Panels/General/entry_9"
@@ -1,5 +1,5 @@
 name: "Whole Room"
-display_name: "North Landscape"
+panel_display_name: "North Landscape"
 panels {
   name: "VAULT"
   path: "Panels/Whole Room/whole_1"
@@ -1,5 +1,5 @@
 name: "Y Room"
-display_name: "Question Room"
+panel_display_name: "Question Room"
 letters {
   key: "y"
   path: "Components/Collectables/y"
@@ -1,5 +1,5 @@
 name: "Zero Room"
-display_name: "Zero Room"
+panel_display_name: "Zero Room"
 panels {
   name: "HERO"
   path: "Panels/General/zero_1"
@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Main Area"
 # I'm probably not going to include any of the panels in here.
 ports {
   name: "RIGHT"
@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Hive"
 panels {
   name: "ASP"
   path: "Panels/Room 1/panel_1"
@@ -1,5 +1,4 @@
 name: "Mastery Room"
-display_name: "Hive"
 masteries {
   name: "MASTERY"
   path: "Components/Collectables/smiley"
@@ -1,5 +1,4 @@
 name: "Room 8"
-display_name: "Hive"
 panels {
   name: "BUMBLE"
   path: "Panels/Room 8/panel_1"
@@ -1,5 +1,5 @@
 name: "Green Eye"
-display_name: "Impressive"
+panel_display_name: "Outside"
 panels {
   name: "RETURN"
   path: "Panels/entry_5"
@@ -1,5 +1,5 @@
 name: "Lobby"
-display_name: "Impressive"
+panel_display_name: "Outside"
 panels {
   name: "RIGHT"
   path: "Panels/entry_1"
@@ -1,5 +1,5 @@
 name: "M Room"
-display_name: "Impressive"
+panel_display_name: "Inside"
 letters {
   key: "m"
   path: "Components/Collectables/collectable"
@@ -1,5 +1,5 @@
 name: "M2 Room"
-display_name: "Impressive"
+panel_display_name: "Inside"
 letters {
   key: "m"
   level2: true
@@ -1,5 +1,5 @@
 name: "Side Area"
-display_name: "Impressive"
+panel_display_name: "Outside"
 panels {
   name: "COLOR"
   path: "Panels/entry_4"
@@ -1,5 +1,5 @@
 name: "W Room"
-display_name: "Impressive"
+panel_display_name: "Inside"
 letters {
   key: "w"
   path: "Components/Collectables/collectable2"
@@ -1,5 +1,5 @@
 name: "WM Room"
-display_name: "Impressive"
+panel_display_name: "Inside"
 panels {
   name: "LEFT"
   path: "Panels/entry_2"
@@ -1,5 +1,4 @@
 name: "Entrance"
-display_name: "Invisible"
 panels {
   name: "VISIBLE"
   path: "Panels/Room_1/panel_1"
@@ -1,5 +1,4 @@
 name: "Maze"
-display_name: "Invisible"
 masteries {
   name: "MASTERY"
   path: "Components/Collectables/smiley"
@@ -1,5 +1,4 @@
 name: "J Room"
-display_name: "Jubilant"
 letters {
   key: "j"
   path: "Components/Collectables/q" # yeah lol
@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Jubilant"
 panels {
   name: "GEMSTONE"
   path: "Panels/Main/panel_1"
@@ -1,5 +1,4 @@
 name: "Side Area"
-display_name: "Jubilant"
 panels {
   name: "CALLBACK"
   path: "Panels/Back Helpers/back_1"
@@ -1,5 +1,4 @@
 name: "K Room"
-display_name: "Keen"
 letters {
   key: "k"
   path: "Components/Collectables/collectable"
@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Keen"
 panels {
   name: "TIN (1)"
   path: "Panels/entry_3"
@@ -11,4 +11,5 @@ doors {
   panels { room: "Puzzle Room" name: "WOLF" }
   panels { room: "Puzzle Room" name: "FOOT" }
   location_room: "Puzzle Room"
+  location_name: "Puzzles"
 }
@@ -1,5 +1,4 @@
 name: "Painting Room"
-display_name: "Liberated"
 paintings {
   name: "PYRAMID"
   path: "Components/triangle"
@@ -1,5 +1,4 @@
 name: "Puzzle Room"
-display_name: "Liberated"
 panels {
   name: "CORPSE"
   path: "Panels/entry_1"
@@ -1,5 +1,4 @@
 name: "Room"
-display_name: "Room"
 panels {
   name: "HORN"
   path: "Panels/entry_1"
@@ -1,5 +1,4 @@
 name: "E2 Room"
-display_name: "Lionized"
 letters {
   key: "e"
   level2: true
@@ -1,5 +1,4 @@
 name: "Puzzle Room"
-display_name: "Lionized"
 panels {
   name: "CHILD"
   path: "Panels/entry_1"
@@ -11,4 +11,5 @@ doors {
   panels { room: "Puzzle Room" name: "STICK" }
   panels { room: "Puzzle Room" name: "BREAD" }
   location_room: "Puzzle Room"
+  location_name: "Puzzles"
 }
@@ -1,5 +1,4 @@
 name: "Painting Room"
-display_name: "Literate"
 paintings {
   name: "PYRAMID"
   path: "Components/triangle"
@@ -1,5 +1,4 @@
 name: "Puzzle Room"
-display_name: "Literate"
 panels {
   name: "WATER"
   path: "Panels/entry_1"
@@ -1,5 +1,4 @@
 name: "L2 Room"
-display_name: "Lively"
 letters {
   key: "l"
   level2: true
@@ -1,5 +1,4 @@
 name: "Puzzle Room"
-display_name: "Lively"
 panels {
   name: "LIONESS"
   path: "Panels/entry_1"
@@ -1,5 +1,4 @@
 name: "Back Room"
-display_name: "Nuanced"
 panels {
   name: "COURSE"
   path: "Panels/Rhymes/panel_1"
@@ -1,5 +1,4 @@
 name: "Main Room"
-display_name: "Nuanced"
 panels {
   name: "HOARSE"
   path: "Panels/Eyes/panel_1"
@@ -1,5 +1,4 @@
 name: "N2 Room"
-display_name: "Nuanced"
 letters {
   key: "n"
   level2: true
@@ -1,5 +1,4 @@
 name: "B Room"
-display_name: "Orb"
 letters {
   key: "b"
   path: "Components/Collectables/b"
@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Orb"
 panels {
   name: "STRIKE"
   path: "Panels/O/entry_1"
@@ -1,5 +1,4 @@
 name: "O Room"
-display_name: "Orb"
 letters {
   key: "o"
   path: "Components/Collectables/o"
@@ -1,5 +1,4 @@
 name: "R Room"
-display_name: "Orb"
 letters {
   key: "r"
   path: "Components/Collectables/r"
@@ -1,5 +1,4 @@
 name: "Blue Room"
-display_name: "Owl"
 panels {
   name: "SKY"
   path: "Panels/Colors/owl_7"
@@ -1,5 +1,4 @@
 name: "Connected Area"
-display_name: "Owl"
 panels {
   name: "MODE"
   path: "Panels/Noncritical/owl_12"
@@ -1,5 +1,4 @@
 name: "Magenta Hallway"
-display_name: "Owl"
 ports {
   name: "STURDY"
   path: "Components/Warps/worldport3"
@@ -1,5 +1,4 @@
 name: "R1C4 Left"
-display_name: "Owl"
 panels {
   name: "WALK"
   path: "Panels/Noncritical/owl_5"
@@ -1,5 +1,4 @@
 name: "R2C1 Left"
-display_name: "Owl"
 panels {
   name: "VERB"
   path: "Panels/Bottom Left/owl_8"
@@ -1,5 +1,4 @@
 name: "R2C2 Bottom"
-display_name: "Owl"
 panels {
   name: "FOUL"
   path: "Panels/Bottom Mid/owl_11"
@@ -1,5 +1,4 @@
 name: "R2C2 Top"
-display_name: "Owl"
 panels {
   name: "CRUSH"
   path: "Panels/Bottom Mid/owl_1"
@@ -1,5 +1,4 @@
 name: "R2C2.5 Bottom"
-display_name: "Owl"
 panels {
   name: "FIZZLE"
   path: "Panels/Bottom Mid/owl_10"
@@ -1,5 +1,4 @@
 name: "Z Room"
-display_name: "Owl"
 panels {
   name: "MAZE"
   path: "Panels/Noncritical/owl_10"
@@ -19,6 +19,7 @@ doors {
   panels { room: "Main Area" name: "ALEXANDER" answer: "greece" }
   panels { room: "Main Area" name: "CAESAR" answer: "rome" }
   location_room: "Main Area"
+  location_name: "Empires"
 }
 doors {
   name: "Ending Door"
@@ -1,5 +1,4 @@
 name: "Ending"
-display_name: "Parthenon"
 endings {
   name: "CYAN"
   path: "Components/cyan_end"
@@ -1,5 +1,4 @@
 name: "K2 Room"
-display_name: "Parthenon"
 letters {
   key: "k"
   level2: true
@@ -1,5 +1,4 @@
 name: "Lavender Area"
-display_name: "Parthenon"
 panels {
   name: "ME"
   path: "Panels/Lavender/panel_7"
@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Parthenon"
 panels {
   name: "XERXES"
   path: "Panels/Main/panel_1"
@@ -1,5 +1,4 @@
 name: "U Keyholder"
-display_name: "Parthenon"
 keyholders {
   name: "U"
   path: "Components/KeyHolders/keyHolderU"
@@ -22,6 +22,7 @@ doors {
   panels { room: "Obverse Side" name: "CUT" }
   panels { room: "Obverse Side" name: "FUN" }
   location_room: "Obverse Side"
+  location_name: "Obverse Side Room"
 }
 doors {
   name: "Giant P"
@@ -1,5 +1,4 @@
 name: "Control Center Entrance"
-display_name: "Partial"
 panels {
   name: "RETURN"
   path: "Panels/Control/panel_10"
@@ -1,5 +1,4 @@
 name: "F Room"
-display_name: "Partial"
 letters {
   key: "f"
   path: "Components/Collectables/collectable2"
@@ -1,5 +1,4 @@
 name: "Obverse Side"
-display_name: "Partial"
 panels {
   name: "PUN"
   path: "Panels/Main/panel_1"
@@ -1,5 +1,4 @@
 name: "P Room"
-display_name: "Partial"
 letters {
   key: "p"
   path: "Components/Collectables/collectable"
@@ -1,5 +1,4 @@
 name: "Reverse Side"
-display_name: "Partial"
 panels {
   name: "BRO"
   path: "Panels/Side 2/panel_2"
@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Perceptive"
 ports {
   name: "CC"
   path: "Components/Warps/worldport"
@@ -41,6 +41,7 @@ doors {
   panels { room: "Center Room" name: "DENTIST" }
   panels { room: "Center Room" name: "SQUIRREL" }
   location_room: "Center Room"
+  location_name: "First Room"
 }
 doors {
   name: "Top Right Door"
@@ -1,5 +1,4 @@
 name: "Bottom Left Room"
-display_name: "Plaza"
 panels {
   name: "SHELL (1)"
   path: "Panels/Room 4/panel_1"
@@ -1,5 +1,4 @@
 name: "Bottom Right Room"
-display_name: "Plaza"
 panels {
   name: "FLY"
   path: "Panels/Room 3/panel_1"
@@ -1,5 +1,4 @@
 name: "Center Room"
-display_name: "Plaza"
 panels {
   name: "REPORTER"
   path: "Panels/Room 2/panel_1"
@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Plaza"
 panels {
   name: "COURTYARD"
   path: "Panels/Entrances/panel_1"
@@ -1,5 +1,4 @@
 name: "Mastery"
-display_name: "Plaza"
 masteries {
   name: "MASTERY"
   path: "Components/Collectables/smiley"
@@ -1,5 +1,4 @@
 name: "Repetitive Entrance"
-display_name: "Plaza"
 panels {
   name: "TEDIOUS"
   path: "Panels/Entrances/panel_6"
@@ -1,5 +1,4 @@
 name: "Sirenic Entrance"
-display_name: "Plaza"
 panels {
   name: "SIREN"
   path: "Panels/Entrances/panel_8"
@@ -1,5 +1,4 @@
 name: "Symbolic Entrance"
-display_name: "Plaza"
 panels {
   name: "FIGURATIVE"
   path: "Panels/Entrances/panel_5"
@@ -1,5 +1,4 @@
 name: "Top Left Room"
-display_name: "Plaza"
 panels {
   name: "BARE SOD"
   path: "Panels/Room 6/panel_1"
@@ -42,6 +41,7 @@ panels {
   clue: "knot"
   answer: "not"
   symbols: ZERO
+  display_name: "KNOT (TL)"
 }
 panels {
   name: "SURE TEMPER"
@@ -129,6 +129,7 @@ panels {
   clue: "bear"
   answer: "bearer"
   symbols: SPARKLES
+  display_name: "BEAR (TL)"
 }
 panels {
   name: "CHILL"
@@ -1,5 +1,4 @@
 name: "Top Right Room"
-display_name: "Plaza"
 panels {
   name: "RIGHT WING"
   path: "Panels/Room 5/panel_1"
@@ -34,6 +33,7 @@ panels {
   clue: "bear"
   answer: "cave"
   symbols: STARS
+  display_name: "BEAR (TR)"
 }
 panels {
   name: "TYPIST"
@@ -125,6 +125,7 @@ panels {
   clue: "knot"
   answer: "not"
   symbols: ZERO
+  display_name: "KNOT (TR)"
 }
 panels {
   name: "HALVES ANNOYED SOUR GOOD"
@@ -1,5 +1,4 @@
 name: "Keyholder Room"
-display_name: "Quiet"
 keyholders {
   name: "Q"
   path: "Components/KeyHolders/keyHolderQ"
@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Quiet"
 panels {
   name: "SOLID"
   path: "Panels/Main/panel_1"
@@ -1,5 +1,4 @@
 name: "Q Room"
-display_name: "Quiet"
 letters {
   key: "q"
   path: "Components/Collectables/q"
@@ -1,5 +1,4 @@
 name: "All"
-display_name: "Relentless"
 panels {
   name: "LEFT (1)"
   path: "Panels/Room_1/panel_6"
@@ -1,5 +1,4 @@
 name: "Left And Turn"
-display_name: "Relentless"
 panels {
   name: "HIDE (1)"
   path: "Panels/Room_1/panel_2"
@@ -1,5 +1,4 @@
 name: "Left Room"
-display_name: "Relentless"
 panels {
   name: "HIDE"
   path: "Panels/Room_1/panel_1"
@@ -1,5 +1,4 @@
 name: "Mastery"
-display_name: "Relentless"
 masteries {
   name: "MASTERY"
   path: "Components/Collectables/smiley"
@@ -1,5 +1,4 @@
 name: "Shop Room"
-display_name: "Relentless"
 panels {
   name: "LEFT (1)"
   path: "Panels/Room_3/panel_5"
@@ -1,5 +1,4 @@
 name: "Turn And Shop"
-display_name: "Relentless"
 panels {
   name: "LEFT (1)"
   path: "Panels/Room_2/panel_5"
@@ -1,5 +1,4 @@
 name: "Turn Room"
-display_name: "Relentless"
 panels {
   name: "HIDE (1)"
   path: "Panels/Room_2/panel_2"
@@ -1,5 +1,4 @@
 name: "Anti Room"
-display_name: "Repetitive"
 # Ignore the collectible. The mod should remove it and the back wall too.
 panels {
   name: "HA (1)"
@@ -1,5 +1,4 @@
 name: "Cyan Room"
-display_name: "Repetitive"
 panels {
   name: "ALFA"
   path: "Panels/Lingo2/panel_3"
@@ -1,5 +1,4 @@
 name: "Dot Area"
-display_name: "Repetitive"
 panels {
   name: "TUTU (1)"
   path: "Panels/Lingo2/panel"
@@ -1,5 +1,4 @@
 name: "Entry Connector"
-display_name: "Repetitive"
 ports {
   name: "ENTRY"
   path: "Components/Warps/worldport2"
@@ -1,5 +1,4 @@
 name: "Lime Room"
-display_name: "Repetitive"
 panels {
   name: "RAT"
   path: "Panels/Lingo2/panel_1"
@@ -1,5 +1,4 @@
 name: "Magenta Room"
-display_name: "Repetitive"
 panels {
   name: "WRITE"
   path: "Panels/Eval/panel_9"
@@ -1,5 +1,4 @@
 name: "Main Room"
-display_name: "Repetitive"
 panels {
   name: "HOTS (2)"
   path: "Panels/Entry/panel_3"
@@ -1,5 +1,4 @@
 name: "Mastery Room"
-display_name: "Repetitive"
 masteries {
   name: "MASTERY"
   path: "Components/Collectables/smiley"
@@ -1,5 +1,4 @@
 name: "Plaza Connector"
-display_name: "Repetitive"
 ports {
   name: "PLAZA"
   path: "Components/Warps/worldport"
@@ -1,5 +1,4 @@
 name: "Yellow Room"
-display_name: "Repetitive"
 panels {
   name: "W"
   path: "Panels/Eval/panel_1"
@@ -1,5 +1,4 @@
 name: "Bye Room"
-display_name: "Revitalized"
 panels {
   name: "BYE"
   path: "Panels/panel_1"
@@ -1,5 +1,4 @@
 name: "Hidden Room"
-display_name: "Revitalized"
 panels {
   name: "HIDDEN"
   path: "Panels/panel_3"
@@ -1,5 +1,4 @@
 name: "Hide Room"
-display_name: "Revitalized"
 panels {
   name: "HIDE"
   path: "Panels/panel_2"
@@ -1,5 +1,4 @@
 name: "High Room"
-display_name: "Revitalized"
 panels {
   name: "HIGH"
   path: "Panels/panel_4"
@@ -1,5 +1,4 @@
 name: "Return Room"
-display_name: "Revitalized"
 panels {
   name: "RETURN"
   path: "Components/panel_7"
@@ -1,5 +1,4 @@
 name: "Too Room"
-display_name: "Revitalized"
 panels {
   name: "TOO"
   path: "Panels/panel_6"
@@ -1,5 +1,4 @@
 name: "Won Room"
-display_name: "Revitalized"
 panels {
   name: "WON"
   path: "Panels/panel_5"
@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Shop"
 panels {
   name: "DUCKS"
   path: "Panels/Books/panel_1"
@@ -1,5 +1,4 @@
 name: "Mastery"
-display_name: "Sirenic"
 masteries {
   name: "MASTERY"
   path: "Components/Collectables/smiley"
@@ -1,5 +1,4 @@
 name: "Puzzles"
-display_name: "Sirenic"
 panels {
   name: "Left Top 1"
   path: "Panels/Room_1/pip_1"
@@ -1,5 +1,4 @@
 name: "Start"
-display_name: "Sirenic"
 panels {
   name: "Flipped"
   path: "Panels/Entry/entry_2"
@@ -1,5 +1,4 @@
 name: "Center"
-display_name: "Stormy"
 panels {
   name: "REACTOR"
   path: "Panels/Room_1/panel_7"
@@ -20,6 +19,7 @@ panels {
   clue: "cloud"
   answer: "rain"
   symbols: AGE
+  display_name: "CLOUD (1)"
 }
 panels {
   name: "WIND"
@@ -27,6 +27,7 @@ panels {
   clue: "wind"
   answer: "tornado"
   symbols: CROSS
+  display_name: "WIND (1)"
 }
 ports {
   name: "ENTRY"
@@ -1,5 +1,4 @@
 name: "Nuclear Side"
-display_name: "Stormy"
 panels {
   name: "GERM"
   path: "Panels/Room_1/panel_2"
@@ -1,5 +1,4 @@
 name: "Nuclear Vestibule"
-display_name: "Stormy"
 panels {
   name: "STORM"
   path: "Panels/Room 2/panel_11"
@@ -1,11 +1,11 @@
 name: "Rain Side"
-display_name: "Stormy"
 panels {
   name: "CLOUD"
   path: "Panels/Room_1/panel_4"
   clue: "cloud"
   answer: "lightning"
   symbols: CROSS
+  display_name: "CLOUD (2)"
 }
 panels {
   name: "WIND"
@@ -13,4 +13,5 @@ panels {
   clue: "wind"
   answer: "whirlwind"
   symbols: PYRAMID
+  display_name: "WIND (2)"
 }
@@ -1,5 +1,4 @@
 name: "Tornado Side"
-display_name: "Stormy"
 panels {
   name: "PUDDLE"
   path: "Panels/Room_1/panel_6"
@@ -1,5 +1,4 @@
 name: "Tornado Vestibule"
-display_name: "Stormy"
 panels {
   name: "SHIP"
   path: "Panels/Room 2/panel_12"
@@ -1,5 +1,4 @@
 name: "Volcano Side"
-display_name: "Stormy"
 panels {
   name: "SNOW"
   path: "Panels/Room_1/panel_1"
@@ -1,5 +1,4 @@
 name: "X2 Room"
-display_name: "Stormy"
 letters {
   key: "x"
   level2: true
@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Sturdy"
 panels {
   name: "MOVE (1)"
   path: "Panels/Main/panel_1"
@@ -1,5 +1,4 @@
 name: "S2 Area"
-display_name: "Sturdy"
 panels {
   name: "COLORS"
   path: "Panels/Rainbow/panel_1"
@@ -1,5 +1,4 @@
 name: "Ending"
-display_name: "Sun Temple"
 endings {
   name: "PURPLE"
   path: "Components/purple_ending"
@@ -1,5 +1,4 @@
 name: "Entrance"
-display_name: "Sun Temple"
 panels {
   name: "SUN"
   path: "Panels/Main/panel_1"
@@ -1,5 +1,4 @@
 name: "Mastery"
-display_name: "Sun Temple"
 masteries {
   name: "MASTERY"
   path: "Components/Collectables/collectable"
@@ -1,5 +1,4 @@
 name: "Temple"
-display_name: "Sun Temple"
 panels {
   name: "DELAY"
   path: "Panels/Main/panel_2"
@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Sweet"
 panels {
   name: "POTATO"
   path: "Panels/Sweetening Room/panel_1"
@@ -1,5 +1,4 @@
 name: "Y2 Room"
-display_name: "Sweet"
 letters {
   key: "y"
   level2: true
@@ -183,6 +183,21 @@ doors {
   panels { room: "Central Connected Area" name: "CHIN" }
   panels { room: "Central Connected Area" name: "DING" }
   location_room: "Central Connected Area"
+  location_name: "East Room 2"
+}
+doors {
+  name: "East Room 1"
+  type: LOCATION_ONLY
+  panels { room: "East Room 1" name: "CHIN" }
+  panels { room: "East Room 1" name: "HEAT" }
+  panels { room: "East Room 1" name: "END" }
+  panels { room: "East Room 1" name: "FLY" }
+  panels { room: "East Room 1" name: "OUCH" }
+  panels { room: "East Room 1" name: "HAG" }
+  panels { room: "East Room 1" name: "TIN" }
+  panels { room: "East Room 1" name: "RID" }
+  panels { room: "East Room 1" name: "TUG" }
+  location_room: "East Room 1"
 }
 doors {
   name: "Orange Alcove"
@@ -199,6 +214,7 @@ doors {
 }
 doors {
   name: "Black Alcove"
+  type: EVENT
   panels { room: "Star Rooms" name: "TURN" }
   panels { room: "Central Connected Area" name: "HAD" }
   panels { room: "Central Connected Area" name: "SOW" }
@@ -218,6 +234,7 @@ doors {
   panels { room: "Northeast Room 1" name: "CAR" }
   panels { room: "Northeast Room 1" name: "SIR" }
   location_room: "Northeast Room 1"
+  location_name: "Northeast Room 1"
 }
 doors {
   name: "Northeast Corner Behind"
@@ -245,6 +262,7 @@ doors {
   panels { room: "Northwest Room" name: "HER" }
   panels { room: "Northwest Room" name: "DAM" }
   location_room: "Northwest Room"
+  location_name: "Northwest Room"
 }
 doors {
   name: "Cyan Alcove"
@@ -274,6 +292,7 @@ doors {
   panels { room: "Southwest Room 3" name: "HOST" }
   panels { room: "Southwest Room 3" name: "MUG" }
   location_room: "Southwest Room 3"
+  location_name: "Southwest Room 3"
 }
 doors {
   name: "Southwest Room 2 Entrance"
@@ -293,6 +312,7 @@ doors {
   panels { room: "Southwest Room 2" name: "ION" }
   panels { room: "Southwest Room 2" name: "INN" }
   location_room: "Southwest Room 2"
+  location_name: "Southwest Room 2"
 }
 doors {
   name: "Southwest 4"
@@ -411,6 +431,7 @@ doors {
   panels { room: "Central Connected Area" name: "SON (1)" }
   panels { room: "Central Connected Area" name: "URGE" }
   location_room: "Central Connected Area"
+  location_name: "Northeast Room 2"
 }
 doors {
   name: "South Right Painting"
@@ -4,6 +4,7 @@ panels {
   path: "Panels/panel_3"
   clue: "shrink"
   answer: "shrink"
+  display_name: "SHRINK (2)"
 }
 panels {
   name: "IRE"
@@ -4,4 +4,5 @@ panels {
   path: "Panels/panel_2"
   clue: "shrink"
   answer: "shrink"
+  display_name: "SHRINK (1)"
 }
@@ -107,6 +107,8 @@ message Door {
   repeated uint64 endings = 16;
 
   optional DoorType type = 8;
+
+  optional string location_name = 17;
 }
 
 message PanelData {
@@ -124,6 +126,8 @@ message PanelData {
 
   optional uint64 required_door = 9;
   optional uint64 required_room = 11;
+
+  optional string display_name = 12;
 }
 
 message PaintingData {
@@ -198,6 +202,7 @@ message Room {
   optional uint64 map_id = 8;
   optional string name = 2;
   optional string display_name = 3;
+  optional string panel_display_name = 13;
 
   repeated uint64 panels = 4;
   repeated uint64 paintings = 5;
@@ -90,6 +90,7 @@ message HumanDoor {
 
   optional DoorType type = 4;
   optional string location_room = 5;
+  optional string location_name = 14;
 }
 
 message HumanDoors {
@@ -108,6 +109,8 @@ message HumanPanel {
 
   optional DoorIdentifier required_door = 7;
   optional RoomIdentifier required_room = 8;
+
+  optional string display_name = 9;
 }
 
 message HumanPainting {
@@ -161,6 +164,10 @@ message HumanRoom {
   optional string name = 1;
   optional string display_name = 2;
 
+  // This is used in panelsanity location names and location names for STANDARD
+  // doors generated from panels in the same area.
+  optional string panel_display_name = 10;
+
   repeated HumanPanel panels = 3;
   repeated HumanPainting paintings = 4;
   repeated HumanLetter letters = 5;
@@ -104,7 +104,11 @@ class DataPacker {
         container_.FindOrAddRoom(current_map_name, h_room.name(), std::nullopt);
     Room& room = *container_.all_objects().mutable_rooms(room_id);
 
-    room.set_display_name(h_room.display_name());
+    //room.set_display_name(h_room.display_name());
+
+    if (h_room.has_panel_display_name()) {
+      room.set_panel_display_name(h_room.panel_display_name());
+    }
 
     for (const HumanPanel& h_panel : h_room.panels()) {
       room.add_panels(ProcessPanel(h_panel, current_map_name, room.name()));
@@ -175,6 +179,10 @@ class DataPacker {
           map_name, h_panel.required_room().name(), current_map_name));
     }
 
+    if (h_panel.has_display_name()) {
+      panel.set_display_name(h_panel.display_name());
+    }
+
     return panel_id;
   }
 
@@ -394,6 +402,10 @@ class DataPacker {
     }
 
     door.set_type(h_door.type());
+
+    if (h_door.has_location_name()) {
+      door.set_location_name(h_door.location_name());
+    }
   }
 
   void ProcessConnectionsFile(std::filesystem::path path,
@@ -1,3 +1,4 @@
+find_package(fmt REQUIRED)
 find_package(Protobuf REQUIRED)
 
 add_executable(validator
@@ -9,4 +10,4 @@ add_executable(validator
 set_property(TARGET validator PROPERTY CXX_STANDARD 20)
 set_property(TARGET validator PROPERTY CXX_STANDARD_REQUIRED ON)
 target_include_directories(validator PUBLIC ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/tools)
-target_link_libraries(validator PUBLIC protos util protobuf::libprotobuf)
+target_link_libraries(validator PUBLIC protos util fmt::fmt protobuf::libprotobuf)
@@ -1,5 +1,6 @@
 #include "human_processor.h"
 
+#include <fmt/core.h>
 #include <google/protobuf/message.h>
 #include <google/protobuf/text_format.h>
 
@@ -93,7 +94,7 @@ class HumanProcessor {
     room_info.definitions.push_back(h_room);
 
     for (const HumanPanel& h_panel : h_room.panels()) {
-      ProcessPanel(h_panel, current_map_name, h_room.name());
+      ProcessPanel(h_panel, current_map_name, h_room);
     }
 
     for (const HumanPainting& h_painting : h_room.paintings()) {
@@ -123,10 +124,10 @@ class HumanProcessor {
 
   void ProcessPanel(const HumanPanel& h_panel,
                     const std::string& current_map_name,
-                    const std::string& current_room_name) {
+                    const HumanRoom& h_room) {
     PanelIdentifier panel_identifier;
     panel_identifier.set_map(current_map_name);
-    panel_identifier.set_room(current_room_name);
+    panel_identifier.set_room(h_room.name());
     panel_identifier.set_name(h_panel.name());
 
     PanelInfo& panel_info = info_.panels[panel_identifier];
@@ -155,6 +156,24 @@ class HumanProcessor {
       RoomInfo& required_room_info = info_.rooms[required_room_identifier];
       required_room_info.panels_referenced_by.push_back(panel_identifier);
     }
+
+    std::string map_area_name = current_map_name;
+    if (h_room.has_panel_display_name()) {
+      map_area_name =
+          fmt::format("{} ({})", current_map_name, h_room.panel_display_name());
+    }
+
+    panel_info.map_area_name = map_area_name;
+
+    std::string panelsanity_name;
+    if (h_panel.has_display_name()) {
+      panelsanity_name =
+          fmt::format("{} - {}", map_area_name, h_panel.display_name());
+    } else {
+      panelsanity_name = fmt::format("{} - {}", map_area_name, h_panel.name());
+    }
+    info_.panel_names[panelsanity_name].panels_used_by.push_back(
+        panel_identifier);
   }
 
   void ProcessPainting(const HumanPainting& h_painting,
@@ -72,6 +72,8 @@ struct ProxyInfo {
 struct PanelInfo {
   std::vector<HumanPanel> definitions;
 
+  std::string map_area_name;
+
   std::vector<HumanConnection> connections_referenced_by;
   std::vector<DoorIdentifier> doors_referenced_by;
 
@@ -96,6 +98,10 @@ struct EndingInfo {
   std::vector<DoorIdentifier> doors_referenced_by;
 };
 
+struct PanelNameInfo {
+  std::vector<PanelIdentifier> panels_used_by;
+};
+
 struct CollectedInfo {
   std::map<std::string, MapInfo> maps;
   std::map<RoomIdentifier, RoomInfo, RoomIdentifierLess> rooms;
@@ -107,6 +113,7 @@ struct CollectedInfo {
       keyholders;
   std::map<LetterIdentifier, LetterInfo> letters;
   std::map<std::string, EndingInfo> endings;
+  std::map<std::string, PanelNameInfo> panel_names;
 };
 
 }  // namespace com::fourisland::lingo2_archipelago
@@ -9,291 +9,365 @@
 namespace com::fourisland::lingo2_archipelago {
 namespace {
 
-void ValidateMap(const std::string& map_name, const MapInfo& map_info) {
-  for (const auto& [node_path, node_info] : map_info.game_nodes) {
-    if (node_info.uses > 1) {
-      std::cout << "Map " << map_name << " node " << node_path
-                << " is used in multiple places." << std::endl;
-    } else if (node_info.uses == 0) {
-      std::cout << "Map " << map_name << " node " << node_path
-                << " is not used." << std::endl;
-    }
+class Validator {
+ public:
+  explicit Validator(const CollectedInfo& info) : info_(info) {}
 
-    if (!node_info.defined) {
-      std::cout << "Map " << map_name << " node " << node_path
-                << " is not defined in the game file." << std::endl;
+  void Validate() const {
+    for (const auto& [map_name, map_info] : info_.maps) {
+      ValidateMap(map_name, map_info);
+    }
+    for (const auto& [room_identifier, room_info] : info_.rooms) {
+      ValidateRoom(room_identifier, room_info);
+    }
+    for (const auto& [door_identifier, door_info] : info_.doors) {
+      ValidateDoor(door_identifier, door_info);
+    }
+    for (const auto& [port_identifier, port_info] : info_.ports) {
+      ValidatePort(port_identifier, port_info);
+    }
+    for (const auto& [painting_identifier, painting_info] : info_.paintings) {
+      ValidatePainting(painting_identifier, painting_info);
+    }
+    for (const auto& [panel_identifier, panel_info] : info_.panels) {
+      ValidatePanel(panel_identifier, panel_info);
+    }
+    for (const auto& [keyholder_identifier, keyholder_info] :
+         info_.keyholders) {
+      ValidateKeyholder(keyholder_identifier, keyholder_info);
+    }
+    for (const auto& [letter_identifier, letter_info] : info_.letters) {
+      ValidateLetter(letter_identifier, letter_info);
+    }
+    for (const auto& [ending_name, ending_info] : info_.endings) {
+      ValidateEnding(ending_name, ending_info);
+    }
+    for (const auto& [panel_name, panel_info] : info_.panel_names) {
+      ValidatePanelName(panel_name, panel_info);
     }
   }
-}
 
-void ValidateRoom(const RoomIdentifier& room_identifier,
-                  const RoomInfo& room_info) {
-  if (room_info.definitions.empty()) {
-    std::cout << "Room " << room_identifier.ShortDebugString()
-              << " has no definition, but was referenced:" << std::endl;
+ private:
+  void ValidateMap(const std::string& map_name, const MapInfo& map_info) const {
+    for (const auto& [node_path, node_info] : map_info.game_nodes) {
+      if (node_info.uses > 1) {
+        std::cout << "Map " << map_name << " node " << node_path
+                  << " is used in multiple places." << std::endl;
+      } else if (node_info.uses == 0) {
+        std::cout << "Map " << map_name << " node " << node_path
+                  << " is not used." << std::endl;
+      }
 
-    for (const DoorIdentifier& door_identifier :
-         room_info.doors_referenced_by) {
-      std::cout << "    DOOR " << door_identifier.ShortDebugString()
-                << std::endl;
+      if (!node_info.defined) {
+        std::cout << "Map " << map_name << " node " << node_path
+                  << " is not defined in the game file." << std::endl;
+      }
     }
+  }
 
-    for (const PanelIdentifier& panel_identifier :
-         room_info.panels_referenced_by) {
-      std::cout << "    PANEL " << panel_identifier.ShortDebugString()
-                << std::endl;
-    }
+  void ValidateRoom(const RoomIdentifier& room_identifier,
+                    const RoomInfo& room_info) const {
+    if (room_info.definitions.empty()) {
+      std::cout << "Room " << room_identifier.ShortDebugString()
+                << " has no definition, but was referenced:" << std::endl;
+
+      for (const DoorIdentifier& door_identifier :
+           room_info.doors_referenced_by) {
+        std::cout << "    DOOR " << door_identifier.ShortDebugString()
+                  << std::endl;
+      }
+
+      for (const PanelIdentifier& panel_identifier :
+           room_info.panels_referenced_by) {
+        std::cout << "    PANEL " << panel_identifier.ShortDebugString()
+                  << std::endl;
+      }
 
-    for (const HumanConnection& connection :
-         room_info.connections_referenced_by) {
-      std::cout << "    CONNECTION " << connection.ShortDebugString()
-                << std::endl;
+      for (const HumanConnection& connection :
+           room_info.connections_referenced_by) {
+        std::cout << "    CONNECTION " << connection.ShortDebugString()
+                  << std::endl;
+      }
+    } else if (room_info.definitions.size() > 1) {
+      std::cout << "Room " << room_identifier.ShortDebugString()
+                << " was defined multiple times." << std::endl;
     }
-  } else if (room_info.definitions.size() > 1) {
-    std::cout << "Room " << room_identifier.ShortDebugString()
-              << " was defined multiple times." << std::endl;
   }
-}
 
-void ValidateDoor(const DoorIdentifier& door_identifier,
-                  const DoorInfo& door_info) {
-  if (door_info.definitions.empty()) {
-    std::cout << "Door " << door_identifier.ShortDebugString()
-              << " has no definition, but was referenced:" << std::endl;
-
-    for (const DoorIdentifier& other_door_identifier :
-         door_info.doors_referenced_by) {
-      std::cout << "    DOOR " << other_door_identifier.ShortDebugString()
-                << std::endl;
+  bool DoesDoorNeedLocationName(const HumanDoor& h_door,
+                                const std::string& map_name) const {
+    if (h_door.type() != DoorType::STANDARD) {
+      return false;
     }
 
-    for (const PanelIdentifier& panel_identifier :
-         door_info.panels_referenced_by) {
-      std::cout << "    PANEL " << panel_identifier.ShortDebugString()
-                << std::endl;
+    if (h_door.keyholders_size() > 0 || h_door.endings_size() > 0) {
+      return true;
     }
 
-    for (const PaintingIdentifier& painting_identifier :
-         door_info.paintings_referenced_by) {
-      std::cout << "    PAINTING " << painting_identifier.ShortDebugString()
-                << std::endl;
+    if (h_door.panels_size() > 4) {
+      return true;
     }
 
-    for (const PortIdentifier& port_identifier :
-         door_info.ports_referenced_by) {
-      std::cout << "    PORT " << port_identifier.ShortDebugString()
-                << std::endl;
+    std::set<std::string> map_areas;
+    for (const PanelIdentifier& pi : h_door.panels()) {
+      auto full_pi =
+          GetCompletePanelIdentifierWithoutAnswer(pi, map_name, std::nullopt);
+      if (full_pi) {
+        auto panel_info_it = info_.panels.find(*full_pi);
+        if (panel_info_it != info_.panels.end()) {
+          const PanelInfo& panel_info = panel_info_it->second;
+
+          map_areas.insert(panel_info.map_area_name);
+        }
+      }
     }
 
-    for (const HumanConnection& connection :
-         door_info.connections_referenced_by) {
-      std::cout << "    CONNECTION " << connection.ShortDebugString()
-                << std::endl;
+    if (map_areas.size() > 1) {
+      return true;
     }
-  } else if (door_info.definitions.size() > 1) {
-    std::cout << "Door " << door_identifier.ShortDebugString()
-              << " was defined multiple times." << std::endl;
+
+    return false;
   }
 
-  if (door_info.malformed_identifiers.HasAny()) {
-    std::cout << "Door " << door_identifier.ShortDebugString()
-              << " has malformed identifiers:" << std::endl;
+  void ValidateDoor(const DoorIdentifier& door_identifier,
+                    const DoorInfo& door_info) const {
+    if (door_info.definitions.empty()) {
+      std::cout << "Door " << door_identifier.ShortDebugString()
+                << " has no definition, but was referenced:" << std::endl;
 
-    for (const PaintingIdentifier& painting_identifier :
-         door_info.malformed_identifiers.paintings) {
-      std::cout << "    PAINTING " << painting_identifier.ShortDebugString()
-                << std::endl;
-    }
+      for (const DoorIdentifier& other_door_identifier :
+           door_info.doors_referenced_by) {
+        std::cout << "    DOOR " << other_door_identifier.ShortDebugString()
+                  << std::endl;
+      }
 
-    for (const PanelIdentifier& panel_identifier :
-         door_info.malformed_identifiers.panels) {
-      std::cout << "    PANEL " << panel_identifier.ShortDebugString()
-                << std::endl;
-    }
+      for (const PanelIdentifier& panel_identifier :
+           door_info.panels_referenced_by) {
+        std::cout << "    PANEL " << panel_identifier.ShortDebugString()
+                  << std::endl;
+      }
 
-    for (const KeyholderIdentifier& keyholder_identifier :
-         door_info.malformed_identifiers.keyholders) {
-      std::cout << "    KEYHOLDER " << keyholder_identifier.ShortDebugString()
-                << std::endl;
-    }
-  }
-}
+      for (const PaintingIdentifier& painting_identifier :
+           door_info.paintings_referenced_by) {
+        std::cout << "    PAINTING " << painting_identifier.ShortDebugString()
+                  << std::endl;
+      }
 
-void ValidatePort(const PortIdentifier& port_identifier,
-                  const PortInfo& port_info) {
-  if (port_info.definitions.empty()) {
-    std::cout << "Port " << port_identifier.ShortDebugString()
-              << " has no definition, but was referenced:" << std::endl;
+      for (const PortIdentifier& port_identifier :
+           door_info.ports_referenced_by) {
+        std::cout << "    PORT " << port_identifier.ShortDebugString()
+                  << std::endl;
+      }
 
-    for (const HumanConnection& connection :
-         port_info.connections_referenced_by) {
-      std::cout << "    CONNECTION " << connection.ShortDebugString()
-                << std::endl;
+      for (const HumanConnection& connection :
+           door_info.connections_referenced_by) {
+        std::cout << "    CONNECTION " << connection.ShortDebugString()
+                  << std::endl;
+      }
+    } else if (door_info.definitions.size() > 1) {
+      std::cout << "Door " << door_identifier.ShortDebugString()
+                << " was defined multiple times." << std::endl;
     }
-  } else if (port_info.definitions.size() > 1) {
-    std::cout << "Port " << port_identifier.ShortDebugString()
-              << " was defined multiple times." << std::endl;
-  }
-}
 
-void ValidatePainting(const PaintingIdentifier& painting_identifier,
-                      const PaintingInfo& painting_info) {
-  if (painting_info.definitions.empty()) {
-    std::cout << "Painting " << painting_identifier.ShortDebugString()
-              << " has no definition, but was referenced:" << std::endl;
+    if (door_info.malformed_identifiers.HasAny()) {
+      std::cout << "Door " << door_identifier.ShortDebugString()
+                << " has malformed identifiers:" << std::endl;
+
+      for (const PaintingIdentifier& painting_identifier :
+           door_info.malformed_identifiers.paintings) {
+        std::cout << "    PAINTING " << painting_identifier.ShortDebugString()
+                  << std::endl;
+      }
+
+      for (const PanelIdentifier& panel_identifier :
+           door_info.malformed_identifiers.panels) {
+        std::cout << "    PANEL " << panel_identifier.ShortDebugString()
+                  << std::endl;
+      }
 
-    for (const DoorIdentifier& door_identifier :
-         painting_info.doors_referenced_by) {
-      std::cout << "    DOOR " << door_identifier.ShortDebugString()
-                << std::endl;
+      for (const KeyholderIdentifier& keyholder_identifier :
+           door_info.malformed_identifiers.keyholders) {
+        std::cout << "    KEYHOLDER " << keyholder_identifier.ShortDebugString()
+                  << std::endl;
+      }
     }
 
-    for (const HumanConnection& connection :
-         painting_info.connections_referenced_by) {
-      std::cout << "    CONNECTION " << connection.ShortDebugString()
-                << std::endl;
+    for (const HumanDoor& h_door : door_info.definitions) {
+      if (DoesDoorNeedLocationName(h_door, door_identifier.map()) &&
+          !h_door.has_location_name()) {
+        std::cout << "Door " << door_identifier.ShortDebugString()
+                  << " needs an explicit location name." << std::endl;
+      }
     }
-  } else if (painting_info.definitions.size() > 1) {
-    std::cout << "Painting " << painting_identifier.ShortDebugString()
-              << " was defined multiple times." << std::endl;
   }
-}
 
-void ValidatePanel(const PanelIdentifier& panel_identifier,
-                   const PanelInfo& panel_info) {
-  if (panel_identifier.name().empty()) {
-    std::cout << "Panel " << panel_identifier.ShortDebugString()
-              << " has no name." << std::endl;
+  void ValidatePort(const PortIdentifier& port_identifier,
+                    const PortInfo& port_info) const {
+    if (port_info.definitions.empty()) {
+      std::cout << "Port " << port_identifier.ShortDebugString()
+                << " has no definition, but was referenced:" << std::endl;
+
+      for (const HumanConnection& connection :
+           port_info.connections_referenced_by) {
+        std::cout << "    CONNECTION " << connection.ShortDebugString()
+                  << std::endl;
+      }
+    } else if (port_info.definitions.size() > 1) {
+      std::cout << "Port " << port_identifier.ShortDebugString()
+                << " was defined multiple times." << std::endl;
+    }
   }
 
-  if (panel_info.definitions.empty()) {
-    std::cout << "Panel " << panel_identifier.ShortDebugString()
-              << " has no definition, but was referenced:" << std::endl;
+  void ValidatePainting(const PaintingIdentifier& painting_identifier,
+                        const PaintingInfo& painting_info) const {
+    if (painting_info.definitions.empty()) {
+      std::cout << "Painting " << painting_identifier.ShortDebugString()
+                << " has no definition, but was referenced:" << std::endl;
 
-    for (const DoorIdentifier& door_identifier :
-         panel_info.doors_referenced_by) {
-      std::cout << "    DOOR " << door_identifier.ShortDebugString()
-                << std::endl;
-    }
+      for (const DoorIdentifier& door_identifier :
+           painting_info.doors_referenced_by) {
+        std::cout << "    DOOR " << door_identifier.ShortDebugString()
+                  << std::endl;
+      }
 
-    for (const HumanConnection& connection :
-         panel_info.connections_referenced_by) {
-      std::cout << "    CONNECTION " << connection.ShortDebugString()
-                << std::endl;
+      for (const HumanConnection& connection :
+           painting_info.connections_referenced_by) {
+        std::cout << "    CONNECTION " << connection.ShortDebugString()
+                  << std::endl;
+      }
+    } else if (painting_info.definitions.size() > 1) {
+      std::cout << "Painting " << painting_identifier.ShortDebugString()
+                << " was defined multiple times." << std::endl;
     }
-  } else if (panel_info.definitions.size() > 1) {
-    std::cout << "Panel " << panel_identifier.ShortDebugString()
-              << " was defined multiple times." << std::endl;
   }
 
-  for (const auto& [answer, proxy_info] : panel_info.proxies) {
-    if (proxy_info.definitions.empty()) {
+  void ValidatePanel(const PanelIdentifier& panel_identifier,
+                     const PanelInfo& panel_info) const {
+    if (panel_identifier.name().empty()) {
+      std::cout << "Panel " << panel_identifier.ShortDebugString()
+                << " has no name." << std::endl;
+    }
+
+    if (panel_info.definitions.empty()) {
       std::cout << "Panel " << panel_identifier.ShortDebugString()
-                << " with answer \"" << answer
-                << "\" has no definition, but was referenced:" << std::endl;
+                << " has no definition, but was referenced:" << std::endl;
 
       for (const DoorIdentifier& door_identifier :
-           proxy_info.doors_referenced_by) {
+           panel_info.doors_referenced_by) {
         std::cout << "    DOOR " << door_identifier.ShortDebugString()
                   << std::endl;
       }
 
       for (const HumanConnection& connection :
-           proxy_info.connections_referenced_by) {
+           panel_info.connections_referenced_by) {
         std::cout << "    CONNECTION " << connection.ShortDebugString()
                   << std::endl;
       }
-    } else if (proxy_info.definitions.size() > 1) {
+    } else if (panel_info.definitions.size() > 1) {
       std::cout << "Panel " << panel_identifier.ShortDebugString()
-                << " with answer \"" << answer
-                << "\" was defined multiple times." << std::endl;
+                << " was defined multiple times." << std::endl;
+    }
+
+    for (const auto& [answer, proxy_info] : panel_info.proxies) {
+      if (proxy_info.definitions.empty()) {
+        std::cout << "Panel " << panel_identifier.ShortDebugString()
+                  << " with answer \"" << answer
+                  << "\" has no definition, but was referenced:" << std::endl;
+
+        for (const DoorIdentifier& door_identifier :
+             proxy_info.doors_referenced_by) {
+          std::cout << "    DOOR " << door_identifier.ShortDebugString()
+                    << std::endl;
+        }
+
+        for (const HumanConnection& connection :
+             proxy_info.connections_referenced_by) {
+          std::cout << "    CONNECTION " << connection.ShortDebugString()
+                    << std::endl;
+        }
+      } else if (proxy_info.definitions.size() > 1) {
+        std::cout << "Panel " << panel_identifier.ShortDebugString()
+                  << " with answer \"" << answer
+                  << "\" was defined multiple times." << std::endl;
+      }
     }
   }
-}
 
-void ValidateKeyholder(const KeyholderIdentifier& keyholder_identifier,
-                       const KeyholderInfo& keyholder_info) {
-  if (keyholder_info.definitions.empty()) {
-    std::cout << "Keyholder " << keyholder_identifier.ShortDebugString()
-              << " has no definition, but was referenced:" << std::endl;
+  void ValidateKeyholder(const KeyholderIdentifier& keyholder_identifier,
+                         const KeyholderInfo& keyholder_info) const {
+    if (keyholder_info.definitions.empty()) {
+      std::cout << "Keyholder " << keyholder_identifier.ShortDebugString()
+                << " has no definition, but was referenced:" << std::endl;
 
-    for (const DoorIdentifier& door_identifier :
-         keyholder_info.doors_referenced_by) {
-      std::cout << "    DOOR " << door_identifier.ShortDebugString()
-                << std::endl;
+      for (const DoorIdentifier& door_identifier :
+           keyholder_info.doors_referenced_by) {
+        std::cout << "    DOOR " << door_identifier.ShortDebugString()
+                  << std::endl;
+      }
+    } else if (keyholder_info.definitions.size() > 1) {
+      std::cout << "Keyholder " << keyholder_identifier.ShortDebugString()
+                << " was defined multiple times." << std::endl;
     }
-  } else if (keyholder_info.definitions.size() > 1) {
-    std::cout << "Keyholder " << keyholder_identifier.ShortDebugString()
-              << " was defined multiple times." << std::endl;
   }
-}
 
-void ValidateLetter(const LetterIdentifier& letter_identifier,
-                    const LetterInfo& letter_info) {
-  std::string letter_name = std::string(1, std::get<0>(letter_identifier)) +
-                            (std::get<1>(letter_identifier) ? "2" : "1");
+  void ValidateLetter(const LetterIdentifier& letter_identifier,
+                      const LetterInfo& letter_info) const {
+    std::string letter_name = std::string(1, std::get<0>(letter_identifier)) +
+                              (std::get<1>(letter_identifier) ? "2" : "1");
 
-  if (letter_info.defined_in.size() > 1) {
-    std::cout << "Letter " << letter_name
-              << " was defined in multiple places:" << std::endl;
+    if (letter_info.defined_in.size() > 1) {
+      std::cout << "Letter " << letter_name
+                << " was defined in multiple places:" << std::endl;
 
-    for (const RoomIdentifier& room_identifier : letter_info.defined_in) {
-      std::cout << "    " << room_identifier.ShortDebugString() << std::endl;
+      for (const RoomIdentifier& room_identifier : letter_info.defined_in) {
+        std::cout << "    " << room_identifier.ShortDebugString() << std::endl;
+      }
     }
   }
-}
 
-void ValidateEnding(const std::string& ending_name,
-                    const EndingInfo& ending_info) {
-  if (ending_info.defined_in.empty()) {
-    std::cout << "Ending " << ending_name
-              << " has no definition, but was referenced:" << std::endl;
+  void ValidateEnding(const std::string& ending_name,
+                      const EndingInfo& ending_info) const {
+    if (ending_info.defined_in.empty()) {
+      std::cout << "Ending " << ending_name
+                << " has no definition, but was referenced:" << std::endl;
+
+      for (const DoorIdentifier& door_identifier :
+           ending_info.doors_referenced_by) {
+        std::cout << "    DOOR " << door_identifier.ShortDebugString()
+                  << std::endl;
+      }
+    } else if (ending_info.defined_in.size() > 1) {
+      std::cout << "Ending " << ending_name
+                << " was defined in multiple places:" << std::endl;
 
-    for (const DoorIdentifier& door_identifier :
-         ending_info.doors_referenced_by) {
-      std::cout << "    DOOR " << door_identifier.ShortDebugString()
-                << std::endl;
+      for (const RoomIdentifier& room_identifier : ending_info.defined_in) {
+        std::cout << "    " << room_identifier.ShortDebugString() << std::endl;
+      }
     }
-  } else if (ending_info.defined_in.size() > 1) {
-    std::cout << "Ending " << ending_name
-              << " was defined in multiple places:" << std::endl;
+  }
+
+  void ValidatePanelName(const std::string& panel_name,
+                         const PanelNameInfo& panel_info) const {
+    if (panel_info.panels_used_by.size() > 1) {
+      std::cout << "The location name \"" << panel_name
+                << "\" is used by multiple panels:" << std::endl;
 
-    for (const RoomIdentifier& room_identifier : ending_info.defined_in) {
-      std::cout << "    " << room_identifier.ShortDebugString() << std::endl;
+      for (const PanelIdentifier& panel_identifier :
+           panel_info.panels_used_by) {
+        std::cout << "    PANEL " << panel_identifier.ShortDebugString()
+                  << std::endl;
+      }
     }
   }
-}
+
+  const CollectedInfo& info_;
+};
 
 }  // namespace
 
 void ValidateCollectedInfo(const CollectedInfo& info) {
-  for (const auto& [map_name, map_info] : info.maps) {
-    ValidateMap(map_name, map_info);
-  }
-  for (const auto& [room_identifier, room_info] : info.rooms) {
-    ValidateRoom(room_identifier, room_info);
-  }
-  for (const auto& [door_identifier, door_info] : info.doors) {
-    ValidateDoor(door_identifier, door_info);
-  }
-  for (const auto& [port_identifier, port_info] : info.ports) {
-    ValidatePort(port_identifier, port_info);
-  }
-  for (const auto& [painting_identifier, painting_info] : info.paintings) {
-    ValidatePainting(painting_identifier, painting_info);
-  }
-  for (const auto& [panel_identifier, panel_info] : info.panels) {
-    ValidatePanel(panel_identifier, panel_info);
-  }
-  for (const auto& [keyholder_identifier, keyholder_info] : info.keyholders) {
-    ValidateKeyholder(keyholder_identifier, keyholder_info);
-  }
-  for (const auto& [letter_identifier, letter_info] : info.letters) {
-    ValidateLetter(letter_identifier, letter_info);
-  }
-  for (const auto& [ending_name, ending_info] : info.endings) {
-    ValidateEnding(ending_name, ending_info);
-  }
+  Validator validator(info);
+  validator.Validate();
 }
 
 }  // namespace com::fourisland::lingo2_archipelago
@@ -1,5 +1,6 @@
 {
   "dependencies": [
+    "fmt",
     "protobuf",
     "yaml-cpp"
   ],