diff --git a/data/README-names.md b/data/README-names.md
index ef3bd51..3bda323 100644
--- a/data/README-names.md
+++ b/data/README-names.md
@@ -4,7 +4,7 @@ Open https://xenoblade.github.io/xb2/bdat/common/BLD_NameList.html and paste
 this into the browser inspector:
 
 ```js
-let names = [];
+names = [];
 Array.from(document.getElementsByClassName("sortable")[0].children[1].children)
   .forEach(row => names.push(row.children[2]
     .innerHTML
diff --git a/data/names.json b/data/names.json
index a16bdea..ad0f4ad 100644
--- a/data/names.json
+++ b/data/names.json
@@ -792,7 +792,7 @@
   "millie",
   "milotic",
   "miltank",
-  "mime jr.",
+  "mime-jr",
   "mimikyu",
   "minami",
   "minazuki",
@@ -824,7 +824,7 @@
   "mothim",
   "moyoi",
   "mr-breezy",
-  "mr. mime",
+  "mr-mime",
   "mr-stripes",
   "mr-waddle",
   "mr-zippy",
@@ -1278,10 +1278,10 @@
   "tamon",
   "tangela",
   "tangrowth",
-  "tapu bulu",
-  "tapu fini",
-  "tapu koko",
-  "tapu lele",
+  "tapu-bulu",
+  "tapu-fini",
+  "tapu-koko",
+  "tapu-lele",
   "tarantella",
   "tauros",
   "teddiursa",
@@ -1349,7 +1349,7 @@
   "tyhei",
   "tympole",
   "tynamo",
-  "type: null",
+  "type-null",
   "typhlosion",
   "tyranitar",
   "tyrantrum",
diff --git a/data/pokedex.sh b/data/pokedex.sh
index a8874d1..505da11 100755
--- a/data/pokedex.sh
+++ b/data/pokedex.sh
@@ -4,5 +4,8 @@
 curl https://raw.githubusercontent.com/fanzeyi/pokemon.json/master/pokedex.json \
     | jq -r '.[].name.english' \
     | tr '[:upper:]' '[:lower:]' \
+    | tr ' ' '-' \
+    | sed 's/\.//g' \
+    | sed 's/://g' \
     | jq --raw-input '.' \
     | jq -s > pokemon.json
diff --git a/data/pokemon.json b/data/pokemon.json
index 2eb309b..7353c3f 100644
--- a/data/pokemon.json
+++ b/data/pokemon.json
@@ -120,7 +120,7 @@
   "seaking",
   "staryu",
   "starmie",
-  "mr. mime",
+  "mr-mime",
   "scyther",
   "jynx",
   "electabuzz",
@@ -437,7 +437,7 @@
   "bronzor",
   "bronzong",
   "bonsly",
-  "mime jr.",
+  "mime-jr",
   "happiny",
   "chatot",
   "spiritomb",
@@ -770,7 +770,7 @@
   "sandygast",
   "palossand",
   "pyukumuku",
-  "type: null",
+  "type-null",
   "silvally",
   "minior",
   "komala",
@@ -783,10 +783,10 @@
   "jangmo-o",
   "hakamo-o",
   "kommo-o",
-  "tapu koko",
-  "tapu lele",
-  "tapu bulu",
-  "tapu fini",
+  "tapu-koko",
+  "tapu-lele",
+  "tapu-bulu",
+  "tapu-fini",
   "cosmog",
   "cosmoem",
   "solgaleo",