diff --git a/data/api/v2/gender/1/index.json b/data/api/v2/gender/1/index.json
index 0916e6685a..ba46941526 100644
--- a/data/api/v2/gender/1/index.json
+++ b/data/api/v2/gender/1/index.json
@@ -3077,15 +3077,15 @@
         },
         {
             "pokemon_species": {
-                "name": "samurott",
-                "url": "/api/v2/pokemon-species/503/"
+                "name": "watchog",
+                "url": "/api/v2/pokemon-species/505/"
             },
-            "rate": 1
+            "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "watchog",
-                "url": "/api/v2/pokemon-species/505/"
+                "name": "herdier",
+                "url": "/api/v2/pokemon-species/507/"
             },
             "rate": 4
         },
@@ -5737,10 +5737,10 @@
         },
         {
             "pokemon_species": {
-                "name": "herdier",
-                "url": "/api/v2/pokemon-species/507/"
+                "name": "samurott",
+                "url": "/api/v2/pokemon-species/503/"
             },
-            "rate": 4
+            "rate": 1
         },
         {
             "pokemon_species": {
diff --git a/data/api/v2/gender/2/index.json b/data/api/v2/gender/2/index.json
index f9dc6cb659..a29905170a 100644
--- a/data/api/v2/gender/2/index.json
+++ b/data/api/v2/gender/2/index.json
@@ -3049,15 +3049,15 @@
         },
         {
             "pokemon_species": {
-                "name": "samurott",
-                "url": "/api/v2/pokemon-species/503/"
+                "name": "watchog",
+                "url": "/api/v2/pokemon-species/505/"
             },
-            "rate": 1
+            "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "watchog",
-                "url": "/api/v2/pokemon-species/505/"
+                "name": "herdier",
+                "url": "/api/v2/pokemon-species/507/"
             },
             "rate": 4
         },
@@ -5646,10 +5646,10 @@
         },
         {
             "pokemon_species": {
-                "name": "herdier",
-                "url": "/api/v2/pokemon-species/507/"
+                "name": "samurott",
+                "url": "/api/v2/pokemon-species/503/"
             },
-            "rate": 4
+            "rate": 1
         },
         {
             "pokemon_species": {
diff --git a/data/api/v2/generation/5/index.json b/data/api/v2/generation/5/index.json
index 4838e83c3f..dbad6fde2e 100644
--- a/data/api/v2/generation/5/index.json
+++ b/data/api/v2/generation/5/index.json
@@ -935,14 +935,14 @@
             "name": "dewott",
             "url": "/api/v2/pokemon-species/502/"
         },
-        {
-            "name": "samurott",
-            "url": "/api/v2/pokemon-species/503/"
-        },
         {
             "name": "watchog",
             "url": "/api/v2/pokemon-species/505/"
         },
+        {
+            "name": "herdier",
+            "url": "/api/v2/pokemon-species/507/"
+        },
         {
             "name": "stoutland",
             "url": "/api/v2/pokemon-species/508/"
@@ -1448,8 +1448,8 @@
             "url": "/api/v2/pokemon-species/637/"
         },
         {
-            "name": "herdier",
-            "url": "/api/v2/pokemon-species/507/"
+            "name": "samurott",
+            "url": "/api/v2/pokemon-species/503/"
         },
         {
             "name": "gurdurr",
diff --git a/data/api/v2/growth-rate/4/index.json b/data/api/v2/growth-rate/4/index.json
index b4491be902..c0b231066f 100644
--- a/data/api/v2/growth-rate/4/index.json
+++ b/data/api/v2/growth-rate/4/index.json
@@ -953,8 +953,8 @@
             "url": "/api/v2/pokemon-species/502/"
         },
         {
-            "name": "samurott",
-            "url": "/api/v2/pokemon-species/503/"
+            "name": "herdier",
+            "url": "/api/v2/pokemon-species/507/"
         },
         {
             "name": "stoutland",
@@ -1441,8 +1441,8 @@
             "url": "/api/v2/pokemon-species/391/"
         },
         {
-            "name": "herdier",
-            "url": "/api/v2/pokemon-species/507/"
+            "name": "samurott",
+            "url": "/api/v2/pokemon-species/503/"
         },
         {
             "name": "gurdurr",
diff --git a/data/api/v2/pokemon-color/2/index.json b/data/api/v2/pokemon-color/2/index.json
index 6e4ce4c82e..13b5538d1d 100644
--- a/data/api/v2/pokemon-color/2/index.json
+++ b/data/api/v2/pokemon-color/2/index.json
@@ -466,10 +466,6 @@
             "name": "dewott",
             "url": "/api/v2/pokemon-species/502/"
         },
-        {
-            "name": "samurott",
-            "url": "/api/v2/pokemon-species/503/"
-        },
         {
             "name": "simipour",
             "url": "/api/v2/pokemon-species/516/"
@@ -746,6 +742,10 @@
             "name": "toxicroak",
             "url": "/api/v2/pokemon-species/454/"
         },
+        {
+            "name": "samurott",
+            "url": "/api/v2/pokemon-species/503/"
+        },
         {
             "name": "malamar",
             "url": "/api/v2/pokemon-species/687/"
diff --git a/data/api/v2/pokemon-color/4/index.json b/data/api/v2/pokemon-color/4/index.json
index 38cce3b284..28bae53cf5 100644
--- a/data/api/v2/pokemon-color/4/index.json
+++ b/data/api/v2/pokemon-color/4/index.json
@@ -238,6 +238,10 @@
             "name": "probopass",
             "url": "/api/v2/pokemon-species/476/"
         },
+        {
+            "name": "herdier",
+            "url": "/api/v2/pokemon-species/507/"
+        },
         {
             "name": "stoutland",
             "url": "/api/v2/pokemon-species/508/"
@@ -470,10 +474,6 @@
             "name": "iron-boulder",
             "url": "/api/v2/pokemon-species/1022/"
         },
-        {
-            "name": "herdier",
-            "url": "/api/v2/pokemon-species/507/"
-        },
         {
             "name": "gurdurr",
             "url": "/api/v2/pokemon-species/533/"
diff --git a/data/api/v2/pokemon-form/10372/index.json b/data/api/v2/pokemon-form/10372/index.json
index 37eb30424d..eae657bd64 100644
--- a/data/api/v2/pokemon-form/10372/index.json
+++ b/data/api/v2/pokemon-form/10372/index.json
@@ -80,4 +80,4 @@
         "name": "sword-shield",
         "url": "/api/v2/version-group/20/"
     }
-}
+}
\ No newline at end of file
diff --git a/data/api/v2/pokemon-shape/8/index.json b/data/api/v2/pokemon-shape/8/index.json
index 6c716f930d..8b778be219 100644
--- a/data/api/v2/pokemon-shape/8/index.json
+++ b/data/api/v2/pokemon-shape/8/index.json
@@ -411,8 +411,8 @@
             "url": "/api/v2/pokemon-species/471/"
         },
         {
-            "name": "samurott",
-            "url": "/api/v2/pokemon-species/503/"
+            "name": "herdier",
+            "url": "/api/v2/pokemon-species/507/"
         },
         {
             "name": "stoutland",
@@ -823,8 +823,8 @@
             "url": "/api/v2/pokemon-species/473/"
         },
         {
-            "name": "herdier",
-            "url": "/api/v2/pokemon-species/507/"
+            "name": "samurott",
+            "url": "/api/v2/pokemon-species/503/"
         },
         {
             "name": "appletun",