diff --git a/data/api/v2/encounter-condition/11/index.json b/data/api/v2/encounter-condition/11/index.json
index 11565241b7..35f1cd958b 100644
--- a/data/api/v2/encounter-condition/11/index.json
+++ b/data/api/v2/encounter-condition/11/index.json
@@ -1,7 +1,22 @@
 {
     "id": 11,
     "name": "item",
-    "names": [],
+    "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "Objet"
+        },
+        {
+            "language": {
+                "name": "en",
+                "url": "/api/v2/language/9/"
+            },
+            "name": "Item"
+        }
+    ],
     "values": [
         {
             "name": "item-none",
diff --git a/data/api/v2/encounter-condition/12/index.json b/data/api/v2/encounter-condition/12/index.json
index ed46c08e82..b48104237c 100644
--- a/data/api/v2/encounter-condition/12/index.json
+++ b/data/api/v2/encounter-condition/12/index.json
@@ -1,7 +1,22 @@
 {
     "id": 12,
     "name": "weekday",
-    "names": [],
+    "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "Jour de la semaine"
+        },
+        {
+            "language": {
+                "name": "en",
+                "url": "/api/v2/language/9/"
+            },
+            "name": "Weekday"
+        }
+    ],
     "values": [
         {
             "name": "weekday-sunday",
diff --git a/data/api/v2/encounter-condition/13/index.json b/data/api/v2/encounter-condition/13/index.json
index 26917f18a2..4b2c4f274f 100644
--- a/data/api/v2/encounter-condition/13/index.json
+++ b/data/api/v2/encounter-condition/13/index.json
@@ -1,7 +1,22 @@
 {
     "id": 13,
     "name": "first-party-pokemon",
-    "names": [],
+    "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "Premier Pokemon de l'\u00e9quipe"
+        },
+        {
+            "language": {
+                "name": "en",
+                "url": "/api/v2/language/9/"
+            },
+            "name": "First party Pokemon"
+        }
+    ],
     "values": [
         {
             "name": "first-party-pokemon-high-friendship",
diff --git a/data/api/v2/encounter-condition/14/index.json b/data/api/v2/encounter-condition/14/index.json
index b34488608f..33510ac509 100644
--- a/data/api/v2/encounter-condition/14/index.json
+++ b/data/api/v2/encounter-condition/14/index.json
@@ -1,7 +1,22 @@
 {
     "id": 14,
     "name": "special-encounter",
-    "names": [],
+    "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "Rencontre sp\u00e9ciale"
+        },
+        {
+            "language": {
+                "name": "en",
+                "url": "/api/v2/language/9/"
+            },
+            "name": "Special encounter"
+        }
+    ],
     "values": [
         {
             "name": "special-encounter-couldnt-capture-before",
diff --git a/data/api/v2/encounter-method/38/index.json b/data/api/v2/encounter-method/38/index.json
index a98f66e11b..e8a53aee45 100644
--- a/data/api/v2/encounter-method/38/index.json
+++ b/data/api/v2/encounter-method/38/index.json
@@ -8,6 +8,13 @@
                 "url": "/api/v2/language/9/"
             },
             "name": "Walking in the overworld"
+        },
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "En marchant dans le monde ext\u00e9rieur"
         }
     ],
     "order": 38
diff --git a/data/api/v2/encounter-method/39/index.json b/data/api/v2/encounter-method/39/index.json
index 9aaa7d52b7..e750d1f611 100644
--- a/data/api/v2/encounter-method/39/index.json
+++ b/data/api/v2/encounter-method/39/index.json
@@ -8,6 +8,13 @@
                 "url": "/api/v2/language/9/"
             },
             "name": "Surfing in the overworld"
+        },
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "En surfant dans le monde ext\u00e9rieur"
         }
     ],
     "order": 39
diff --git a/data/api/v2/encounter-method/40/index.json b/data/api/v2/encounter-method/40/index.json
index ea5ce4f371..55cfdd1890 100644
--- a/data/api/v2/encounter-method/40/index.json
+++ b/data/api/v2/encounter-method/40/index.json
@@ -8,6 +8,13 @@
                 "url": "/api/v2/language/9/"
             },
             "name": "Flying Pokemon in the sky"
+        },
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "Pokemon volant dans le ciel"
         }
     ],
     "order": 40
diff --git a/data/api/v2/encounter-method/41/index.json b/data/api/v2/encounter-method/41/index.json
index 6b33738c87..a072f05842 100644
--- a/data/api/v2/encounter-method/41/index.json
+++ b/data/api/v2/encounter-method/41/index.json
@@ -8,6 +8,13 @@
                 "url": "/api/v2/language/9/"
             },
             "name": "Rare spawn in grass with lure or catch combo"
+        },
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "Apparition rare dans les herbes avec un parfum ou un combo capture"
         }
     ],
     "order": 41
diff --git a/data/api/v2/encounter-method/42/index.json b/data/api/v2/encounter-method/42/index.json
index 83aa3160f1..2d85c3ea9f 100644
--- a/data/api/v2/encounter-method/42/index.json
+++ b/data/api/v2/encounter-method/42/index.json
@@ -8,6 +8,13 @@
                 "url": "/api/v2/language/9/"
             },
             "name": "Rare spawn in the sky with lure or catch combo"
+        },
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "Apparition rare dans le ciel avec un parfum ou un combo capture"
         }
     ],
     "order": 42
diff --git a/data/api/v2/encounter-method/43/index.json b/data/api/v2/encounter-method/43/index.json
index dac40d8981..5cfe757469 100644
--- a/data/api/v2/encounter-method/43/index.json
+++ b/data/api/v2/encounter-method/43/index.json
@@ -8,6 +8,13 @@
                 "url": "/api/v2/language/9/"
             },
             "name": "Rare spawn in water with lure or catch combo"
+        },
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "Apparition rare dans l'eau avec un parfum ou un combo capture"
         }
     ],
     "order": 43
diff --git a/data/api/v2/gender/1/index.json b/data/api/v2/gender/1/index.json
index 42eed7d18f..0916e6685a 100644
--- a/data/api/v2/gender/1/index.json
+++ b/data/api/v2/gender/1/index.json
@@ -191,6 +191,76 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "venusaur",
+                "url": "/api/v2/pokemon-species/3/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "charmeleon",
+                "url": "/api/v2/pokemon-species/5/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "charizard",
+                "url": "/api/v2/pokemon-species/6/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "wartortle",
+                "url": "/api/v2/pokemon-species/8/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "blastoise",
+                "url": "/api/v2/pokemon-species/9/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "metapod",
+                "url": "/api/v2/pokemon-species/11/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "butterfree",
+                "url": "/api/v2/pokemon-species/12/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "kakuna",
+                "url": "/api/v2/pokemon-species/14/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "beedrill",
+                "url": "/api/v2/pokemon-species/15/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "pidgeotto",
+                "url": "/api/v2/pokemon-species/17/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "pidgeot",
@@ -324,6 +394,97 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "dugtrio",
+                "url": "/api/v2/pokemon-species/51/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "persian",
+                "url": "/api/v2/pokemon-species/53/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "golduck",
+                "url": "/api/v2/pokemon-species/55/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "primeape",
+                "url": "/api/v2/pokemon-species/57/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "arcanine",
+                "url": "/api/v2/pokemon-species/59/"
+            },
+            "rate": 2
+        },
+        {
+            "pokemon_species": {
+                "name": "poliwhirl",
+                "url": "/api/v2/pokemon-species/61/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "poliwrath",
+                "url": "/api/v2/pokemon-species/62/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "kadabra",
+                "url": "/api/v2/pokemon-species/64/"
+            },
+            "rate": 2
+        },
+        {
+            "pokemon_species": {
+                "name": "alakazam",
+                "url": "/api/v2/pokemon-species/65/"
+            },
+            "rate": 2
+        },
+        {
+            "pokemon_species": {
+                "name": "machoke",
+                "url": "/api/v2/pokemon-species/67/"
+            },
+            "rate": 2
+        },
+        {
+            "pokemon_species": {
+                "name": "machamp",
+                "url": "/api/v2/pokemon-species/68/"
+            },
+            "rate": 2
+        },
+        {
+            "pokemon_species": {
+                "name": "weepinbell",
+                "url": "/api/v2/pokemon-species/70/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "victreebel",
+                "url": "/api/v2/pokemon-species/71/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "tentacruel",
@@ -541,6 +702,41 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "rapidash",
+                "url": "/api/v2/pokemon-species/78/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "slowbro",
+                "url": "/api/v2/pokemon-species/80/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "dodrio",
+                "url": "/api/v2/pokemon-species/85/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "dewgong",
+                "url": "/api/v2/pokemon-species/87/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "muk",
+                "url": "/api/v2/pokemon-species/89/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "cloyster",
@@ -5483,167 +5679,6 @@
             },
             "rate": 1
         },
-        {
-            "pokemon_species": {
-                "name": "venusaur",
-                "url": "/api/v2/pokemon-species/3/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "charmeleon",
-                "url": "/api/v2/pokemon-species/5/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "charizard",
-                "url": "/api/v2/pokemon-species/6/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "wartortle",
-                "url": "/api/v2/pokemon-species/8/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "blastoise",
-                "url": "/api/v2/pokemon-species/9/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "metapod",
-                "url": "/api/v2/pokemon-species/11/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "butterfree",
-                "url": "/api/v2/pokemon-species/12/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "kakuna",
-                "url": "/api/v2/pokemon-species/14/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "beedrill",
-                "url": "/api/v2/pokemon-species/15/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "pidgeotto",
-                "url": "/api/v2/pokemon-species/17/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "dugtrio",
-                "url": "/api/v2/pokemon-species/51/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "persian",
-                "url": "/api/v2/pokemon-species/53/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "golduck",
-                "url": "/api/v2/pokemon-species/55/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "primeape",
-                "url": "/api/v2/pokemon-species/57/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "arcanine",
-                "url": "/api/v2/pokemon-species/59/"
-            },
-            "rate": 2
-        },
-        {
-            "pokemon_species": {
-                "name": "poliwhirl",
-                "url": "/api/v2/pokemon-species/61/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "poliwrath",
-                "url": "/api/v2/pokemon-species/62/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "kadabra",
-                "url": "/api/v2/pokemon-species/64/"
-            },
-            "rate": 2
-        },
-        {
-            "pokemon_species": {
-                "name": "alakazam",
-                "url": "/api/v2/pokemon-species/65/"
-            },
-            "rate": 2
-        },
-        {
-            "pokemon_species": {
-                "name": "machoke",
-                "url": "/api/v2/pokemon-species/67/"
-            },
-            "rate": 2
-        },
-        {
-            "pokemon_species": {
-                "name": "machamp",
-                "url": "/api/v2/pokemon-species/68/"
-            },
-            "rate": 2
-        },
-        {
-            "pokemon_species": {
-                "name": "weepinbell",
-                "url": "/api/v2/pokemon-species/70/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "victreebel",
-                "url": "/api/v2/pokemon-species/71/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "golem",
@@ -5651,41 +5686,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "rapidash",
-                "url": "/api/v2/pokemon-species/78/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "slowbro",
-                "url": "/api/v2/pokemon-species/80/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "dodrio",
-                "url": "/api/v2/pokemon-species/85/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "dewgong",
-                "url": "/api/v2/pokemon-species/87/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "muk",
-                "url": "/api/v2/pokemon-species/89/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "bayleef",
@@ -5791,27 +5791,6 @@
             },
             "rate": 1
         },
