diff --git a/include/constants/metatile_behaviors.h b/include/constants/metatile_behaviors.h
index 4e71cdb7e..38a02075f 100644
--- a/include/constants/metatile_behaviors.h
+++ b/include/constants/metatile_behaviors.h
@@ -12,7 +12,7 @@
 #define MB_MOUNTAIN_TOP 0x0C
 //
 #define MB_POND_WATER 0x10
-#define MB_SEMI_DEEP_WATER 0x11
+#define MB_FAST_WATER 0x11
 #define MB_DEEP_WATER 0x12
 #define MB_WATERFALL 0x13
 //
diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h
index 6e129c830..e378e77ff 100644
--- a/include/metatile_behavior.h
+++ b/include/metatile_behavior.h
@@ -26,7 +26,7 @@ bool8 MetatileBehavior_IsLadder(u8 metatileBehavior);
 bool8 MetatileBehavior_IsNonAnimDoor(u8 metatileBehavior);
 bool8 MetatileBehavior_IsDeepSouthWarp(u8 metatileBehavior);
 bool8 MetatileBehavior_IsSurfable(u8 metatileBehavior);
-bool8 MetatileBehavior_IsSemiDeepWater(u8 metatileBehavior);
+bool8 MetatileBehavior_IsFastWater(u8 metatileBehavior);
 bool8 MetatileBehavior_IsEastArrowWarp(u8 metatileBehavior);
 bool8 MetatileBehavior_IsWestArrowWarp(u8 metatileBehavior);
 bool8 MetatileBehavior_IsNorthArrowWarp(u8 metatileBehavior);
@@ -64,7 +64,7 @@ bool8 MetatileBehavior_IsUnableToEmerge(u8 metatileBehavior);
 bool8 MetatileBehavior_IsShallowFlowingWater(u8 metatileBehavior);
 bool8 MetatileBehavior_IsThinIce(u8 metatileBehavior);
 bool8 MetatileBehavior_IsCrackedIce(u8 metatileBehavior);
-bool8 MetatileBehavior_IsDeepSemiDeepOrSplashingWater(u8 metatileBehavior);
+bool8 MetatileBehavior_IsDeepWaterTerrain(u8 metatileBehavior);
 bool8 MetatileBehavior_IsSurfableAndNotWaterfall(u8 metatileBehavior);
 bool8 MetatileBehavior_IsEastBlocked(u8 metatileBehavior);
 bool8 MetatileBehavior_IsWestBlocked(u8 metatileBehavior);
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 3a08e6610..36c9eac1b 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -497,7 +497,7 @@ u8 BattleSetup_GetTerrainId(void)
             return BATTLE_TERRAIN_WATER;
         return BATTLE_TERRAIN_PLAIN;
     }
-    if (MetatileBehavior_IsDeepSemiDeepOrSplashingWater(tileBehavior))
+    if (MetatileBehavior_IsDeepWaterTerrain(tileBehavior))
         return BATTLE_TERRAIN_WATER;
     if (MetatileBehavior_IsSurfable(tileBehavior))
         return BATTLE_TERRAIN_POND;
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index 31dd27e17..9a7d55edc 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -600,7 +600,7 @@ static const u8 *GetInteractedMetatileScript(struct MapPosition *position, u8 me
 
 static const u8 *GetInteractedWaterScript(struct MapPosition *unused1, u8 metatileBehavior, u8 direction)
 {
-    if (MetatileBehavior_IsSemiDeepWater(metatileBehavior) == TRUE &&PartyHasMonWithSurf() == TRUE)
+    if (MetatileBehavior_IsFastWater(metatileBehavior) == TRUE && PartyHasMonWithSurf() == TRUE)
         return EventScript_CurrentTooFast;
     if (FlagGet(FLAG_BADGE05_GET) == TRUE && PartyHasMonWithSurf() == TRUE && IsPlayerFacingSurfableFishableWater() == TRUE)
         return EventScript_UseSurf;
diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c
index 81b9fc239..ce2736647 100644
--- a/src/metatile_behavior.c
+++ b/src/metatile_behavior.c
@@ -4,7 +4,7 @@
 
 static const bool8 sBehaviorSurfable[NUM_METATILE_BEHAVIORS] = {
     [MB_POND_WATER]         = TRUE,
-    [MB_SEMI_DEEP_WATER]    = TRUE,
+    [MB_FAST_WATER]         = TRUE,
     [MB_DEEP_WATER]         = TRUE,
     [MB_WATERFALL]          = TRUE,
     [MB_OCEAN_WATER]        = TRUE,
@@ -209,9 +209,10 @@ bool8 MetatileBehavior_IsSurfable(u8 metatileBehavior)
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsSemiDeepWater(u8 metatileBehavior)
+// Water that's too fast to surf on
+bool8 MetatileBehavior_IsFastWater(u8 metatileBehavior)
 {
-    if (metatileBehavior == MB_SEMI_DEEP_WATER)
+    if (metatileBehavior == MB_FAST_WATER)
         return TRUE;
     else
         return FALSE;
@@ -476,7 +477,7 @@ bool8 MetatileBehavior_IsMountain(u8 metatileBehavior)
 
 bool8 MetatileBehavior_IsDiveable(u8 metatileBehavior)
 {
-    if (metatileBehavior >= MB_SEMI_DEEP_WATER && metatileBehavior <= MB_DEEP_WATER)
+    if (metatileBehavior >= MB_FAST_WATER && metatileBehavior <= MB_DEEP_WATER)
         return TRUE;
     else
         return FALSE;
@@ -514,9 +515,9 @@ bool8 MetatileBehavior_IsCrackedIce(u8 metatileBehavior)
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsDeepSemiDeepOrSplashingWater(u8 metatileBehavior)
+bool8 MetatileBehavior_IsDeepWaterTerrain(u8 metatileBehavior)
 {
-    if ((metatileBehavior >= MB_SEMI_DEEP_WATER && metatileBehavior <= MB_DEEP_WATER)
+    if ((metatileBehavior >= MB_FAST_WATER && metatileBehavior <= MB_DEEP_WATER)
       || metatileBehavior == MB_OCEAN_WATER)
         return TRUE;
     else
diff --git a/src/party_menu.c b/src/party_menu.c
index d19354c5b..f87119218 100644
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -4063,7 +4063,7 @@ static bool8 SetUpFieldMove_Surf(void)
     s16 x, y;
     
     GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
-    if (MetatileBehavior_IsSemiDeepWater(MapGridGetMetatileBehaviorAt(x, y)) != TRUE
+    if (MetatileBehavior_IsFastWater(MapGridGetMetatileBehaviorAt(x, y)) != TRUE
      && PartyHasMonWithSurf() == TRUE
      && IsPlayerFacingSurfableFishableWater() == TRUE)
     {
@@ -4085,7 +4085,7 @@ static void DisplayCantUseSurfMessage(void)
     else
     {
         GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
-        if (MetatileBehavior_IsSemiDeepWater(MapGridGetMetatileBehaviorAt(x, y)) == TRUE)
+        if (MetatileBehavior_IsFastWater(MapGridGetMetatileBehaviorAt(x, y)) == TRUE)
             DisplayPartyMenuStdMessage(PARTY_MSG_CURRENT_TOO_FAST);
         else if ((gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ROUTE17))
               && ((gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE17))