From 554a461c952bd95a57cbc4bda565f8dd6f9be947 Mon Sep 17 00:00:00 2001
From: gymnast86 <stock.joann@gmail.com>
Date: Wed, 8 Apr 2026 16:11:11 -0700
Subject: [PATCH] add entrance aliases

---
 .../data/entrance_shuffle_data.yaml           | 168 ++++++++++++++++++
 src/dusk/randomizer/logic/entrance.cpp        |  25 ++-
 src/dusk/randomizer/logic/entrance.hpp        |  11 +-
 .../randomizer/logic/entrance_shuffle.cpp     |   6 +-
 src/dusk/randomizer/logic/spoiler_log.cpp     |  12 +-
 5 files changed, 211 insertions(+), 11 deletions(-)

diff --git a/src/dusk/randomizer/data/entrance_shuffle_data.yaml b/src/dusk/randomizer/data/entrance_shuffle_data.yaml
index 7f7e486b6c..a40fa3c80b 100644
--- a/src/dusk/randomizer/data/entrance_shuffle_data.yaml
+++ b/src/dusk/randomizer/data/entrance_shuffle_data.yaml
@@ -173,6 +173,7 @@
 - Type: Dungeon
   Forward:
     Connection: North Faron Woods -> Forest Temple Entrance
+    Alias: Faron Woods -> Forest Temple
     Stage: 6
     Room: 22
     Spawn: "00"
@@ -181,6 +182,7 @@
     State: "FF"
   Return:
     Connection: Forest Temple Entrance -> North Faron Woods
+    Alias: Forest Temple -> Faron Woods
     Stage: 45
     Room: 6
     Spawn: "01"
@@ -191,6 +193,7 @@
 - Type: Dungeon
   Forward:
     Connection: Death Mountain Sumo Hall Goron Mines Tunnel -> Goron Mines Entrance
+    Alias: Death Mountain Sumo Hall -> Goron Mines
     Stage: 3
     Room: 1
     Spawn: "01"
@@ -199,6 +202,7 @@
     State: "FF"
   Return:
     Connection: Goron Mines Entrance -> Death Mountain Sumo Hall Goron Mines Tunnel
+    Alias: Goron Mines -> Death Mountain Sumo Hall
     Stage: 69
     Room: 0
     Spawn: "01"
@@ -209,6 +213,7 @@
 - Type: Dungeon
   Forward:
     Connection: Lake Hylia Lakebed Temple Entrance -> Lakebed Temple Entrance
+    Alias: Lake Hylia -> Lakebed Temple
     Stage: 0
     Room: 0
     Spawn: "00"
@@ -217,6 +222,7 @@
     State: "FF"
   Return:
     Connection: Lakebed Temple Entrance -> Lake Hylia Lakebed Temple Entrance
+    Alias: Lakebed Temple -> Lake Hylia
     Stage: 52
     Room: 0
     Spawn: "0B"
@@ -227,6 +233,7 @@
 - Type: Dungeon
   Forward:
     Connection: Outside Arbiters Grounds -> Arbiters Grounds Entrance
+    Alias: Outside Arbiters Grounds -> Arbiters Grounds
     Stage: 24
     Room: 0
     Spawn: "00"
@@ -235,6 +242,7 @@
     State: "FF"
   Return:
     Connection: Arbiters Grounds Entrance -> Outside Arbiters Grounds
+    Alias: Arbiters Grounds -> Outside Arbiters Grounds
     Stage: 55
     Room: 3
     Spawn: "03"
@@ -246,6 +254,7 @@
   Door Couple Tag: Snowpeak Ruins Entrance
   Forward:
     Connection: Snowpeak Ruins East Door Exterior -> Snowpeak Ruins East Door Interior
+    Alias: Outside Snowpeak Ruins -> Snowpeak Ruins East Door
     Stage: 27
     Room: 0
     Spawn: "02"
@@ -254,6 +263,7 @@
     State: "FF"
   Return:
     Connection: Snowpeak Ruins East Door Interior -> Snowpeak Ruins East Door Exterior
+    Alias: Snowpeak Ruins East Door -> Outside Snowpeak Ruins
     Stage: 51
     Room: 1
     Spawn: "0A"
@@ -265,6 +275,7 @@
   Door Couple Tag: Snowpeak Ruins Entrance
   Forward:
     Connection: Snowpeak Ruins West Door Exterior -> Snowpeak Ruins West Door Interior
+    Alias: Outside Snowpeak Ruins -> Snowpeak Ruins West Door
     Stage: 27
     Room: 0
     Spawn: "01"
@@ -273,6 +284,7 @@
     State: "FF"
   Return:
     Connection: Snowpeak Ruins West Door Interior -> Snowpeak Ruins West Door Exterior
+    Alias: Snowpeak Ruins West Door -> Outside Snowpeak Ruins
     Stage: 51
     Room: 1
     Spawn: "09"
@@ -283,6 +295,7 @@
 - Type: Dungeon
   Forward:
     Connection: Sacred Grove Past Behind Window -> Temple of Time Entrance
+    Alias: Sacred Grove Past -> Temple of Time
     Stage: 9
     Room: 0
     Spawn: "00"
@@ -291,6 +304,7 @@
     State: "FF"
   Return:
     Connection: Temple of Time Entrance -> Sacred Grove Past Behind Window
+    Alias: Temple of Time -> Sacred Grove Past
     Stage: 54
     Room: 2
     Spawn: "01"
@@ -301,6 +315,7 @@
 - Type: Dungeon
   Forward:
     Connection: Lake Hylia -> City in the Sky Entrance
+    Alias: Lake Hylia -> City in the Sky
     Stage: 12
     Room: 0
     Spawn: "02"
@@ -309,6 +324,7 @@
     State: "FF"
   Return:
     Connection: City in the Sky Entrance -> Lake Hylia
+    Alias: City in the Sky -> Lake Hylia
     Stage: 52
     Room: 0
     Spawn: "4D"
@@ -319,6 +335,7 @@
 - Type: Dungeon
   Forward:
     Connection: Mirror Chamber Portal -> Palace of Twilight Entrance
+    Alias: Mirror Chamber -> Palace of Twilight
     Stage: 15
     Room: 0
     Spawn: "0A"
@@ -327,6 +344,7 @@
     State: "E"
   Return:
     Connection: Palace of Twilight Entrance -> Mirror Chamber Portal
+    Alias: Palace of Twilight -> Mirror Chamber
     Stage: 60
     Room: 4
     Spawn: "04"
@@ -337,6 +355,7 @@
 - Type: Dungeon
   Forward:
     Connection: Castle Town North Inside Barrier -> Hyrule Castle Entrance
+    Alias: Castle Town -> Hyrule Castle
     Stage: 20
     Room: 11
     Spawn: "00"
@@ -345,6 +364,7 @@
     State: "FF"
   Return:
     Connection: Hyrule Castle Entrance -> Castle Town North Inside Barrier
+    Alias: Hyrule Castle -> Castle Town
     Stage: 53
     Room: 1
     Spawn: "32"
@@ -359,6 +379,7 @@
 - Type: Boss
   Forward:
     Connection: Forest Temple Boss Door Room North Side -> Forest Temple Boss Room
+    Alias: Forest Temple -> Forest Temple Boss Room
     Stage: 7
     Room: 50
     Spawn: "01"
