diff --git a/Lua/data/entrance names.lua b/Lua/data/entrance names.lua
index 603e3d4..7157cd9 100644
--- a/Lua/data/entrance names.lua	
+++ b/Lua/data/entrance names.lua	
@@ -410,25 +410,25 @@ return {[0]=
     --  "(crash)",
     },
 
-    {name="Great Bay Coast (Lab Area)",
+    {name="Great Bay Coast",
     [0]="from Termina Field",
-        "from Zora area",
-        "from swimming too far",
-        "from pinnacle rock",
+        "from Zora Cape",
+        "from swimming too far (near Lab)",
+        "from Pinnacle Rock",
         "from Fisherman's Hut",
         "from Pirates' Fortress",
-        "from swimming too far (near pinnacle?)",
-        "from lab",
-        "from spider house",
+        "from swimming too far (near Pinnacle)",
+        "from Lab",
+        "from Spider House",
         "getting Zora mask",
-        "in front of mikau's grave",
+        "in front of Mikau's grave",
         "from Owl Statue",
         "getting kicked out of Pirates'",
         "after beating minigame",
     },
 
-    {name="Great Bay Coast (Zora Area)",
-    [0]="from lab area",
+    {name="Zora Cape",
+    [0]="from Great Bay Coast",
         "from Zora Hall",
         "from Zora Hall (turtle)",
         "from swimming too far",