152 files changed, 238 insertions, 154 deletions
diff --git a/data/maps/daedalus/doors.txtpb b/data/maps/daedalus/doors.txtpb
index a92f648..4e35de2 100644
--- a/data/maps/daedalus/doors.txtpb
+++ b/data/maps/daedalus/doors.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/After Bee Room.txtpb b/data/maps/daedalus/rooms/After Bee Room.txtpb
index f38bd7d..c2dfc0f 100644
--- a/data/maps/daedalus/rooms/After Bee Room.txtpb
+++ b/data/maps/daedalus/rooms/After Bee Room.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Amber North 2.txtpb b/data/maps/daedalus/rooms/Amber North 2.txtpb
index 8fbaccd..7029695 100644
--- a/data/maps/daedalus/rooms/Amber North 2.txtpb
+++ b/data/maps/daedalus/rooms/Amber North 2.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Bee Room Obverse.txtpb b/data/maps/daedalus/rooms/Bee Room Obverse.txtpb
index 1badbc0..7677ed1 100644
--- a/data/maps/daedalus/rooms/Bee Room Obverse.txtpb
+++ b/data/maps/daedalus/rooms/Bee Room Obverse.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Bee Room Reverse.txtpb b/data/maps/daedalus/rooms/Bee Room Reverse.txtpb
index f455f06..cba8285 100644
--- a/data/maps/daedalus/rooms/Bee Room Reverse.txtpb
+++ b/data/maps/daedalus/rooms/Bee Room Reverse.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Beehalls Intersection.txtpb b/data/maps/daedalus/rooms/Beehalls Intersection.txtpb
index fecf71d..7ecbe50 100644
--- a/data/maps/daedalus/rooms/Beehalls Intersection.txtpb
+++ b/data/maps/daedalus/rooms/Beehalls Intersection.txtpb

@@ -1,5 +1,5 @@
 name: "Beehalls Intersection"