@@ -367,6 +388,7 @@
     State: "FF"
   Return:
     Connection: Forest Temple Boss Room -> South Faron Woods
+    Alias: Forest Temple Boss Room -> Faron Woods
     Stage: -1
     Room: -1
     Spawn: ""
@@ -377,6 +399,7 @@
 - Type: Boss
   Forward:
     Connection: Goron Mines Boss Door Room Near Boss Door -> Goron Mines Boss Room
+    Alias: Goron Mines -> Goron Mines Boss Room
     Stage: 4
     Room: 50
     Spawn: "01"
@@ -385,6 +408,7 @@
     State: "FF"
   Return:
     Connection: Goron Mines Boss Room -> Lower Kakariko Village
+    Alias: Goron Mines Boss Room -> Kakariko Village
     Stage: -1
     Room: -1
     Spawn: ""
@@ -395,6 +419,7 @@
 - Type: Boss
   Forward:
     Connection: Lakebed Temple Central Room Past Boss Door -> Lakebed Temple Boss Room
+    Alias: Lakebed Temple -> Lakebed Temple Boss Room
     Stage: 1
     Room: 50
     Spawn: "01"
@@ -403,6 +428,7 @@
     State: "FF"
   Return:
     Connection: Lakebed Temple Boss Room -> Lake Hylia Lanayru Spring
+    Alias: Lakebed Temple Boss Room -> Lanayru Spring
     Stage: -1
     Room: -1
     Spawn: ""
@@ -413,6 +439,7 @@
 - Type: Boss
   Forward:
     Connection: Arbiters Grounds Socket Room Near Boss Door -> Arbiters Grounds Boss Room
+    Alias: Arbiters Grounds -> Arbiters Grounds Boss Room
     Stage: 25
     Room: 50
     Spawn: "00"
@@ -421,6 +448,7 @@
     State: "FF"
   Return:
     Connection: Arbiters Grounds Boss Room -> Mirror Chamber Lower
+    Alias: Arbiters Grounds Boss Room -> Mirror Chamber
     Stage: -1
     Room: -1
     Spawn: ""
@@ -431,6 +459,7 @@
 - Type: Boss
   Forward:
     Connection: Snowpeak Ruins West Courtyard North Balcony -> Snowpeak Ruins Boss Room
+    Alias: Snowpeak Ruins -> Snowpeak Ruins Boss Room
     Stage: 27
     Room: 4
     Spawn: "01"
@@ -439,6 +468,7 @@
     State: "FF"
   Return:
     Connection: Snowpeak Ruins Boss Room -> Snowpeak Summit Lower
+    Alias: Snowpeak Ruins Boss Room -> Outside Snowpeak Ruins
     Stage: -1
     Room: -1
     Spawn: ""
@@ -449,6 +479,7 @@
 - Type: Boss
   Forward:
     Connection: Temple of Time Crumbling Corridor Near Boss Door -> Temple of Time Boss Room
+    Alias: Temple of Time -> Temple of Time Boss Room
     Stage: 10
     Room: 50
     Spawn: "00"
@@ -457,6 +488,7 @@
     State: "FF"
   Return:
     Connection: Temple of Time Boss Room -> Sacred Grove Past Behind Window
+    Alias: Temple of Time Boss Room -> Sacred Grove Past
     Stage: -1
     Room: -1
     Spawn: ""
@@ -467,6 +499,7 @@
 - Type: Boss
   Forward:
     Connection: City in the Sky North Tower Top -> City in the Sky Boss Room
+    Alias: City in the Sky -> City in the Sky Boss Room
     Stage: 13
     Room: 50
     Spawn: "01"
@@ -485,6 +518,7 @@
 - Type: Boss
   Forward:
     Connection: Palace of Twilight Boss Door Room -> Palace of Twilight Boss Room
+    Alias: Palace of Twilight -> Palace of Twilight Boss Room
     Stage: 16
     Room: 10
     Spawn: "00"
@@ -525,6 +559,7 @@
 - Type: Grotto
   Forward:
     Connection: Lost Woods Lower Battle Arena -> Lost Woods Baba Serpent Grotto
+    Alias: Lost Woods -> Lost Woods Baba Serpent Grotto
     Stage: 36
     Room: 1
     Spawn: "00"
@@ -533,6 +568,7 @@
     State: "2"
   Return:
     Connection: Lost Woods Baba Serpent Grotto -> Lost Woods Lower Battle Arena
+    Alias: Lost Woods Baba Serpent Grotto -> Lost Woods
     Stage: 54
     Room: 3
     Spawn: "05"
@@ -633,6 +669,7 @@
 - Type: Grotto
   Forward:
     Connection: Eldin Field Grotto Platform -> Eldin Field Stalfos Grotto
+    Alias: Eldin Field -> Eldin Field Stalfos Grotto
     Stage: 36
     Room: 1
     Spawn: "00"
@@ -641,6 +678,7 @@
     State: "0"
   Return:
     Connection: Eldin Field Stalfos Grotto -> Eldin Field Grotto Platform
+    Alias: Eldin Field Stalfos Grotto -> Eldin Field
     Stage: 56
     Room: 7
     Spawn: "02"
@@ -705,6 +743,7 @@
 - Type: Grotto
   Forward:
     Connection: Outside Castle Town West Grotto Ledge -> Outside Castle Town West Helmasaur Grotto
+    Alias: Outside Castle Town West -> Outside Castle Town West Helmasaur Grotto
     Stage: 35
     Room: 0
     Spawn: "00"
@@ -713,6 +752,7 @@
     State: "0"
   Return:
     Connection: Outside Castle Town West Helmasaur Grotto -> Outside Castle Town West Grotto Exit
+    Alias: Outside Castle Town West Helmasaur Grotto -> Outside Castle Town West
     Stage: 57
     Room: 8
     Spawn: "05"
@@ -723,6 +763,7 @@
 - Type: Grotto
   Forward:
     Connection: Outside Castle Town South Tektite Grotto Platform -> Outside Castle Town South Tektite Grotto
+    Alias: Outside Castle Town South -> Outside Castle Town South Tektite Grotto
     Stage: 39
     Room: 4
     Spawn: "00"
@@ -731,6 +772,7 @@
     State: "0"
   Return:
     Connection: Outside Castle Town South Tektite Grotto -> Outside Castle Town South Tektite Grotto Platform
+    Alias: Outside Castle Town South Tektite Grotto -> Outside Castle Town South
     Stage: 57
     Room: 16
     Spawn: "03"
@@ -741,6 +783,7 @@
 - Type: Grotto
   Forward:
     Connection: Lake Hylia Bridge Grotto Ledge -> Lake Hylia Bridge Bubble Grotto
+    Alias: Lake Hylia Bridge -> Lake Hylia Bridge Bubble Grotto
     Stage: 38
     Room: 3
     Spawn: "00"
@@ -749,6 +792,7 @@
     State: "0"
   Return:
     Connection: Lake Hylia Bridge Bubble Grotto -> Lake Hylia Bridge Grotto Ledge
+    Alias: Lake Hylia Bridge Bubble Grotto -> Lake Hylia Bridge
     Stage: 56
     Room: 13
     Spawn: "03"
@@ -759,6 +803,7 @@
 - Type: Grotto
   Forward:
     Connection: Lake Hylia Upper Area -> Lake Hylia Water Toadpoli Grotto
