diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/1.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/1.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/1.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/1.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/10.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/10.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/10.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/10.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/11.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/11.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/11.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/11.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/12.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/12.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/12.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/12.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/13.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/13.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/13.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/13.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/14.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/14.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/14.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/14.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/15.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/15.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/15.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/15.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/16.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/16.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/16.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/16.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/17.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/17.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/17.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/17.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/18.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/18.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/18.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/18.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/2.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/2.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/2.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/2.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/3.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/3.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/3.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/3.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/4.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/4.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/4.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/4.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/5.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/5.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/5.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/5.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/6.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/6.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/6.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/6.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/7.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/7.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/7.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/7.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/8.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/8.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/8.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/8.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/9.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/9.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/9.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/9.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/1.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/1.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/1.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/1.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/10.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/10.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/10.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/10.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/11.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/11.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/11.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/11.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/12.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/12.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/12.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/12.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/13.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/13.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/13.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/13.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/14.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/14.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/14.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/14.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/15.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/15.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/15.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/15.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/16.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/16.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/16.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/16.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/17.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/17.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/17.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/17.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/18.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/18.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/18.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/18.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/2.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/2.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/2.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/2.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/3.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/3.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/3.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/3.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/4.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/4.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/4.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/4.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/5.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/5.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/5.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/5.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/6.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/6.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/6.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/6.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/7.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/7.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/7.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/7.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/8.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/8.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/8.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/8.png
diff --git a/sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/9.png b/sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/9.png
similarity index 100%
rename from sprites/types/generation-viii/brilliant-diamond-and-shining-pearl/small/9.png
rename to sprites/types/generation-viii/brilliant-diamond-shining-pearl/small/9.png