-display_name: "North Area"
+panel_display_name: "North Area"
 panels {
  name: "CLOUDS"
  path: "Panels/Halls/beehalls_4"
diff --git a/data/maps/daedalus/rooms/Black Hex.txtpb b/data/maps/daedalus/rooms/Black Hex.txtpb
index bd8359e..1276685 100644
--- a/data/maps/daedalus/rooms/Black Hex.txtpb
+++ b/data/maps/daedalus/rooms/Black Hex.txtpb

@@ -1,5 +1,5 @@
 name: "Black Hex"
-display_name: "Northwest Area"
+panel_display_name: "Northwest Area"
 panels {
  name: "HIDE"
  path: "Panels/Hexes/black_1"
diff --git a/data/maps/daedalus/rooms/Blue Hallway Cut Side.txtpb b/data/maps/daedalus/rooms/Blue Hallway Cut Side.txtpb
index ea2ffef..5a6c081 100644
--- a/data/maps/daedalus/rooms/Blue Hallway Cut Side.txtpb
+++ b/data/maps/daedalus/rooms/Blue Hallway Cut Side.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Blue Hallway Tall Side.txtpb b/data/maps/daedalus/rooms/Blue Hallway Tall Side.txtpb
index 93d4136..4a775d8 100644
--- a/data/maps/daedalus/rooms/Blue Hallway Tall Side.txtpb
+++ b/data/maps/daedalus/rooms/Blue Hallway Tall Side.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Blue Hallway.txtpb b/data/maps/daedalus/rooms/Blue Hallway.txtpb
index 0bac459..81bc428 100644
--- a/data/maps/daedalus/rooms/Blue Hallway.txtpb
+++ b/data/maps/daedalus/rooms/Blue Hallway.txtpb

@@ -1,5 +1,5 @@
 name: "Blue Hallway"
-display_name: "South Area"
+panel_display_name: "South Area"
 panels {
  name: "CHOP"
  path: "Panels/Halls/halls_10"
diff --git a/data/maps/daedalus/rooms/Blue Room.txtpb b/data/maps/daedalus/rooms/Blue Room.txtpb
index 98d933b..1d060d8 100644
--- a/data/maps/daedalus/rooms/Blue Room.txtpb
+++ b/data/maps/daedalus/rooms/Blue Room.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Blue Smiley Annex.txtpb b/data/maps/daedalus/rooms/Blue Smiley Annex.txtpb
index c39aeb5..d44bf1a 100644
--- a/data/maps/daedalus/rooms/Blue Smiley Annex.txtpb
+++ b/data/maps/daedalus/rooms/Blue Smiley Annex.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Blue Smiley.txtpb b/data/maps/daedalus/rooms/Blue Smiley.txtpb
index 5ddb330..8464525 100644
--- a/data/maps/daedalus/rooms/Blue Smiley.txtpb
+++ b/data/maps/daedalus/rooms/Blue Smiley.txtpb

@@ -1,5 +1,5 @@
 name: "Blue Smiley"
-display_name: "South Area"
+panel_display_name: "South Area"
 panels {
  name: "SMILE"
  path: "Panels/Smiley Rooms/blue"
diff --git a/data/maps/daedalus/rooms/Book Room.txtpb b/data/maps/daedalus/rooms/Book Room.txtpb
index 7571ec1..534fbfe 100644
--- a/data/maps/daedalus/rooms/Book Room.txtpb
+++ b/data/maps/daedalus/rooms/Book Room.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Bow Side.txtpb b/data/maps/daedalus/rooms/Bow Side.txtpb
index 6e07925..f04065d 100644
--- a/data/maps/daedalus/rooms/Bow Side.txtpb
+++ b/data/maps/daedalus/rooms/Bow Side.txtpb

@@ -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)"
 }
diff --git a/data/maps/daedalus/rooms/Brown Smiley.txtpb b/data/maps/daedalus/rooms/Brown Smiley.txtpb
index 91ba963..53783c1 100644
--- a/data/maps/daedalus/rooms/Brown Smiley.txtpb
+++ b/data/maps/daedalus/rooms/Brown Smiley.txtpb

@@ -1,5 +1,5 @@
 name: "Brown Smiley"
-display_name: "Rainbow"
+panel_display_name: "Rainbow"
 panels {
  name: "OTHERS"
  path: "Panels/Smiley Rooms/rainbow2"
diff --git a/data/maps/daedalus/rooms/C Keyholder.txtpb b/data/maps/daedalus/rooms/C Keyholder.txtpb
index a8ad9aa..cc8548c 100644
--- a/data/maps/daedalus/rooms/C Keyholder.txtpb
+++ b/data/maps/daedalus/rooms/C Keyholder.txtpb

@@ -1,5 +1,5 @@
 name: "C Keyholder"
-display_name: "North Area"
+panel_display_name: "North Area"
 keyholders {
  name: "C"
  path: "Components/KeyHolders/keyHolderC"
diff --git a/data/maps/daedalus/rooms/Castle.txtpb b/data/maps/daedalus/rooms/Castle.txtpb
index 4797e80..7fd9a81 100644
--- a/data/maps/daedalus/rooms/Castle.txtpb
+++ b/data/maps/daedalus/rooms/Castle.txtpb

@@ -1,5 +1,5 @@
 name: "Castle"
-display_name: "Castle"
+panel_display_name: "Castle"
 panels {
  name: "REVERSE"
  path: "Panels/Castle Interior/panel_flip"
diff --git a/data/maps/daedalus/rooms/Coin Tower.txtpb b/data/maps/daedalus/rooms/Coin Tower.txtpb
index 032ece3..177fc6e 100644
--- a/data/maps/daedalus/rooms/Coin Tower.txtpb
+++ b/data/maps/daedalus/rooms/Coin Tower.txtpb

@@ -1,5 +1,5 @@
 name: "Coin Tower"
-display_name: "Northeast Area"
+panel_display_name: "Northeast Area"
 panels {
  name: "RAIN"
  path: "Panels/Entry/db_2"
diff --git a/data/maps/daedalus/rooms/Composite Room NE.txtpb b/data/maps/daedalus/rooms/Composite Room NE.txtpb
index a4b13cd..c91a06f 100644
--- a/data/maps/daedalus/rooms/Composite Room NE.txtpb
+++ b/data/maps/daedalus/rooms/Composite Room NE.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Composite Room NW.txtpb b/data/maps/daedalus/rooms/Composite Room NW.txtpb
index 94f987b..949fe31 100644
--- a/data/maps/daedalus/rooms/Composite Room NW.txtpb
+++ b/data/maps/daedalus/rooms/Composite Room NW.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Composite Room S.txtpb b/data/maps/daedalus/rooms/Composite Room S.txtpb
index ec36ac3..3773034 100644
--- a/data/maps/daedalus/rooms/Composite Room S.txtpb
+++ b/data/maps/daedalus/rooms/Composite Room S.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Computer Room Seal.txtpb b/data/maps/daedalus/rooms/Computer Room Seal.txtpb
index 19dcf3a..b271a5c 100644
--- a/data/maps/daedalus/rooms/Computer Room Seal.txtpb
+++ b/data/maps/daedalus/rooms/Computer Room Seal.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Computer Room.txtpb b/data/maps/daedalus/rooms/Computer Room.txtpb
index 9cc6cbf..1d5a56d 100644
--- a/data/maps/daedalus/rooms/Computer Room.txtpb
+++ b/data/maps/daedalus/rooms/Computer Room.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Cyan Room.txtpb b/data/maps/daedalus/rooms/Cyan Room.txtpb
index 8430dcd..60a3595 100644
--- a/data/maps/daedalus/rooms/Cyan Room.txtpb
+++ b/data/maps/daedalus/rooms/Cyan Room.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/D Keyholder.txtpb b/data/maps/daedalus/rooms/D Keyholder.txtpb
index d2f226b..2521ab2 100644
--- a/data/maps/daedalus/rooms/D Keyholder.txtpb
+++ b/data/maps/daedalus/rooms/D Keyholder.txtpb

@@ -1,5 +1,5 @@
 name: "D Keyholder"
-display_name: "Plum Room"
+panel_display_name: "Plum Room"
 keyholders {
  name: "D"
  path: "Components/KeyHolders/keyHolderD"
diff --git a/data/maps/daedalus/rooms/D2 Room.txtpb b/data/maps/daedalus/rooms/D2 Room.txtpb
index cfc645d..ec41086 100644
--- a/data/maps/daedalus/rooms/D2 Room.txtpb
+++ b/data/maps/daedalus/rooms/D2 Room.txtpb

@@ -1,5 +1,5 @@
 name: "D2 Room"
-display_name: "Intense Room"
+panel_display_name: "Intense Room"
 letters {
  key: "d"
  level2: true
diff --git a/data/maps/daedalus/rooms/Dark Light Exit.txtpb b/data/maps/daedalus/rooms/Dark Light Exit.txtpb
index 9c4d674..53b01f3 100644
--- a/data/maps/daedalus/rooms/Dark Light Exit.txtpb
+++ b/data/maps/daedalus/rooms/Dark Light Exit.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Dark Light Room.txtpb b/data/maps/daedalus/rooms/Dark Light Room.txtpb
index 4716a36..dcd6347 100644
--- a/data/maps/daedalus/rooms/Dark Light Room.txtpb
+++ b/data/maps/daedalus/rooms/Dark Light Room.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Ending.txtpb b/data/maps/daedalus/rooms/Ending.txtpb
index b8d91c0..6b7843c 100644
--- a/data/maps/daedalus/rooms/Ending.txtpb
+++ b/data/maps/daedalus/rooms/Ending.txtpb

@@ -1,5 +1,5 @@
 name: "Ending"
-display_name: "Castle"
+panel_display_name: "Castle"
 endings {
  name: "ORANGE"
  path: "Components/Triggers/orange_ending"
diff --git a/data/maps/daedalus/rooms/Entry Shortcut.txtpb b/data/maps/daedalus/rooms/Entry Shortcut.txtpb
index a94d84c..63202ba 100644
--- a/data/maps/daedalus/rooms/Entry Shortcut.txtpb
+++ b/data/maps/daedalus/rooms/Entry Shortcut.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Eye Painting.txtpb b/data/maps/daedalus/rooms/Eye Painting.txtpb
index d4c7cc6..4214811 100644
--- a/data/maps/daedalus/rooms/Eye Painting.txtpb
+++ b/data/maps/daedalus/rooms/Eye Painting.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Eye Temple 1F Side.txtpb b/data/maps/daedalus/rooms/Eye Temple 1F Side.txtpb
index 0e914d5..3eb1a6b 100644
--- a/data/maps/daedalus/rooms/Eye Temple 1F Side.txtpb
+++ b/data/maps/daedalus/rooms/Eye Temple 1F Side.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Eye Temple 1F.txtpb b/data/maps/daedalus/rooms/Eye Temple 1F.txtpb
index 9e8dc12..e15afc1 100644
--- a/data/maps/daedalus/rooms/Eye Temple 1F.txtpb
+++ b/data/maps/daedalus/rooms/Eye Temple 1F.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Eye Temple 2F Side.txtpb b/data/maps/daedalus/rooms/Eye Temple 2F Side.txtpb
index b78a413..7a1eb0a 100644
--- a/data/maps/daedalus/rooms/Eye Temple 2F Side.txtpb
+++ b/data/maps/daedalus/rooms/Eye Temple 2F Side.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Eye Temple 2F.txtpb b/data/maps/daedalus/rooms/Eye Temple 2F.txtpb
index b564e7e..d9e06d9 100644
--- a/data/maps/daedalus/rooms/Eye Temple 2F.txtpb
+++ b/data/maps/daedalus/rooms/Eye Temple 2F.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Eye Temple Pillar 1.txtpb b/data/maps/daedalus/rooms/Eye Temple Pillar 1.txtpb
index 7fccfb2..8243704 100644
--- a/data/maps/daedalus/rooms/Eye Temple Pillar 1.txtpb
+++ b/data/maps/daedalus/rooms/Eye Temple Pillar 1.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Eye Temple Pillar 2.txtpb b/data/maps/daedalus/rooms/Eye Temple Pillar 2.txtpb
index 88b468e..445649a 100644
--- a/data/maps/daedalus/rooms/Eye Temple Pillar 2.txtpb
+++ b/data/maps/daedalus/rooms/Eye Temple Pillar 2.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/F Keyholder.txtpb b/data/maps/daedalus/rooms/F Keyholder.txtpb
index 8063161..662f76d 100644
--- a/data/maps/daedalus/rooms/F Keyholder.txtpb
+++ b/data/maps/daedalus/rooms/F Keyholder.txtpb

@@ -1,5 +1,5 @@
 name: "F Keyholder"
-display_name: "West Area"
+panel_display_name: "West Area"
 keyholders {
  name: "F"
  path: "Components/KeyHolders/keyHolderF"
diff --git a/data/maps/daedalus/rooms/F2 Prize.txtpb b/data/maps/daedalus/rooms/F2 Prize.txtpb
index 7a062f1..ac95340 100644
--- a/data/maps/daedalus/rooms/F2 Prize.txtpb
+++ b/data/maps/daedalus/rooms/F2 Prize.txtpb

@@ -1,5 +1,5 @@
 name: "F2 Prize"
-display_name: "F2 Room"
+panel_display_name: "F2 Room"
 letters {
  key: "f"
  level2: true
diff --git a/data/maps/daedalus/rooms/F2 Room.txtpb b/data/maps/daedalus/rooms/F2 Room.txtpb
index 49872ec..96b609e 100644
--- a/data/maps/daedalus/rooms/F2 Room.txtpb
+++ b/data/maps/daedalus/rooms/F2 Room.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Flip Painting Destination.txtpb b/data/maps/daedalus/rooms/Flip Painting Destination.txtpb
index 99ceb25..b3ec055 100644
--- a/data/maps/daedalus/rooms/Flip Painting Destination.txtpb
+++ b/data/maps/daedalus/rooms/Flip Painting Destination.txtpb

@@ -1,5 +1,5 @@
 name: "Flip Painting Destination"
-display_name: "Central"
+panel_display_name: "Central"
 paintings {
  name: "FLIP"
  path: "Components/Paintings/Group2/flip"
diff --git a/data/maps/daedalus/rooms/Flip Painting Hidden Panel.txtpb b/data/maps/daedalus/rooms/Flip Painting Hidden Panel.txtpb
index 71d345e..d597114 100644
--- a/data/maps/daedalus/rooms/Flip Painting Hidden Panel.txtpb
+++ b/data/maps/daedalus/rooms/Flip Painting Hidden Panel.txtpb

@@ -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)"
 }
diff --git a/data/maps/daedalus/rooms/Flip Painting.txtpb b/data/maps/daedalus/rooms/Flip Painting.txtpb
index cea1273..6d9bf06 100644
--- a/data/maps/daedalus/rooms/Flip Painting.txtpb
+++ b/data/maps/daedalus/rooms/Flip Painting.txtpb

@@ -1,5 +1,5 @@
 name: "Flip Painting"
-display_name: "West Area"
+panel_display_name: "West Area"
 paintings {
  name: "FLIP2"
  path: "Components/Paintings/Group2/flip2"
diff --git a/data/maps/daedalus/rooms/Gallery Entrance.txtpb b/data/maps/daedalus/rooms/Gallery Entrance.txtpb
index bed708f..3616bf7 100644
--- a/data/maps/daedalus/rooms/Gallery Entrance.txtpb
+++ b/data/maps/daedalus/rooms/Gallery Entrance.txtpb

@@ -1,5 +1,5 @@
 name: "Gallery Entrance"
-display_name: "Central"
+panel_display_name: "Central"
 paintings {
  name: "GALLERY"
  path: "Components/Warps/eyeWorldport"
diff --git a/data/maps/daedalus/rooms/Globe Room.txtpb b/data/maps/daedalus/rooms/Globe Room.txtpb
index 49488f0..b090ac6 100644
--- a/data/maps/daedalus/rooms/Globe Room.txtpb
+++ b/data/maps/daedalus/rooms/Globe Room.txtpb

@@ -1,5 +1,5 @@
 name: "Globe Room"
-display_name: "Southwest Area"
+panel_display_name: "Southwest Area"
 panels {
  name: "NORTH"
  path: "Panels/Halls/directions_1"
diff --git a/data/maps/daedalus/rooms/Godot Room.txtpb b/data/maps/daedalus/rooms/Godot Room.txtpb
index a9c89ec..92cf009 100644
--- a/data/maps/daedalus/rooms/Godot Room.txtpb
+++ b/data/maps/daedalus/rooms/Godot Room.txtpb

@@ -1,5 +1,5 @@
 name: "Godot Room"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
  name: "MOTORCYCLE"
  path: "Panels/Southwest Room/sw_1"
diff --git a/data/maps/daedalus/rooms/Gray Color Backside.txtpb b/data/maps/daedalus/rooms/Gray Color Backside.txtpb
index 8afb97e..7d90b7f 100644
--- a/data/maps/daedalus/rooms/Gray Color Backside.txtpb
+++ b/data/maps/daedalus/rooms/Gray Color Backside.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Gray Color Door.txtpb b/data/maps/daedalus/rooms/Gray Color Door.txtpb
index f8298ff..db46389 100644
--- a/data/maps/daedalus/rooms/Gray Color Door.txtpb
+++ b/data/maps/daedalus/rooms/Gray Color Door.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Green Color Door.txtpb b/data/maps/daedalus/rooms/Green Color Door.txtpb
index 275a3fa..fe52c09 100644
--- a/data/maps/daedalus/rooms/Green Color Door.txtpb
+++ b/data/maps/daedalus/rooms/Green Color Door.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Green Room.txtpb b/data/maps/daedalus/rooms/Green Room.txtpb
index 3b1cde1..d93ee4a 100644
--- a/data/maps/daedalus/rooms/Green Room.txtpb
+++ b/data/maps/daedalus/rooms/Green Room.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Green Smiley.txtpb b/data/maps/daedalus/rooms/Green Smiley.txtpb
index 7827f45..18f067f 100644
--- a/data/maps/daedalus/rooms/Green Smiley.txtpb
+++ b/data/maps/daedalus/rooms/Green Smiley.txtpb

@@ -1,5 +1,5 @@
 name: "Green Smiley"
-display_name: "Southwest Area"
+panel_display_name: "Southwest Area"
 panels {
  name: "SMILE"
  path: "Panels/Smiley Rooms/green"
diff --git a/data/maps/daedalus/rooms/Hedges Tower.txtpb b/data/maps/daedalus/rooms/Hedges Tower.txtpb
index 97fe935..3031c1d 100644
--- a/data/maps/daedalus/rooms/Hedges Tower.txtpb
+++ b/data/maps/daedalus/rooms/Hedges Tower.txtpb

@@ -1,5 +1,5 @@
 name: "Hedges Tower"
-display_name: "Hedges"
+panel_display_name: "Hedges"
 ports {
  name: "TENACIOUS"
  path: "Components/Warps/Worldports/worldport13"
diff --git a/data/maps/daedalus/rooms/Hedges.txtpb b/data/maps/daedalus/rooms/Hedges.txtpb
index e467f7c..69c66a9 100644
--- a/data/maps/daedalus/rooms/Hedges.txtpb
+++ b/data/maps/daedalus/rooms/Hedges.txtpb

@@ -1,5 +1,5 @@
 name: "Hedges"
-display_name: "Hedges"
+panel_display_name: "Hedges"
 panels {
  name: "SOLVE"
  path: "Panels/Tower Maze/maze_1"
diff --git a/data/maps/daedalus/rooms/Hotel.txtpb b/data/maps/daedalus/rooms/Hotel.txtpb
index 9834c3f..d2a05db 100644
--- a/data/maps/daedalus/rooms/Hotel.txtpb
+++ b/data/maps/daedalus/rooms/Hotel.txtpb

@@ -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 {
diff --git a/data/maps/daedalus/rooms/House Entrance.txtpb b/data/maps/daedalus/rooms/House Entrance.txtpb
index 99bf58e..06dcb3f 100644
--- a/data/maps/daedalus/rooms/House Entrance.txtpb
+++ b/data/maps/daedalus/rooms/House Entrance.txtpb

@@ -1,5 +1,5 @@
 name: "House Entrance"
-display_name: "Maze"
+panel_display_name: "Maze"
 panels {
  name: "ADULT"
  path: "Panels/Entry/entry_6"
diff --git a/data/maps/daedalus/rooms/House.txtpb b/data/maps/daedalus/rooms/House.txtpb
index fcf938d..3cfd4d8 100644
--- a/data/maps/daedalus/rooms/House.txtpb
+++ b/data/maps/daedalus/rooms/House.txtpb

@@ -1,5 +1,5 @@
 name: "House"
-display_name: "House"
+panel_display_name: "House"
 panels {
  name: "GOAT"
  path: "Panels/Theos House/panel_1"
diff --git a/data/maps/daedalus/rooms/I2 Room.txtpb b/data/maps/daedalus/rooms/I2 Room.txtpb
index ac9e7d5..2735a3b 100644
--- a/data/maps/daedalus/rooms/I2 Room.txtpb
+++ b/data/maps/daedalus/rooms/I2 Room.txtpb

@@ -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
diff --git a/data/maps/daedalus/rooms/Intense Room.txtpb b/data/maps/daedalus/rooms/Intense Room.txtpb
index ce1cd08..30780f9 100644
--- a/data/maps/daedalus/rooms/Intense Room.txtpb
+++ b/data/maps/daedalus/rooms/Intense Room.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/J2 Room.txtpb b/data/maps/daedalus/rooms/J2 Room.txtpb
index 48ae0c2..20211d9 100644
--- a/data/maps/daedalus/rooms/J2 Room.txtpb
+++ b/data/maps/daedalus/rooms/J2 Room.txtpb

@@ -1,5 +1,5 @@
 name: "J2 Room"
-display_name: "Southwest Area"
+panel_display_name: "Southwest Area"
 letters {
  key: "j"
  level2: true
diff --git a/data/maps/daedalus/rooms/J2 Vestibule.txtpb b/data/maps/daedalus/rooms/J2 Vestibule.txtpb
index a7f786d..57f5a4f 100644
--- a/data/maps/daedalus/rooms/J2 Vestibule.txtpb
+++ b/data/maps/daedalus/rooms/J2 Vestibule.txtpb

@@ -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)"
 }
diff --git a/data/maps/daedalus/rooms/Magic Room.txtpb b/data/maps/daedalus/rooms/Magic Room.txtpb
index c16dca6..66c63ca 100644
--- a/data/maps/daedalus/rooms/Magic Room.txtpb
+++ b/data/maps/daedalus/rooms/Magic Room.txtpb

@@ -1,5 +1,5 @@
 name: "Magic Room"
-display_name: "Maze"
+panel_display_name: "Maze"
 panels {
  name: "1"
  path: "Panels/Magic Maze/maze_1"
diff --git a/data/maps/daedalus/rooms/Maze Paintings Area.txtpb b/data/maps/daedalus/rooms/Maze Paintings Area.txtpb
index 42a45c5..3b070f7 100644
--- a/data/maps/daedalus/rooms/Maze Paintings Area.txtpb
+++ b/data/maps/daedalus/rooms/Maze Paintings Area.txtpb

@@ -1,5 +1,5 @@
 name: "Maze Paintings Area"
-display_name: "Maze"
+panel_display_name: "Maze"
 panels {
  name: "Paintings"
  path: "Panels/Halls/halls_28"
diff --git a/data/maps/daedalus/rooms/Maze.txtpb b/data/maps/daedalus/rooms/Maze.txtpb
index 0329465..a2bb5a3 100644
--- a/data/maps/daedalus/rooms/Maze.txtpb
+++ b/data/maps/daedalus/rooms/Maze.txtpb

@@ -1,2 +1,2 @@
 name: "Maze"
-display_name: "Maze"
+panel_display_name: "Maze"
diff --git a/data/maps/daedalus/rooms/Moat.txtpb b/data/maps/daedalus/rooms/Moat.txtpb
index f834609..cbb5d16 100644
--- a/data/maps/daedalus/rooms/Moat.txtpb
+++ b/data/maps/daedalus/rooms/Moat.txtpb

@@ -1,5 +1,5 @@
 name: "Moat"
-display_name: "East Area"
+panel_display_name: "East Area"
 paintings {
  name: "CASTLE"
  path: "Components/Paintings/Group1/castle"
diff --git a/data/maps/daedalus/rooms/North Castle Area.txtpb b/data/maps/daedalus/rooms/North Castle Area.txtpb
index 6d177c9..a549245 100644
--- a/data/maps/daedalus/rooms/North Castle Area.txtpb
+++ b/data/maps/daedalus/rooms/North Castle Area.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Number Paintings Area.txtpb b/data/maps/daedalus/rooms/Number Paintings Area.txtpb
index fb01075..15c8875 100644
--- a/data/maps/daedalus/rooms/Number Paintings Area.txtpb
+++ b/data/maps/daedalus/rooms/Number Paintings Area.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Nursery.txtpb b/data/maps/daedalus/rooms/Nursery.txtpb
index cd1b5e3..c73072d 100644
--- a/data/maps/daedalus/rooms/Nursery.txtpb
+++ b/data/maps/daedalus/rooms/Nursery.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/O2 Prize.txtpb b/data/maps/daedalus/rooms/O2 Prize.txtpb
index 0a81954..a810182 100644
--- a/data/maps/daedalus/rooms/O2 Prize.txtpb
+++ b/data/maps/daedalus/rooms/O2 Prize.txtpb

@@ -1,5 +1,5 @@
 name: "O2 Prize"
-display_name: "O2 Room"
+panel_display_name: "O2 Room"
 letters {
  key: "o"
  level2: true
diff --git a/data/maps/daedalus/rooms/O2 Room.txtpb b/data/maps/daedalus/rooms/O2 Room.txtpb
index 7ea3ce2..b1a839f 100644
--- a/data/maps/daedalus/rooms/O2 Room.txtpb
+++ b/data/maps/daedalus/rooms/O2 Room.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Orange Room.txtpb b/data/maps/daedalus/rooms/Orange Room.txtpb
index ba1bedd..08a0ff2 100644
--- a/data/maps/daedalus/rooms/Orange Room.txtpb
+++ b/data/maps/daedalus/rooms/Orange Room.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Outside Book Room.txtpb b/data/maps/daedalus/rooms/Outside Book Room.txtpb
index a8e647f..1592217 100644
--- a/data/maps/daedalus/rooms/Outside Book Room.txtpb
+++ b/data/maps/daedalus/rooms/Outside Book Room.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Outside Eye Temple.txtpb b/data/maps/daedalus/rooms/Outside Eye Temple.txtpb
index c7d35fd..85a9c19 100644
--- a/data/maps/daedalus/rooms/Outside Eye Temple.txtpb
+++ b/data/maps/daedalus/rooms/Outside Eye Temple.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Outside Hedges.txtpb b/data/maps/daedalus/rooms/Outside Hedges.txtpb
index b157beb..9f32e26 100644
--- a/data/maps/daedalus/rooms/Outside Hedges.txtpb
+++ b/data/maps/daedalus/rooms/Outside Hedges.txtpb

@@ -1,5 +1,5 @@
 name: "Outside Hedges"
-display_name: "Hedges"
+panel_display_name: "Hedges"
 panels {
  name: "GOURD (1)"
  path: "Panels/Halls/halls_11"
diff --git a/data/maps/daedalus/rooms/Outside Hotel.txtpb b/data/maps/daedalus/rooms/Outside Hotel.txtpb
index 62b5a41..7766c7d 100644
--- a/data/maps/daedalus/rooms/Outside Hotel.txtpb
+++ b/data/maps/daedalus/rooms/Outside Hotel.txtpb

@@ -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)"
 }
diff --git a/data/maps/daedalus/rooms/Outside House.txtpb b/data/maps/daedalus/rooms/Outside House.txtpb
index 8a5e911..fd3f5f0 100644
--- a/data/maps/daedalus/rooms/Outside House.txtpb
+++ b/data/maps/daedalus/rooms/Outside House.txtpb

@@ -1,5 +1,5 @@
 name: "Outside House"
-display_name: "Maze"
+panel_display_name: "Maze"
 panels {
  name: "WHISPER"
  path: "Panels/Beehalls/beehalls_1"
diff --git a/data/maps/daedalus/rooms/Outside Magic Room.txtpb b/data/maps/daedalus/rooms/Outside Magic Room.txtpb
index ef45563..2aa7848 100644
--- a/data/maps/daedalus/rooms/Outside Magic Room.txtpb
+++ b/data/maps/daedalus/rooms/Outside Magic Room.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Outside Orange Room.txtpb b/data/maps/daedalus/rooms/Outside Orange Room.txtpb
index a50db78..55efe34 100644
--- a/data/maps/daedalus/rooms/Outside Orange Room.txtpb
+++ b/data/maps/daedalus/rooms/Outside Orange Room.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Outside Pyramid.txtpb b/data/maps/daedalus/rooms/Outside Pyramid.txtpb
index fd7ef21..247d3a8 100644
--- a/data/maps/daedalus/rooms/Outside Pyramid.txtpb
+++ b/data/maps/daedalus/rooms/Outside Pyramid.txtpb

@@ -1,5 +1,5 @@
 name: "Outside Pyramid"
-display_name: "Pyramid"
+panel_display_name: "Pyramid"
 panels {
  name: "PEER"
  path: "Panels/Pyramid/pyramid_entry"
diff --git a/data/maps/daedalus/rooms/Outside Red Room.txtpb b/data/maps/daedalus/rooms/Outside Red Room.txtpb
index e5be363..307633b 100644
--- a/data/maps/daedalus/rooms/Outside Red Room.txtpb
+++ b/data/maps/daedalus/rooms/Outside Red Room.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Outside Salt Room.txtpb b/data/maps/daedalus/rooms/Outside Salt Room.txtpb
index 3d374f8..f5c4833 100644
--- a/data/maps/daedalus/rooms/Outside Salt Room.txtpb
+++ b/data/maps/daedalus/rooms/Outside Salt Room.txtpb

@@ -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)"
 }
diff --git a/data/maps/daedalus/rooms/Outside Snake Room.txtpb b/data/maps/daedalus/rooms/Outside Snake Room.txtpb
index b65ee77..31f3281 100644
--- a/data/maps/daedalus/rooms/Outside Snake Room.txtpb
+++ b/data/maps/daedalus/rooms/Outside Snake Room.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Pains Room.txtpb b/data/maps/daedalus/rooms/Pains Room.txtpb
index cc0c7bb..d5c9c4a 100644
--- a/data/maps/daedalus/rooms/Pains Room.txtpb
+++ b/data/maps/daedalus/rooms/Pains Room.txtpb

@@ -1,5 +1,5 @@
 name: "Pains Room"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
  name: "MOO"
  path: "Panels/Gold/gold_1"
diff --git a/data/maps/daedalus/rooms/Pairs Room.txtpb b/data/maps/daedalus/rooms/Pairs Room.txtpb
index ca5e885..ba484bf 100644
--- a/data/maps/daedalus/rooms/Pairs Room.txtpb
+++ b/data/maps/daedalus/rooms/Pairs Room.txtpb

@@ -1,2 +1,2 @@
 name: "Pairs Room"
-display_name: "West Area"
+panel_display_name: "West Area"
diff --git a/data/maps/daedalus/rooms/Pepper Room.txtpb b/data/maps/daedalus/rooms/Pepper Room.txtpb
index 074869f..104efa7 100644
--- a/data/maps/daedalus/rooms/Pepper Room.txtpb
+++ b/data/maps/daedalus/rooms/Pepper Room.txtpb

@@ -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)"
 }
diff --git a/data/maps/daedalus/rooms/Plum Room.txtpb b/data/maps/daedalus/rooms/Plum Room.txtpb
index 90243a4..36185b9 100644
--- a/data/maps/daedalus/rooms/Plum Room.txtpb
+++ b/data/maps/daedalus/rooms/Plum Room.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Post Orange Smiley Three Way.txtpb b/data/maps/daedalus/rooms/Post Orange Smiley Three Way.txtpb
index 868ff86..63463f0 100644
--- a/data/maps/daedalus/rooms/Post Orange Smiley Three Way.txtpb
+++ b/data/maps/daedalus/rooms/Post Orange Smiley Three Way.txtpb

@@ -1,2 +1,2 @@
 name: "Post Orange Smiley Three Way"
-display_name: "West Area"
+panel_display_name: "West Area"
diff --git a/data/maps/daedalus/rooms/Pumpkin Entrance.txtpb b/data/maps/daedalus/rooms/Pumpkin Entrance.txtpb
index c7fc3d1..a746746 100644
--- a/data/maps/daedalus/rooms/Pumpkin Entrance.txtpb
+++ b/data/maps/daedalus/rooms/Pumpkin Entrance.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Pumpkin Room.txtpb b/data/maps/daedalus/rooms/Pumpkin Room.txtpb
index 345b372..e40693b 100644
--- a/data/maps/daedalus/rooms/Pumpkin Room.txtpb
+++ b/data/maps/daedalus/rooms/Pumpkin Room.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Purple Hallway From Great.txtpb b/data/maps/daedalus/rooms/Purple Hallway From Great.txtpb
index fef68e9..5284133 100644
--- a/data/maps/daedalus/rooms/Purple Hallway From Great.txtpb
+++ b/data/maps/daedalus/rooms/Purple Hallway From Great.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Purple NW Vestibule.txtpb b/data/maps/daedalus/rooms/Purple NW Vestibule.txtpb
index 6aedce9..0244e6c 100644
--- a/data/maps/daedalus/rooms/Purple NW Vestibule.txtpb
+++ b/data/maps/daedalus/rooms/Purple NW Vestibule.txtpb

@@ -1,5 +1,5 @@
 name: "Purple NW Vestibule"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
  name: "MESSAGES"
  path: "Panels/Purple Exterior/purple_8"
diff --git a/data/maps/daedalus/rooms/Purple Room East.txtpb b/data/maps/daedalus/rooms/Purple Room East.txtpb
index a866868..6fa31bd 100644
--- a/data/maps/daedalus/rooms/Purple Room East.txtpb
+++ b/data/maps/daedalus/rooms/Purple Room East.txtpb

@@ -1,2 +1,2 @@
 name: "Purple Room East"
-display_name: "Central"
+panel_display_name: "Central"
diff --git a/data/maps/daedalus/rooms/Purple Room South.txtpb b/data/maps/daedalus/rooms/Purple Room South.txtpb
index b6a25e6..68a6264 100644
--- a/data/maps/daedalus/rooms/Purple Room South.txtpb
+++ b/data/maps/daedalus/rooms/Purple Room South.txtpb

@@ -1,5 +1,5 @@
 name: "Purple Room South"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
  name: "LITTLE"
  path: "Panels/Halls/hof_1"
diff --git a/data/maps/daedalus/rooms/Purple Room West.txtpb b/data/maps/daedalus/rooms/Purple Room West.txtpb
index 8c20399..9971cd2 100644
--- a/data/maps/daedalus/rooms/Purple Room West.txtpb
+++ b/data/maps/daedalus/rooms/Purple Room West.txtpb

@@ -1,2 +1,2 @@
 name: "Purple Room West"
-display_name: "Central"
+panel_display_name: "Central"
diff --git a/data/maps/daedalus/rooms/Purple Room.txtpb b/data/maps/daedalus/rooms/Purple Room.txtpb
index 612f8d8..f34d26c 100644
--- a/data/maps/daedalus/rooms/Purple Room.txtpb
+++ b/data/maps/daedalus/rooms/Purple Room.txtpb

@@ -1,5 +1,5 @@
 name: "Purple Room"
-display_name: "Central"
+panel_display_name: "Purple Room"
 panels {
  name: "HOIST"
  path: "Panels/Purple Room/purple_1"
diff --git a/data/maps/daedalus/rooms/Purple SE Vestibule.txtpb b/data/maps/daedalus/rooms/Purple SE Vestibule.txtpb
index 5f34151..be86861 100644
--- a/data/maps/daedalus/rooms/Purple SE Vestibule.txtpb
+++ b/data/maps/daedalus/rooms/Purple SE Vestibule.txtpb

@@ -1,5 +1,5 @@
 name: "Purple SE Vestibule"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
  name: "RUN"
  path: "Panels/Purple Exterior/purple_1"
diff --git a/data/maps/daedalus/rooms/Purple SW Vestibule.txtpb b/data/maps/daedalus/rooms/Purple SW Vestibule.txtpb
index 05acc75..fbc5fff 100644
--- a/data/maps/daedalus/rooms/Purple SW Vestibule.txtpb
+++ b/data/maps/daedalus/rooms/Purple SW Vestibule.txtpb

@@ -1,5 +1,5 @@
 name: "Purple SW Vestibule"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
  name: "LETTERS"
  path: "Panels/Purple Exterior/purple_11"
diff --git a/data/maps/daedalus/rooms/Purple Smiley.txtpb b/data/maps/daedalus/rooms/Purple Smiley.txtpb
index 515336f..5f6c989 100644
--- a/data/maps/daedalus/rooms/Purple Smiley.txtpb
+++ b/data/maps/daedalus/rooms/Purple Smiley.txtpb

@@ -1,5 +1,5 @@
 name: "Purple Smiley"
-display_name: "Northeast Area"
+panel_display_name: "Northeast Area"
 panels {
  name: "SMILE"
  path: "Panels/Smiley Rooms/purple"
diff --git a/data/maps/daedalus/rooms/Pyramid 3.txtpb b/data/maps/daedalus/rooms/Pyramid 3.txtpb
index f760ab0..be862d1 100644
--- a/data/maps/daedalus/rooms/Pyramid 3.txtpb
+++ b/data/maps/daedalus/rooms/Pyramid 3.txtpb

@@ -1,5 +1,5 @@
 name: "Pyramid 3"
-display_name: "Pyramid"
+panel_display_name: "Pyramid"
 panels {
  name: "VEHICLE"
  path: "Panels/Pyramid/pyramid_3"
diff --git a/data/maps/daedalus/rooms/Pyramid 4.txtpb b/data/maps/daedalus/rooms/Pyramid 4.txtpb
index 3247ffa..e67e1c6 100644
--- a/data/maps/daedalus/rooms/Pyramid 4.txtpb
+++ b/data/maps/daedalus/rooms/Pyramid 4.txtpb

@@ -1,5 +1,5 @@
 name: "Pyramid 4"
-display_name: "Pyramid"
+panel_display_name: "Pyramid"
 panels {
  name: "CAT"
  path: "Panels/Pyramid/pyramid_4"
diff --git a/data/maps/daedalus/rooms/Pyramid 5.txtpb b/data/maps/daedalus/rooms/Pyramid 5.txtpb
index fc05e50..42e8a52 100644
--- a/data/maps/daedalus/rooms/Pyramid 5.txtpb
+++ b/data/maps/daedalus/rooms/Pyramid 5.txtpb

@@ -1,5 +1,5 @@
 name: "Pyramid 5"
-display_name: "Pyramid"
+panel_display_name: "Pyramid"
 panels {
  name: "ROYAL"
  path: "Panels/Pyramid/pyramid_5"
diff --git a/data/maps/daedalus/rooms/Pyramid 6.txtpb b/data/maps/daedalus/rooms/Pyramid 6.txtpb
index 78efb0c..3a7346b 100644
--- a/data/maps/daedalus/rooms/Pyramid 6.txtpb
+++ b/data/maps/daedalus/rooms/Pyramid 6.txtpb

@@ -1,5 +1,5 @@
 name: "Pyramid 6"
-display_name: "Pyramid"
+panel_display_name: "Pyramid"
 panels {
  name: "TEA"
  path: "Panels/Pyramid/pyramid_6"
diff --git a/data/maps/daedalus/rooms/Pyramid 7.txtpb b/data/maps/daedalus/rooms/Pyramid 7.txtpb
index bf4ebc6..2db71ea 100644
--- a/data/maps/daedalus/rooms/Pyramid 7.txtpb
+++ b/data/maps/daedalus/rooms/Pyramid 7.txtpb

@@ -1,5 +1,5 @@
 name: "Pyramid 7"
-display_name: "Pyramid"
+panel_display_name: "Pyramid"
 panels {
  name: "ARTIST"
  path: "Panels/Pyramid/pyramid_7"
diff --git a/data/maps/daedalus/rooms/Pyramid 8.txtpb b/data/maps/daedalus/rooms/Pyramid 8.txtpb
index f65fc69..6f61340 100644
--- a/data/maps/daedalus/rooms/Pyramid 8.txtpb
+++ b/data/maps/daedalus/rooms/Pyramid 8.txtpb

@@ -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)"
 }
diff --git a/data/maps/daedalus/rooms/Pyramid Entry.txtpb b/data/maps/daedalus/rooms/Pyramid Entry.txtpb
index 3bb531f..2c9e841 100644
--- a/data/maps/daedalus/rooms/Pyramid Entry.txtpb
+++ b/data/maps/daedalus/rooms/Pyramid Entry.txtpb

@@ -1,5 +1,5 @@
 name: "Pyramid Entry"
-display_name: "Pyramid"
+panel_display_name: "Pyramid"
 panels {
  name: "TREE"
  path: "Panels/Pyramid/pyramid_1"
diff --git a/data/maps/daedalus/rooms/Pyramid Second Floor.txtpb b/data/maps/daedalus/rooms/Pyramid Second Floor.txtpb
index e7578e8..86f5f2a 100644
--- a/data/maps/daedalus/rooms/Pyramid Second Floor.txtpb
+++ b/data/maps/daedalus/rooms/Pyramid Second Floor.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Pyramid Top.txtpb b/data/maps/daedalus/rooms/Pyramid Top.txtpb
index b3938fd..c017cd6 100644
--- a/data/maps/daedalus/rooms/Pyramid Top.txtpb
+++ b/data/maps/daedalus/rooms/Pyramid Top.txtpb

@@ -1,5 +1,5 @@
 name: "Pyramid Top"
-display_name: "Pyramid"
+panel_display_name: "Pyramid"
 letters {
  key: "r"
  level2: true
diff --git a/data/maps/daedalus/rooms/Quiet Entrance.txtpb b/data/maps/daedalus/rooms/Quiet Entrance.txtpb
index 21e0f68..08fbcc7 100644
--- a/data/maps/daedalus/rooms/Quiet Entrance.txtpb
+++ b/data/maps/daedalus/rooms/Quiet Entrance.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Rain Side.txtpb b/data/maps/daedalus/rooms/Rain Side.txtpb
index 63e95c8..6906aef 100644
--- a/data/maps/daedalus/rooms/Rain Side.txtpb
+++ b/data/maps/daedalus/rooms/Rain Side.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Rainbow Blue.txtpb b/data/maps/daedalus/rooms/Rainbow Blue.txtpb
index b566cbb..516a9b6 100644
--- a/data/maps/daedalus/rooms/Rainbow Blue.txtpb
+++ b/data/maps/daedalus/rooms/Rainbow Blue.txtpb

@@ -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)"
 }
diff --git a/data/maps/daedalus/rooms/Rainbow Color Backside.txtpb b/data/maps/daedalus/rooms/Rainbow Color Backside.txtpb
index 3fb3a5c..d9b49c5 100644
--- a/data/maps/daedalus/rooms/Rainbow Color Backside.txtpb
+++ b/data/maps/daedalus/rooms/Rainbow Color Backside.txtpb

@@ -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"
 }
diff --git a/data/maps/daedalus/rooms/Rainbow Color Doors.txtpb b/data/maps/daedalus/rooms/Rainbow Color Doors.txtpb
index 3204d28..df44979 100644
--- a/data/maps/daedalus/rooms/Rainbow Color Doors.txtpb
+++ b/data/maps/daedalus/rooms/Rainbow Color Doors.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Rainbow Cyan.txtpb b/data/maps/daedalus/rooms/Rainbow Cyan.txtpb
index 9ce8b3f..f55b0d2 100644
--- a/data/maps/daedalus/rooms/Rainbow Cyan.txtpb
+++ b/data/maps/daedalus/rooms/Rainbow Cyan.txtpb

@@ -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)"
 }
diff --git a/data/maps/daedalus/rooms/Rainbow End.txtpb b/data/maps/daedalus/rooms/Rainbow End.txtpb
index 27f3c4f..ec623c7 100644
--- a/data/maps/daedalus/rooms/Rainbow End.txtpb
+++ b/data/maps/daedalus/rooms/Rainbow End.txtpb

@@ -1,5 +1,5 @@
 name: "Rainbow End"
-display_name: "Rainbow"
+panel_display_name: "Rainbow"
 panels {
  name: "POT"
  path: "Components/Warps/gold"
diff --git a/data/maps/daedalus/rooms/Rainbow Green.txtpb b/data/maps/daedalus/rooms/Rainbow Green.txtpb
index 84de8a5..85bb8be 100644
--- a/data/maps/daedalus/rooms/Rainbow Green.txtpb
+++ b/data/maps/daedalus/rooms/Rainbow Green.txtpb

@@ -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)"
 }
diff --git a/data/maps/daedalus/rooms/Rainbow Orange.txtpb b/data/maps/daedalus/rooms/Rainbow Orange.txtpb
index 290c061..785eda8 100644
--- a/data/maps/daedalus/rooms/Rainbow Orange.txtpb
+++ b/data/maps/daedalus/rooms/Rainbow Orange.txtpb

@@ -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)"
 }
diff --git a/data/maps/daedalus/rooms/Rainbow Purple.txtpb b/data/maps/daedalus/rooms/Rainbow Purple.txtpb
index 698af59..1f585dd 100644
--- a/data/maps/daedalus/rooms/Rainbow Purple.txtpb
+++ b/data/maps/daedalus/rooms/Rainbow Purple.txtpb

@@ -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)"
 }
diff --git a/data/maps/daedalus/rooms/Rainbow Red.txtpb b/data/maps/daedalus/rooms/Rainbow Red.txtpb
index 92dbda0..7ef4db3 100644
--- a/data/maps/daedalus/rooms/Rainbow Red.txtpb
+++ b/data/maps/daedalus/rooms/Rainbow Red.txtpb

@@ -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)"
 }
diff --git a/data/maps/daedalus/rooms/Rainbow Start.txtpb b/data/maps/daedalus/rooms/Rainbow Start.txtpb
index e0d5dc1..c46b762 100644
--- a/data/maps/daedalus/rooms/Rainbow Start.txtpb
+++ b/data/maps/daedalus/rooms/Rainbow Start.txtpb

@@ -1,5 +1,5 @@
 name: "Rainbow Start"
-display_name: "Rainbow"
+panel_display_name: "Rainbow"
 panels {
  name: "PAINTING"
  path: "Panels/Smiley Rooms/rainbow"
diff --git a/data/maps/daedalus/rooms/Rainbow Yellow.txtpb b/data/maps/daedalus/rooms/Rainbow Yellow.txtpb
index bbbdce4..bd2cfc5 100644
--- a/data/maps/daedalus/rooms/Rainbow Yellow.txtpb
+++ b/data/maps/daedalus/rooms/Rainbow Yellow.txtpb

@@ -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)"
 }
diff --git a/data/maps/daedalus/rooms/Red Color Door.txtpb b/data/maps/daedalus/rooms/Red Color Door.txtpb
index a2f40a5..f7eab21 100644
--- a/data/maps/daedalus/rooms/Red Color Door.txtpb
+++ b/data/maps/daedalus/rooms/Red Color Door.txtpb

@@ -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)"
 }
diff --git a/data/maps/daedalus/rooms/Red Room.txtpb b/data/maps/daedalus/rooms/Red Room.txtpb
index 99f0a1e..d73f591 100644
--- a/data/maps/daedalus/rooms/Red Room.txtpb
+++ b/data/maps/daedalus/rooms/Red Room.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Red Smiley.txtpb b/data/maps/daedalus/rooms/Red Smiley.txtpb
index 6f7c41c..28f2a03 100644
--- a/data/maps/daedalus/rooms/Red Smiley.txtpb
+++ b/data/maps/daedalus/rooms/Red Smiley.txtpb

@@ -1,5 +1,5 @@
 name: "Red Smiley"
-display_name: "Northwest Area"
+panel_display_name: "Northwest Area"
 panels {
  name: "SMILE"
  path: "Panels/Smiley Rooms/red"
diff --git a/data/maps/daedalus/rooms/Salt Room.txtpb b/data/maps/daedalus/rooms/Salt Room.txtpb
index 0c7fe73..39c9c9f 100644
--- a/data/maps/daedalus/rooms/Salt Room.txtpb
+++ b/data/maps/daedalus/rooms/Salt Room.txtpb

@@ -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)"
 }
diff --git a/data/maps/daedalus/rooms/Seasoning Room.txtpb b/data/maps/daedalus/rooms/Seasoning Room.txtpb
index d3123b9..6159134 100644
--- a/data/maps/daedalus/rooms/Seasoning Room.txtpb
+++ b/data/maps/daedalus/rooms/Seasoning Room.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Snake Room.txtpb b/data/maps/daedalus/rooms/Snake Room.txtpb
index f3cea2e..fb947ab 100644
--- a/data/maps/daedalus/rooms/Snake Room.txtpb
+++ b/data/maps/daedalus/rooms/Snake Room.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/South Castle Area.txtpb b/data/maps/daedalus/rooms/South Castle Area.txtpb
index 9e9f389..4bb73f3 100644
--- a/data/maps/daedalus/rooms/South Castle Area.txtpb
+++ b/data/maps/daedalus/rooms/South Castle Area.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Starting Room.txtpb b/data/maps/daedalus/rooms/Starting Room.txtpb
index 615104b..62fc96a 100644
--- a/data/maps/daedalus/rooms/Starting Room.txtpb
+++ b/data/maps/daedalus/rooms/Starting Room.txtpb

@@ -1,5 +1,5 @@
 name: "Starting Room"
-display_name: "Central"
+panel_display_name: "Central"
 panels {
  name: "ENTRANCE"
  path: "Panels/Entry/entry_1"
diff --git a/data/maps/daedalus/rooms/Sweet Foyer.txtpb b/data/maps/daedalus/rooms/Sweet Foyer.txtpb
index d337e7e..03c8262 100644
--- a/data/maps/daedalus/rooms/Sweet Foyer.txtpb
+++ b/data/maps/daedalus/rooms/Sweet Foyer.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Tree Entrance.txtpb b/data/maps/daedalus/rooms/Tree Entrance.txtpb
index df2db7e..2b98178 100644
--- a/data/maps/daedalus/rooms/Tree Entrance.txtpb
+++ b/data/maps/daedalus/rooms/Tree Entrance.txtpb

@@ -1,5 +1,5 @@
 name: "Tree Entrance"
-display_name: "Outside Pumpkin"
+panel_display_name: "Outside Pumpkin"
 panels {
  name: "RAT"
  path: "Panels/Hexes/lime_1"
diff --git a/data/maps/daedalus/rooms/U2 Prize.txtpb b/data/maps/daedalus/rooms/U2 Prize.txtpb
index 947af67..571b0c8 100644
--- a/data/maps/daedalus/rooms/U2 Prize.txtpb
+++ b/data/maps/daedalus/rooms/U2 Prize.txtpb

@@ -1,5 +1,5 @@
 name: "U2 Prize"
-display_name: "U2 Room"
+panel_display_name: "U2 Room"
 letters {
  key: "u"
  level2: true
diff --git a/data/maps/daedalus/rooms/U2 Room.txtpb b/data/maps/daedalus/rooms/U2 Room.txtpb
index c9907eb..1e5879a 100644
--- a/data/maps/daedalus/rooms/U2 Room.txtpb
+++ b/data/maps/daedalus/rooms/U2 Room.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Unkempt Entrance.txtpb b/data/maps/daedalus/rooms/Unkempt Entrance.txtpb
index 192ba9c..c0cb0df 100644
--- a/data/maps/daedalus/rooms/Unkempt Entrance.txtpb
+++ b/data/maps/daedalus/rooms/Unkempt Entrance.txtpb

@@ -1,5 +1,5 @@
 name: "Unkempt Entrance"
-display_name: "O2 Room"
+panel_display_name: "O2 Room"
 ports {
  name: "UNKEMPT"
  path: "Components/Warps/Worldports/worldport6"
diff --git a/data/maps/daedalus/rooms/Welcome Back Area.txtpb b/data/maps/daedalus/rooms/Welcome Back Area.txtpb
index 3f320a3..701baca 100644
--- a/data/maps/daedalus/rooms/Welcome Back Area.txtpb
+++ b/data/maps/daedalus/rooms/Welcome Back Area.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Welcome Back Exit.txtpb b/data/maps/daedalus/rooms/Welcome Back Exit.txtpb
index a4a23e2..ac221c7 100644
--- a/data/maps/daedalus/rooms/Welcome Back Exit.txtpb
+++ b/data/maps/daedalus/rooms/Welcome Back Exit.txtpb

@@ -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)"
 }
diff --git a/data/maps/daedalus/rooms/West Castle Area.txtpb b/data/maps/daedalus/rooms/West Castle Area.txtpb
index 88722f5..010e5d6 100644
--- a/data/maps/daedalus/rooms/West Castle Area.txtpb
+++ b/data/maps/daedalus/rooms/West Castle Area.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/West Spire.txtpb b/data/maps/daedalus/rooms/West Spire.txtpb
index fdf8f9a..7cc579f 100644
--- a/data/maps/daedalus/rooms/West Spire.txtpb
+++ b/data/maps/daedalus/rooms/West Spire.txtpb

@@ -1,5 +1,5 @@
 name: "West Spire"
-display_name: "West Area"
+panel_display_name: "West Area"
 panels {
  name: "MISSING"
  path: "Panels/Entry/wb_5"
diff --git a/data/maps/daedalus/rooms/White Hallway From Entry.txtpb b/data/maps/daedalus/rooms/White Hallway From Entry.txtpb
index 2af7584..a172313 100644
--- a/data/maps/daedalus/rooms/White Hallway From Entry.txtpb
+++ b/data/maps/daedalus/rooms/White Hallway From Entry.txtpb

@@ -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
diff --git a/data/maps/daedalus/rooms/Wisdom Panel.txtpb b/data/maps/daedalus/rooms/Wisdom Panel.txtpb
index 5cbf051..d789f2b 100644
--- a/data/maps/daedalus/rooms/Wisdom Panel.txtpb
+++ b/data/maps/daedalus/rooms/Wisdom Panel.txtpb

@@ -1,5 +1,5 @@
 name: "Wisdom Panel"
-display_name: "Castle"
+panel_display_name: "Castle"
 panels {
  name: "INTELLIGENCE"
  path: "Components/Warps/numbers"
diff --git a/data/maps/daedalus/rooms/Wonderland.txtpb b/data/maps/daedalus/rooms/Wonderland.txtpb
index 99c124e..4b69e99 100644
--- a/data/maps/daedalus/rooms/Wonderland.txtpb
+++ b/data/maps/daedalus/rooms/Wonderland.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Yellow Color Backside.txtpb b/data/maps/daedalus/rooms/Yellow Color Backside.txtpb
index 931e501..1c29b43 100644
--- a/data/maps/daedalus/rooms/Yellow Color Backside.txtpb
+++ b/data/maps/daedalus/rooms/Yellow Color Backside.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Yellow Color Door.txtpb b/data/maps/daedalus/rooms/Yellow Color Door.txtpb
index a098c91..f22c954 100644
--- a/data/maps/daedalus/rooms/Yellow Color Door.txtpb
+++ b/data/maps/daedalus/rooms/Yellow Color Door.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Yellow Room.txtpb b/data/maps/daedalus/rooms/Yellow Room.txtpb
index 1e84965..b4d8ff0 100644
--- a/data/maps/daedalus/rooms/Yellow Room.txtpb
+++ b/data/maps/daedalus/rooms/Yellow Room.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Yellow Smiley Annex.txtpb b/data/maps/daedalus/rooms/Yellow Smiley Annex.txtpb
index fa059c4..cb6c402 100644
--- a/data/maps/daedalus/rooms/Yellow Smiley Annex.txtpb
+++ b/data/maps/daedalus/rooms/Yellow Smiley Annex.txtpb

@@ -1,5 +1,5 @@
 name: "Yellow Smiley Annex"
-display_name: "Hedges"
+panel_display_name: "Hedges"
 panels {
  name: "COW"
  path: "Panels/Miscellaneous/plum1"
diff --git a/data/maps/daedalus/rooms/Z2 Prize.txtpb b/data/maps/daedalus/rooms/Z2 Prize.txtpb
index a7dd8fb..7b1ceae 100644
--- a/data/maps/daedalus/rooms/Z2 Prize.txtpb
+++ b/data/maps/daedalus/rooms/Z2 Prize.txtpb

@@ -1,5 +1,5 @@
 name: "Z2 Prize"
-display_name: "Northwest Area"
+panel_display_name: "Z2 Room"
 letters {
  key: "z"
  level2: true
diff --git a/data/maps/daedalus/rooms/Z2 Room.txtpb b/data/maps/daedalus/rooms/Z2 Room.txtpb
index 1e84dbc..513150a 100644
--- a/data/maps/daedalus/rooms/Z2 Room.txtpb
+++ b/data/maps/daedalus/rooms/Z2 Room.txtpb

@@ -1,5 +1,5 @@
 name: "Z2 Room"
-display_name: "Northwest Area"
+panel_display_name: "Z2 Room"
 panels {
  name: "EXHIBIT"
  path: "Panels/V Maze/entry"
diff --git a/data/maps/daedalus/rooms/Zoo Center.txtpb b/data/maps/daedalus/rooms/Zoo Center.txtpb
index fcf72a1..5a788db 100644
--- a/data/maps/daedalus/rooms/Zoo Center.txtpb
+++ b/data/maps/daedalus/rooms/Zoo Center.txtpb

@@ -1,5 +1,5 @@
 name: "Zoo Center"
-display_name: "Zoo"
+panel_display_name: "Zoo"
 letters {
  key: "v"
  level2: true
diff --git a/data/maps/daedalus/rooms/Zoo E.txtpb b/data/maps/daedalus/rooms/Zoo E.txtpb
index 59479dc..3195623 100644
--- a/data/maps/daedalus/rooms/Zoo E.txtpb
+++ b/data/maps/daedalus/rooms/Zoo E.txtpb

@@ -1,5 +1,5 @@
 name: "Zoo E"
-display_name: "Zoo"
+panel_display_name: "Zoo"
 panels {
  name: "WING"
  path: "Panels/V Maze/four_1"
diff --git a/data/maps/daedalus/rooms/Zoo N.txtpb b/data/maps/daedalus/rooms/Zoo N.txtpb
index e2c1f5d..d621ed4 100644
--- a/data/maps/daedalus/rooms/Zoo N.txtpb
+++ b/data/maps/daedalus/rooms/Zoo N.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Zoo NE.txtpb b/data/maps/daedalus/rooms/Zoo NE.txtpb
index 155172d..89bedae 100644
--- a/data/maps/daedalus/rooms/Zoo NE.txtpb
+++ b/data/maps/daedalus/rooms/Zoo NE.txtpb

@@ -1,5 +1,5 @@
 name: "Zoo NE"
-display_name: "Zoo"
+panel_display_name: "Zoo"
 panels {
  name: "FANG"
  path: "Panels/V Maze/four_5"
diff --git a/data/maps/daedalus/rooms/Zoo S.txtpb b/data/maps/daedalus/rooms/Zoo S.txtpb
index f4ddaea..3f3a8de 100644
--- a/data/maps/daedalus/rooms/Zoo S.txtpb
+++ b/data/maps/daedalus/rooms/Zoo S.txtpb

@@ -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"
diff --git a/data/maps/daedalus/rooms/Zoo SE.txtpb b/data/maps/daedalus/rooms/Zoo SE.txtpb
index 906d009..199f234 100644
--- a/data/maps/daedalus/rooms/Zoo SE.txtpb
+++ b/data/maps/daedalus/rooms/Zoo SE.txtpb

@@ -1,2 +1,2 @@
 name: "Zoo SE"
-display_name: "Zoo"
+panel_display_name: "Zoo"