+    Alias: Lake Hylia -> Lake Hylia Water Toadpoli Grotto
     Stage: 39
     Room: 4
     Spawn: "00"
@@ -767,6 +812,7 @@
     State: "2"
   Return:
     Connection: Lake Hylia Water Toadpoli Grotto -> Lake Hylia Upper Area
+    Alias: Lake Hylia Water Toadpoli Grotto -> Lake Hylia
     Stage: 52
     Room: 0
     Spawn: "04"
@@ -777,6 +823,7 @@
 - Type: Grotto
   Forward:
     Connection: Lake Hylia Shell Blade Grotto Ledge -> Lake Hylia Shell Blade Grotto
+    Alias: Lake Hylia -> Lake Hylia Shell Blade Grotto
     Stage: 39
     Room: 4
     Spawn: "00"
@@ -785,6 +832,7 @@
     State: "4"
   Return:
     Connection: Lake Hylia Shell Blade Grotto -> Lake Hylia Shell Blade Grotto Ledge
+    Alias: Lake Hylia Shell Blade Grotto -> Lake Hylia
     Stage: 52
     Room: 0
     Spawn: "63"
@@ -813,6 +861,7 @@
 - Type: Grotto
   Forward:
     Connection: Gerudo Desert Basin -> Gerudo Desert Chu Grotto
+    Alias: Gerudo Desert -> Gerudo Desert Chu Grotto
     Stage: 37
     Room: 2
     Spawn: "00"
@@ -821,6 +870,7 @@
     State: "1"
   Return:
     Connection: Gerudo Desert Chu Grotto -> Gerudo Desert Basin
+    Alias: Gerudo Desert Chu Grotto -> Gerudo Desert
     Stage: 59
     Room: 0
     Spawn: "0A"
@@ -831,6 +881,7 @@
 - Type: Grotto
   Forward:
     Connection: Gerudo Desert North East Ledge -> Gerudo Desert Rock Grotto
+    Alias: Gerudo Desert -> Gerudo Desert Rock Grotto
     Stage: 37
     Room: 2
     Spawn: "00"
@@ -839,6 +890,7 @@
     State: "0"
   Return:
     Connection: Gerudo Desert Rock Grotto -> Gerudo Desert North East Ledge
+    Alias: Gerudo Desert Rock Grotto -> Gerudo Desert
     Stage: 59
     Room: 0
     Spawn: "09"
@@ -849,6 +901,7 @@
 - Type: Grotto
   Forward:
     Connection: Snowpeak Climb Upper -> Snowpeak Ice Keese Grotto
+    Alias: Snowpeak Climb -> Snowpeak Ice Keese Grotto
     Stage: 37
     Room: 2
     Spawn: "00"
@@ -857,6 +910,7 @@
     State: "2"
   Return:
     Connection: Snowpeak Ice Keese Grotto -> Snowpeak Climb Upper
+    Alias: Snowpeak Ice Keese Grotto -> Snowpeak Climb
     Stage: 51
     Room: 0
     Spawn: "02"
@@ -867,6 +921,7 @@
 - Type: Grotto
   Forward:
     Connection: Snowpeak Climb Upper -> Snowpeak Freezard Grotto
+    Alias: Snowpeak Climb -> Snowpeak Freezard Grotto
     Stage: 38
     Room: 3
     Spawn: "00"
@@ -875,6 +930,7 @@
     State: "2"
   Return:
     Connection: Snowpeak Freezard Grotto -> Snowpeak Climb Upper
+    Alias: Snowpeak Freezard Grotto -> Snowpeak Climb
     Stage: 51
     Room: 0
     Spawn: "01"
@@ -889,6 +945,7 @@
 - Type: Interior
   Forward:
     Connection: Outside Links House -> Ordon Links House
+    Alias: Outside Links House -> Links House
     Stage: 65
     Room: 4
     Spawn: "00"
@@ -897,6 +954,7 @@
     State: "FF"
   Return:
     Connection: Ordon Links House -> Outside Links House
+    Alias: Links House -> Outside Links House 
     Stage: 43
     Room: 1
     Spawn: "03"
@@ -998,6 +1056,7 @@
   Door Couple Tag: Ordon Bos House
   Forward:
     Connection: Ordon Bos House Left Door Exterior -> Ordon Bos House Left Door Interior
+    Alias: Ordon Village -> Ordon Bos House Left Door
     Stage: 65
     Room: 0
     Spawn: "01"
@@ -1006,6 +1065,7 @@
     State: "FF"
   Return:
     Connection: Ordon Bos House Left Door Interior -> Ordon Bos House Left Door Exterior
+    Alias: Ordon Bos House Left Door -> Ordon Village
     Stage: 43
     Room: 0
     Spawn: "0B"
@@ -1017,6 +1077,7 @@
   Door Couple Tag: Ordon Bos House
   Forward:
     Connection: Ordon Bos House Right Door Exterior -> Ordon Bos House Right Door Interior
+    Alias: Ordon Village -> Ordon Bos House Right Door
     Stage: 65
     Room: 0
     Spawn: "00"
@@ -1025,6 +1086,7 @@
     State: "FF"
   Return:
     Connection: Ordon Bos House Right Door Interior -> Ordon Bos House Right Door Exterior
+    Alias: Ordon Bos House Right Door -> Ordon Village
     Stage: 43
     Room: 0
     Spawn: "04"
@@ -1035,6 +1097,7 @@
 - Type: Interior
   Forward:
     Connection: South Faron Woods -> Faron Woods Coros House Lower
+    Alias: Faron Woods -> Coros House Door
     Stage: 67
     Room: 0
     Spawn: "01"
@@ -1043,6 +1106,7 @@
     State: "FF"
   Return:
     Connection: Faron Woods Coros House Lower -> South Faron Woods
+    Alias: Coros House Door -> Faron Woods
     Stage: 45
     Room: 4
     Spawn: "01"
@@ -1053,6 +1117,7 @@
 - Type: Interior
   Forward:
     Connection: South Faron Woods Coros Ledge -> Faron Woods Coros House Upper
+    Alias: Faron Woods -> Coros House Window
     Stage: 67
     Room: 0
     Spawn: "00"
@@ -1061,6 +1126,7 @@
     State: "FF"
   Return:
     Connection: Faron Woods Coros House Upper -> South Faron Woods Coros Ledge
+    Alias: Coros House Window -> Faron Woods
     Stage: 45
     Room: 4
     Spawn: "09"
@@ -1072,6 +1138,7 @@
   Door Couple Tag: Renados Sanctuary Front Door
   Forward:
     Connection: Renados Sanctuary Front East Door Exterior -> Renados Sanctuary Front East Door Interior
+    Alias: Kakriko Village -> Renados Sanctuary Front East Door
     Stage: 68
     Room: 0
     Spawn: "06"
@@ -1080,6 +1147,7 @@
     State: "FF"
   Return:
     Connection: Renados Sanctuary Front East Door Interior -> Renados Sanctuary Front East Door Exterior
+    Alias: Renados Sanctuary Front East Door -> Kakariko Village
     Stage: 46
     Room: 0
     Spawn: "30"
@@ -1091,6 +1159,7 @@
   Door Couple Tag: Renados Sanctuary Front Door
   Forward:
     Connection: Renados Sanctuary Front West Door Exterior -> Renados Sanctuary Front West Door Interior