-        {
-            "pokemon_species": {
-                "name": "baxcalibur",
-                "url": "/api/v2/pokemon-species/998/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "archaludon",
-                "url": "/api/v2/pokemon-species/1018/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "hydrapple",
-                "url": "/api/v2/pokemon-species/1019/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "brionne",
@@ -5888,6 +5867,27 @@
                 "url": "/api/v2/pokemon-species/997/"
             },
             "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "baxcalibur",
+                "url": "/api/v2/pokemon-species/998/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "archaludon",
+                "url": "/api/v2/pokemon-species/1018/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "hydrapple",
+                "url": "/api/v2/pokemon-species/1019/"
+            },
+            "rate": 4
         }
     ],
     "required_for_evolution": [
diff --git a/data/api/v2/gender/2/index.json b/data/api/v2/gender/2/index.json
index 00c3e6bbe4..f9dc6cb659 100644
--- a/data/api/v2/gender/2/index.json
+++ b/data/api/v2/gender/2/index.json
@@ -191,6 +191,76 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "venusaur",
+                "url": "/api/v2/pokemon-species/3/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "charmeleon",
+                "url": "/api/v2/pokemon-species/5/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "charizard",
+                "url": "/api/v2/pokemon-species/6/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "wartortle",
+                "url": "/api/v2/pokemon-species/8/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "blastoise",
+                "url": "/api/v2/pokemon-species/9/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "metapod",
+                "url": "/api/v2/pokemon-species/11/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "butterfree",
+                "url": "/api/v2/pokemon-species/12/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "kakuna",
+                "url": "/api/v2/pokemon-species/14/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "beedrill",
+                "url": "/api/v2/pokemon-species/15/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "pidgeotto",
+                "url": "/api/v2/pokemon-species/17/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "pidgeot",
@@ -324,6 +394,97 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "dugtrio",
+                "url": "/api/v2/pokemon-species/51/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "persian",
+                "url": "/api/v2/pokemon-species/53/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "golduck",
+                "url": "/api/v2/pokemon-species/55/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "primeape",
+                "url": "/api/v2/pokemon-species/57/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "arcanine",
+                "url": "/api/v2/pokemon-species/59/"
+            },
+            "rate": 2
+        },
+        {
+            "pokemon_species": {
+                "name": "poliwhirl",
+                "url": "/api/v2/pokemon-species/61/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "poliwrath",
+                "url": "/api/v2/pokemon-species/62/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "kadabra",
+                "url": "/api/v2/pokemon-species/64/"
+            },
+            "rate": 2
+        },
+        {
+            "pokemon_species": {
+                "name": "alakazam",
+                "url": "/api/v2/pokemon-species/65/"
+            },
+            "rate": 2
+        },
+        {
+            "pokemon_species": {
+                "name": "machoke",
+                "url": "/api/v2/pokemon-species/67/"
+            },
+            "rate": 2
+        },
+        {
+            "pokemon_species": {
+                "name": "machamp",
+                "url": "/api/v2/pokemon-species/68/"
+            },
+            "rate": 2
+        },
+        {
+            "pokemon_species": {
+                "name": "weepinbell",
+                "url": "/api/v2/pokemon-species/70/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "victreebel",
+                "url": "/api/v2/pokemon-species/71/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "tentacruel",
@@ -541,6 +702,41 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "rapidash",
+                "url": "/api/v2/pokemon-species/78/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "slowbro",
+                "url": "/api/v2/pokemon-species/80/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "dodrio",
+                "url": "/api/v2/pokemon-species/85/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "dewgong",
+                "url": "/api/v2/pokemon-species/87/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "muk",
+                "url": "/api/v2/pokemon-species/89/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "cloyster",
@@ -5392,167 +5588,6 @@
             },
             "rate": 1
         },
-        {
-            "pokemon_species": {
-                "name": "venusaur",
-                "url": "/api/v2/pokemon-species/3/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "charmeleon",
-                "url": "/api/v2/pokemon-species/5/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "charizard",
-                "url": "/api/v2/pokemon-species/6/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "wartortle",
-                "url": "/api/v2/pokemon-species/8/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "blastoise",
-                "url": "/api/v2/pokemon-species/9/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "metapod",
-                "url": "/api/v2/pokemon-species/11/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "butterfree",
-                "url": "/api/v2/pokemon-species/12/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "kakuna",
-                "url": "/api/v2/pokemon-species/14/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "beedrill",
-                "url": "/api/v2/pokemon-species/15/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "pidgeotto",
-                "url": "/api/v2/pokemon-species/17/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "dugtrio",
-                "url": "/api/v2/pokemon-species/51/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "persian",
-                "url": "/api/v2/pokemon-species/53/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "golduck",
-                "url": "/api/v2/pokemon-species/55/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "primeape",
-                "url": "/api/v2/pokemon-species/57/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "arcanine",
-                "url": "/api/v2/pokemon-species/59/"
-            },
-            "rate": 2
-        },
-        {
-            "pokemon_species": {
-                "name": "poliwhirl",
-                "url": "/api/v2/pokemon-species/61/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "poliwrath",
-                "url": "/api/v2/pokemon-species/62/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "kadabra",
-                "url": "/api/v2/pokemon-species/64/"
-            },
-            "rate": 2
-        },
-        {
-            "pokemon_species": {
-                "name": "alakazam",
-                "url": "/api/v2/pokemon-species/65/"
-            },
-            "rate": 2
-        },
-        {
-            "pokemon_species": {
-                "name": "machoke",
-                "url": "/api/v2/pokemon-species/67/"
-            },
-            "rate": 2
-        },
-        {
-            "pokemon_species": {
-                "name": "machamp",
-                "url": "/api/v2/pokemon-species/68/"
-            },
-            "rate": 2
-        },
-        {
-            "pokemon_species": {
-                "name": "weepinbell",
-                "url": "/api/v2/pokemon-species/70/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "victreebel",
-                "url": "/api/v2/pokemon-species/71/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "golem",
@@ -5560,41 +5595,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "rapidash",
-                "url": "/api/v2/pokemon-species/78/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "slowbro",
-                "url": "/api/v2/pokemon-species/80/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "dodrio",
-                "url": "/api/v2/pokemon-species/85/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "dewgong",
-                "url": "/api/v2/pokemon-species/87/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "muk",
-                "url": "/api/v2/pokemon-species/89/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "bayleef",
@@ -5700,27 +5700,6 @@
             },
             "rate": 1
         },
-        {
-            "pokemon_species": {
-                "name": "baxcalibur",
-                "url": "/api/v2/pokemon-species/998/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "archaludon",
-                "url": "/api/v2/pokemon-species/1018/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "hydrapple",
-                "url": "/api/v2/pokemon-species/1019/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "brionne",
@@ -5797,6 +5776,27 @@
                 "url": "/api/v2/pokemon-species/997/"
             },
             "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "baxcalibur",
+                "url": "/api/v2/pokemon-species/998/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "archaludon",
+                "url": "/api/v2/pokemon-species/1018/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "hydrapple",
+                "url": "/api/v2/pokemon-species/1019/"
+            },
+            "rate": 4
         }
     ],
     "required_for_evolution": [
diff --git a/data/api/v2/gender/3/index.json b/data/api/v2/gender/3/index.json
index 5443c79e10..7b0da09178 100644
--- a/data/api/v2/gender/3/index.json
+++ b/data/api/v2/gender/3/index.json
@@ -65,6 +65,13 @@
             },
             "rate": -1
         },
+        {
+            "pokemon_species": {
+                "name": "magneton",
+                "url": "/api/v2/pokemon-species/82/"
+            },
+            "rate": -1
+        },
         {
             "pokemon_species": {
                 "name": "electrode",
@@ -1087,13 +1094,6 @@
             },
             "rate": -1
         },
-        {
-            "pokemon_species": {
-                "name": "magneton",
-                "url": "/api/v2/pokemon-species/82/"
-            },
-            "rate": -1
-        },
         {
             "pokemon_species": {
                 "name": "metagross",
diff --git a/data/api/v2/generation/1/index.json b/data/api/v2/generation/1/index.json
index f3860920d2..4d4ce5dac9 100644
--- a/data/api/v2/generation/1/index.json
+++ b/data/api/v2/generation/1/index.json
@@ -846,6 +846,46 @@
             "name": "geodude",
             "url": "/api/v2/pokemon-species/74/"
         },
+        {
+            "name": "venusaur",
+            "url": "/api/v2/pokemon-species/3/"
+        },
+        {
+            "name": "charmeleon",
+            "url": "/api/v2/pokemon-species/5/"
+        },
+        {
+            "name": "charizard",
+            "url": "/api/v2/pokemon-species/6/"
+        },
+        {
+            "name": "wartortle",
+            "url": "/api/v2/pokemon-species/8/"
+        },
+        {
+            "name": "blastoise",
+            "url": "/api/v2/pokemon-species/9/"
+        },
+        {
+            "name": "metapod",
+            "url": "/api/v2/pokemon-species/11/"
+        },
+        {
+            "name": "butterfree",
+            "url": "/api/v2/pokemon-species/12/"
+        },
+        {
+            "name": "kakuna",
+            "url": "/api/v2/pokemon-species/14/"
+        },
+        {
+            "name": "beedrill",
+            "url": "/api/v2/pokemon-species/15/"
+        },
+        {
+            "name": "pidgeotto",
+            "url": "/api/v2/pokemon-species/17/"
+        },
         {
             "name": "pidgeot",
             "url": "/api/v2/pokemon-species/18/"
@@ -930,6 +970,58 @@
             "name": "venomoth",
             "url": "/api/v2/pokemon-species/49/"
         },
+        {
+            "name": "dugtrio",
+            "url": "/api/v2/pokemon-species/51/"
+        },
+        {
+            "name": "persian",
+            "url": "/api/v2/pokemon-species/53/"
+        },
+        {
+            "name": "golduck",
+            "url": "/api/v2/pokemon-species/55/"
+        },
+        {
+            "name": "primeape",
+            "url": "/api/v2/pokemon-species/57/"
+        },
+        {
+            "name": "arcanine",
+            "url": "/api/v2/pokemon-species/59/"
+        },
+        {
+            "name": "poliwhirl",
+            "url": "/api/v2/pokemon-species/61/"
+        },
+        {
+            "name": "poliwrath",
+            "url": "/api/v2/pokemon-species/62/"
+        },
+        {
+            "name": "kadabra",
+            "url": "/api/v2/pokemon-species/64/"
+        },
+        {
+            "name": "alakazam",
+            "url": "/api/v2/pokemon-species/65/"
+        },
+        {
+            "name": "machoke",
+            "url": "/api/v2/pokemon-species/67/"
+        },
+        {
+            "name": "machamp",
+            "url": "/api/v2/pokemon-species/68/"
+        },
+        {
+            "name": "weepinbell",
+            "url": "/api/v2/pokemon-species/70/"
+        },
+        {
+            "name": "victreebel",
+            "url": "/api/v2/pokemon-species/71/"
+        },
         {
             "name": "tentacruel",
             "url": "/api/v2/pokemon-species/73/"
@@ -1094,6 +1186,30 @@
             "name": "mewtwo",
             "url": "/api/v2/pokemon-species/150/"
         },
+        {
+            "name": "rapidash",
+            "url": "/api/v2/pokemon-species/78/"
+        },
+        {
+            "name": "slowbro",
+            "url": "/api/v2/pokemon-species/80/"
+        },
+        {
+            "name": "magneton",
+            "url": "/api/v2/pokemon-species/82/"
+        },
+        {
+            "name": "dodrio",
+            "url": "/api/v2/pokemon-species/85/"
+        },
+        {
+            "name": "dewgong",
+            "url": "/api/v2/pokemon-species/87/"
+        },
+        {
+            "name": "muk",
+            "url": "/api/v2/pokemon-species/89/"
+        },
         {
             "name": "cloyster",
             "url": "/api/v2/pokemon-species/91/"
@@ -1218,125 +1334,9 @@
             "name": "ivysaur",
             "url": "/api/v2/pokemon-species/2/"
         },
-        {
-            "name": "venusaur",
-            "url": "/api/v2/pokemon-species/3/"
-        },
-        {
-            "name": "charmeleon",
-            "url": "/api/v2/pokemon-species/5/"
-        },
-        {
-            "name": "charizard",
-            "url": "/api/v2/pokemon-species/6/"
-        },
-        {
-            "name": "wartortle",
-            "url": "/api/v2/pokemon-species/8/"
-        },
-        {
-            "name": "blastoise",
-            "url": "/api/v2/pokemon-species/9/"
-        },
-        {
-            "name": "metapod",
-            "url": "/api/v2/pokemon-species/11/"
-        },
-        {
-            "name": "butterfree",
-            "url": "/api/v2/pokemon-species/12/"
-        },
-        {
-            "name": "kakuna",
-            "url": "/api/v2/pokemon-species/14/"
-        },
-        {
-            "name": "beedrill",
-            "url": "/api/v2/pokemon-species/15/"
-        },
-        {
-            "name": "pidgeotto",
-            "url": "/api/v2/pokemon-species/17/"
-        },
-        {
-            "name": "dugtrio",
-            "url": "/api/v2/pokemon-species/51/"
-        },
-        {
-            "name": "persian",
-            "url": "/api/v2/pokemon-species/53/"
-        },
-        {
-            "name": "golduck",
-            "url": "/api/v2/pokemon-species/55/"
-        },
-        {
-            "name": "primeape",
-            "url": "/api/v2/pokemon-species/57/"
-        },
-        {
-            "name": "arcanine",
-            "url": "/api/v2/pokemon-species/59/"
-        },
-        {
-            "name": "poliwhirl",
-            "url": "/api/v2/pokemon-species/61/"
-        },
-        {
-            "name": "poliwrath",
-            "url": "/api/v2/pokemon-species/62/"
-        },
-        {
-            "name": "kadabra",
-            "url": "/api/v2/pokemon-species/64/"
-        },
-        {
-            "name": "alakazam",
-            "url": "/api/v2/pokemon-species/65/"
-        },
-        {
-            "name": "machoke",
-            "url": "/api/v2/pokemon-species/67/"
-        },
-        {
-            "name": "machamp",
-            "url": "/api/v2/pokemon-species/68/"
-        },
-        {
-            "name": "weepinbell",
-            "url": "/api/v2/pokemon-species/70/"
-        },
-        {
-            "name": "victreebel",
-            "url": "/api/v2/pokemon-species/71/"
-        },
         {
             "name": "golem",
             "url": "/api/v2/pokemon-species/76/"
-        },
-        {
-            "name": "rapidash",
-            "url": "/api/v2/pokemon-species/78/"
-        },
-        {
-            "name": "slowbro",
-            "url": "/api/v2/pokemon-species/80/"
-        },
-        {
-            "name": "magneton",
-            "url": "/api/v2/pokemon-species/82/"
-        },
-        {
-            "name": "dodrio",
-            "url": "/api/v2/pokemon-species/85/"
-        },
-        {
-            "name": "dewgong",
-            "url": "/api/v2/pokemon-species/87/"
-        },
-        {
-            "name": "muk",
-            "url": "/api/v2/pokemon-species/89/"
         }
     ],
     "types": [
diff --git a/data/api/v2/generation/9/index.json b/data/api/v2/generation/9/index.json
index 2777640c80..92b1dd2719 100644
--- a/data/api/v2/generation/9/index.json
+++ b/data/api/v2/generation/9/index.json
@@ -951,26 +951,6 @@
             "name": "pecharunt",
             "url": "/api/v2/pokemon-species/1025/"
         },
