diff --git a/src/port/Rando/Logic/Regions/RustyBucketBay.cpp b/src/port/Rando/Logic/Regions/RustyBucketBay.cpp
index cdd7bd015..30a45b24d 100644
--- a/src/port/Rando/Logic/Regions/RustyBucketBay.cpp
+++ b/src/port/Rando/Logic/Regions/RustyBucketBay.cpp
@@ -11,11 +11,11 @@ static RegisterShipInitFunc initFunc([]() {
 			CHECK(RC_RBB_BLUE_EGG_BETWEEN_SHIPPING_CONTAINERS_2,			CAN_USE_ABILITY(ABILITY_6_EGGS) && (CAN_USE_ABILITY(ABILITY_5_CLIMB) || CAN_USE_ABILITY(ABILITY_10_TALON_TROT))),
 			CHECK(RC_RBB_BLUE_EGG_BETWEEN_SHIPPING_CONTAINERS_3,			CAN_USE_ABILITY(ABILITY_6_EGGS) && (CAN_USE_ABILITY(ABILITY_5_CLIMB) || CAN_USE_ABILITY(ABILITY_10_TALON_TROT))),
 			CHECK(RC_RBB_BLUE_EGG_BETWEEN_SHIPPING_CONTAINERS_4,			CAN_USE_ABILITY(ABILITY_6_EGGS) && (CAN_USE_ABILITY(ABILITY_5_CLIMB) || CAN_USE_ABILITY(ABILITY_10_TALON_TROT))),
-			CHECK(RC_RRB_BLUE_EGG_ENTRANCE_1,								true),
-			CHECK(RC_RRB_BLUE_EGG_ENTRANCE_2,								true),
-			CHECK(RC_RRB_BLUE_EGG_ENTRANCE_3,								true),
-			CHECK(RC_RRB_BLUE_EGG_ENTRANCE_4,								CAN_USE_ABILITY(ABILITY_8_FLAP_FLIP)),
-			CHECK(RC_RRB_BLUE_EGG_ENTRANCE_5,								CAN_USE_ABILITY(ABILITY_8_FLAP_FLIP)),
+			CHECK(RC_RBB_BLUE_EGG_ENTRANCE_1,								true),
+			CHECK(RC_RBB_BLUE_EGG_ENTRANCE_2,								true),
+			CHECK(RC_RBB_BLUE_EGG_ENTRANCE_3,								true),
+			CHECK(RC_RBB_BLUE_EGG_ENTRANCE_4,								CAN_USE_ABILITY(ABILITY_8_FLAP_FLIP)),
+			CHECK(RC_RBB_BLUE_EGG_ENTRANCE_5,								CAN_USE_ABILITY(ABILITY_8_FLAP_FLIP)),
 			CHECK(RC_RBB_BLUE_EGG_NEAR_PINK_JINJO_1,						CAN_USE_ABILITY(ABILITY_F_DIVE)),
 			CHECK(RC_RBB_BLUE_EGG_NEAR_PINK_JINJO_2,						CAN_USE_ABILITY(ABILITY_F_DIVE)),
 			CHECK(RC_RBB_BLUE_EGG_NEAR_PINK_JINJO_3,						CAN_USE_ABILITY(ABILITY_F_DIVE)),
diff --git a/src/port/Rando/StaticData/Checks.cpp b/src/port/Rando/StaticData/Checks.cpp
index 8a23c19b4..4d37be529 100644
--- a/src/port/Rando/StaticData/Checks.cpp
+++ b/src/port/Rando/StaticData/Checks.cpp
@@ -1622,11 +1622,11 @@ std::map<RandoCheckId, RandoStaticCheck> Checks = {
     RC(RC_RBB_BLUE_EGG_ENGING_ROOM_2,                                           RCTYPE_BLUE_EGG,        LEVEL_9_RUSTY_BUCKET_BAY,       RI_BLUE_EGG_RUSTY_BUCKET_BAY,           NULL,                                                                   -2550, 1059, -2300),
     RC(RC_RBB_BLUE_EGG_ENGING_ROOM_3,                                           RCTYPE_BLUE_EGG,        LEVEL_9_RUSTY_BUCKET_BAY,       RI_BLUE_EGG_RUSTY_BUCKET_BAY,           NULL,                                                                   -2550, 1059, -2475),
     RC(RC_RBB_BLUE_EGG_ENGING_ROOM_4,                                           RCTYPE_BLUE_EGG,        LEVEL_9_RUSTY_BUCKET_BAY,       RI_BLUE_EGG_RUSTY_BUCKET_BAY,           NULL,                                                                   -2550, 1059, -2825),
-    RC(RC_RRB_BLUE_EGG_ENTRANCE_1,                                              RCTYPE_BLUE_EGG,        LEVEL_9_RUSTY_BUCKET_BAY,       RI_BLUE_EGG_RUSTY_BUCKET_BAY,           NULL,                                                                   -550, -650, 3549),
-    RC(RC_RRB_BLUE_EGG_ENTRANCE_2,                                              RCTYPE_BLUE_EGG,        LEVEL_9_RUSTY_BUCKET_BAY,       RI_BLUE_EGG_RUSTY_BUCKET_BAY,           NULL,                                                                   -1200, -450, 3899),
-    RC(RC_RRB_BLUE_EGG_ENTRANCE_3,                                              RCTYPE_BLUE_EGG,        LEVEL_9_RUSTY_BUCKET_BAY,       RI_BLUE_EGG_RUSTY_BUCKET_BAY,           NULL,                                                                   -1750, -650, 3300),
-    RC(RC_RRB_BLUE_EGG_ENTRANCE_4,                                              RCTYPE_BLUE_EGG,        LEVEL_9_RUSTY_BUCKET_BAY,       RI_BLUE_EGG_RUSTY_BUCKET_BAY,           NULL,                                                                   1549, -500, 3250),
-    RC(RC_RRB_BLUE_EGG_ENTRANCE_5,                                              RCTYPE_BLUE_EGG,        LEVEL_9_RUSTY_BUCKET_BAY,       RI_BLUE_EGG_RUSTY_BUCKET_BAY,           NULL,                                                                   1900, -200, 3800),
+    RC(RC_RBB_BLUE_EGG_ENTRANCE_1,                                              RCTYPE_BLUE_EGG,        LEVEL_9_RUSTY_BUCKET_BAY,       RI_BLUE_EGG_RUSTY_BUCKET_BAY,           NULL,                                                                   -550, -650, 3549),
+    RC(RC_RBB_BLUE_EGG_ENTRANCE_2,                                              RCTYPE_BLUE_EGG,        LEVEL_9_RUSTY_BUCKET_BAY,       RI_BLUE_EGG_RUSTY_BUCKET_BAY,           NULL,                                                                   -1200, -450, 3899),
+    RC(RC_RBB_BLUE_EGG_ENTRANCE_3,                                              RCTYPE_BLUE_EGG,        LEVEL_9_RUSTY_BUCKET_BAY,       RI_BLUE_EGG_RUSTY_BUCKET_BAY,           NULL,                                                                   -1750, -650, 3300),
+    RC(RC_RBB_BLUE_EGG_ENTRANCE_4,                                              RCTYPE_BLUE_EGG,        LEVEL_9_RUSTY_BUCKET_BAY,       RI_BLUE_EGG_RUSTY_BUCKET_BAY,           NULL,                                                                   1549, -500, 3250),
+    RC(RC_RBB_BLUE_EGG_ENTRANCE_5,                                              RCTYPE_BLUE_EGG,        LEVEL_9_RUSTY_BUCKET_BAY,       RI_BLUE_EGG_RUSTY_BUCKET_BAY,           NULL,                                                                   1900, -200, 3800),
     RC(RC_RBB_BLUE_EGG_KITCHEN_1,                                               RCTYPE_BLUE_EGG,        LEVEL_9_RUSTY_BUCKET_BAY,       RI_BLUE_EGG_RUSTY_BUCKET_BAY,           NULL,                                                                   702, 213, -596),
     RC(RC_RBB_BLUE_EGG_KITCHEN_2,                                               RCTYPE_BLUE_EGG,        LEVEL_9_RUSTY_BUCKET_BAY,       RI_BLUE_EGG_RUSTY_BUCKET_BAY,           NULL,                                                                   758, 213, -600),
     RC(RC_RBB_BLUE_EGG_KITCHEN_3,                                               RCTYPE_BLUE_EGG,        LEVEL_9_RUSTY_BUCKET_BAY,       RI_BLUE_EGG_RUSTY_BUCKET_BAY,           NULL,                                                                   647, 213, -601),
diff --git a/src/port/Rando/Types.h b/src/port/Rando/Types.h
index ba6b63e3f..ebba74e34 100644
--- a/src/port/Rando/Types.h
+++ b/src/port/Rando/Types.h
@@ -1623,11 +1623,11 @@ typedef enum {
     RC_RBB_BLUE_EGG_ENGING_ROOM_2,
     RC_RBB_BLUE_EGG_ENGING_ROOM_3,
     RC_RBB_BLUE_EGG_ENGING_ROOM_4,
-    RC_RRB_BLUE_EGG_ENTRANCE_1,
-    RC_RRB_BLUE_EGG_ENTRANCE_2,
-    RC_RRB_BLUE_EGG_ENTRANCE_3,
-    RC_RRB_BLUE_EGG_ENTRANCE_4,
-    RC_RRB_BLUE_EGG_ENTRANCE_5,
+    RC_RBB_BLUE_EGG_ENTRANCE_1,
+    RC_RBB_BLUE_EGG_ENTRANCE_2,
+    RC_RBB_BLUE_EGG_ENTRANCE_3,
+    RC_RBB_BLUE_EGG_ENTRANCE_4,
+    RC_RBB_BLUE_EGG_ENTRANCE_5,
     RC_RBB_BLUE_EGG_KITCHEN_1,
     RC_RBB_BLUE_EGG_KITCHEN_2,
     RC_RBB_BLUE_EGG_KITCHEN_3,