+    Alias: Kakriko Village -> Renados Sanctuary Front West Door
     Stage: 68
     Room: 0
     Spawn: "05"
@@ -1099,6 +1168,7 @@
     State: "FF"
   Return:
     Connection: Renados Sanctuary Front West Door Interior -> Renados Sanctuary Front West Door Exterior
+    Alias: Renados Sanctuary Front West Door -> Kakariko Village
     Stage: 46
     Room: 0
     Spawn: "2E"
@@ -1110,6 +1180,7 @@
   Door Couple Tag: Renados Sanctuary Back Door
   Forward:
     Connection: Renados Sanctuary Back East Door Exterior -> Renados Sanctuary Back East Door Interior
+    Alias: Kakriko Village -> Renados Sanctuary Back East Door
     Stage: 68
     Room: 0
     Spawn: "08"
@@ -1118,6 +1189,7 @@
     State: "FF"
   Return:
     Connection: Renados Sanctuary Back East Door Interior -> Renados Sanctuary Back East Door Exterior
+    Alias: Renados Sanctuary Back East Door -> Kakariko Village
     Stage: 46
     Room: 0
     Spawn: "33"
@@ -1129,6 +1201,7 @@
   Door Couple Tag: Renados Sanctuary Back Door
   Forward:
     Connection: Renados Sanctuary Back West Door Exterior -> Renados Sanctuary Back West Door Interior
+    Alias: Kakriko Village -> Renados Sanctuary Back West Door
     Stage: 68
     Room: 0
     Spawn: "07"
@@ -1137,6 +1210,7 @@
     State: "FF"
   Return:
     Connection: Renados Sanctuary Back West Door Interior -> Renados Sanctuary Back West Door Exterior
+    Alias: Renados Sanctuary Back West Door -> Kakariko Village
     Stage: 46
     Room: 0
     Spawn: "32"
@@ -1165,6 +1239,7 @@
 - Type: Interior
   Forward:
     Connection: Lower Kakariko Village -> Kakariko Malo Mart
+    Alias: Kakariko Village -> Kakariko Malo Mart
     Stage: 68
     Room: 3
     Spawn: "00"
@@ -1173,6 +1248,7 @@
     State: "FF"
   Return:
     Connection: Kakariko Malo Mart -> Lower Kakariko Village
+    Alias: Kakariko Malo Mart -> Kakariko Village
     Stage: 46
     Room: 0
     Spawn: "28"
@@ -1184,6 +1260,7 @@
   Door Couple Tag: Elde Inn
   Forward:
     Connection: Elde Inn North Door Exterior -> Elde Inn North Door Interior
+    Alias: Kakariko Village -> Edle Inn North Door
     Stage: 68
     Room: 2
     Spawn: "02"
@@ -1192,6 +1269,7 @@
     State: "FF"
   Return:
     Connection: Elde Inn North Door Interior -> Elde Inn North Door Exterior
+    Alias: Elde Inn North Door -> Kakariko Village
     Stage: 46
     Room: 0
     Spawn: "31"
@@ -1203,6 +1281,7 @@
   Door Couple Tag: Elde Inn
   Forward:
     Connection: Elde Inn South Door Exterior -> Elde Inn South Door Interior
+    Alias: Kakariko Village -> Elde Inn South Door
     Stage: 68
     Room: 2
     Spawn: "00"
@@ -1211,6 +1290,7 @@
     State: "FF"
   Return:
     Connection: Elde Inn South Door Interior -> Elde Inn South Door Exterior
+    Alias: Elde Inn South Door -> Kakariko Village
     Stage: 46
     Room: 0
     Spawn: "2A"
@@ -1221,6 +1301,7 @@
 - Type: Interior
   Forward:
     Connection: Kakariko Bug House Door -> Kakariko Bug House
+    Alias: Kakariko Village -> Kakariko Bug House Door
     Stage: 68
     Room: 6
     Spawn: "05"
@@ -1229,6 +1310,7 @@
     State: "FF"
   Return:
     Connection: Kakariko Bug House -> Kakariko Bug House Door
+    Alias: Kakariko Bug House Door -> Kakariko Village
     Stage: 46
     Room: 0
     Spawn: "29"
@@ -1239,6 +1321,7 @@
 - Type: Interior
   Forward:
     Connection: Kakariko Bug House Ceiling Hole -> Kakariko Bug House
+    Alias: Kakariko Village -> Kakariko Bug House Ceiling Hole
     Stage: 68
     Room: 6
     Spawn: "00"
@@ -1247,6 +1330,7 @@
     State: "FF"
   Return:
     Connection: Kakariko Bug House -> Kakariko Bug House Ceiling Hole
+    Alias: Kakariko Bug House Ceiling Hole -> Kakariko Village
     Stage: 46
     Room: 0
     Spawn: "04"
@@ -1257,6 +1341,7 @@
 - Type: Interior
   Forward:
     Connection: Lower Kakariko Village -> Kakariko Barnes Bomb Shop Lower
+    Alias: Kakariko Village -> Kakariko Barnes Bomb Shop Door
     Stage: 68
     Room: 1
     Spawn: "02"
@@ -1265,6 +1350,7 @@
     State: "FF"
   Return:
     Connection: Kakariko Barnes Bomb Shop Lower -> Lower Kakariko Village
+    Alias: Kakariko Barnes Bomb Shop Door -> Kakariko Village
     Stage: 46
     Room: 0
     Spawn: "2C"
@@ -1275,6 +1361,7 @@
 - Type: Interior
   Forward:
     Connection: Upper Kakariko Village -> Kakariko Barnes Bomb Shop Upper
+    Alias: Kakariko Village -> Kakariko Barnes Bomb Shop Window
     Stage: 68
     Room: 1
     Spawn: "00"
@@ -1283,6 +1370,7 @@
     State: "FF"
   Return:
     Connection: Kakariko Barnes Bomb Shop Upper -> Upper Kakariko Village
+    Alias: Kakariko Barnes Bomb Shop Window -> Kakariko Village
     Stage: 46
     Room: 0
     Spawn: "0A"
@@ -1293,6 +1381,7 @@
 - Type: Interior
   Forward:
     Connection: Kakariko Watchtower Lower Door -> Kakariko Watchtower Lower Interior
+    Alias: Kakariko Village -> Kakariko Watchtower Lower Door
     Stage: 68
     Room: 4
     Spawn: "00"
@@ -1301,6 +1390,7 @@
     State: "FF"
   Return:
     Connection: Kakariko Watchtower Lower Interior -> Kakariko Watchtower Lower Door
+    Alias: Kakariko Watchtower Lower Door -> Kakariko Village
     Stage: 46
     Room: 0
     Spawn: "2D"
@@ -1311,6 +1401,7 @@
 - Type: Interior
   Forward:
     Connection: Kakariko Watchtower Dig Spot -> Kakariko Watchtower Lower Interior
+    Alias: Kakariko Village -> Kakariko Watchtower Dig Spot
     Stage: 68
     Room: 4
     Spawn: "01"
@@ -1319,6 +1410,7 @@
     State: "FF"
   Return:
     Connection: Kakariko Watchtower Lower Interior -> Kakariko Watchtower Dig Spot
+    Alias: Kakariko Watchtower Dig Spot -> Kakariko Village
     Stage: 46
     Room: 0
     Spawn: "03"
