diff --git a/src/canonical/minisprites/gen6/custom/Alcremie--Caramelswirl.png b/src/canonical/minisprites/gen6/custom/Alcremie--Caramel_Swirl.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/Alcremie--Caramelswirl.png
rename to src/canonical/minisprites/gen6/custom/Alcremie--Caramel_Swirl.png
diff --git a/src/canonical/minisprites/gen6/custom/Alcremie--Lemoncream.png b/src/canonical/minisprites/gen6/custom/Alcremie--Lemon_Cream.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/Alcremie--Lemoncream.png
rename to src/canonical/minisprites/gen6/custom/Alcremie--Lemon_Cream.png
diff --git a/src/canonical/minisprites/gen6/custom/Alcremie--Matchacream.png b/src/canonical/minisprites/gen6/custom/Alcremie--Matcha_Cream.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/Alcremie--Matchacream.png
rename to src/canonical/minisprites/gen6/custom/Alcremie--Matcha_Cream.png
diff --git a/src/canonical/minisprites/gen6/custom/Alcremie--Mintcream.png b/src/canonical/minisprites/gen6/custom/Alcremie--Mint_Cream.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/Alcremie--Mintcream.png
rename to src/canonical/minisprites/gen6/custom/Alcremie--Mint_Cream.png
diff --git a/src/canonical/minisprites/gen6/custom/Alcremie--Rainbowswirl.png b/src/canonical/minisprites/gen6/custom/Alcremie--Rainbow_Swirl.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/Alcremie--Rainbowswirl.png
rename to src/canonical/minisprites/gen6/custom/Alcremie--Rainbow_Swirl.png
diff --git a/src/canonical/minisprites/gen6/custom/Alcremie--Rubycream.png b/src/canonical/minisprites/gen6/custom/Alcremie--Ruby_Cream.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/Alcremie--Rubycream.png
rename to src/canonical/minisprites/gen6/custom/Alcremie--Ruby_Cream.png
diff --git a/src/canonical/minisprites/gen6/custom/Alcremie--Rubyswirl.png b/src/canonical/minisprites/gen6/custom/Alcremie--Ruby_Swirl.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/Alcremie--Rubyswirl.png
rename to src/canonical/minisprites/gen6/custom/Alcremie--Ruby_Swirl.png
diff --git a/src/canonical/minisprites/gen6/custom/Alcremie--Saltedcream.png b/src/canonical/minisprites/gen6/custom/Alcremie--Salted_Cream.png
similarity index 100%
rename from src/canonical/minisprites/gen6/custom/Alcremie--Saltedcream.png
rename to src/canonical/minisprites/gen6/custom/Alcremie--Salted_Cream.png
diff --git a/src/canonical/minisprites/gen8/pokemon/Alcremie--Caramelswirl.png b/src/canonical/minisprites/gen8/pokemon/Alcremie--Caramel_Swirl.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/Alcremie--Caramelswirl.png
rename to src/canonical/minisprites/gen8/pokemon/Alcremie--Caramel_Swirl.png
diff --git a/src/canonical/minisprites/gen8/pokemon/Alcremie--Lemoncream.png b/src/canonical/minisprites/gen8/pokemon/Alcremie--Lemon_Cream.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/Alcremie--Lemoncream.png
rename to src/canonical/minisprites/gen8/pokemon/Alcremie--Lemon_Cream.png
diff --git a/src/canonical/minisprites/gen8/pokemon/Alcremie--Matchacream.png b/src/canonical/minisprites/gen8/pokemon/Alcremie--Matcha_Cream.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/Alcremie--Matchacream.png
rename to src/canonical/minisprites/gen8/pokemon/Alcremie--Matcha_Cream.png
diff --git a/src/canonical/minisprites/gen8/pokemon/Alcremie--Mintcream.png b/src/canonical/minisprites/gen8/pokemon/Alcremie--Mint_Cream.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/Alcremie--Mintcream.png
rename to src/canonical/minisprites/gen8/pokemon/Alcremie--Mint_Cream.png
diff --git a/src/canonical/minisprites/gen8/pokemon/Alcremie--Rainbowswirl.png b/src/canonical/minisprites/gen8/pokemon/Alcremie--Rainbow_Swirl.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/Alcremie--Rainbowswirl.png
rename to src/canonical/minisprites/gen8/pokemon/Alcremie--Rainbow_Swirl.png
diff --git a/src/canonical/minisprites/gen8/pokemon/Alcremie--Rubycream.png b/src/canonical/minisprites/gen8/pokemon/Alcremie--Ruby_Cream.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/Alcremie--Rubycream.png
rename to src/canonical/minisprites/gen8/pokemon/Alcremie--Ruby_Cream.png
diff --git a/src/canonical/minisprites/gen8/pokemon/Alcremie--Rubyswirl.png b/src/canonical/minisprites/gen8/pokemon/Alcremie--Ruby_Swirl.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/Alcremie--Rubyswirl.png
rename to src/canonical/minisprites/gen8/pokemon/Alcremie--Ruby_Swirl.png
diff --git a/src/canonical/minisprites/gen8/pokemon/Alcremie--Saltedcream.png b/src/canonical/minisprites/gen8/pokemon/Alcremie--Salted_Cream.png
similarity index 100%
rename from src/canonical/minisprites/gen8/pokemon/Alcremie--Saltedcream.png
rename to src/canonical/minisprites/gen8/pokemon/Alcremie--Salted_Cream.png
diff --git a/src/canonical/models/back-cosmetic/Alcremie--Caramel_Swirl.gif b/src/canonical/models/back-cosmetic/Alcremie--Caramel_Swirl.gif
new file mode 100644
index 00000000..ee69d5bb
Binary files /dev/null and b/src/canonical/models/back-cosmetic/Alcremie--Caramel_Swirl.gif differ
diff --git a/src/canonical/models/back-cosmetic/Alcremie--Lemon_Cream.gif b/src/canonical/models/back-cosmetic/Alcremie--Lemon_Cream.gif
new file mode 100644
index 00000000..be8d53b9
Binary files /dev/null and b/src/canonical/models/back-cosmetic/Alcremie--Lemon_Cream.gif differ
diff --git a/src/canonical/models/back-cosmetic/Alcremie--Matcha_Cream.gif b/src/canonical/models/back-cosmetic/Alcremie--Matcha_Cream.gif
new file mode 100644
index 00000000..252a7287
Binary files /dev/null and b/src/canonical/models/back-cosmetic/Alcremie--Matcha_Cream.gif differ
diff --git a/src/canonical/models/back-cosmetic/Alcremie--Mint_Cream.gif b/src/canonical/models/back-cosmetic/Alcremie--Mint_Cream.gif
new file mode 100644
index 00000000..22d8fa0f
Binary files /dev/null and b/src/canonical/models/back-cosmetic/Alcremie--Mint_Cream.gif differ
diff --git a/src/canonical/models/back-cosmetic/Alcremie--Rainbow_Swirl.gif b/src/canonical/models/back-cosmetic/Alcremie--Rainbow_Swirl.gif
new file mode 100644
index 00000000..ebc146cc
Binary files /dev/null and b/src/canonical/models/back-cosmetic/Alcremie--Rainbow_Swirl.gif differ
diff --git a/src/canonical/models/back-cosmetic/Alcremie--Ruby_Cream.gif b/src/canonical/models/back-cosmetic/Alcremie--Ruby_Cream.gif
new file mode 100644
index 00000000..912aa6a0
Binary files /dev/null and b/src/canonical/models/back-cosmetic/Alcremie--Ruby_Cream.gif differ
diff --git a/src/canonical/models/back-cosmetic/Alcremie--Ruby_Swirl.gif b/src/canonical/models/back-cosmetic/Alcremie--Ruby_Swirl.gif
new file mode 100644
index 00000000..9e6168f9
Binary files /dev/null and b/src/canonical/models/back-cosmetic/Alcremie--Ruby_Swirl.gif differ
diff --git a/src/canonical/models/back-cosmetic/Alcremie--Salted_Cream.gif b/src/canonical/models/back-cosmetic/Alcremie--Salted_Cream.gif
new file mode 100644
index 00000000..05091680
Binary files /dev/null and b/src/canonical/models/back-cosmetic/Alcremie--Salted_Cream.gif differ
diff --git a/src/canonical/models/front-cosmetic/Alcremie--Caramel_Swirl.gif b/src/canonical/models/front-cosmetic/Alcremie--Caramel_Swirl.gif
new file mode 100644
index 00000000..00566005
Binary files /dev/null and b/src/canonical/models/front-cosmetic/Alcremie--Caramel_Swirl.gif differ
diff --git a/src/canonical/models/front-cosmetic/Alcremie--Lemon_Cream.gif b/src/canonical/models/front-cosmetic/Alcremie--Lemon_Cream.gif
new file mode 100644
index 00000000..6b9b61ea
Binary files /dev/null and b/src/canonical/models/front-cosmetic/Alcremie--Lemon_Cream.gif differ
diff --git a/src/canonical/models/front-cosmetic/Alcremie--Matcha_Cream.gif b/src/canonical/models/front-cosmetic/Alcremie--Matcha_Cream.gif
new file mode 100644
index 00000000..4ac2f29f
Binary files /dev/null and b/src/canonical/models/front-cosmetic/Alcremie--Matcha_Cream.gif differ
diff --git a/src/canonical/models/front-cosmetic/Alcremie--Mint_Cream.gif b/src/canonical/models/front-cosmetic/Alcremie--Mint_Cream.gif
new file mode 100644
index 00000000..5fc705d2
Binary files /dev/null and b/src/canonical/models/front-cosmetic/Alcremie--Mint_Cream.gif differ
diff --git a/src/canonical/models/front-cosmetic/Alcremie--Rainbow_Swirl.gif b/src/canonical/models/front-cosmetic/Alcremie--Rainbow_Swirl.gif
new file mode 100644
index 00000000..baa5963a
Binary files /dev/null and b/src/canonical/models/front-cosmetic/Alcremie--Rainbow_Swirl.gif differ
diff --git a/src/canonical/models/front-cosmetic/Alcremie--Ruby_Cream.gif b/src/canonical/models/front-cosmetic/Alcremie--Ruby_Cream.gif
new file mode 100644
index 00000000..5bbeafc3
Binary files /dev/null and b/src/canonical/models/front-cosmetic/Alcremie--Ruby_Cream.gif differ
diff --git a/src/canonical/models/front-cosmetic/Alcremie--Ruby_Swirl.gif b/src/canonical/models/front-cosmetic/Alcremie--Ruby_Swirl.gif
new file mode 100644
index 00000000..c7a924de
Binary files /dev/null and b/src/canonical/models/front-cosmetic/Alcremie--Ruby_Swirl.gif differ
diff --git a/src/canonical/models/front-cosmetic/Alcremie--Salted_Cream.gif b/src/canonical/models/front-cosmetic/Alcremie--Salted_Cream.gif
new file mode 100644
index 00000000..8ce5c5fa
Binary files /dev/null and b/src/canonical/models/front-cosmetic/Alcremie--Salted_Cream.gif differ
diff --git a/src/canonical/models/front-shiny-cosmetic/Alcremie--Caramel_Swirl.gif b/src/canonical/models/front-shiny-cosmetic/Alcremie--Caramel_Swirl.gif
new file mode 100644
index 00000000..e62db49c
Binary files /dev/null and b/src/canonical/models/front-shiny-cosmetic/Alcremie--Caramel_Swirl.gif differ
diff --git a/src/canonical/models/front-shiny-cosmetic/Alcremie--Lemon_Cream.gif b/src/canonical/models/front-shiny-cosmetic/Alcremie--Lemon_Cream.gif
new file mode 100644
index 00000000..c69a7a92
Binary files /dev/null and b/src/canonical/models/front-shiny-cosmetic/Alcremie--Lemon_Cream.gif differ
diff --git a/src/canonical/models/front-shiny-cosmetic/Alcremie--Matcha_Cream.gif b/src/canonical/models/front-shiny-cosmetic/Alcremie--Matcha_Cream.gif
new file mode 100644
index 00000000..a4ecae95
Binary files /dev/null and b/src/canonical/models/front-shiny-cosmetic/Alcremie--Matcha_Cream.gif differ
diff --git a/src/canonical/models/front-shiny-cosmetic/Alcremie--Mint_Cream.gif b/src/canonical/models/front-shiny-cosmetic/Alcremie--Mint_Cream.gif
new file mode 100644
index 00000000..dece905e
Binary files /dev/null and b/src/canonical/models/front-shiny-cosmetic/Alcremie--Mint_Cream.gif differ
diff --git a/src/canonical/models/front-shiny-cosmetic/Alcremie--Rainbow_Swirl.gif b/src/canonical/models/front-shiny-cosmetic/Alcremie--Rainbow_Swirl.gif
new file mode 100644
index 00000000..e747020f
Binary files /dev/null and b/src/canonical/models/front-shiny-cosmetic/Alcremie--Rainbow_Swirl.gif differ
diff --git a/src/canonical/models/front-shiny-cosmetic/Alcremie--Ruby_Cream.gif b/src/canonical/models/front-shiny-cosmetic/Alcremie--Ruby_Cream.gif
new file mode 100644
index 00000000..26ddce19
Binary files /dev/null and b/src/canonical/models/front-shiny-cosmetic/Alcremie--Ruby_Cream.gif differ
diff --git a/src/canonical/models/front-shiny-cosmetic/Alcremie--Ruby_Swirl.gif b/src/canonical/models/front-shiny-cosmetic/Alcremie--Ruby_Swirl.gif
new file mode 100644
index 00000000..2150bdec
Binary files /dev/null and b/src/canonical/models/front-shiny-cosmetic/Alcremie--Ruby_Swirl.gif differ
diff --git a/src/canonical/models/front-shiny-cosmetic/Alcremie--Salted_Cream.gif b/src/canonical/models/front-shiny-cosmetic/Alcremie--Salted_Cream.gif
new file mode 100644
index 00000000..92d6dbb5
Binary files /dev/null and b/src/canonical/models/front-shiny-cosmetic/Alcremie--Salted_Cream.gif differ
diff --git a/src/noncanonical/sprites/afd/back-cosmetic/Alcremie--Caramelswirl.png b/src/noncanonical/sprites/afd/back-cosmetic/Alcremie--Caramel_Swirl.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back-cosmetic/Alcremie--Caramelswirl.png
rename to src/noncanonical/sprites/afd/back-cosmetic/Alcremie--Caramel_Swirl.png
diff --git a/src/noncanonical/sprites/afd/back-cosmetic/Alcremie--Lemoncream.png b/src/noncanonical/sprites/afd/back-cosmetic/Alcremie--Lemon_Cream.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back-cosmetic/Alcremie--Lemoncream.png
rename to src/noncanonical/sprites/afd/back-cosmetic/Alcremie--Lemon_Cream.png
diff --git a/src/noncanonical/sprites/afd/back-cosmetic/Alcremie--Matchacream.png b/src/noncanonical/sprites/afd/back-cosmetic/Alcremie--Matcha_Cream.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back-cosmetic/Alcremie--Matchacream.png
rename to src/noncanonical/sprites/afd/back-cosmetic/Alcremie--Matcha_Cream.png
diff --git a/src/noncanonical/sprites/afd/back-cosmetic/Alcremie--Mintcream.png b/src/noncanonical/sprites/afd/back-cosmetic/Alcremie--Mint_Cream.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back-cosmetic/Alcremie--Mintcream.png
rename to src/noncanonical/sprites/afd/back-cosmetic/Alcremie--Mint_Cream.png
diff --git a/src/noncanonical/sprites/afd/back-cosmetic/Alcremie--Rainbowswirl.png b/src/noncanonical/sprites/afd/back-cosmetic/Alcremie--Rainbow_Swirl.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back-cosmetic/Alcremie--Rainbowswirl.png
rename to src/noncanonical/sprites/afd/back-cosmetic/Alcremie--Rainbow_Swirl.png
diff --git a/src/noncanonical/sprites/afd/back-cosmetic/Alcremie--Rubycream.png b/src/noncanonical/sprites/afd/back-cosmetic/Alcremie--Ruby_Cream.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back-cosmetic/Alcremie--Rubycream.png
rename to src/noncanonical/sprites/afd/back-cosmetic/Alcremie--Ruby_Cream.png
diff --git a/src/noncanonical/sprites/afd/back-cosmetic/Alcremie--Rubyswirl.png b/src/noncanonical/sprites/afd/back-cosmetic/Alcremie--Ruby_Swirl.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back-cosmetic/Alcremie--Rubyswirl.png
rename to src/noncanonical/sprites/afd/back-cosmetic/Alcremie--Ruby_Swirl.png
diff --git a/src/noncanonical/sprites/afd/back-cosmetic/Alcremie--Saltedcream.png b/src/noncanonical/sprites/afd/back-cosmetic/Alcremie--Salted_Cream.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back-cosmetic/Alcremie--Saltedcream.png
rename to src/noncanonical/sprites/afd/back-cosmetic/Alcremie--Salted_Cream.png
diff --git a/src/noncanonical/sprites/afd/back-shiny-cosmetic/Alcremie--Caramelswirl.png b/src/noncanonical/sprites/afd/back-shiny-cosmetic/Alcremie--Caramel_Swirl.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back-shiny-cosmetic/Alcremie--Caramelswirl.png
rename to src/noncanonical/sprites/afd/back-shiny-cosmetic/Alcremie--Caramel_Swirl.png
diff --git a/src/noncanonical/sprites/afd/back-shiny-cosmetic/Alcremie--Lemoncream.png b/src/noncanonical/sprites/afd/back-shiny-cosmetic/Alcremie--Lemon_Cream.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back-shiny-cosmetic/Alcremie--Lemoncream.png
rename to src/noncanonical/sprites/afd/back-shiny-cosmetic/Alcremie--Lemon_Cream.png
diff --git a/src/noncanonical/sprites/afd/back-shiny-cosmetic/Alcremie--Matchacream.png b/src/noncanonical/sprites/afd/back-shiny-cosmetic/Alcremie--Matcha_Cream.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back-shiny-cosmetic/Alcremie--Matchacream.png
rename to src/noncanonical/sprites/afd/back-shiny-cosmetic/Alcremie--Matcha_Cream.png
diff --git a/src/noncanonical/sprites/afd/back-shiny-cosmetic/Alcremie--Mintcream.png b/src/noncanonical/sprites/afd/back-shiny-cosmetic/Alcremie--Mint_Cream.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back-shiny-cosmetic/Alcremie--Mintcream.png
rename to src/noncanonical/sprites/afd/back-shiny-cosmetic/Alcremie--Mint_Cream.png
diff --git a/src/noncanonical/sprites/afd/back-shiny-cosmetic/Alcremie--Rainbowswirl.png b/src/noncanonical/sprites/afd/back-shiny-cosmetic/Alcremie--Rainbow_Swirl.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back-shiny-cosmetic/Alcremie--Rainbowswirl.png
rename to src/noncanonical/sprites/afd/back-shiny-cosmetic/Alcremie--Rainbow_Swirl.png
diff --git a/src/noncanonical/sprites/afd/back-shiny-cosmetic/Alcremie--Rubycream.png b/src/noncanonical/sprites/afd/back-shiny-cosmetic/Alcremie--Ruby_Cream.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back-shiny-cosmetic/Alcremie--Rubycream.png
rename to src/noncanonical/sprites/afd/back-shiny-cosmetic/Alcremie--Ruby_Cream.png
diff --git a/src/noncanonical/sprites/afd/back-shiny-cosmetic/Alcremie--Rubyswirl.png b/src/noncanonical/sprites/afd/back-shiny-cosmetic/Alcremie--Ruby_Swirl.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back-shiny-cosmetic/Alcremie--Rubyswirl.png
rename to src/noncanonical/sprites/afd/back-shiny-cosmetic/Alcremie--Ruby_Swirl.png
diff --git a/src/noncanonical/sprites/afd/back-shiny-cosmetic/Alcremie--Saltedcream.png b/src/noncanonical/sprites/afd/back-shiny-cosmetic/Alcremie--Salted_Cream.png
similarity index 100%
rename from src/noncanonical/sprites/afd/back-shiny-cosmetic/Alcremie--Saltedcream.png
rename to src/noncanonical/sprites/afd/back-shiny-cosmetic/Alcremie--Salted_Cream.png
diff --git a/src/noncanonical/sprites/afd/front-cosmetic/Alcremie--Caramelswirl.png b/src/noncanonical/sprites/afd/front-cosmetic/Alcremie--Caramel_Swirl.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front-cosmetic/Alcremie--Caramelswirl.png
rename to src/noncanonical/sprites/afd/front-cosmetic/Alcremie--Caramel_Swirl.png
diff --git a/src/noncanonical/sprites/afd/front-cosmetic/Alcremie--Lemoncream.png b/src/noncanonical/sprites/afd/front-cosmetic/Alcremie--Lemon_Cream.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front-cosmetic/Alcremie--Lemoncream.png
rename to src/noncanonical/sprites/afd/front-cosmetic/Alcremie--Lemon_Cream.png
diff --git a/src/noncanonical/sprites/afd/front-cosmetic/Alcremie--Matchacream.png b/src/noncanonical/sprites/afd/front-cosmetic/Alcremie--Matcha_Cream.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front-cosmetic/Alcremie--Matchacream.png
rename to src/noncanonical/sprites/afd/front-cosmetic/Alcremie--Matcha_Cream.png
diff --git a/src/noncanonical/sprites/afd/front-cosmetic/Alcremie--Mintcream.png b/src/noncanonical/sprites/afd/front-cosmetic/Alcremie--Mint_Cream.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front-cosmetic/Alcremie--Mintcream.png
rename to src/noncanonical/sprites/afd/front-cosmetic/Alcremie--Mint_Cream.png
diff --git a/src/noncanonical/sprites/afd/front-cosmetic/Alcremie--Rainbowswirl.png b/src/noncanonical/sprites/afd/front-cosmetic/Alcremie--Rainbow_Swirl.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front-cosmetic/Alcremie--Rainbowswirl.png
rename to src/noncanonical/sprites/afd/front-cosmetic/Alcremie--Rainbow_Swirl.png
diff --git a/src/noncanonical/sprites/afd/front-cosmetic/Alcremie--Rubycream.png b/src/noncanonical/sprites/afd/front-cosmetic/Alcremie--Ruby_Cream.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front-cosmetic/Alcremie--Rubycream.png
rename to src/noncanonical/sprites/afd/front-cosmetic/Alcremie--Ruby_Cream.png
diff --git a/src/noncanonical/sprites/afd/front-cosmetic/Alcremie--Rubyswirl.png b/src/noncanonical/sprites/afd/front-cosmetic/Alcremie--Ruby_Swirl.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front-cosmetic/Alcremie--Rubyswirl.png
rename to src/noncanonical/sprites/afd/front-cosmetic/Alcremie--Ruby_Swirl.png
diff --git a/src/noncanonical/sprites/afd/front-cosmetic/Alcremie--Saltedcream.png b/src/noncanonical/sprites/afd/front-cosmetic/Alcremie--Salted_Cream.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front-cosmetic/Alcremie--Saltedcream.png
rename to src/noncanonical/sprites/afd/front-cosmetic/Alcremie--Salted_Cream.png
diff --git a/src/noncanonical/sprites/afd/front-shiny-cosmetic/Alcremie--Caramelswirl.png b/src/noncanonical/sprites/afd/front-shiny-cosmetic/Alcremie--Caramel_Swirl.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front-shiny-cosmetic/Alcremie--Caramelswirl.png
rename to src/noncanonical/sprites/afd/front-shiny-cosmetic/Alcremie--Caramel_Swirl.png
diff --git a/src/noncanonical/sprites/afd/front-shiny-cosmetic/Alcremie--Lemoncream.png b/src/noncanonical/sprites/afd/front-shiny-cosmetic/Alcremie--Lemon_Cream.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front-shiny-cosmetic/Alcremie--Lemoncream.png
rename to src/noncanonical/sprites/afd/front-shiny-cosmetic/Alcremie--Lemon_Cream.png
diff --git a/src/noncanonical/sprites/afd/front-shiny-cosmetic/Alcremie--Matchacream.png b/src/noncanonical/sprites/afd/front-shiny-cosmetic/Alcremie--Matcha_Cream.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front-shiny-cosmetic/Alcremie--Matchacream.png
rename to src/noncanonical/sprites/afd/front-shiny-cosmetic/Alcremie--Matcha_Cream.png
diff --git a/src/noncanonical/sprites/afd/front-shiny-cosmetic/Alcremie--Mintcream.png b/src/noncanonical/sprites/afd/front-shiny-cosmetic/Alcremie--Mint_Cream.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front-shiny-cosmetic/Alcremie--Mintcream.png
rename to src/noncanonical/sprites/afd/front-shiny-cosmetic/Alcremie--Mint_Cream.png
diff --git a/src/noncanonical/sprites/afd/front-shiny-cosmetic/Alcremie--Rainbowswirl.png b/src/noncanonical/sprites/afd/front-shiny-cosmetic/Alcremie--Rainbow_Swirl.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front-shiny-cosmetic/Alcremie--Rainbowswirl.png
rename to src/noncanonical/sprites/afd/front-shiny-cosmetic/Alcremie--Rainbow_Swirl.png
diff --git a/src/noncanonical/sprites/afd/front-shiny-cosmetic/Alcremie--Rubycream.png b/src/noncanonical/sprites/afd/front-shiny-cosmetic/Alcremie--Ruby_Cream.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front-shiny-cosmetic/Alcremie--Rubycream.png
rename to src/noncanonical/sprites/afd/front-shiny-cosmetic/Alcremie--Ruby_Cream.png
diff --git a/src/noncanonical/sprites/afd/front-shiny-cosmetic/Alcremie--Rubyswirl.png b/src/noncanonical/sprites/afd/front-shiny-cosmetic/Alcremie--Ruby_Swirl.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front-shiny-cosmetic/Alcremie--Rubyswirl.png
rename to src/noncanonical/sprites/afd/front-shiny-cosmetic/Alcremie--Ruby_Swirl.png
diff --git a/src/noncanonical/sprites/afd/front-shiny-cosmetic/Alcremie--Saltedcream.png b/src/noncanonical/sprites/afd/front-shiny-cosmetic/Alcremie--Salted_Cream.png
similarity index 100%
rename from src/noncanonical/sprites/afd/front-shiny-cosmetic/Alcremie--Saltedcream.png
rename to src/noncanonical/sprites/afd/front-shiny-cosmetic/Alcremie--Salted_Cream.png