diff --git a/worlds/witness/data/WitnessItems.txt b/worlds/witness/data/WitnessItems.txt
index 86567f29..782fa9c3 100644
--- a/worlds/witness/data/WitnessItems.txt
+++ b/worlds/witness/data/WitnessItems.txt
@@ -177,7 +177,7 @@ Doors:
 1774 - Bunker Elevator Room Entry (Door) - 0x0A08D
 1777 - Swamp Entry (Door) - 0x00C1C
 1780 - Swamp Between Bridges First Door - 0x184B7
-1783 - Swamp Platform Shortcut Door - 0x38AE6
+1783 - Swamp Platform Shortcut (Door) - 0x38AE6
 1786 - Swamp Cyan Water Pump (Door) - 0x04B7F
 1789 - Swamp Between Bridges Second Door - 0x18507
 1792 - Swamp Red Water Pump (Door) - 0x183F2
@@ -201,7 +201,7 @@ Doors:
 1849 - Caves Pillar Door - 0x019A5
 1855 - Caves Swamp Shortcut (Door) - 0x2D859
 1858 - Challenge Entry (Door) - 0x0A19A
-1861 - Challenge Tunnels Entry (Door) - 0x0348A
+1861 - Tunnels Entry (Door) - 0x0348A
 1864 - Tunnels Theater Shortcut (Door) - 0x27739
 1867 - Tunnels Desert Shortcut (Door) - 0x27263
 1870 - Tunnels Town Shortcut (Door) - 0x09E87
diff --git a/worlds/witness/data/WitnessLogic.txt b/worlds/witness/data/WitnessLogic.txt
index e3bacfb4..4dc172ac 100644
--- a/worlds/witness/data/WitnessLogic.txt
+++ b/worlds/witness/data/WitnessLogic.txt
@@ -766,7 +766,7 @@ Swamp Near Platform (Swamp) - Swamp Cyan Underwater - 0x04B7F - Swamp Near Boat
 Door - 0x184B7 (Between Bridges First Door) - 0x00990
 158317 - 0x17C0D (Platform Shortcut Left Panel) - True - Shapers
 158318 - 0x17C0E (Platform Shortcut Right Panel) - 0x17C0D - Shapers
-Door - 0x38AE6 (Platform Shortcut Door) - 0x17C0E
+Door - 0x38AE6 (Platform Shortcut) - 0x17C0E
 Door - 0x04B7F (Cyan Water Pump) - 0x00006
 
 Swamp Cyan Underwater (Swamp):
diff --git a/worlds/witness/data/WitnessLogicExpert.txt b/worlds/witness/data/WitnessLogicExpert.txt
index b01d5551..b08ef9e4 100644
--- a/worlds/witness/data/WitnessLogicExpert.txt
+++ b/worlds/witness/data/WitnessLogicExpert.txt
@@ -766,7 +766,7 @@ Swamp Near Platform (Swamp) - Swamp Cyan Underwater - 0x04B7F - Swamp Near Boat
 Door - 0x184B7 (Between Bridges First Door) - 0x00990
 158317 - 0x17C0D (Platform Shortcut Left Panel) - True - Rotated Shapers
 158318 - 0x17C0E (Platform Shortcut Right Panel) - 0x17C0D - Rotated Shapers
-Door - 0x38AE6 (Platform Shortcut Door) - 0x17C0E
+Door - 0x38AE6 (Platform Shortcut) - 0x17C0E
 Door - 0x04B7F (Cyan Water Pump) - 0x00006
 
 Swamp Cyan Underwater (Swamp):
diff --git a/worlds/witness/data/WitnessLogicVanilla.txt b/worlds/witness/data/WitnessLogicVanilla.txt
index 62c38d41..09504187 100644
--- a/worlds/witness/data/WitnessLogicVanilla.txt
+++ b/worlds/witness/data/WitnessLogicVanilla.txt
@@ -766,7 +766,7 @@ Swamp Near Platform (Swamp) - Swamp Cyan Underwater - 0x04B7F - Swamp Near Boat
 Door - 0x184B7 (Between Bridges First Door) - 0x00990
 158317 - 0x17C0D (Platform Shortcut Left Panel) - True - Shapers
 158318 - 0x17C0E (Platform Shortcut Right Panel) - 0x17C0D - Shapers
-Door - 0x38AE6 (Platform Shortcut Door) - 0x17C0E
+Door - 0x38AE6 (Platform Shortcut) - 0x17C0E
 Door - 0x04B7F (Cyan Water Pump) - 0x00006
 
 Swamp Cyan Underwater (Swamp):
diff --git a/worlds/witness/data/settings/Door_Shuffle/Complex_Doors.txt b/worlds/witness/data/settings/Door_Shuffle/Complex_Doors.txt
index 7c81fd34..513f1d9a 100644
--- a/worlds/witness/data/settings/Door_Shuffle/Complex_Doors.txt
+++ b/worlds/witness/data/settings/Door_Shuffle/Complex_Doors.txt
@@ -67,7 +67,7 @@ Bunker UV Room Entry (Door)
 Bunker Elevator Room Entry (Door)
 Swamp Entry (Door)
 Swamp Between Bridges First Door
-Swamp Platform Shortcut Door
+Swamp Platform Shortcut (Door)
 Swamp Cyan Water Pump (Door)
 Swamp Between Bridges Second Door
 Swamp Red Water Pump (Door)
@@ -92,7 +92,7 @@ Caves Pillar Door
 Caves Mountain Shortcut (Door)
 Caves Swamp Shortcut (Door)
 Challenge Entry (Door)
-Challenge Tunnels Entry (Door)
+Tunnels Entry (Door)
 Tunnels Theater Shortcut (Door)
 Tunnels Desert Shortcut (Door)
 Tunnels Town Shortcut (Door)