@@ -1329,6 +1421,7 @@
 - Type: Interior
   Forward:
     Connection: Kakariko Top of Watchtower -> Kakariko Watchtower Upper Interior
+    Alias: Kakariko Village -> Kakariko Watchtower Upper Door
     Stage: 68
     Room: 4
     Spawn: "02"
@@ -1337,6 +1430,7 @@
     State: "FF"
   Return:
     Connection: Kakariko Watchtower Upper Interior -> Kakariko Top of Watchtower
+    Alias: Kakariko Watchtower Upper Door -> Kakariko Village
     Stage: 46
     Room: 0
     Spawn: "2F"
@@ -1347,6 +1441,7 @@
 - Type: Interior
   Forward:
     Connection: Death Mountain Outside Sumo Hall -> Death Mountain Sumo Hall
+    Alias: Death Mountain -> Death Mountain Sumo Hall
     Stage: 69
     Room: 0
     Spawn: "00"
@@ -1355,6 +1450,7 @@
     State: "FF"
   Return:
     Connection: Death Mountain Sumo Hall -> Death Mountain Outside Sumo Hall
+    Alias: Death Mountain Sumo Hall -> Death Mountain
     Stage: 47
     Room: 3
     Spawn: "01"
@@ -1365,6 +1461,7 @@
 - Type: Interior
   Forward:
     Connection: Death Mountain Lower Elevator -> Death Mountain Sumo Hall Elevator
+    Alias: Death Mountain Elevator -> Death Mountain Sumo Hall
     Stage: 69
     Room: 0
     Spawn: "03"
@@ -1373,6 +1470,7 @@
     State: "FF"
   Return:
     Connection: Death Mountain Sumo Hall Elevator -> Death Mountain Lower Elevator
+    Alias: Death Mountain Sumo Hall -> Death Mountain Elevator
     Stage: 47
     Room: 3
     Spawn: "03"
@@ -1457,6 +1555,7 @@
   Door Couple Tag: Castle Town Goron House
   Forward:
     Connection: Castle Town Goron House West Door Exterior -> Castle Town Goron House West Door Interior
+    Alias: Castle Town Center -> Castle Town Goron House West Door
     Stage: 73
     Room: 4
     Spawn: "00"
@@ -1465,6 +1564,7 @@
     State: "FF"
   Return:
     Connection: Castle Town Goron House West Door Interior -> Castle Town Goron House West Door Exterior
+    Alias: Castle Town Goron House West Door -> Castle Town Center
     Stage: 53
     Room: 0
     Spawn: "0E"
@@ -1476,6 +1576,7 @@
   Door Couple Tag: Castle Town Goron House
   Forward:
     Connection: Castle Town Goron House East Door Exterior -> Castle Town Goron House East Door Interior
+    Alias: Castle Town Center -> Castle Town Goron House East Door
     Stage: 73
     Room: 4
     Spawn: "02"
@@ -1484,6 +1585,7 @@
     State: "FF"
   Return:
     Connection: Castle Town Goron House East Door Interior -> Castle Town Goron House East Door Exterior
+    Alias: Castle Town Goron House East Door -> Castle Town Center
     Stage: 53
     Room: 0
     Spawn: "10"
@@ -1513,6 +1615,7 @@
   Door Couple Tag: Castle Town Doctors Office
   Forward:
     Connection: Castle Town Doctors Office West Door Exterior -> Castle Town Doctors Office West Door Interior
+    Alias: Castle Town East -> Castle Town Doctors Office West Door
     Stage: 73
     Room: 2
     Spawn: "01"
@@ -1521,6 +1624,7 @@
     State: "FF"
   Return:
     Connection: Castle Town Doctors Office West Door Interior -> Castle Town Doctors Office West Door Exterior
+    Alias: Castle Town Doctors Office West Door -> Castle Town East
     Stage: 53
     Room: 4
     Spawn: "04"
@@ -1532,6 +1636,7 @@
   Door Couple Tag: Castle Town Doctors Office
   Forward:
     Connection: Castle Town Doctors Office East Door Exterior -> Castle Town Doctors Office East Door Interior
+    Alias: Castle Town East -> Castle Town Doctors Office East Door
     Stage: 73
     Room: 2
     Spawn: "00"
@@ -1540,6 +1645,7 @@
     State: "FF"
   Return:
     Connection: Castle Town Doctors Office East Door Interior -> Castle Town Doctors Office East Door Exterior
+    Alias: Castle Town Doctors Office East Door -> Castle Town East
     Stage: 53
     Room: 4
     Spawn: "03"
@@ -1550,6 +1656,7 @@
 - Type: Interior
   Forward:
     Connection: Castle Town Doctors Office Balcony -> Castle Town Doctors Office Upper
+    Alias: Castle Town Doctors Office Balcony -> Castle Town Doctors Office
     Stage: 73
     Room: 2
     Spawn: "02"
@@ -1558,6 +1665,7 @@
     State: "FF"
   Return:
     Connection: Castle Town Doctors Office Upper -> Castle Town Doctors Office Balcony
+    Alias: Castle Town Doctors Office -> Castle Town Doctors Office Balcony
     Stage: 53
     Room: 4
     Spawn: "05"
@@ -1644,6 +1752,7 @@
 - Type: Cave
   Forward:
     Connection: South Faron Woods Behind Gate -> Faron Woods Cave South
+    Alias: South Faron Woods -> Faron Woods Cave
     Stage: 40
     Room: 0
     Spawn: "00"
@@ -1652,6 +1761,7 @@
     State: "FF"
   Return:
     Connection: Faron Woods Cave South -> South Faron Woods Behind Gate
+    Alias: Faron Woods Cave -> South Faron Woods
     Stage: 45
     Room: 3
     Spawn: "63"
@@ -1662,6 +1772,7 @@
 - Type: Cave
   Forward:
     Connection: Mist Area Near Faron Woods Cave -> Faron Woods Cave North
+    Alias: Faron Woods Mist Area -> Faron Woods Cave
     Stage: 40
     Room: 0
     Spawn: "01"
@@ -1670,6 +1781,7 @@
     State: "FF"
   Return:
     Connection: Faron Woods Cave North -> Mist Area Near Faron Woods Cave
+    Alias: Faron Woods Cave -> Faron Woods Mist Area
     Stage: 45
     Room: 5
     Spawn: "04"
@@ -1680,6 +1792,7 @@
 - Type: Cave
   Forward:
     Connection: Mist Area Outside Faron Mist Cave -> Mist Area Faron Mist Cave
+    Alias: Faron Woods Mist Area -> Faron Woods Mist Cave
     Stage: 45
     Room: 14
     Spawn: "00"
@@ -1688,6 +1801,7 @@
     State: "FF"
   Return:
     Connection: Mist Area Faron Mist Cave -> Mist Area Outside Faron Mist Cave
+    Alias: Faron Woods Mist Cave -> Faron Woods Mist Area
     Stage: 45
     Room: 5
     Spawn: "06"
@@ -1698,6 +1812,7 @@
 - Type: Cave
   Forward:
     Connection: Kakariko Gorge Cave Entrance -> Eldin Lantern Cave
+    Alias: Kakariko Gorge -> Eldin Lantern Cave
     Stage: 32
     Room: 0
     Spawn: "00"
@@ -1706,6 +1821,7 @@
     State: "FF"
   Return:
     Connection: Eldin Lantern Cave -> Kakariko Gorge Cave Entrance