-        {
-            "name": "baxcalibur",
-            "url": "/api/v2/pokemon-species/998/"
-        },
-        {
-            "name": "gholdengo",
-            "url": "/api/v2/pokemon-species/1000/"
-        },
-        {
-            "name": "dipplin",
-            "url": "/api/v2/pokemon-species/1011/"
-        },
-        {
-            "name": "archaludon",
-            "url": "/api/v2/pokemon-species/1018/"
-        },
-        {
-            "name": "hydrapple",
-            "url": "/api/v2/pokemon-species/1019/"
-        },
         {
             "name": "lokix",
             "url": "/api/v2/pokemon-species/920/"
@@ -987,9 +967,29 @@
             "name": "arctibax",
             "url": "/api/v2/pokemon-species/997/"
         },
+        {
+            "name": "baxcalibur",
+            "url": "/api/v2/pokemon-species/998/"
+        },
+        {
+            "name": "gholdengo",
+            "url": "/api/v2/pokemon-species/1000/"
+        },
+        {
+            "name": "dipplin",
+            "url": "/api/v2/pokemon-species/1011/"
+        },
         {
             "name": "sinistcha",
             "url": "/api/v2/pokemon-species/1013/"
+        },
+        {
+            "name": "archaludon",
+            "url": "/api/v2/pokemon-species/1018/"
+        },
+        {
+            "name": "hydrapple",
+            "url": "/api/v2/pokemon-species/1019/"
         }
     ],
     "types": [
diff --git a/data/api/v2/growth-rate/1/index.json b/data/api/v2/growth-rate/1/index.json
index 1b58177d40..11870181ea 100644
--- a/data/api/v2/growth-rate/1/index.json
+++ b/data/api/v2/growth-rate/1/index.json
@@ -436,6 +436,10 @@
             "name": "tentacool",
             "url": "/api/v2/pokemon-species/72/"
         },
+        {
+            "name": "arcanine",
+            "url": "/api/v2/pokemon-species/59/"
+        },
         {
             "name": "tentacruel",
             "url": "/api/v2/pokemon-species/73/"
@@ -1412,10 +1416,6 @@
             "name": "pecharunt",
             "url": "/api/v2/pokemon-species/1025/"
         },
-        {
-            "name": "arcanine",
-            "url": "/api/v2/pokemon-species/59/"
-        },
         {
             "name": "mantine",
             "url": "/api/v2/pokemon-species/226/"
@@ -1428,6 +1428,10 @@
             "name": "mamoswine",
             "url": "/api/v2/pokemon-species/473/"
         },
+        {
+            "name": "arctibax",
+            "url": "/api/v2/pokemon-species/997/"
+        },
         {
             "name": "baxcalibur",
             "url": "/api/v2/pokemon-species/998/"
@@ -1440,10 +1444,6 @@
             "name": "dipplin",
             "url": "/api/v2/pokemon-species/1011/"
         },
-        {
-            "name": "arctibax",
-            "url": "/api/v2/pokemon-species/997/"
-        },
         {
             "name": "sinistcha",
             "url": "/api/v2/pokemon-species/1013/"
diff --git a/data/api/v2/growth-rate/2/index.json b/data/api/v2/growth-rate/2/index.json
index aae5f9aac2..84d5d80698 100644
--- a/data/api/v2/growth-rate/2/index.json
+++ b/data/api/v2/growth-rate/2/index.json
@@ -484,6 +484,22 @@
             "name": "mankey",
             "url": "/api/v2/pokemon-species/56/"
         },
+        {
+            "name": "metapod",
+            "url": "/api/v2/pokemon-species/11/"
+        },
+        {
+            "name": "butterfree",
+            "url": "/api/v2/pokemon-species/12/"
+        },
+        {
+            "name": "kakuna",
+            "url": "/api/v2/pokemon-species/14/"
+        },
+        {
+            "name": "beedrill",
+            "url": "/api/v2/pokemon-species/15/"
+        },
         {
             "name": "raticate",
             "url": "/api/v2/pokemon-species/20/"
@@ -524,6 +540,22 @@
             "name": "venomoth",
             "url": "/api/v2/pokemon-species/49/"
         },
+        {
+            "name": "dugtrio",
+            "url": "/api/v2/pokemon-species/51/"
+        },
+        {
+            "name": "persian",
+            "url": "/api/v2/pokemon-species/53/"
+        },
+        {
+            "name": "golduck",
+            "url": "/api/v2/pokemon-species/55/"
+        },
+        {
+            "name": "primeape",
+            "url": "/api/v2/pokemon-species/57/"
+        },
         {
             "name": "ponyta",
             "url": "/api/v2/pokemon-species/77/"
@@ -620,6 +652,30 @@
             "name": "kabuto",
             "url": "/api/v2/pokemon-species/140/"
         },
+        {
+            "name": "rapidash",
+            "url": "/api/v2/pokemon-species/78/"
+        },
+        {
+            "name": "slowbro",
+            "url": "/api/v2/pokemon-species/80/"
+        },
+        {
+            "name": "magneton",
+            "url": "/api/v2/pokemon-species/82/"
+        },
+        {
+            "name": "dodrio",
+            "url": "/api/v2/pokemon-species/85/"
+        },
+        {
+            "name": "dewgong",
+            "url": "/api/v2/pokemon-species/87/"
+        },
+        {
+            "name": "muk",
+            "url": "/api/v2/pokemon-species/89/"
+        },
         {
             "name": "hypno",
             "url": "/api/v2/pokemon-species/97/"
@@ -1912,62 +1968,6 @@
             "name": "kingambit",
             "url": "/api/v2/pokemon-species/983/"
         },
-        {
-            "name": "metapod",
-            "url": "/api/v2/pokemon-species/11/"
-        },
-        {
-            "name": "butterfree",
-            "url": "/api/v2/pokemon-species/12/"
-        },
-        {
-            "name": "kakuna",
-            "url": "/api/v2/pokemon-species/14/"
-        },
-        {
-            "name": "beedrill",
-            "url": "/api/v2/pokemon-species/15/"
-        },
-        {
-            "name": "dugtrio",
-            "url": "/api/v2/pokemon-species/51/"
-        },
-        {
-            "name": "persian",
-            "url": "/api/v2/pokemon-species/53/"
-        },
-        {
-            "name": "golduck",
-            "url": "/api/v2/pokemon-species/55/"
-        },
-        {
-            "name": "primeape",
-            "url": "/api/v2/pokemon-species/57/"
-        },
-        {
-            "name": "rapidash",
-            "url": "/api/v2/pokemon-species/78/"
-        },
-        {
-            "name": "slowbro",
-            "url": "/api/v2/pokemon-species/80/"
-        },
-        {
-            "name": "magneton",
-            "url": "/api/v2/pokemon-species/82/"
-        },
-        {
-            "name": "dodrio",
-            "url": "/api/v2/pokemon-species/85/"
-        },
-        {
-            "name": "dewgong",
-            "url": "/api/v2/pokemon-species/87/"
-        },
-        {
-            "name": "muk",
-            "url": "/api/v2/pokemon-species/89/"
-        },
         {
             "name": "gastrodon",
             "url": "/api/v2/pokemon-species/423/"
@@ -1992,10 +1992,6 @@
             "name": "tyrantrum",
             "url": "/api/v2/pokemon-species/697/"
         },
-        {
-            "name": "archaludon",
-            "url": "/api/v2/pokemon-species/1018/"
-        },
         {
             "name": "golisopod",
             "url": "/api/v2/pokemon-species/768/"
@@ -2023,6 +2019,10 @@
         {
             "name": "revavroom",
             "url": "/api/v2/pokemon-species/966/"
+        },
+        {
+            "name": "archaludon",
+            "url": "/api/v2/pokemon-species/1018/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/growth-rate/4/index.json b/data/api/v2/growth-rate/4/index.json
index 2171fba11a..b4491be902 100644
--- a/data/api/v2/growth-rate/4/index.json
+++ b/data/api/v2/growth-rate/4/index.json
@@ -476,6 +476,30 @@
             "name": "geodude",
             "url": "/api/v2/pokemon-species/74/"
         },
+        {
+            "name": "venusaur",
+            "url": "/api/v2/pokemon-species/3/"
+        },
+        {
+            "name": "charmeleon",
+            "url": "/api/v2/pokemon-species/5/"
+        },
+        {
+            "name": "charizard",
+            "url": "/api/v2/pokemon-species/6/"
+        },
+        {
+            "name": "wartortle",
+            "url": "/api/v2/pokemon-species/8/"
+        },
+        {
+            "name": "blastoise",
+            "url": "/api/v2/pokemon-species/9/"
+        },
+        {
+            "name": "pidgeotto",
+            "url": "/api/v2/pokemon-species/17/"
+        },
         {
             "name": "pidgeot",
             "url": "/api/v2/pokemon-species/18/"
@@ -504,6 +528,38 @@
             "name": "vileplume",
             "url": "/api/v2/pokemon-species/45/"
         },
+        {
+            "name": "poliwhirl",
+            "url": "/api/v2/pokemon-species/61/"
+        },
+        {
+            "name": "poliwrath",
+            "url": "/api/v2/pokemon-species/62/"
+        },
+        {
+            "name": "kadabra",
+            "url": "/api/v2/pokemon-species/64/"
+        },
+        {
+            "name": "alakazam",
+            "url": "/api/v2/pokemon-species/65/"
+        },
+        {
+            "name": "machoke",
+            "url": "/api/v2/pokemon-species/67/"
+        },
+        {
+            "name": "machamp",
+            "url": "/api/v2/pokemon-species/68/"
+        },
+        {
+            "name": "weepinbell",
+            "url": "/api/v2/pokemon-species/70/"
+        },
+        {
+            "name": "victreebel",
+            "url": "/api/v2/pokemon-species/71/"
+        },
         {
             "name": "graveler",
             "url": "/api/v2/pokemon-species/75/"
@@ -1372,62 +1428,6 @@
             "name": "ivysaur",
             "url": "/api/v2/pokemon-species/2/"
         },
-        {
-            "name": "venusaur",
-            "url": "/api/v2/pokemon-species/3/"
-        },
-        {
-            "name": "charmeleon",
-            "url": "/api/v2/pokemon-species/5/"
-        },
-        {
-            "name": "charizard",
-            "url": "/api/v2/pokemon-species/6/"
-        },
-        {
-            "name": "wartortle",
-            "url": "/api/v2/pokemon-species/8/"
-        },
-        {
-            "name": "blastoise",
-            "url": "/api/v2/pokemon-species/9/"
-        },
-        {
-            "name": "pidgeotto",
-            "url": "/api/v2/pokemon-species/17/"
-        },
-        {
-            "name": "poliwhirl",
-            "url": "/api/v2/pokemon-species/61/"
-        },
-        {
-            "name": "poliwrath",
-            "url": "/api/v2/pokemon-species/62/"
-        },
-        {
-            "name": "kadabra",
-            "url": "/api/v2/pokemon-species/64/"
-        },
-        {
-            "name": "alakazam",
-            "url": "/api/v2/pokemon-species/65/"
-        },
-        {
-            "name": "machoke",
-            "url": "/api/v2/pokemon-species/67/"
-        },
-        {
-            "name": "machamp",
-            "url": "/api/v2/pokemon-species/68/"
-        },
-        {
-            "name": "weepinbell",
-            "url": "/api/v2/pokemon-species/70/"
-        },
-        {
-            "name": "victreebel",
-            "url": "/api/v2/pokemon-species/71/"
-        },
         {
             "name": "golem",
             "url": "/api/v2/pokemon-species/76/"
diff --git a/data/api/v2/growth-rate/5/index.json b/data/api/v2/growth-rate/5/index.json
index b97f9a3958..504ea069a3 100644
--- a/data/api/v2/growth-rate/5/index.json
+++ b/data/api/v2/growth-rate/5/index.json
@@ -536,13 +536,13 @@
             "name": "squawkabilly",
             "url": "/api/v2/pokemon-species/931/"
         },
-        {
-            "name": "hydrapple",
-            "url": "/api/v2/pokemon-species/1019/"
-        },
         {
             "name": "appletun",
             "url": "/api/v2/pokemon-species/842/"
+        },
+        {
+            "name": "hydrapple",
+            "url": "/api/v2/pokemon-species/1019/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/location/1054/index.json b/data/api/v2/location/1054/index.json
index 5700ba263f..d544a190ce 100644
--- a/data/api/v2/location/1054/index.json
+++ b/data/api/v2/location/1054/index.json
@@ -23,13 +23,6 @@
             },
             "name": "Einall (wandernd)"
         },
