diff --git a/Lua/data/entrance names.lua b/Lua/data/entrance names.lua
index e792307..d66005b 100644
--- a/Lua/data/entrance names.lua	
+++ b/Lua/data/entrance names.lua	
@@ -129,12 +129,11 @@ return {
         "from Hookshot room",
         "from above Hookshot room",
         "from 100 Rupee room",
-        -- FIXME: all these pirate room names
-        "egg room 1",
-        "from cannon(?) room",
-        "from egg room 3",
-        "from tall walls(?) room",
-        "from egg room 2",
+        "from 100 Rupee room (egg)",
+        "from barrel room",
+        "from barrel room (egg)",
+        "from twin barrel room",
+        "from twin barrel room (egg)",
         "from nowhere (unused?)",
         "through telescope",
         "from nowhere (press start screen?)",
@@ -236,14 +235,14 @@ return {
     },
 
     {[0]=
-        "hookshot room",
-        "hookshot room from above",
-        "100 rupee room",
-        "egg room 1?",
-        "cannon(?) room",
-        "egg room 2?",
-        "tall walls(?) room",
-        "egg room 3?",
+        "Hookshot room",
+        "Hookshot room from above",
+        "100 Rupee room",
+        "100 Rupee room (egg)",
+        "barrel room",
+        "barrel room (egg)",
+        "twin barrel room",
+        "twin barrel room (egg)",
         "after telescope",
         "from outside, underwater",
         "from outside, near telescope",
@@ -458,7 +457,7 @@ return {
         "from underwater passage",
         "from one-way underwater",
         "being kicked out",
-        "from hookshot platform",
+        "from Hookshot platform",
         "from passage door",
         "from Great Bay (no cutscene)",
     },