diff --git a/common/src/main/resources/data/cobblemon/species/generation1/blastoise.json b/common/src/main/resources/data/cobblemon/species/generation1/blastoise.json
index d07137e17e..e4eb0c6aff 100644
--- a/common/src/main/resources/data/cobblemon/species/generation1/blastoise.json
+++ b/common/src/main/resources/data/cobblemon/species/generation1/blastoise.json
@@ -97,7 +97,7 @@
             "pitchExpr": "math.max(1.0 ,0.2 + math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2))",
             "playForNonPassengers": false,
             "playForPassengers": true,
-            "soundLocation": "cobblemon:ride.loop.water_sufrace.stereo",
+            "soundLocation": "cobblemon:ride.loop.water_surface.stereo",
             "volumeExpr": "math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2)"
           },
           {
diff --git a/common/src/main/resources/data/cobblemon/species/generation1/dewgong.json b/common/src/main/resources/data/cobblemon/species/generation1/dewgong.json
index 13e59b3f66..6c465f63c4 100644
--- a/common/src/main/resources/data/cobblemon/species/generation1/dewgong.json
+++ b/common/src/main/resources/data/cobblemon/species/generation1/dewgong.json
@@ -73,7 +73,7 @@
             "pitchExpr": "math.max(1.0 ,0.2 + math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2))",
             "playForNonPassengers": false,
             "playForPassengers": true,
-            "soundLocation": "cobblemon:ride.loop.water_sufrace.stereo",
+            "soundLocation": "cobblemon:ride.loop.water_surface.stereo",
             "volumeExpr": "math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2)"
           },
           {
diff --git a/common/src/main/resources/data/cobblemon/species/generation1/dragonite.json b/common/src/main/resources/data/cobblemon/species/generation1/dragonite.json
index b457b99546..64826b061c 100644
--- a/common/src/main/resources/data/cobblemon/species/generation1/dragonite.json
+++ b/common/src/main/resources/data/cobblemon/species/generation1/dragonite.json
@@ -135,7 +135,7 @@
             "pitchExpr": "math.max(1.0 ,0.2 + math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2))",
             "playForNonPassengers": false,
             "playForPassengers": true,
-            "soundLocation": "cobblemon:ride.loop.water_sufrace.stereo",
+            "soundLocation": "cobblemon:ride.loop.water_surface.stereo",
             "volumeExpr": "math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2)"
           }
         ],
diff --git a/common/src/main/resources/data/cobblemon/species/generation1/gyarados.json b/common/src/main/resources/data/cobblemon/species/generation1/gyarados.json
index 8f125c6ed8..f408078fa6 100644
--- a/common/src/main/resources/data/cobblemon/species/generation1/gyarados.json
+++ b/common/src/main/resources/data/cobblemon/species/generation1/gyarados.json
@@ -100,7 +100,7 @@
             "pitchExpr": "math.max(1.0 ,0.2 + math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2))",
             "playForNonPassengers": false,
             "playForPassengers": true,