+    Alias: Eldin Lantern Cave -> Kakariko Gorge
     Stage: 56
     Room: 3
     Spawn: "0F"
@@ -1716,6 +1832,7 @@
 - Type: Cave
   Forward:
     Connection: Eldin Field Lava Cave Upper Ledge -> Eldin Field Lava Cave Upper
+    Alias: Eldin Field -> Eldin Field Lava Cave Upper
     Stage: 34
     Room: 10
     Spawn: "00"
@@ -1724,6 +1841,7 @@
     State: "FF"
   Return:
     Connection: Eldin Field Lava Cave Upper -> Eldin Field Lava Cave Upper Ledge
+    Alias: Eldin Field Lava Cave Upper -> Eldin Field
     Stage: 56
     Room: 0
     Spawn: "14"
@@ -1734,6 +1852,7 @@
 - Type: Cave
   Forward:
     Connection: Eldin Field Lava Cave Lower -> Eldin Field Lava Cave Lower Ledge
+    Alias: Eldin Field Lava Cave Lower -> Eldin Field
     Stage: 56
     Room: 0
     Spawn: "15"
@@ -1742,6 +1861,7 @@
     State: "FF"
   Return:
     Connection: Eldin Field Lava Cave Lower Ledge -> Eldin Field Lava Cave Lower
+    Alias: Eldin Field -> Eldin Field Lava Cave Lower
     Stage: 34
     Room: 10
     Spawn: "01"
@@ -1752,6 +1872,7 @@
 - Type: Cave
   Forward:
     Connection: Lanayru Field Cave Entrance -> Lanayru Ice Puzzle Cave
+    Alias: Lanayru Field -> Lanayru Ice Puzzle Cave
     Stage: 30
     Room: 0
     Spawn: "00"
@@ -1760,6 +1881,7 @@
     State: "FF"
   Return:
     Connection: Lanayru Ice Puzzle Cave -> Lanayru Field Cave Entrance
+    Alias: Lanayru Ice Puzzle Cave -> Lanayru Field
     Stage: 56
     Room: 10
     Spawn: "0F"
@@ -1770,6 +1892,7 @@
 - Type: Cave
   Forward:
     Connection: Lake Hylia -> Lake Hylia Lanayru Spring
+    Alias: Lake Hylia -> Lanayru Spring
     Stage: 52
     Room: 1
     Spawn: "00"
@@ -1778,6 +1901,7 @@
     State: "FF"
   Return:
     Connection: Lake Hylia Lanayru Spring -> Lake Hylia
+    Alias: Lanayru Spring -> Lake Hylia
     Stage: 52
     Room: 0
     Spawn: "07"
@@ -1788,6 +1912,7 @@
 - Type: Cave
   Forward:
     Connection: Lake Hylia Cave Entrance -> Lake Hylia Long Cave
+    Alias: Lake Hylia -> Lake Hylia Long Cave
     Stage: 33
     Room: 0
     Spawn: "00"
@@ -1796,6 +1921,7 @@
     State: "FF"
   Return:
     Connection: Lake Hylia Long Cave -> Lake Hylia Cave Entrance
+    Alias: Lake Hylia Long Cave -> Lake Hylia
     Stage: 52
     Room: 0
     Spawn: "1D"
@@ -1806,6 +1932,7 @@
 - Type: Cave
   Forward:
     Connection: Gerudo Desert Cave of Ordeals Plateau -> Cave of Ordeals
+    Alias: Gerudo Desert -> Cave of Ordeals
     Stage: 31
     Room: 0
     Spawn: "00"
@@ -1814,6 +1941,7 @@
     State: "FF"
   Return:
     Connection: Cave of Ordeals -> Gerudo Desert Cave of Ordeals Plateau
+    Alias: Cave of Ordeals -> Gerudo Desert
     Stage: 59
     Room: 0
     Spawn: "06"
@@ -1864,6 +1992,7 @@
 - Type: Overworld
   Forward:
     Connection: Ordon Village -> Ordon Ranch Village Pathway
+    Alias: Ordon Village -> Ordon Ranch
     Stage: 41
     Room: 0
     Spawn: "01"
@@ -1872,6 +2001,7 @@
     State: "FF"
   Return:
     Connection: Ordon Ranch Village Pathway -> Ordon Village
+    Alias: Ordon Ranch -> Ordon Village
     Stage: 43
     Room: 0
     Spawn: "00"
@@ -1900,6 +2030,7 @@
 - Type: Overworld
   Forward:
     Connection: South Faron Woods Above Owl Statue -> Mist Area Near Owl Statue Chest
+    Alias: South Faron Woods -> Faron Woods Mist Area
     Stage: 45
     Room: 5
     Spawn: "62"
@@ -1908,6 +2039,7 @@
     State: "FF"
   Return:
     Connection: Mist Area Near Owl Statue Chest -> South Faron Woods Above Owl Statue
+    Alias: Faron Woods Mist Area -> South Faron Woods
     Stage: 45
     Room: 8
     Spawn: "02"
@@ -1918,6 +2050,7 @@
 - Type: Overworld
   Forward:
     Connection: Mist Area Near North Faron Woods -> North Faron Woods
+    Alias: Faron Woods Mist Area -> North Faron Woods
     Stage: 45
     Room: 6
     Spawn: "02"
@@ -1926,6 +2059,7 @@
     State: "FF"
   Return:
     Connection: North Faron Woods -> Mist Area Near North Faron Woods
+    Alias: North Faron Woods -> Faron Woods Mist Area
     Stage: 45
     Room: 11
     Spawn: "00"
@@ -1936,6 +2070,7 @@
 - Type: Overworld
   Forward:
     Connection: North Faron Lost Woods Ledge -> Lost Woods
+    Alias: North Faron Woods -> Lost Woods
     Stage: 54
     Room: 3
     Spawn: "00"
@@ -1944,6 +2079,7 @@
     State: "FF"
   Return:
     Connection: Lost Woods -> North Faron Lost Woods Ledge
+    Alias: Lost Woods -> North Faron Woods
     Stage: 45
     Room: 6
     Spawn: "03"
@@ -1954,6 +2090,7 @@
 - Type: Overworld
   Forward:
     Connection: Lost Woods Lower Battle Arena -> Sacred Grove Lower
+    Alias: Lost Woods Lower Battle Arena -> Sacred Grove
     Stage: 54
     Room: 1
     Spawn: "03"
@@ -1962,6 +2099,7 @@
     State: "FF"
   Return:
     Connection: Sacred Grove Lower -> Lost Woods Lower Battle Arena
+    Alias: Sacred Grove -> Lost Woods Lower Battle Arena
     Stage: 54
     Room: 1
     Spawn: "01"
@@ -1972,6 +2110,7 @@
 - Type: Overworld
   Forward:
     Connection: Lost Woods Upper Battle Arena -> Sacred Grove Before Block
+    Alias: Lost Woods Upper Battle Arena -> Sacred Grove
     Stage: 54
     Room: 1
     Spawn: "06"
@@ -1980,6 +2119,7 @@
     State: "FF"
   Return:
     Connection: Sacred Grove Before Block -> Lost Woods Upper Battle Arena
+    Alias: Sacred Grove -> Lost Woods Upper Battle Arena
     Stage: 54
     Room: 3
     Spawn: "02"