-        {
-            "language": {
-                "name": "en",
-                "url": "/api/v2/language/9/"
-            },
-            "name": "Unova (Romaing)"
-        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-color/10/index.json b/data/api/v2/pokemon-color/10/index.json
index b909bb21f7..559aad9cd8 100644
--- a/data/api/v2/pokemon-color/10/index.json
+++ b/data/api/v2/pokemon-color/10/index.json
@@ -86,6 +86,14 @@
             "name": "psyduck",
             "url": "/api/v2/pokemon-species/54/"
         },
+        {
+            "name": "kakuna",
+            "url": "/api/v2/pokemon-species/14/"
+        },
+        {
+            "name": "beedrill",
+            "url": "/api/v2/pokemon-species/15/"
+        },
         {
             "name": "pikachu",
             "url": "/api/v2/pokemon-species/25/"
@@ -102,6 +110,10 @@
             "name": "ninetales",
             "url": "/api/v2/pokemon-species/38/"
         },
+        {
+            "name": "persian",
+            "url": "/api/v2/pokemon-species/53/"
+        },
         {
             "name": "ponyta",
             "url": "/api/v2/pokemon-species/77/"
@@ -118,6 +130,10 @@
             "name": "moltres",
             "url": "/api/v2/pokemon-species/146/"
         },
+        {
+            "name": "rapidash",
+            "url": "/api/v2/pokemon-species/78/"
+        },
         {
             "name": "hypno",
             "url": "/api/v2/pokemon-species/97/"
@@ -402,22 +418,6 @@
             "name": "raging-bolt",
             "url": "/api/v2/pokemon-species/1021/"
         },
-        {
-            "name": "kakuna",
-            "url": "/api/v2/pokemon-species/14/"
-        },
-        {
-            "name": "beedrill",
-            "url": "/api/v2/pokemon-species/15/"
-        },
-        {
-            "name": "persian",
-            "url": "/api/v2/pokemon-species/53/"
-        },
-        {
-            "name": "rapidash",
-            "url": "/api/v2/pokemon-species/78/"
-        },
         {
             "name": "cofagrigus",
             "url": "/api/v2/pokemon-species/563/"
diff --git a/data/api/v2/pokemon-color/2/index.json b/data/api/v2/pokemon-color/2/index.json
index a8fff187ac..8578b86b63 100644
--- a/data/api/v2/pokemon-color/2/index.json
+++ b/data/api/v2/pokemon-color/2/index.json
@@ -94,6 +94,14 @@
             "name": "tentacool",
             "url": "/api/v2/pokemon-species/72/"
         },
+        {
+            "name": "wartortle",
+            "url": "/api/v2/pokemon-species/8/"
+        },
+        {
+            "name": "blastoise",
+            "url": "/api/v2/pokemon-species/9/"
+        },
         {
             "name": "nidorina",
             "url": "/api/v2/pokemon-species/30/"
@@ -106,6 +114,18 @@
             "name": "gloom",
             "url": "/api/v2/pokemon-species/44/"
         },
+        {
+            "name": "golduck",
+            "url": "/api/v2/pokemon-species/55/"
+        },
+        {
+            "name": "poliwhirl",
+            "url": "/api/v2/pokemon-species/61/"
+        },
+        {
+            "name": "poliwrath",
+            "url": "/api/v2/pokemon-species/62/"
+        },
         {
             "name": "tentacruel",
             "url": "/api/v2/pokemon-species/73/"
@@ -718,26 +738,6 @@
             "name": "terapagos",
             "url": "/api/v2/pokemon-species/1024/"
         },
-        {
-            "name": "wartortle",
-            "url": "/api/v2/pokemon-species/8/"
-        },
-        {
-            "name": "blastoise",
-            "url": "/api/v2/pokemon-species/9/"
-        },
-        {
-            "name": "golduck",
-            "url": "/api/v2/pokemon-species/55/"
-        },
-        {
-            "name": "poliwhirl",
-            "url": "/api/v2/pokemon-species/61/"
-        },
-        {
-            "name": "poliwrath",
-            "url": "/api/v2/pokemon-species/62/"
-        },
         {
             "name": "metagross",
             "url": "/api/v2/pokemon-species/376/"
diff --git a/data/api/v2/pokemon-color/3/index.json b/data/api/v2/pokemon-color/3/index.json
index 9f0ca3d809..5c6373a296 100644
--- a/data/api/v2/pokemon-color/3/index.json
+++ b/data/api/v2/pokemon-color/3/index.json
@@ -110,6 +110,10 @@
             "name": "geodude",
             "url": "/api/v2/pokemon-species/74/"
         },
+        {
+            "name": "pidgeotto",
+            "url": "/api/v2/pokemon-species/17/"
+        },
         {
             "name": "pidgeot",
             "url": "/api/v2/pokemon-species/18/"
@@ -122,6 +126,26 @@
             "name": "fearow",
             "url": "/api/v2/pokemon-species/22/"
         },
+        {
+            "name": "dugtrio",
+            "url": "/api/v2/pokemon-species/51/"
+        },
+        {
+            "name": "primeape",
+            "url": "/api/v2/pokemon-species/57/"
+        },
+        {
+            "name": "arcanine",
+            "url": "/api/v2/pokemon-species/59/"
+        },
+        {
+            "name": "kadabra",
+            "url": "/api/v2/pokemon-species/64/"
+        },
+        {
+            "name": "alakazam",
+            "url": "/api/v2/pokemon-species/65/"
+        },
         {
             "name": "graveler",
             "url": "/api/v2/pokemon-species/75/"
@@ -162,6 +186,10 @@
             "name": "kabuto",
             "url": "/api/v2/pokemon-species/140/"
         },
+        {
+            "name": "dodrio",
+            "url": "/api/v2/pokemon-species/85/"
+        },
         {
             "name": "marowak",
             "url": "/api/v2/pokemon-species/105/"
@@ -614,38 +642,10 @@
             "name": "gouging-fire",
             "url": "/api/v2/pokemon-species/1020/"
         },
-        {
-            "name": "pidgeotto",
-            "url": "/api/v2/pokemon-species/17/"
-        },
-        {
-            "name": "dugtrio",
-            "url": "/api/v2/pokemon-species/51/"
-        },
-        {
-            "name": "primeape",
-            "url": "/api/v2/pokemon-species/57/"
-        },
-        {
-            "name": "arcanine",
-            "url": "/api/v2/pokemon-species/59/"
-        },
-        {
-            "name": "kadabra",
-            "url": "/api/v2/pokemon-species/64/"
-        },
-        {
-            "name": "alakazam",
-            "url": "/api/v2/pokemon-species/65/"
-        },
         {
             "name": "golem",
             "url": "/api/v2/pokemon-species/76/"
         },
-        {
-            "name": "dodrio",
-            "url": "/api/v2/pokemon-species/85/"
-        },
         {
             "name": "monferno",
             "url": "/api/v2/pokemon-species/391/"
diff --git a/data/api/v2/pokemon-color/4/index.json b/data/api/v2/pokemon-color/4/index.json
index 62212ae943..aecc38afad 100644
--- a/data/api/v2/pokemon-color/4/index.json
+++ b/data/api/v2/pokemon-color/4/index.json
@@ -78,6 +78,14 @@
             "name": "machop",
             "url": "/api/v2/pokemon-species/66/"
         },
+        {
+            "name": "machoke",
+            "url": "/api/v2/pokemon-species/67/"
+        },
+        {
+            "name": "machamp",
+            "url": "/api/v2/pokemon-species/68/"
+        },
         {
             "name": "magnemite",
             "url": "/api/v2/pokemon-species/81/"
@@ -90,6 +98,10 @@
             "name": "rhyhorn",
             "url": "/api/v2/pokemon-species/111/"
         },
+        {
+            "name": "magneton",
+            "url": "/api/v2/pokemon-species/82/"
+        },
         {
             "name": "rhydon",
             "url": "/api/v2/pokemon-species/112/"
@@ -458,18 +470,6 @@
             "name": "iron-boulder",
             "url": "/api/v2/pokemon-species/1022/"
         },
-        {
-            "name": "machoke",
-            "url": "/api/v2/pokemon-species/67/"
-        },
-        {
-            "name": "machamp",
-            "url": "/api/v2/pokemon-species/68/"
-        },
-        {
-            "name": "magneton",
-            "url": "/api/v2/pokemon-species/82/"
-        },
         {
             "name": "herdier",
             "url": "/api/v2/pokemon-species/507/"
@@ -482,10 +482,6 @@
             "name": "klinklang",
             "url": "/api/v2/pokemon-species/601/"
         },