-            "soundLocation": "cobblemon:ride.loop.water_sufrace.stereo",
+            "soundLocation": "cobblemon:ride.loop.water_surface.stereo",
             "volumeExpr": "math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2)"
           },
           {
diff --git a/common/src/main/resources/data/cobblemon/species/generation1/lapras.json b/common/src/main/resources/data/cobblemon/species/generation1/lapras.json
index 4e9d68f028..06035f690a 100644
--- a/common/src/main/resources/data/cobblemon/species/generation1/lapras.json
+++ b/common/src/main/resources/data/cobblemon/species/generation1/lapras.json
@@ -73,7 +73,7 @@
             "pitchExpr": "math.max(1.0 ,0.2 + math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2))",
             "playForNonPassengers": false,
             "playForPassengers": true,
-            "soundLocation": "cobblemon:ride.loop.water_sufrace.stereo",
+            "soundLocation": "cobblemon:ride.loop.water_surface.stereo",
             "volumeExpr": "math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2)"
           },
           {
diff --git a/common/src/main/resources/data/cobblemon/species/generation2/mantine.json b/common/src/main/resources/data/cobblemon/species/generation2/mantine.json
index df4a0d7b2b..29781c0eca 100644
--- a/common/src/main/resources/data/cobblemon/species/generation2/mantine.json
+++ b/common/src/main/resources/data/cobblemon/species/generation2/mantine.json
@@ -100,7 +100,7 @@
             "pitchExpr": "math.max(1.0 ,0.2 + math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2))",
             "playForNonPassengers": false,
             "playForPassengers": true,
-            "soundLocation": "cobblemon:ride.loop.water_sufrace.stereo",
+            "soundLocation": "cobblemon:ride.loop.water_surface.stereo",
             "volumeExpr": "math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2)"
           },
           {
diff --git a/common/src/main/resources/data/cobblemon/species/generation3/milotic.json b/common/src/main/resources/data/cobblemon/species/generation3/milotic.json
index 0eb7d83d7e..f400f05e5a 100644
--- a/common/src/main/resources/data/cobblemon/species/generation3/milotic.json
+++ b/common/src/main/resources/data/cobblemon/species/generation3/milotic.json
@@ -72,7 +72,7 @@
             "pitchExpr": "math.max(1.0 ,0.2 + math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2))",
             "playForNonPassengers": false,
             "playForPassengers": true,
-            "soundLocation": "cobblemon:ride.loop.water_sufrace.stereo",
+            "soundLocation": "cobblemon:ride.loop.water_surface.stereo",
             "volumeExpr": "math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2)"
           },
           {
diff --git a/common/src/main/resources/data/cobblemon/species/generation3/relicanth.json b/common/src/main/resources/data/cobblemon/species/generation3/relicanth.json
index 8324ddaf6e..4a9113439b 100644
--- a/common/src/main/resources/data/cobblemon/species/generation3/relicanth.json
+++ b/common/src/main/resources/data/cobblemon/species/generation3/relicanth.json
@@ -60,7 +60,7 @@
             "pitchExpr": "math.max(1.0 ,0.2 + math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2))",
             "playForNonPassengers": false,
             "playForPassengers": true,
-            "soundLocation": "cobblemon:ride.loop.water_sufrace.stereo",
+            "soundLocation": "cobblemon:ride.loop.water_surface.stereo",
             "volumeExpr": "math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2)"
           },
           {
diff --git a/common/src/main/resources/data/cobblemon/species/generation3/sharpedo.json b/common/src/main/resources/data/cobblemon/species/generation3/sharpedo.json
index 58d2f91726..d47c70db9a 100644
--- a/common/src/main/resources/data/cobblemon/species/generation3/sharpedo.json
+++ b/common/src/main/resources/data/cobblemon/species/generation3/sharpedo.json
@@ -58,7 +58,7 @@
             "pitchExpr": "math.max(1.0 ,0.2 + math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2))",
             "playForNonPassengers": false,
             "playForPassengers": true,
-            "soundLocation": "cobblemon:ride.loop.water_sufrace.stereo",
+            "soundLocation": "cobblemon:ride.loop.water_surface.stereo",
             "volumeExpr": "math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2)"
           },
           {
diff --git a/common/src/main/resources/data/cobblemon/species/generation3/wailmer.json b/common/src/main/resources/data/cobblemon/species/generation3/wailmer.json
index 4b00b05e65..6923944a99 100644
--- a/common/src/main/resources/data/cobblemon/species/generation3/wailmer.json
+++ b/common/src/main/resources/data/cobblemon/species/generation3/wailmer.json
@@ -72,7 +72,7 @@
             "pitchExpr": "math.max(1.0 ,0.2 + math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2))",
             "playForNonPassengers": false,
             "playForPassengers": true,
-            "soundLocation": "cobblemon:ride.loop.water_sufrace.stereo",
+            "soundLocation": "cobblemon:ride.loop.water_surface.stereo",
             "volumeExpr": "math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2)"
           },
           {
diff --git a/common/src/main/resources/data/cobblemon/species/generation3/wailord.json b/common/src/main/resources/data/cobblemon/species/generation3/wailord.json
index 8c224685fd..2218b07eee 100644
--- a/common/src/main/resources/data/cobblemon/species/generation3/wailord.json
+++ b/common/src/main/resources/data/cobblemon/species/generation3/wailord.json
@@ -72,7 +72,7 @@
             "pitchExpr": "math.max(1.0 ,0.2 + math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2))",
             "playForNonPassengers": false,
             "playForPassengers": true,
-            "soundLocation": "cobblemon:ride.loop.water_sufrace.stereo",
+            "soundLocation": "cobblemon:ride.loop.water_surface.stereo",
             "volumeExpr": "math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2)"
           },
           {
diff --git a/common/src/main/resources/data/cobblemon/species/generation4/garchomp.json b/common/src/main/resources/data/cobblemon/species/generation4/garchomp.json
index ac0883981d..2ad6787fef 100644
--- a/common/src/main/resources/data/cobblemon/species/generation4/garchomp.json
+++ b/common/src/main/resources/data/cobblemon/species/generation4/garchomp.json
@@ -113,7 +113,7 @@
             "pitchExpr": "math.max(1.0 ,0.2 + math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2))",
             "playForNonPassengers": false,
             "playForPassengers": true,
-            "soundLocation": "cobblemon:ride.loop.water_sufrace.stereo",
+            "soundLocation": "cobblemon:ride.loop.water_surface.stereo",
             "volumeExpr": "math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2)"
           },
           {
diff --git a/common/src/main/resources/data/cobblemon/species/generation7/dhelmise.json b/common/src/main/resources/data/cobblemon/species/generation7/dhelmise.json
index 95b6cc46ea..bd25b56dbe 100644
--- a/common/src/main/resources/data/cobblemon/species/generation7/dhelmise.json
+++ b/common/src/main/resources/data/cobblemon/species/generation7/dhelmise.json
@@ -71,7 +71,7 @@
             "pitchExpr": "math.max(1.0 ,0.2 + math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2))",
             "playForNonPassengers": false,
             "playForPassengers": true,
-            "soundLocation": "cobblemon:ride.loop.water_sufrace.stereo",
+            "soundLocation": "cobblemon:ride.loop.water_surface.stereo",
             "volumeExpr": "math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2)"
           },
           {
diff --git a/common/src/main/resources/data/cobblemon/species/generation9/dondozo.json b/common/src/main/resources/data/cobblemon/species/generation9/dondozo.json
index 8d62ffb594..666bbb46b5 100644
--- a/common/src/main/resources/data/cobblemon/species/generation9/dondozo.json
+++ b/common/src/main/resources/data/cobblemon/species/generation9/dondozo.json
@@ -71,7 +71,7 @@
             "pitchExpr": "math.max(1.0 ,0.2 + math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2))",
             "playForNonPassengers": false,
             "playForPassengers": true,
-            "soundLocation": "cobblemon:ride.loop.water_sufrace.stereo",
+            "soundLocation": "cobblemon:ride.loop.water_surface.stereo",
             "volumeExpr": "math.pow(math.min(q.ride_velocity() / 1.5, 1.0),2)"
           },
           {