@@ -1990,6 +2130,7 @@
 - Type: Overworld
   Forward:
     Connection: Sacred Grove Upper -> Sacred Grove Past
+    Alias: Sacred Grove -> Sacred Grove Past
     Stage: 54
     Room: 2
     Spawn: "00"
@@ -1998,6 +2139,7 @@
     State: "FF"
   Return:
     Connection: Sacred Grove Past -> Sacred Grove Upper
+    Alias: Sacred Grove Past -> Sacred Grove
     Stage: 54
     Room: 1
     Spawn: "05"
@@ -2026,6 +2168,7 @@
 - Type: Overworld
   Forward:
     Connection: Faron Field Behind Boulder -> Outside Castle Town South Inside Boulder
+    Alias: Faron Field -> Outside Castle Town South
     Stage: 57
     Room: 16
     Spawn: "00"
@@ -2034,6 +2177,7 @@
     State: "FF"
   Return:
     Connection: Outside Castle Town South -> Faron Field Behind Boulder
+    Alias: Outside Castle Town South -> Faron Field
     Stage: 56
     Room: 6
     Spawn: "01"
@@ -2044,6 +2188,7 @@
 - Type: Overworld
   Forward:
     Connection: Kakariko Gorge Behind Gate -> Lower Kakariko Village
+    Alias: Kakariko Gorge -> Kakariko Village
     Stage: 46
     Room: 0
     Spawn: "3C"
@@ -2052,6 +2197,7 @@
     State: "FF"
   Return:
     Connection: Lower Kakariko Village -> Kakariko Gorge Behind Gate
+    Alias: Kakariko Village -> Kakariko Gorge
     Stage: 56
     Room: 3
     Spawn: "00"
@@ -2062,6 +2208,7 @@
 - Type: Overworld
   Forward:
     Connection: Lower Kakariko Village -> Kakariko Graveyard
+    Alias: Kakariko Village -> Kakariko Graveyard
     Stage: 48
     Room: 0
     Spawn: "00"
@@ -2070,6 +2217,7 @@
     State: "FF"
   Return:
     Connection: Kakariko Graveyard -> Lower Kakariko Village
+    Alias: Kakariko Graveyard -> Kakariko Village
     Stage: 46
     Room: 0
     Spawn: "06"
@@ -2080,6 +2228,7 @@
 - Type: Overworld
   Forward:
     Connection: Lower Kakariko Village -> Death Mountain Near Kakariko
+    Alias: Kakariko Village -> Death Mountain
     Stage: 47
     Room: 0
     Spawn: "00"
@@ -2088,6 +2237,7 @@
     State: "FF"
   Return:
     Connection: Death Mountain Near Kakariko -> Lower Kakariko Village
+    Alias: Death Mountain -> Kakariko Village
     Stage: 46
     Room: 0
     Spawn: "01"
@@ -2098,6 +2248,7 @@
 - Type: Overworld
   Forward:
     Connection: Kakariko Graveyard Pond -> Lake Hylia
+    Alias: Kakariko Graveyard -> Lake Hylia
     Stage: 52
     Room: 0
     Spawn: "19"
@@ -2106,6 +2257,7 @@
     State: "FF"
   Return:
     Connection: Lake Hylia -> Kakariko Graveyard Pond
+    Alias: Lake Hylia -> Kakariko Graveyard
     Stage: -1
     Room: -1
     Spawn: ""
@@ -2116,6 +2268,7 @@
 - Type: Overworld
   Forward:
     Connection: Kakariko Village Behind Gate -> Eldin Field
+    Alias: Kakariko Village -> Eldin Field
     Stage: 56
     Room: 0
     Spawn: "01"
@@ -2124,6 +2277,7 @@
     State: "FF"
   Return:
     Connection: Eldin Field -> Kakariko Village Behind Gate
+    Alias: Eldin Field -> Kakariko Village
     Stage: 46
     Room: 0
     Spawn: "08"
@@ -2134,6 +2288,7 @@
 - Type: Overworld
   Forward:
     Connection: Eldin Field Near Castle Town -> Outside Castle Town East
+    Alias: Eldin Field -> Outside Castle Town East
     Stage: 57
     Room: 17
     Spawn: "01"
@@ -2142,6 +2297,7 @@
     State: "FF"
   Return:
     Connection: Outside Castle Town East -> Eldin Field Near Castle Town
+    Alias: Outside Castle Town East -> Eldin Field
     Stage: 56
     Room: 0
     Spawn: "07"
@@ -2152,6 +2308,7 @@
 - Type: Overworld
   Forward:
     Connection: Eldin Field Outside Hidden Village -> Hidden Village
+    Alias: Eldin Field -> Hidden Village
     Stage: 63
     Room: 0
     Spawn: "00"
@@ -2160,6 +2317,7 @@
     State: "FF"
   Return:
     Connection: Hidden Village -> Eldin Field Outside Hidden Village
+    Alias: Hidden Village -> Eldin Field
     Stage: 56
     Room: 7
     Spawn: "01"
@@ -2170,6 +2328,7 @@
 - Type: Overworld
   Forward:
     Connection: Lanayru Field Near Zoras Domain -> Zoras Domain West Ledge
+    Alias: Lanayru Field -> Zoras Domain
     Stage: 50
     Room: 1
     Spawn: "0F"
@@ -2178,6 +2337,7 @@
     State: "FF"
   Return:
     Connection: Zoras Domain West Ledge -> Lanayru Field Near Zoras Domain
+    Alias: Zoras Domain -> Lanayru Field
     Stage: 56
     Room: 10
     Spawn: "03"
@@ -2242,6 +2402,7 @@
 - Type: Overworld
   Forward:
     Connection: Zoras Domain Top of Waterfall -> Zoras Throne Room
+    Alias: Zoras Domain -> Zoras Throne Room
     Stage: 50
     Room: 0
     Spawn: "01"
@@ -2250,6 +2411,7 @@
     State: "FF"
   Return:
     Connection: Zoras Throne Room -> Zoras Domain Top of Waterfall
+    Alias: Zoras Throne Room -> Zoras Domain
     Stage: 50
     Room: 1
     Spawn: "00"
@@ -2260,6 +2422,7 @@
 - Type: Overworld
   Forward:
     Connection: Zoras Domain -> Snowpeak Climb Lower
+    Alias: Zoras Domain -> Snowpeak Province
     Stage: 51
     Room: 0
     Spawn: "00"
@@ -2268,6 +2431,7 @@
     State: "FF"
   Return:
     Connection: Snowpeak Climb Lower -> Zoras Domain
+    Alias: Snowpeak Province -> Zoras Domain
     Stage: 50
     Room: 1
     Spawn: "06"
@@ -2278,6 +2442,7 @@
 - Type: Overworld
   Forward:
     Connection: Snowpeak Climb Upper -> Snowpeak Summit Cave
+    Alias: Snowpeak Climb -> Snowpeak Summit Cave
     Stage: 51
     Room: 2
     Spawn: "08"
@@ -2286,6 +2451,7 @@
     State: "FF"
   Return:
     Connection: Snowpeak Summit Cave -> Snowpeak Climb Upper
+    Alias: Snowpeak Summit Cave -> Snowpeak Climb
     Stage: 51
     Room: 0
     Spawn: "0F"
@@ -2548,6 +2714,7 @@
 - Type: Overworld
   Forward:
     Connection: Gerudo Desert Outside Bulblin Camp -> Bulblin Camp