-        {
-            "name": "baxcalibur",
-            "url": "/api/v2/pokemon-species/998/"
-        },
         {
             "name": "golisopod",
             "url": "/api/v2/pokemon-species/768/"
@@ -501,6 +497,10 @@
         {
             "name": "arctibax",
             "url": "/api/v2/pokemon-species/997/"
+        },
+        {
+            "name": "baxcalibur",
+            "url": "/api/v2/pokemon-species/998/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-color/5/index.json b/data/api/v2/pokemon-color/5/index.json
index 8015b0c8e9..008eeb4c02 100644
--- a/data/api/v2/pokemon-color/5/index.json
+++ b/data/api/v2/pokemon-color/5/index.json
@@ -86,6 +86,22 @@
             "name": "bellsprout",
             "url": "/api/v2/pokemon-species/69/"
         },
+        {
+            "name": "venusaur",
+            "url": "/api/v2/pokemon-species/3/"
+        },
+        {
+            "name": "metapod",
+            "url": "/api/v2/pokemon-species/11/"
+        },
+        {
+            "name": "weepinbell",
+            "url": "/api/v2/pokemon-species/70/"
+        },
+        {
+            "name": "victreebel",
+            "url": "/api/v2/pokemon-species/71/"
+        },
         {
             "name": "scyther",
             "url": "/api/v2/pokemon-species/123/"
@@ -554,34 +570,10 @@
             "name": "ivysaur",
             "url": "/api/v2/pokemon-species/2/"
         },
-        {
-            "name": "venusaur",
-            "url": "/api/v2/pokemon-species/3/"
-        },
-        {
-            "name": "metapod",
-            "url": "/api/v2/pokemon-species/11/"
-        },
-        {
-            "name": "weepinbell",
-            "url": "/api/v2/pokemon-species/70/"
-        },
-        {
-            "name": "victreebel",
-            "url": "/api/v2/pokemon-species/71/"
-        },
         {
             "name": "bayleef",
             "url": "/api/v2/pokemon-species/153/"
         },
-        {
-            "name": "dipplin",
-            "url": "/api/v2/pokemon-species/1011/"
-        },
-        {
-            "name": "hydrapple",
-            "url": "/api/v2/pokemon-species/1019/"
-        },
         {
             "name": "appletun",
             "url": "/api/v2/pokemon-species/842/"
@@ -590,9 +582,17 @@
             "name": "arboliva",
             "url": "/api/v2/pokemon-species/930/"
         },
+        {
+            "name": "dipplin",
+            "url": "/api/v2/pokemon-species/1011/"
+        },
         {
             "name": "sinistcha",
             "url": "/api/v2/pokemon-species/1013/"
+        },
+        {
+            "name": "hydrapple",
+            "url": "/api/v2/pokemon-species/1019/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-color/6/index.json b/data/api/v2/pokemon-color/6/index.json
index 173d87fd5a..b39babc17c 100644
--- a/data/api/v2/pokemon-color/6/index.json
+++ b/data/api/v2/pokemon-color/6/index.json
@@ -106,6 +106,10 @@
             "name": "porygon",
             "url": "/api/v2/pokemon-species/137/"
         },
+        {
+            "name": "slowbro",
+            "url": "/api/v2/pokemon-species/80/"
+        },
         {
             "name": "chansey",
             "url": "/api/v2/pokemon-species/113/"
@@ -309,10 +313,6 @@
         {
             "name": "tinkaton",
             "url": "/api/v2/pokemon-species/959/"
-        },
-        {
-            "name": "slowbro",
-            "url": "/api/v2/pokemon-species/80/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-color/7/index.json b/data/api/v2/pokemon-color/7/index.json
index 9a69cf0efa..e088659a3d 100644
--- a/data/api/v2/pokemon-color/7/index.json
+++ b/data/api/v2/pokemon-color/7/index.json
@@ -142,6 +142,10 @@
             "name": "mewtwo",
             "url": "/api/v2/pokemon-species/150/"
         },
+        {
+            "name": "muk",
+            "url": "/api/v2/pokemon-species/89/"
+        },
         {
             "name": "cloyster",
             "url": "/api/v2/pokemon-species/91/"
@@ -394,10 +398,6 @@
             "name": "pecharunt",
             "url": "/api/v2/pokemon-species/1025/"
         },
-        {
-            "name": "muk",
-            "url": "/api/v2/pokemon-species/89/"
-        },
         {
             "name": "mantine",
             "url": "/api/v2/pokemon-species/226/"
diff --git a/data/api/v2/pokemon-color/8/index.json b/data/api/v2/pokemon-color/8/index.json
index 6e7b9ce68d..31e4246222 100644
--- a/data/api/v2/pokemon-color/8/index.json
+++ b/data/api/v2/pokemon-color/8/index.json
@@ -82,6 +82,14 @@
             "name": "paras",
             "url": "/api/v2/pokemon-species/46/"
         },
+        {
+            "name": "charmeleon",
+            "url": "/api/v2/pokemon-species/5/"
+        },
+        {
+            "name": "charizard",
+            "url": "/api/v2/pokemon-species/6/"
+        },
         {
             "name": "vileplume",
             "url": "/api/v2/pokemon-species/45/"
@@ -446,14 +454,6 @@
             "name": "koraidon",
             "url": "/api/v2/pokemon-species/1007/"
         },
-        {
-            "name": "charmeleon",
-            "url": "/api/v2/pokemon-species/5/"
-        },
-        {
-            "name": "charizard",
-            "url": "/api/v2/pokemon-species/6/"
-        },
         {
             "name": "tyrantrum",
             "url": "/api/v2/pokemon-species/697/"
diff --git a/data/api/v2/pokemon-color/9/index.json b/data/api/v2/pokemon-color/9/index.json
index 452521816b..fa0875dc18 100644
--- a/data/api/v2/pokemon-color/9/index.json
+++ b/data/api/v2/pokemon-color/9/index.json
@@ -74,10 +74,18 @@
         }
     ],
     "pokemon_species": [
+        {
+            "name": "butterfree",
+            "url": "/api/v2/pokemon-species/12/"
+        },
         {
             "name": "seel",
             "url": "/api/v2/pokemon-species/86/"
         },
+        {
+            "name": "dewgong",
+            "url": "/api/v2/pokemon-species/87/"
+        },
         {
             "name": "togepi",
             "url": "/api/v2/pokemon-species/175/"
@@ -410,14 +418,6 @@
             "name": "iron-valiant",
             "url": "/api/v2/pokemon-species/1006/"
         },
-        {
-            "name": "butterfree",
-            "url": "/api/v2/pokemon-species/12/"
-        },
-        {
-            "name": "dewgong",
-            "url": "/api/v2/pokemon-species/87/"
-        },
         {
             "name": "vivillon",
             "url": "/api/v2/pokemon-species/666/"
diff --git a/data/api/v2/pokemon-form/10503/index.json b/data/api/v2/pokemon-form/10503/index.json
index b161b3c3a5..5f337a61ce 100644
--- a/data/api/v2/pokemon-form/10503/index.json
+++ b/data/api/v2/pokemon-form/10503/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-M\u00e9lodelfe"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "clefable-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-M\u00e9lodelfe"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10504/index.json b/data/api/v2/pokemon-form/10504/index.json
index 25dc78e9ae..f30a3a34dc 100644
--- a/data/api/v2/pokemon-form/10504/index.json
+++ b/data/api/v2/pokemon-form/10504/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Empiflor"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "victreebel-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Empiflor"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10505/index.json b/data/api/v2/pokemon-form/10505/index.json
index 4792310c7f..f24716c638 100644
--- a/data/api/v2/pokemon-form/10505/index.json
+++ b/data/api/v2/pokemon-form/10505/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Staross"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "starmie-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Staross"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10506/index.json b/data/api/v2/pokemon-form/10506/index.json
index f8a78ca8b5..96ddd02f7e 100644
--- a/data/api/v2/pokemon-form/10506/index.json
+++ b/data/api/v2/pokemon-form/10506/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Dracolosse"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "dragonite-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Dracolosse"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10507/index.json b/data/api/v2/pokemon-form/10507/index.json
index a46fa4b77e..b9e6a3ba16 100644
--- a/data/api/v2/pokemon-form/10507/index.json
+++ b/data/api/v2/pokemon-form/10507/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-M\u00e9ganium"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "meganium-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-M\u00e9ganium"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10508/index.json b/data/api/v2/pokemon-form/10508/index.json
index c93baf7454..3bd51564a7 100644
--- a/data/api/v2/pokemon-form/10508/index.json
+++ b/data/api/v2/pokemon-form/10508/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Aligatueur"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "feraligatr-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Aligatueur"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10509/index.json b/data/api/v2/pokemon-form/10509/index.json
index e1c98c9b11..696dfcbfb0 100644
--- a/data/api/v2/pokemon-form/10509/index.json
+++ b/data/api/v2/pokemon-form/10509/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Airmure"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "skarmory-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Airmure"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10510/index.json b/data/api/v2/pokemon-form/10510/index.json
index a8494dd6a7..8f0e79fdf6 100644
--- a/data/api/v2/pokemon-form/10510/index.json
+++ b/data/api/v2/pokemon-form/10510/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Momartik"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "froslass-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Momartik"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10511/index.json b/data/api/v2/pokemon-form/10511/index.json
index 4db0540def..63246dd11f 100644
--- a/data/api/v2/pokemon-form/10511/index.json
+++ b/data/api/v2/pokemon-form/10511/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Roitiflam"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "emboar-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Roitiflam"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10512/index.json b/data/api/v2/pokemon-form/10512/index.json
index cacd407619..1f2ee092d0 100644
--- a/data/api/v2/pokemon-form/10512/index.json
+++ b/data/api/v2/pokemon-form/10512/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Minotaupe"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "excadrill-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Minotaupe"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10513/index.json b/data/api/v2/pokemon-form/10513/index.json
index 53cf9389cb..f81adb7188 100644
--- a/data/api/v2/pokemon-form/10513/index.json
+++ b/data/api/v2/pokemon-form/10513/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Brutapode"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "scolipede-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Brutapode"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10514/index.json b/data/api/v2/pokemon-form/10514/index.json
index fac3b966aa..9ec5fa2935 100644
--- a/data/api/v2/pokemon-form/10514/index.json
+++ b/data/api/v2/pokemon-form/10514/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Bagga\u00efd"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "scrafty-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Bagga\u00efd"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10515/index.json b/data/api/v2/pokemon-form/10515/index.json
index 349ebfdf42..b31cf16558 100644
--- a/data/api/v2/pokemon-form/10515/index.json
+++ b/data/api/v2/pokemon-form/10515/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Ohmassacre"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "eelektross-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Ohmassacre"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10516/index.json b/data/api/v2/pokemon-form/10516/index.json
index ab56618bdf..a9ee61e58e 100644
--- a/data/api/v2/pokemon-form/10516/index.json
+++ b/data/api/v2/pokemon-form/10516/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Lugulabre"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "chandelure-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Lugulabre"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10517/index.json b/data/api/v2/pokemon-form/10517/index.json
index fdf7ca7a94..c3b669f818 100644
--- a/data/api/v2/pokemon-form/10517/index.json
+++ b/data/api/v2/pokemon-form/10517/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Blind\u00e9pique"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "chesnaught-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Blind\u00e9pique"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10518/index.json b/data/api/v2/pokemon-form/10518/index.json
index 05857ddb7c..483e9aca90 100644
--- a/data/api/v2/pokemon-form/10518/index.json
+++ b/data/api/v2/pokemon-form/10518/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Goupelin"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "delphox-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Goupelin"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10519/index.json b/data/api/v2/pokemon-form/10519/index.json
index 5c734552df..5edfbeaca4 100644
--- a/data/api/v2/pokemon-form/10519/index.json
+++ b/data/api/v2/pokemon-form/10519/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Amphinobi"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "greninja-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Amphinobi"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10520/index.json b/data/api/v2/pokemon-form/10520/index.json
index 4e9a761bb8..48f5b91fc0 100644
--- a/data/api/v2/pokemon-form/10520/index.json
+++ b/data/api/v2/pokemon-form/10520/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-N\u00e9m\u00e9lios"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "pyroar-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-N\u00e9m\u00e9lios"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10521/index.json b/data/api/v2/pokemon-form/10521/index.json
index 3a4735db1a..4ceb4de6e4 100644
--- a/data/api/v2/pokemon-form/10521/index.json
+++ b/data/api/v2/pokemon-form/10521/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Floette"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "floette-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Floette"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10522/index.json b/data/api/v2/pokemon-form/10522/index.json
index 9c6ff422c1..9aa6c03401 100644
--- a/data/api/v2/pokemon-form/10522/index.json
+++ b/data/api/v2/pokemon-form/10522/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Sepiatroce"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "malamar-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Sepiatroce"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10523/index.json b/data/api/v2/pokemon-form/10523/index.json
index 806096a0a6..65878b038d 100644
--- a/data/api/v2/pokemon-form/10523/index.json
+++ b/data/api/v2/pokemon-form/10523/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Golgopathe"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "barbaracle-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Golgopathe"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10524/index.json b/data/api/v2/pokemon-form/10524/index.json
index 0ac334e8f0..2f624cf6b9 100644
--- a/data/api/v2/pokemon-form/10524/index.json
+++ b/data/api/v2/pokemon-form/10524/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Kravarech"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "dragalge-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Kravarech"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10525/index.json b/data/api/v2/pokemon-form/10525/index.json
index 3a1a993da8..c19d4d7f5a 100644
--- a/data/api/v2/pokemon-form/10525/index.json
+++ b/data/api/v2/pokemon-form/10525/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Brutalibr\u00e9"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "hawlucha-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Brutalibr\u00e9"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10526/index.json b/data/api/v2/pokemon-form/10526/index.json
index 738152b176..16e30d6142 100644
--- a/data/api/v2/pokemon-form/10526/index.json
+++ b/data/api/v2/pokemon-form/10526/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Zygarde"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "zygarde-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Zygarde"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10527/index.json b/data/api/v2/pokemon-form/10527/index.json
index 7e9beca4fb..4eaaa3521d 100644
--- a/data/api/v2/pokemon-form/10527/index.json
+++ b/data/api/v2/pokemon-form/10527/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Dra\u00efeul"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "drampa-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Dra\u00efeul"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10528/index.json b/data/api/v2/pokemon-form/10528/index.json
index 9245027296..93f414e19e 100644
--- a/data/api/v2/pokemon-form/10528/index.json
+++ b/data/api/v2/pokemon-form/10528/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Hexadron"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "falinks-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Hexadron"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10529/index.json b/data/api/v2/pokemon-form/10529/index.json
index 90f4f58589..fd0713bf09 100644
--- a/data/api/v2/pokemon-form/10529/index.json
+++ b/data/api/v2/pokemon-form/10529/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega-x",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Raichu X"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "raichu-mega-x",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Raichu X"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10530/index.json b/data/api/v2/pokemon-form/10530/index.json
index 3831fa1677..bbb8987ebe 100644
--- a/data/api/v2/pokemon-form/10530/index.json
+++ b/data/api/v2/pokemon-form/10530/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega-y",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Raichu Y"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "raichu-mega-y",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Raichu Y"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10531/index.json b/data/api/v2/pokemon-form/10531/index.json
index 659a50b198..cfd2afa16d 100644
--- a/data/api/v2/pokemon-form/10531/index.json
+++ b/data/api/v2/pokemon-form/10531/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-\u00c9oko"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "chimecho-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-\u00c9oko"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10532/index.json b/data/api/v2/pokemon-form/10532/index.json
index 51fd39fc1d..de6579c73a 100644
--- a/data/api/v2/pokemon-form/10532/index.json
+++ b/data/api/v2/pokemon-form/10532/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega-z",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Absol Z"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "absol-mega-z",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Absol Z"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10533/index.json b/data/api/v2/pokemon-form/10533/index.json
index 8e35d31411..9e24c79c6c 100644
--- a/data/api/v2/pokemon-form/10533/index.json
+++ b/data/api/v2/pokemon-form/10533/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-\u00c9touraptor"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "staraptor-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-\u00c9touraptor"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10534/index.json b/data/api/v2/pokemon-form/10534/index.json
index 58b52d2bd6..d547dadbfc 100644
--- a/data/api/v2/pokemon-form/10534/index.json
+++ b/data/api/v2/pokemon-form/10534/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega-z",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Carchacrok Z"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "garchomp-mega-z",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Carchacrok Z"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10535/index.json b/data/api/v2/pokemon-form/10535/index.json
index 3dd54f92a2..48b43a1f85 100644
--- a/data/api/v2/pokemon-form/10535/index.json
+++ b/data/api/v2/pokemon-form/10535/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega-z",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Lucario Z"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "lucario-mega-z",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Lucario Z"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10536/index.json b/data/api/v2/pokemon-form/10536/index.json
index de09201802..0855073b5f 100644
--- a/data/api/v2/pokemon-form/10536/index.json
+++ b/data/api/v2/pokemon-form/10536/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Heatran"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "heatran-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Heatran"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10537/index.json b/data/api/v2/pokemon-form/10537/index.json
index 23a545a366..46dbb32262 100644
--- a/data/api/v2/pokemon-form/10537/index.json
+++ b/data/api/v2/pokemon-form/10537/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Darkrai"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "darkrai-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Darkrai"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10538/index.json b/data/api/v2/pokemon-form/10538/index.json
index a9f6690060..d0dd79eb18 100644
--- a/data/api/v2/pokemon-form/10538/index.json
+++ b/data/api/v2/pokemon-form/10538/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Golemastoc"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "golurk-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Golemastoc"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10539/index.json b/data/api/v2/pokemon-form/10539/index.json
index 636a66048d..02ab34bf28 100644
--- a/data/api/v2/pokemon-form/10539/index.json
+++ b/data/api/v2/pokemon-form/10539/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Mistigrix"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "meowstic-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Mistigrix"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10540/index.json b/data/api/v2/pokemon-form/10540/index.json
index 141d2c1d2d..59e6beebf5 100644
--- a/data/api/v2/pokemon-form/10540/index.json
+++ b/data/api/v2/pokemon-form/10540/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Crabominable"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "crabominable-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Crabominable"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10541/index.json b/data/api/v2/pokemon-form/10541/index.json
index 7e600c9fb8..a95c7c5e3f 100644
--- a/data/api/v2/pokemon-form/10541/index.json
+++ b/data/api/v2/pokemon-form/10541/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Sarmura\u00ef"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "golisopod-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Sarmura\u00ef"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10542/index.json b/data/api/v2/pokemon-form/10542/index.json
index c8a40a8c7c..6a5c41e9a2 100644
--- a/data/api/v2/pokemon-form/10542/index.json
+++ b/data/api/v2/pokemon-form/10542/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Magearna"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "magearna-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Magearna"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10543/index.json b/data/api/v2/pokemon-form/10543/index.json
index bc21c9d7ef..ccad6a530d 100644
--- a/data/api/v2/pokemon-form/10543/index.json
+++ b/data/api/v2/pokemon-form/10543/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Magearna Couleur du Pass\u00e9"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "magearna-original-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Magearna Couleur du Pass\u00e9"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10544/index.json b/data/api/v2/pokemon-form/10544/index.json
index 50f897dcb5..87fb135fca 100644
--- a/data/api/v2/pokemon-form/10544/index.json
+++ b/data/api/v2/pokemon-form/10544/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Zeraora"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "zeraora-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Zeraora"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10545/index.json b/data/api/v2/pokemon-form/10545/index.json
index ea4e77897b..2a379e3d83 100644
--- a/data/api/v2/pokemon-form/10545/index.json
+++ b/data/api/v2/pokemon-form/10545/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Scovilain"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "scovillain-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Scovilain"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10546/index.json b/data/api/v2/pokemon-form/10546/index.json
index fb087272da..2021314110 100644
--- a/data/api/v2/pokemon-form/10546/index.json
+++ b/data/api/v2/pokemon-form/10546/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Flor\u00e9clat"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "glimmora-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Flor\u00e9clat"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10547/index.json b/data/api/v2/pokemon-form/10547/index.json
index 09fa89c673..a1c8a97afe 100644
--- a/data/api/v2/pokemon-form/10547/index.json
+++ b/data/api/v2/pokemon-form/10547/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Nigirigon Forme Courb\u00e9e"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "tatsugiri-curly-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Nigirigon Forme Courb\u00e9e"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10548/index.json b/data/api/v2/pokemon-form/10548/index.json
index b0baea1f02..23a63ce91a 100644
--- a/data/api/v2/pokemon-form/10548/index.json
+++ b/data/api/v2/pokemon-form/10548/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Nigirigon Forme Affal\u00e9e"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "tatsugiri-droopy-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Nigirigon Forme Affal\u00e9e"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10549/index.json b/data/api/v2/pokemon-form/10549/index.json
index d7e3cd662e..49234095c2 100644
--- a/data/api/v2/pokemon-form/10549/index.json
+++ b/data/api/v2/pokemon-form/10549/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Nigirigon Forme Raide"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "tatsugiri-stretchy-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Nigirigon Forme Raide"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-form/10550/index.json b/data/api/v2/pokemon-form/10550/index.json
index e3744ceff3..eefb66b513 100644
--- a/data/api/v2/pokemon-form/10550/index.json
+++ b/data/api/v2/pokemon-form/10550/index.json
@@ -1,6 +1,13 @@
 {
     "form_name": "mega",
     "form_names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Glaivodo"
+        },
         {
             "language": {
                 "name": "en",
@@ -16,6 +23,13 @@
     "is_mega": true,
     "name": "baxcalibur-mega",
     "names": [
+        {
+            "language": {
+                "name": "fr",
+                "url": "/api/v2/language/5/"
+            },
+            "name": "M\u00e9ga-Glaivodo"
+        },
         {
             "language": {
                 "name": "en",
diff --git a/data/api/v2/pokemon-habitat/1/index.json b/data/api/v2/pokemon-habitat/1/index.json
index ea6b5510af..cd8d1e6acb 100644
--- a/data/api/v2/pokemon-habitat/1/index.json
+++ b/data/api/v2/pokemon-habitat/1/index.json
@@ -37,6 +37,10 @@
             "name": "golbat",
             "url": "/api/v2/pokemon-species/42/"
         },
+        {
+            "name": "dugtrio",
+            "url": "/api/v2/pokemon-species/51/"
+        },
         {
             "name": "gastly",
             "url": "/api/v2/pokemon-species/92/"
@@ -136,10 +140,6 @@
         {
             "name": "registeel",
             "url": "/api/v2/pokemon-species/379/"
-        },
-        {
-            "name": "dugtrio",
-            "url": "/api/v2/pokemon-species/51/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-habitat/2/index.json b/data/api/v2/pokemon-habitat/2/index.json
index 39469e6d4b..53bf20cab3 100644
--- a/data/api/v2/pokemon-habitat/2/index.json
+++ b/data/api/v2/pokemon-habitat/2/index.json
@@ -49,6 +49,26 @@
             "name": "bellsprout",
             "url": "/api/v2/pokemon-species/69/"
         },
+        {
+            "name": "metapod",
+            "url": "/api/v2/pokemon-species/11/"
+        },
+        {
+            "name": "butterfree",
+            "url": "/api/v2/pokemon-species/12/"
+        },
+        {
+            "name": "kakuna",
+            "url": "/api/v2/pokemon-species/14/"
+        },
+        {
+            "name": "beedrill",
+            "url": "/api/v2/pokemon-species/15/"
+        },
+        {
+            "name": "pidgeotto",
+            "url": "/api/v2/pokemon-species/17/"
+        },
         {
             "name": "pidgeot",
             "url": "/api/v2/pokemon-species/18/"
@@ -69,6 +89,14 @@
             "name": "venomoth",
             "url": "/api/v2/pokemon-species/49/"
         },
+        {
+            "name": "weepinbell",
+            "url": "/api/v2/pokemon-species/70/"
+        },
+        {
+            "name": "victreebel",
+            "url": "/api/v2/pokemon-species/71/"
+        },
         {
             "name": "exeggcute",
             "url": "/api/v2/pokemon-species/102/"
@@ -277,34 +305,6 @@
             "name": "dusclops",
             "url": "/api/v2/pokemon-species/356/"
         },
-        {
-            "name": "metapod",
-            "url": "/api/v2/pokemon-species/11/"
-        },
-        {
-            "name": "butterfree",
-            "url": "/api/v2/pokemon-species/12/"
-        },
-        {
-            "name": "kakuna",
-            "url": "/api/v2/pokemon-species/14/"
-        },
-        {
-            "name": "beedrill",
-            "url": "/api/v2/pokemon-species/15/"
-        },
-        {
-            "name": "pidgeotto",
-            "url": "/api/v2/pokemon-species/17/"
-        },
-        {
-            "name": "weepinbell",
-            "url": "/api/v2/pokemon-species/70/"
-        },
-        {
-            "name": "victreebel",
-            "url": "/api/v2/pokemon-species/71/"
-        },
         {
             "name": "delcatty",
             "url": "/api/v2/pokemon-species/301/"
diff --git a/data/api/v2/pokemon-habitat/3/index.json b/data/api/v2/pokemon-habitat/3/index.json
index 97a36ff6e8..174fdefcb8 100644
--- a/data/api/v2/pokemon-habitat/3/index.json
+++ b/data/api/v2/pokemon-habitat/3/index.json
@@ -57,6 +57,10 @@
             "name": "growlithe",
             "url": "/api/v2/pokemon-species/58/"
         },
+        {
+            "name": "venusaur",
+            "url": "/api/v2/pokemon-species/3/"
+        },
         {
             "name": "raticate",
             "url": "/api/v2/pokemon-species/20/"
@@ -101,6 +105,10 @@
             "name": "vileplume",
             "url": "/api/v2/pokemon-species/45/"
         },
+        {
+            "name": "arcanine",
+            "url": "/api/v2/pokemon-species/59/"
+        },
         {
             "name": "ponyta",
             "url": "/api/v2/pokemon-species/77/"
@@ -137,6 +145,14 @@
             "name": "tauros",
             "url": "/api/v2/pokemon-species/128/"
         },
+        {
+            "name": "rapidash",
+            "url": "/api/v2/pokemon-species/78/"
+        },
+        {
+            "name": "dodrio",
+            "url": "/api/v2/pokemon-species/85/"
+        },
         {
             "name": "hypno",
             "url": "/api/v2/pokemon-species/97/"
@@ -325,22 +341,6 @@
             "name": "ivysaur",
             "url": "/api/v2/pokemon-species/2/"
         },
-        {
-            "name": "venusaur",
-            "url": "/api/v2/pokemon-species/3/"
-        },
-        {
-            "name": "arcanine",
-            "url": "/api/v2/pokemon-species/59/"
-        },
-        {
-            "name": "rapidash",
-            "url": "/api/v2/pokemon-species/78/"
-        },
-        {
-            "name": "dodrio",
-            "url": "/api/v2/pokemon-species/85/"
-        },
         {
             "name": "bayleef",
             "url": "/api/v2/pokemon-species/153/"
diff --git a/data/api/v2/pokemon-habitat/4/index.json b/data/api/v2/pokemon-habitat/4/index.json
index 1af090a0ee..2ab15da380 100644
--- a/data/api/v2/pokemon-habitat/4/index.json
+++ b/data/api/v2/pokemon-habitat/4/index.json
@@ -41,6 +41,14 @@
             "name": "geodude",
             "url": "/api/v2/pokemon-species/74/"
         },
+        {
+            "name": "charmeleon",
+            "url": "/api/v2/pokemon-species/5/"
+        },
+        {
+            "name": "charizard",
+            "url": "/api/v2/pokemon-species/6/"
+        },
         {
             "name": "clefairy",
             "url": "/api/v2/pokemon-species/35/"
@@ -49,6 +57,18 @@
             "name": "clefable",
             "url": "/api/v2/pokemon-species/36/"
         },
+        {
+            "name": "primeape",
+            "url": "/api/v2/pokemon-species/57/"
+        },
+        {
+            "name": "machoke",
+            "url": "/api/v2/pokemon-species/67/"
+        },
+        {
+            "name": "machamp",
+            "url": "/api/v2/pokemon-species/68/"
+        },
         {
             "name": "graveler",
             "url": "/api/v2/pokemon-species/75/"
@@ -181,26 +201,6 @@
             "name": "jirachi",
             "url": "/api/v2/pokemon-species/385/"
         },
-        {
-            "name": "charmeleon",
-            "url": "/api/v2/pokemon-species/5/"
-        },
-        {
-            "name": "charizard",
-            "url": "/api/v2/pokemon-species/6/"
-        },
-        {
-            "name": "primeape",
-            "url": "/api/v2/pokemon-species/57/"
-        },
-        {
-            "name": "machoke",
-            "url": "/api/v2/pokemon-species/67/"
-        },
-        {
-            "name": "machamp",
-            "url": "/api/v2/pokemon-species/68/"
-        },
         {
             "name": "golem",
             "url": "/api/v2/pokemon-species/76/"
diff --git a/data/api/v2/pokemon-habitat/6/index.json b/data/api/v2/pokemon-habitat/6/index.json
index 83b3f17460..da5a2e317c 100644
--- a/data/api/v2/pokemon-habitat/6/index.json
+++ b/data/api/v2/pokemon-habitat/6/index.json
@@ -49,6 +49,10 @@
             "name": "rhyhorn",
             "url": "/api/v2/pokemon-species/111/"
         },
+        {
+            "name": "magneton",
+            "url": "/api/v2/pokemon-species/82/"
+        },
         {
             "name": "rhydon",
             "url": "/api/v2/pokemon-species/112/"
@@ -125,10 +129,6 @@
             "name": "groudon",
             "url": "/api/v2/pokemon-species/383/"
         },
-        {
-            "name": "magneton",
-            "url": "/api/v2/pokemon-species/82/"
-        },
         {
             "name": "metagross",
             "url": "/api/v2/pokemon-species/376/"
diff --git a/data/api/v2/pokemon-habitat/7/index.json b/data/api/v2/pokemon-habitat/7/index.json
index c1bde16ce9..249e79b17a 100644
--- a/data/api/v2/pokemon-habitat/7/index.json
+++ b/data/api/v2/pokemon-habitat/7/index.json
@@ -61,6 +61,10 @@
             "name": "kabuto",
             "url": "/api/v2/pokemon-species/140/"
         },
+        {
+            "name": "dewgong",
+            "url": "/api/v2/pokemon-species/87/"
+        },
         {
             "name": "cloyster",
             "url": "/api/v2/pokemon-species/91/"
@@ -177,10 +181,6 @@
             "name": "kyogre",
             "url": "/api/v2/pokemon-species/382/"
         },
-        {
-            "name": "dewgong",
-            "url": "/api/v2/pokemon-species/87/"
-        },
         {
             "name": "mantine",
             "url": "/api/v2/pokemon-species/226/"
diff --git a/data/api/v2/pokemon-habitat/8/index.json b/data/api/v2/pokemon-habitat/8/index.json
index d24f4a582e..c94723bc0f 100644
--- a/data/api/v2/pokemon-habitat/8/index.json
+++ b/data/api/v2/pokemon-habitat/8/index.json
@@ -33,6 +33,18 @@
             "name": "abra",
             "url": "/api/v2/pokemon-species/63/"
         },
+        {
+            "name": "persian",
+            "url": "/api/v2/pokemon-species/53/"
+        },
+        {
+            "name": "kadabra",
+            "url": "/api/v2/pokemon-species/64/"
+        },
+        {
+            "name": "alakazam",
+            "url": "/api/v2/pokemon-species/65/"
+        },
         {
             "name": "grimer",
             "url": "/api/v2/pokemon-species/88/"
@@ -57,6 +69,10 @@
             "name": "porygon",
             "url": "/api/v2/pokemon-species/137/"
         },
+        {
+            "name": "muk",
+            "url": "/api/v2/pokemon-species/89/"
+        },
         {
             "name": "electrode",
             "url": "/api/v2/pokemon-species/101/"
@@ -156,22 +172,6 @@
         {
             "name": "banette",
             "url": "/api/v2/pokemon-species/354/"
-        },
-        {
-            "name": "persian",
-            "url": "/api/v2/pokemon-species/53/"
-        },
-        {
-            "name": "kadabra",
-            "url": "/api/v2/pokemon-species/64/"
-        },
-        {
-            "name": "alakazam",
-            "url": "/api/v2/pokemon-species/65/"
-        },
-        {
-            "name": "muk",
-            "url": "/api/v2/pokemon-species/89/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-habitat/9/index.json b/data/api/v2/pokemon-habitat/9/index.json
index 53dd616e83..5ea6e8c9c2 100644
--- a/data/api/v2/pokemon-habitat/9/index.json
+++ b/data/api/v2/pokemon-habitat/9/index.json
@@ -37,6 +37,26 @@
             "name": "poliwag",
             "url": "/api/v2/pokemon-species/60/"
         },
+        {
+            "name": "wartortle",
+            "url": "/api/v2/pokemon-species/8/"
+        },
+        {
+            "name": "blastoise",
+            "url": "/api/v2/pokemon-species/9/"
+        },
+        {
+            "name": "golduck",
+            "url": "/api/v2/pokemon-species/55/"
+        },
+        {
+            "name": "poliwhirl",
+            "url": "/api/v2/pokemon-species/61/"
+        },
+        {
+            "name": "poliwrath",
+            "url": "/api/v2/pokemon-species/62/"
+        },
         {
             "name": "slowpoke",
             "url": "/api/v2/pokemon-species/79/"
@@ -57,6 +77,10 @@
             "name": "dratini",
             "url": "/api/v2/pokemon-species/147/"
         },
+        {
+            "name": "slowbro",
+            "url": "/api/v2/pokemon-species/80/"
+        },
         {
             "name": "kingler",
             "url": "/api/v2/pokemon-species/99/"
@@ -188,30 +212,6 @@
         {
             "name": "latios",
             "url": "/api/v2/pokemon-species/381/"
-        },
-        {
-            "name": "wartortle",
-            "url": "/api/v2/pokemon-species/8/"
-        },
-        {
-            "name": "blastoise",
-            "url": "/api/v2/pokemon-species/9/"
-        },
-        {
-            "name": "golduck",
-            "url": "/api/v2/pokemon-species/55/"
-        },
-        {
-            "name": "poliwhirl",
-            "url": "/api/v2/pokemon-species/61/"
-        },
-        {
-            "name": "poliwrath",
-            "url": "/api/v2/pokemon-species/62/"
-        },
-        {
-            "name": "slowbro",
-            "url": "/api/v2/pokemon-species/80/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-shape/11/index.json b/data/api/v2/pokemon-shape/11/index.json
index a2b064edc3..5922c66d2a 100644
--- a/data/api/v2/pokemon-shape/11/index.json
+++ b/data/api/v2/pokemon-shape/11/index.json
@@ -34,10 +34,18 @@
         }
     ],
     "pokemon_species": [
+        {
+            "name": "dugtrio",
+            "url": "/api/v2/pokemon-species/51/"
+        },
         {
             "name": "exeggcute",
             "url": "/api/v2/pokemon-species/102/"
         },
+        {
+            "name": "magneton",
+            "url": "/api/v2/pokemon-species/82/"
+        },
         {
             "name": "weezing",
             "url": "/api/v2/pokemon-species/110/"
@@ -90,14 +98,6 @@
             "name": "maushold",
             "url": "/api/v2/pokemon-species/925/"
         },
-        {
-            "name": "dugtrio",
-            "url": "/api/v2/pokemon-species/51/"
-        },
-        {
-            "name": "magneton",
-            "url": "/api/v2/pokemon-species/82/"
-        },
         {
             "name": "metagross",
             "url": "/api/v2/pokemon-species/376/"
diff --git a/data/api/v2/pokemon-shape/12/index.json b/data/api/v2/pokemon-shape/12/index.json
index 26265088c3..5ed1baeddd 100644
--- a/data/api/v2/pokemon-shape/12/index.json
+++ b/data/api/v2/pokemon-shape/12/index.json
@@ -58,6 +58,26 @@
             "name": "vileplume",
             "url": "/api/v2/pokemon-species/45/"
         },
+        {
+            "name": "poliwhirl",
+            "url": "/api/v2/pokemon-species/61/"
+        },
+        {
+            "name": "poliwrath",
+            "url": "/api/v2/pokemon-species/62/"
+        },
+        {
+            "name": "alakazam",
+            "url": "/api/v2/pokemon-species/65/"
+        },
+        {
+            "name": "machoke",
+            "url": "/api/v2/pokemon-species/67/"
+        },
+        {
+            "name": "machamp",
+            "url": "/api/v2/pokemon-species/68/"
+        },
         {
             "name": "graveler",
             "url": "/api/v2/pokemon-species/75/"
@@ -598,26 +618,6 @@
             "name": "ogerpon",
             "url": "/api/v2/pokemon-species/1017/"
         },
-        {
-            "name": "poliwhirl",
-            "url": "/api/v2/pokemon-species/61/"
-        },
-        {
-            "name": "poliwrath",
-            "url": "/api/v2/pokemon-species/62/"
-        },
-        {
-            "name": "alakazam",
-            "url": "/api/v2/pokemon-species/65/"
-        },
-        {
-            "name": "machoke",
-            "url": "/api/v2/pokemon-species/67/"
-        },
-        {
-            "name": "machamp",
-            "url": "/api/v2/pokemon-species/68/"
-        },
         {
             "name": "golem",
             "url": "/api/v2/pokemon-species/76/"
@@ -630,10 +630,6 @@
             "name": "gurdurr",
             "url": "/api/v2/pokemon-species/533/"
         },
-        {
-            "name": "gholdengo",
-            "url": "/api/v2/pokemon-species/1000/"
-        },
         {
             "name": "tsareena",
             "url": "/api/v2/pokemon-species/763/"
@@ -653,6 +649,10 @@
         {
             "name": "arboliva",
             "url": "/api/v2/pokemon-species/930/"
+        },
+        {
+            "name": "gholdengo",
+            "url": "/api/v2/pokemon-species/1000/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-shape/13/index.json b/data/api/v2/pokemon-shape/13/index.json
index 727d636396..612835cae3 100644
--- a/data/api/v2/pokemon-shape/13/index.json
+++ b/data/api/v2/pokemon-shape/13/index.json
@@ -34,6 +34,14 @@
         }
     ],
     "pokemon_species": [
+        {
+            "name": "butterfree",
+            "url": "/api/v2/pokemon-species/12/"
+        },
+        {
+            "name": "beedrill",
+            "url": "/api/v2/pokemon-species/15/"
+        },
         {
             "name": "venomoth",
             "url": "/api/v2/pokemon-species/49/"
@@ -110,14 +118,6 @@
             "name": "iron-moth",
             "url": "/api/v2/pokemon-species/994/"
         },
-        {
-            "name": "butterfree",
-            "url": "/api/v2/pokemon-species/12/"
-        },
-        {
-            "name": "beedrill",
-            "url": "/api/v2/pokemon-species/15/"
-        },
         {
             "name": "vivillon",
             "url": "/api/v2/pokemon-species/666/"
diff --git a/data/api/v2/pokemon-shape/2/index.json b/data/api/v2/pokemon-shape/2/index.json
index c8a8d04b9b..91d96d0982 100644
--- a/data/api/v2/pokemon-shape/2/index.json
+++ b/data/api/v2/pokemon-shape/2/index.json
@@ -38,6 +38,14 @@
             "name": "ekans",
             "url": "/api/v2/pokemon-species/23/"
         },
+        {
+            "name": "metapod",
+            "url": "/api/v2/pokemon-species/11/"
+        },
+        {
+            "name": "kakuna",
+            "url": "/api/v2/pokemon-species/14/"
+        },
         {
             "name": "arbok",
             "url": "/api/v2/pokemon-species/24/"
@@ -178,14 +186,6 @@
             "name": "wo-chien",
             "url": "/api/v2/pokemon-species/1001/"
         },
-        {
-            "name": "metapod",
-            "url": "/api/v2/pokemon-species/11/"
-        },
-        {
-            "name": "kakuna",
-            "url": "/api/v2/pokemon-species/14/"
-        },
         {
             "name": "gastrodon",
             "url": "/api/v2/pokemon-species/423/"
diff --git a/data/api/v2/pokemon-shape/3/index.json b/data/api/v2/pokemon-shape/3/index.json
index 1cacb8492f..79df0cc7e4 100644
--- a/data/api/v2/pokemon-shape/3/index.json
+++ b/data/api/v2/pokemon-shape/3/index.json
@@ -50,6 +50,10 @@
             "name": "lapras",
             "url": "/api/v2/pokemon-species/131/"
         },
+        {
+            "name": "dewgong",
+            "url": "/api/v2/pokemon-species/87/"
+        },
         {
             "name": "seaking",
             "url": "/api/v2/pokemon-species/119/"
@@ -214,10 +218,6 @@
             "name": "chi-yu",
             "url": "/api/v2/pokemon-species/1004/"
         },
-        {
-            "name": "dewgong",
-            "url": "/api/v2/pokemon-species/87/"
-        },
         {
             "name": "brionne",
             "url": "/api/v2/pokemon-species/729/"
diff --git a/data/api/v2/pokemon-shape/4/index.json b/data/api/v2/pokemon-shape/4/index.json
index 0cb0e90e4d..15e2a9c8cc 100644
--- a/data/api/v2/pokemon-shape/4/index.json
+++ b/data/api/v2/pokemon-shape/4/index.json
@@ -46,6 +46,10 @@
             "name": "grimer",
             "url": "/api/v2/pokemon-species/88/"
         },
+        {
+            "name": "muk",
+            "url": "/api/v2/pokemon-species/89/"
+        },
         {
             "name": "haunter",
             "url": "/api/v2/pokemon-species/93/"
@@ -218,10 +222,6 @@
             "name": "drakloak",
             "url": "/api/v2/pokemon-species/886/"
         },
-        {
-            "name": "muk",
-            "url": "/api/v2/pokemon-species/89/"
-        },
         {
             "name": "chandelure",
             "url": "/api/v2/pokemon-species/609/"
diff --git a/data/api/v2/pokemon-shape/5/index.json b/data/api/v2/pokemon-shape/5/index.json
index fd7f9fd02a..951e49d862 100644
--- a/data/api/v2/pokemon-shape/5/index.json
+++ b/data/api/v2/pokemon-shape/5/index.json
@@ -38,6 +38,14 @@
             "name": "diglett",
             "url": "/api/v2/pokemon-species/50/"
         },
+        {
+            "name": "weepinbell",
+            "url": "/api/v2/pokemon-species/70/"
+        },
+        {
+            "name": "victreebel",
+            "url": "/api/v2/pokemon-species/71/"
+        },
         {
             "name": "horsea",
             "url": "/api/v2/pokemon-species/116/"
@@ -182,14 +190,6 @@
             "name": "gimmighoul",
             "url": "/api/v2/pokemon-species/999/"
         },
-        {
-            "name": "weepinbell",
-            "url": "/api/v2/pokemon-species/70/"
-        },
-        {
-            "name": "victreebel",
-            "url": "/api/v2/pokemon-species/71/"
-        },
         {
             "name": "cofagrigus",
             "url": "/api/v2/pokemon-species/563/"
diff --git a/data/api/v2/pokemon-shape/6/index.json b/data/api/v2/pokemon-shape/6/index.json
index 32713e90b4..64ff0d438d 100644
--- a/data/api/v2/pokemon-shape/6/index.json
+++ b/data/api/v2/pokemon-shape/6/index.json
@@ -62,6 +62,22 @@
             "name": "machop",
             "url": "/api/v2/pokemon-species/66/"
         },
+        {
+            "name": "charmeleon",
+            "url": "/api/v2/pokemon-species/5/"
+        },
+        {
+            "name": "charizard",
+            "url": "/api/v2/pokemon-species/6/"
+        },
+        {
+            "name": "wartortle",
+            "url": "/api/v2/pokemon-species/8/"
+        },
+        {
+            "name": "blastoise",
+            "url": "/api/v2/pokemon-species/9/"
+        },
         {
             "name": "raichu",
             "url": "/api/v2/pokemon-species/26/"
@@ -86,6 +102,18 @@
             "name": "clefable",
             "url": "/api/v2/pokemon-species/36/"
         },
+        {
+            "name": "golduck",
+            "url": "/api/v2/pokemon-species/55/"
+        },
+        {
+            "name": "primeape",
+            "url": "/api/v2/pokemon-species/57/"
+        },
+        {
+            "name": "kadabra",
+            "url": "/api/v2/pokemon-species/64/"
+        },
         {
             "name": "cubone",
             "url": "/api/v2/pokemon-species/104/"
@@ -102,6 +130,10 @@
             "name": "mewtwo",
             "url": "/api/v2/pokemon-species/150/"
         },
+        {
+            "name": "slowbro",
+            "url": "/api/v2/pokemon-species/80/"
+        },
         {
             "name": "gengar",
             "url": "/api/v2/pokemon-species/94/"
@@ -842,38 +874,6 @@
             "name": "okidogi",
             "url": "/api/v2/pokemon-species/1014/"
         },
-        {
-            "name": "charmeleon",
-            "url": "/api/v2/pokemon-species/5/"
-        },
-        {
-            "name": "charizard",
-            "url": "/api/v2/pokemon-species/6/"
-        },
-        {
-            "name": "wartortle",
-            "url": "/api/v2/pokemon-species/8/"
-        },
-        {
-            "name": "blastoise",
-            "url": "/api/v2/pokemon-species/9/"
-        },
-        {
-            "name": "golduck",
-            "url": "/api/v2/pokemon-species/55/"
-        },
-        {
-            "name": "primeape",
-            "url": "/api/v2/pokemon-species/57/"
-        },
-        {
-            "name": "kadabra",
-            "url": "/api/v2/pokemon-species/64/"
-        },
-        {
-            "name": "slowbro",
-            "url": "/api/v2/pokemon-species/80/"
-        },
         {
             "name": "monferno",
             "url": "/api/v2/pokemon-species/391/"
@@ -886,6 +886,10 @@
             "name": "tyrantrum",
             "url": "/api/v2/pokemon-species/697/"
         },
+        {
+            "name": "arctibax",
+            "url": "/api/v2/pokemon-species/997/"
+        },
         {
             "name": "baxcalibur",
             "url": "/api/v2/pokemon-species/998/"
@@ -893,10 +897,6 @@
         {
             "name": "archaludon",
             "url": "/api/v2/pokemon-species/1018/"
-        },
-        {
-            "name": "arctibax",
-            "url": "/api/v2/pokemon-species/997/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-shape/7/index.json b/data/api/v2/pokemon-shape/7/index.json
index 01377dd81a..1b0cf1625e 100644
--- a/data/api/v2/pokemon-shape/7/index.json
+++ b/data/api/v2/pokemon-shape/7/index.json
@@ -54,6 +54,10 @@
             "name": "porygon",
             "url": "/api/v2/pokemon-species/137/"
         },
+        {
+            "name": "dodrio",
+            "url": "/api/v2/pokemon-species/85/"
+        },
         {
             "name": "exeggutor",
             "url": "/api/v2/pokemon-species/103/"
@@ -138,10 +142,6 @@
             "name": "varoom",
             "url": "/api/v2/pokemon-species/965/"
         },
-        {
-            "name": "dodrio",
-            "url": "/api/v2/pokemon-species/85/"
-        },
         {
             "name": "revavroom",
             "url": "/api/v2/pokemon-species/966/"
diff --git a/data/api/v2/pokemon-shape/8/index.json b/data/api/v2/pokemon-shape/8/index.json
index bea56c793a..6c716f930d 100644
--- a/data/api/v2/pokemon-shape/8/index.json
+++ b/data/api/v2/pokemon-shape/8/index.json
@@ -62,6 +62,10 @@
             "name": "growlithe",
             "url": "/api/v2/pokemon-species/58/"
         },
+        {
+            "name": "venusaur",
+            "url": "/api/v2/pokemon-species/3/"
+        },
         {
             "name": "raticate",
             "url": "/api/v2/pokemon-species/20/"
@@ -82,6 +86,14 @@
             "name": "ninetales",
             "url": "/api/v2/pokemon-species/38/"
         },
+        {
+            "name": "persian",
+            "url": "/api/v2/pokemon-species/53/"
+        },
+        {
+            "name": "arcanine",
+            "url": "/api/v2/pokemon-species/59/"
+        },
         {
             "name": "ponyta",
             "url": "/api/v2/pokemon-species/77/"
@@ -102,6 +114,10 @@
             "name": "eevee",
             "url": "/api/v2/pokemon-species/133/"
         },
+        {
+            "name": "rapidash",
+            "url": "/api/v2/pokemon-species/78/"
+        },
         {
             "name": "vaporeon",
             "url": "/api/v2/pokemon-species/134/"
@@ -794,22 +810,6 @@
             "name": "ivysaur",
             "url": "/api/v2/pokemon-species/2/"
         },
-        {
-            "name": "venusaur",
-            "url": "/api/v2/pokemon-species/3/"
-        },
-        {
-            "name": "persian",
-            "url": "/api/v2/pokemon-species/53/"
-        },
-        {
-            "name": "arcanine",
-            "url": "/api/v2/pokemon-species/59/"
-        },
-        {
-            "name": "rapidash",
-            "url": "/api/v2/pokemon-species/78/"
-        },
         {
             "name": "bayleef",
             "url": "/api/v2/pokemon-species/153/"
diff --git a/data/api/v2/pokemon-shape/9/index.json b/data/api/v2/pokemon-shape/9/index.json
index 8e720bfb13..0a920dac4f 100644
--- a/data/api/v2/pokemon-shape/9/index.json
+++ b/data/api/v2/pokemon-shape/9/index.json
@@ -46,6 +46,10 @@
             "name": "zubat",
             "url": "/api/v2/pokemon-species/41/"
         },
+        {
+            "name": "pidgeotto",
+            "url": "/api/v2/pokemon-species/17/"
+        },
         {
             "name": "pidgeot",
             "url": "/api/v2/pokemon-species/18/"
@@ -370,10 +374,6 @@
             "name": "fezandipiti",
             "url": "/api/v2/pokemon-species/1016/"
         },
-        {
-            "name": "pidgeotto",
-            "url": "/api/v2/pokemon-species/17/"
-        },
         {
             "name": "mantine",
             "url": "/api/v2/pokemon-species/226/"