+    Alias: Gerudo Desert -> Bulblin Camp
     Stage: 55
     Room: 1
     Spawn: "00"
@@ -2556,6 +2723,7 @@
     State: "FF"
   Return:
     Connection: Bulblin Camp -> Gerudo Desert Outside Bulblin Camp
+    Alias: Bulblin Camp -> Gerudo Desert
     Stage: 59
     Room: 0
     Spawn: "02"
diff --git a/src/dusk/randomizer/logic/entrance.cpp b/src/dusk/randomizer/logic/entrance.cpp
index 7d4833f129..11af2b4f7b 100644
--- a/src/dusk/randomizer/logic/entrance.cpp
+++ b/src/dusk/randomizer/logic/entrance.cpp
@@ -121,9 +121,32 @@ namespace randomizer::logic::entrance
         return this->_originalName;
     }
 
-    void Entrance::GeneralizeOriginalName()
+    void Entrance::SetAlias(const std::string& alias)
+    {
+        this->_alias = alias;
+        // If there's no alias, just use the original name
+        if (this->_alias.empty())
+        {
+            this->_alias = this->_originalName;
+        }
+    }
+
+    std::string Entrance::GetAlias() const
+    {
+        return this->_alias;
+    }
+
+    std::string Entrance::GetAliasFrom()
+    {
+        std::string parentAreaAlias = this->_alias.substr(0, this->_alias.find(" -> "));
+        std::string connectedAreaAlias = this->_alias.substr(this->_alias.find(" -> ") + 4);
+        return connectedAreaAlias + " from " + parentAreaAlias;
+    }
+
+    void Entrance::GeneralizeName()
     {
         randomizer::utility::str::Erase(this->_originalName, " North", " South", " East", " West", " Right", " Left");
+        randomizer::utility::str::Erase(this->_alias, " North", " South", " East", " West", " Right", " Left");
     }
 
     randomizer::logic::area::Area* Entrance::GetParentArea() const
diff --git a/src/dusk/randomizer/logic/entrance.hpp b/src/dusk/randomizer/logic/entrance.hpp
index 16601b58ff..d27bdc75b3 100644
--- a/src/dusk/randomizer/logic/entrance.hpp
+++ b/src/dusk/randomizer/logic/entrance.hpp
@@ -76,10 +76,16 @@ namespace randomizer::logic::entrance
         int GetID() const;
         std::string GetCurrentName() const;
         std::string GetOriginalName() const;
+        void SetAlias(const std::string& alias);
+        std::string GetAlias() const;
+        /*
+        * @brief Gets the alias in the "connected area from parent area" format
+        */
+        std::string GetAliasFrom();
         /**
-         * @brief Removes cardinal/direction specifiers from the entrance's name (North, South, East, West, Left, Right)
+         * @brief Removes cardinal/direction specifiers from the entrance's name/alias (North, South, East, West, Left, Right)
          */
-        void GeneralizeOriginalName();
+        void GeneralizeName();
         randomizer::logic::area::Area* GetParentArea() const;
         randomizer::logic::area::Area* GetConnectedArea() const;
         randomizer::logic::area::Area* GetOriginalConnectedArea() const;
@@ -150,6 +156,7 @@ namespace randomizer::logic::entrance
         Type _type = Type::INVALID;
         Type _originalType = Type::INVALID;
         std::string _originalName = "";
+        std::string _alias = "";
         randomizer::logic::world::World* _world = nullptr;
 
         /**
diff --git a/src/dusk/randomizer/logic/entrance_shuffle.cpp b/src/dusk/randomizer/logic/entrance_shuffle.cpp
index e58a6a57a6..f54f5f33f9 100644
--- a/src/dusk/randomizer/logic/entrance_shuffle.cpp
+++ b/src/dusk/randomizer/logic/entrance_shuffle.cpp
@@ -66,6 +66,8 @@ namespace randomizer::logic::entrance_shuffle
             // TODO: Set actual entrance data
             forwardEntrance->SetID(world->GetNewEntranceID());
             forwardEntrance->SetPrimary(true);
+            forwardEntrance->SetAlias(
+                forwardEntry["Alias"] ? forwardEntry["Alias"].as<std::string>() : "");
 
             if (entranceDataNode["Return"])
             {
@@ -76,6 +78,8 @@ namespace randomizer::logic::entrance_shuffle
                 returnEntrance->SetType(type);
                 // TODO: Set actual entrance data
                 returnEntrance->SetID(world->GetNewEntranceID());
+                returnEntrance->SetAlias(
+                    returnEntry["Alias"] ? returnEntry["Alias"].as<std::string>() : "");
                 forwardEntrance->BindTwoWay(returnEntrance);
 
                 // Add double door entrances to their respective tag group
@@ -117,7 +121,7 @@ namespace randomizer::logic::entrance_shuffle
                     coupledDoor->GetParentArea()->RemoveExit(coupledDoor);
 
                     // Change the main door's name to be more general
-                    mainDoor->GeneralizeOriginalName();
+                    mainDoor->GeneralizeName();
                 }
             }
         }
diff --git a/src/dusk/randomizer/logic/spoiler_log.cpp b/src/dusk/randomizer/logic/spoiler_log.cpp
index 1e92466cda..07373b2d8a 100644
--- a/src/dusk/randomizer/logic/spoiler_log.cpp
+++ b/src/dusk/randomizer/logic/spoiler_log.cpp
@@ -21,18 +21,16 @@ namespace randomizer::logic::spoiler_log
 
     std::string SpoilerFormatEntrance(randomizer::logic::entrance::Entrance* entrance, const size_t& longestNameLength)
     {
-        auto numSpaces = longestNameLength - entrance->GetOriginalName().length();
+        auto numSpaces = longestNameLength - entrance->GetAlias().length();
         std::string spaces(numSpaces, ' ');
         auto replacement = entrance->GetReplaces();
-        auto parent = replacement->GetParentArea()->GetName();
-        auto connected = replacement->GetOriginalConnectedArea()->GetName();
 
-        return entrance->GetOriginalName() + ": " + spaces + connected + " from " + parent;
+        return entrance->GetAlias() + ": " + spaces + replacement->GetAliasFrom();
     }
 
     void LogBasicInfo(std::ofstream& log, randomizer::seedgen::config::Config& config, randomizer::logic::world::WorldPool& worlds)
     {
-        log << "Twilight Princess HD Randomizer Version: " << "1.0.0" << std::endl;
+        log << "Dusk Randomizer Version: " << "1.0.0" << std::endl;
         log << "Seed: " << config.GetSeed() << std::endl;
 
         // TODO: Setting string
@@ -117,7 +115,7 @@ namespace randomizer::logic::spoiler_log
         {
             for (const auto& entrance : sphere)
             {
-                longestNameLength = std::max(entrance->GetOriginalName().length(), longestNameLength);
+                longestNameLength = std::max(entrance->GetAlias().length(), longestNameLength);
             }
         }
 
@@ -169,7 +167,7 @@ namespace randomizer::logic::spoiler_log
         {
             for (const auto& entrance : world->GetShuffledEntrances())
             {
-                longestNameLength = std::max(entrance->GetOriginalName().length(), longestNameLength);
+                longestNameLength = std::max(entrance->GetAlias().length(), longestNameLength);
             }
         }
         // Print all randomized entrances