diff --git a/Released/Gen 6/Wondercards/ENG/0109 ORAS - Satay King Pikachu (ENG) (F).wc6 b/Released/Gen 6/Wondercards/ENG/0109 ORAS - Satay King Pikachu (ENG) (F).wc6
deleted file mode 100644
index 7686877b..00000000
Binary files a/Released/Gen 6/Wondercards/ENG/0109 ORAS - Satay King Pikachu (ENG) (F).wc6 and /dev/null differ
diff --git a/Released/Gen 6/Wondercards/ENG/0109 ORAS - Satay King Pikachu (ENG) (P).wc6full b/Released/Gen 6/Wondercards/ENG/0109 ORAS - Satay King Pikachu (ENG) (P).wc6full
new file mode 100644
index 00000000..46e26355
Binary files /dev/null and b/Released/Gen 6/Wondercards/ENG/0109 ORAS - Satay King Pikachu (ENG) (P).wc6full differ
diff --git a/Released/Gen 6/Wondercards/ENG/0511 XY - SUM2014 (8064) Pokeball Forme Vivillon (ENG).wc6 b/Released/Gen 6/Wondercards/ENG/0511 XY - SUM2014 (8064) Poké Ball Vivillon (ENG).wc6
similarity index 100%
rename from Released/Gen 6/Wondercards/ENG/0511 XY - SUM2014 (8064) Pokeball Forme Vivillon (ENG).wc6
rename to Released/Gen 6/Wondercards/ENG/0511 XY - SUM2014 (8064) Poké Ball Vivillon (ENG).wc6
diff --git a/Released/Gen 6/Wondercards/ENG/0511 XY - SUM2014 (8134) Pokeball Forme Vivillon (ENG).wc6 b/Released/Gen 6/Wondercards/ENG/0511 XY - SUM2014 (8134) Poké Ball Vivillon (ENG).wc6
similarity index 100%
rename from Released/Gen 6/Wondercards/ENG/0511 XY - SUM2014 (8134) Pokeball Forme Vivillon (ENG).wc6
rename to Released/Gen 6/Wondercards/ENG/0511 XY - SUM2014 (8134) Poké Ball Vivillon (ENG).wc6
diff --git a/Released/Gen 6/Wondercards/ENG/0538 ORAS - JUN2015 Dragonite (ENG) (F).wc6 b/Released/Gen 6/Wondercards/ENG/0538 ORAS - JUN2015 Dragonite (ENG) (F).wc6
deleted file mode 100644
index 8e353339..00000000
Binary files a/Released/Gen 6/Wondercards/ENG/0538 ORAS - JUN2015 Dragonite (ENG) (F).wc6 and /dev/null differ
diff --git a/Released/Gen 6/Wondercards/ENG/0538 ORAS - JUN2015 Dragonite (ENG) (M).wc6 b/Released/Gen 6/Wondercards/ENG/0538 ORAS - JUN2015 Dragonite (ENG) (M).wc6
deleted file mode 100644
index df9bb26c..00000000
Binary files a/Released/Gen 6/Wondercards/ENG/0538 ORAS - JUN2015 Dragonite (ENG) (M).wc6 and /dev/null differ
diff --git a/Released/Gen 6/Wondercards/ENG/0538 ORAS - JUN2015 Dragonite (ENG) (P).wc6full b/Released/Gen 6/Wondercards/ENG/0538 ORAS - JUN2015 Dragonite (ENG) (P).wc6full
new file mode 100644
index 00000000..c032d115
Binary files /dev/null and b/Released/Gen 6/Wondercards/ENG/0538 ORAS - JUN2015 Dragonite (ENG) (P).wc6full differ
diff --git a/Released/Gen 6/Wondercards/ENG/1503 XY - GTS Fancy Forme Vivillon (ENG) (F).wc6 b/Released/Gen 6/Wondercards/ENG/1503 XY - GTS Fancy Vivillon (ENG) (F).wc6
similarity index 100%
rename from Released/Gen 6/Wondercards/ENG/1503 XY - GTS Fancy Forme Vivillon (ENG) (F).wc6
rename to Released/Gen 6/Wondercards/ENG/1503 XY - GTS Fancy Vivillon (ENG) (F).wc6
diff --git a/Released/Gen 6/Wondercards/ENG/1503 XY - GTS Fancy Forme Vivillon (ENG) (M).wc6 b/Released/Gen 6/Wondercards/ENG/1503 XY - GTS Fancy Vivillon (ENG) (M).wc6
similarity index 100%
rename from Released/Gen 6/Wondercards/ENG/1503 XY - GTS Fancy Forme Vivillon (ENG) (M).wc6
rename to Released/Gen 6/Wondercards/ENG/1503 XY - GTS Fancy Vivillon (ENG) (M).wc6
diff --git a/Released/Gen 6/Wondercards/ENG/1505 ORAS - Present Serperior HA (ENG) (F).wc6 b/Released/Gen 6/Wondercards/ENG/1505 ORAS - Present Serperior (ENG) (F).wc6
similarity index 100%
rename from Released/Gen 6/Wondercards/ENG/1505 ORAS - Present Serperior HA (ENG) (F).wc6
rename to Released/Gen 6/Wondercards/ENG/1505 ORAS - Present Serperior (ENG) (F).wc6
diff --git a/Released/Gen 6/Wondercards/ENG/1505 ORAS - Present Serperior HA (ENG) (M).wc6 b/Released/Gen 6/Wondercards/ENG/1505 ORAS - Present Serperior (ENG) (M).wc6
similarity index 100%
rename from Released/Gen 6/Wondercards/ENG/1505 ORAS - Present Serperior HA (ENG) (M).wc6
rename to Released/Gen 6/Wondercards/ENG/1505 ORAS - Present Serperior (ENG) (M).wc6
diff --git a/Released/Gen 6/Wondercards/ENG/1506 ORAS - Present Emboar HA (ENG) (F).wc6 b/Released/Gen 6/Wondercards/ENG/1506 ORAS - Present Emboar (ENG) (F).wc6
similarity index 100%
rename from Released/Gen 6/Wondercards/ENG/1506 ORAS - Present Emboar HA (ENG) (F).wc6
rename to Released/Gen 6/Wondercards/ENG/1506 ORAS - Present Emboar (ENG) (F).wc6
diff --git a/Released/Gen 6/Wondercards/ENG/1506 ORAS - Present Emboar HA (ENG) (M).wc6 b/Released/Gen 6/Wondercards/ENG/1506 ORAS - Present Emboar (ENG) (M).wc6
similarity index 100%
rename from Released/Gen 6/Wondercards/ENG/1506 ORAS - Present Emboar HA (ENG) (M).wc6
rename to Released/Gen 6/Wondercards/ENG/1506 ORAS - Present Emboar (ENG) (M).wc6
diff --git a/Released/Gen 6/Wondercards/ENG/1507 ORAS - Present Samurott HA (ENG) (F).wc6 b/Released/Gen 6/Wondercards/ENG/1507 ORAS - Present Samurott (ENG) (F).wc6
similarity index 100%
rename from Released/Gen 6/Wondercards/ENG/1507 ORAS - Present Samurott HA (ENG) (F).wc6
rename to Released/Gen 6/Wondercards/ENG/1507 ORAS - Present Samurott (ENG) (F).wc6
diff --git a/Released/Gen 6/Wondercards/ENG/1507 ORAS - Present Samurott HA (ENG) (M).wc6 b/Released/Gen 6/Wondercards/ENG/1507 ORAS - Present Samurott (ENG) (M).wc6
similarity index 100%
rename from Released/Gen 6/Wondercards/ENG/1507 ORAS - Present Samurott HA (ENG) (M).wc6
rename to Released/Gen 6/Wondercards/ENG/1507 ORAS - Present Samurott (ENG) (M).wc6
diff --git a/Released/Gen 6/Wondercards/ENG/1508 ORAS - PGL Tyrunt HA (ENG).wc6full b/Released/Gen 6/Wondercards/ENG/1508 ORAS - PGL Tyrunt (ENG).wc6full
similarity index 100%
rename from Released/Gen 6/Wondercards/ENG/1508 ORAS - PGL Tyrunt HA (ENG).wc6full
rename to Released/Gen 6/Wondercards/ENG/1508 ORAS - PGL Tyrunt (ENG).wc6full
diff --git a/Released/Gen 6/Wondercards/ENG/1509 ORAS - PGL Amaura HA (ENG).wc6full b/Released/Gen 6/Wondercards/ENG/1509 ORAS - PGL Amaura (ENG).wc6full
similarity index 100%
rename from Released/Gen 6/Wondercards/ENG/1509 ORAS - PGL Amaura HA (ENG).wc6full
rename to Released/Gen 6/Wondercards/ENG/1509 ORAS - PGL Amaura (ENG).wc6full
diff --git a/Released/Gen 6/Wondercards/ENG/1510 ORAS - PGL Pikachu HA (ENG).wc6full b/Released/Gen 6/Wondercards/ENG/1510 ORAS - PGL Pikachu (ENG).wc6full
similarity index 100%
rename from Released/Gen 6/Wondercards/ENG/1510 ORAS - PGL Pikachu HA (ENG).wc6full
rename to Released/Gen 6/Wondercards/ENG/1510 ORAS - PGL Pikachu (ENG).wc6full
diff --git a/Released/Gen 6/Wondercards/ENG/1516 ORAS - N Darmanitan HA (ENG).wc6full b/Released/Gen 6/Wondercards/ENG/1516 ORAS - N Darmanitan (ENG).wc6full
similarity index 100%
rename from Released/Gen 6/Wondercards/ENG/1516 ORAS - N Darmanitan HA (ENG).wc6full
rename to Released/Gen 6/Wondercards/ENG/1516 ORAS - N Darmanitan (ENG).wc6full
diff --git a/Released/Gen 6/Wondercards/FRE/0511 XY - Paris Pokeball Forme Vivillon (6014) (FRE).wc6 b/Released/Gen 6/Wondercards/FRE/0511 XY - Paris Poké Ball Vivillon (FRE).wc6
similarity index 100%
rename from Released/Gen 6/Wondercards/FRE/0511 XY - Paris Pokeball Forme Vivillon (6014) (FRE).wc6
rename to Released/Gen 6/Wondercards/FRE/0511 XY - Paris Poké Ball Vivillon (FRE).wc6
diff --git a/Released/Gen 6/Wondercards/FRE/0511 XY - ÉTÉ 2014 (8064) Poke Ball Forme Vivillon (FRE).wc6 b/Released/Gen 6/Wondercards/FRE/0511 XY - ÉTÉ 2014 (8064) Poké Ball Vivillon (FRE).wc6
similarity index 100%
rename from Released/Gen 6/Wondercards/FRE/0511 XY - ÉTÉ 2014 (8064) Poke Ball Forme Vivillon (FRE).wc6
rename to Released/Gen 6/Wondercards/FRE/0511 XY - ÉTÉ 2014 (8064) Poké Ball Vivillon (FRE).wc6
diff --git a/Released/Gen 6/Wondercards/FRE/0511 XY - ÉTÉ 2014 (8134) Pokeball Forme Vivillon (FRE).wc6 b/Released/Gen 6/Wondercards/FRE/0511 XY - ÉTÉ 2014 (8134) Poké Ball Vivillon (FRE).wc6
similarity index 100%
rename from Released/Gen 6/Wondercards/FRE/0511 XY - ÉTÉ 2014 (8134) Pokeball Forme Vivillon (FRE).wc6
rename to Released/Gen 6/Wondercards/FRE/0511 XY - ÉTÉ 2014 (8134) Poké Ball Vivillon (FRE).wc6
diff --git a/Released/Gen 6/Wondercards/FRE/1503 XY - GTS Fancy Forme Vivillon (FRE) (F).wc6 b/Released/Gen 6/Wondercards/FRE/1503 XY - GTS Fancy Vivillon (FRE) (F).wc6
similarity index 100%
rename from Released/Gen 6/Wondercards/FRE/1503 XY - GTS Fancy Forme Vivillon (FRE) (F).wc6
rename to Released/Gen 6/Wondercards/FRE/1503 XY - GTS Fancy Vivillon (FRE) (F).wc6
diff --git a/Released/Gen 6/Wondercards/FRE/1503 XY - GTS Fancy Forme Vivillon (FRE) (M).wc6 b/Released/Gen 6/Wondercards/FRE/1503 XY - GTS Fancy Vivillon (FRE) (M).wc6
similarity index 100%
rename from Released/Gen 6/Wondercards/FRE/1503 XY - GTS Fancy Forme Vivillon (FRE) (M).wc6
rename to Released/Gen 6/Wondercards/FRE/1503 XY - GTS Fancy Vivillon (FRE) (M).wc6
diff --git a/Released/Gen 6/Wondercards/GER/0511 XY - SOMMER 2014 (8134) Pokéball Forme Vivillon (GER).wc6 b/Released/Gen 6/Wondercards/GER/0511 XY - SOMMER 2014 Poké Ball Vivillon (GER).wc6
similarity index 100%
rename from Released/Gen 6/Wondercards/GER/0511 XY - SOMMER 2014 (8134) Pokéball Forme Vivillon (GER).wc6
rename to Released/Gen 6/Wondercards/GER/0511 XY - SOMMER 2014 Poké Ball Vivillon (GER).wc6
diff --git a/Released/Gen 6/Wondercards/GER/1503 XY - GTS Fancy Forme Vivillon (GER) (F).wc6 b/Released/Gen 6/Wondercards/GER/1503 XY - GTS Fancy Vivillon (GER) (F).wc6
similarity index 100%
rename from Released/Gen 6/Wondercards/GER/1503 XY - GTS Fancy Forme Vivillon (GER) (F).wc6
rename to Released/Gen 6/Wondercards/GER/1503 XY - GTS Fancy Vivillon (GER) (F).wc6
diff --git a/Released/Gen 6/Wondercards/ITA/0511 XY - ESTATE14 Vivillon Poké Ball Forme (8134) (ITA).wc6 b/Released/Gen 6/Wondercards/ITA/0511 XY - ESTATE14 Poké Ball Vivillon (ITA).wc6
similarity index 100%
rename from Released/Gen 6/Wondercards/ITA/0511 XY - ESTATE14 Vivillon Poké Ball Forme (8134) (ITA).wc6
rename to Released/Gen 6/Wondercards/ITA/0511 XY - ESTATE14 Poké Ball Vivillon (ITA).wc6
diff --git a/Released/Gen 6/Wondercards/ITA/1503 XY - GTS Fancy Forme Vivillon (ITA).wc6 b/Released/Gen 6/Wondercards/ITA/1503 XY - GTS Fancy Vivillon (ITA) (F).wc6
similarity index 100%
rename from Released/Gen 6/Wondercards/ITA/1503 XY - GTS Fancy Forme Vivillon (ITA).wc6
rename to Released/Gen 6/Wondercards/ITA/1503 XY - GTS Fancy Vivillon (ITA) (F).wc6
diff --git a/Released/Gen 6/Wondercards/ITA/1503 XY - GTS Fancy Vivillon (ITA) (M).wc6 b/Released/Gen 6/Wondercards/ITA/1503 XY - GTS Fancy Vivillon (ITA) (M).wc6
new file mode 100644
index 00000000..64217d33
Binary files /dev/null and b/Released/Gen 6/Wondercards/ITA/1503 XY - GTS Fancy Vivillon (ITA) (M).wc6 differ
diff --git a/Released/Gen 6/Wondercards/JPN/0036 XY - ポケセン Poké Ball Forme Vivillon (JPN) (F).wc6 b/Released/Gen 6/Wondercards/JPN/0036 XY - ポケセン Poké Ball Vivillon (JPN) (F).wc6
similarity index 100%
rename from Released/Gen 6/Wondercards/JPN/0036 XY - ポケセン Poké Ball Forme Vivillon (JPN) (F).wc6
rename to Released/Gen 6/Wondercards/JPN/0036 XY - ポケセン Poké Ball Vivillon (JPN) (F).wc6
diff --git a/Released/Gen 6/Wondercards/JPN/0036 XY - ポケセン Poké Ball Forme Vivillon (JPN) (M).wc6 b/Released/Gen 6/Wondercards/JPN/0036 XY - ポケセン Poké Ball Vivillon (JPN) (M).wc6
similarity index 100%
rename from Released/Gen 6/Wondercards/JPN/0036 XY - ポケセン Poké Ball Forme Vivillon (JPN) (M).wc6
rename to Released/Gen 6/Wondercards/JPN/0036 XY - ポケセン Poké Ball Vivillon (JPN) (M).wc6
diff --git a/Released/Gen 6/Wondercards/JPN/0143 ORAS - ポケセン Poké Ball Forme Vivillon (JPN) (F).wc6 b/Released/Gen 6/Wondercards/JPN/0143 ORAS - ポケセン Poké Ball Vivillon (JPN) (F).wc6
similarity index 100%
rename from Released/Gen 6/Wondercards/JPN/0143 ORAS - ポケセン Poké Ball Forme Vivillon (JPN) (F).wc6
rename to Released/Gen 6/Wondercards/JPN/0143 ORAS - ポケセン Poké Ball Vivillon (JPN) (F).wc6
diff --git a/Released/Gen 6/Wondercards/JPN/0143 ORAS - ポケセン Poké Ball Forme Vivillon (JPN) (M).wc6 b/Released/Gen 6/Wondercards/JPN/0143 ORAS - ポケセン Poké Ball Vivillon (JPN) (M).wc6
similarity index 100%
rename from Released/Gen 6/Wondercards/JPN/0143 ORAS - ポケセン Poké Ball Forme Vivillon (JPN) (M).wc6
rename to Released/Gen 6/Wondercards/JPN/0143 ORAS - ポケセン Poké Ball Vivillon (JPN) (M).wc6
diff --git a/Released/Gen 6/Wondercards/JPN/1503 XY - GTS Fancy Forme Vivillon (JPN).wc6 b/Released/Gen 6/Wondercards/JPN/1503 XY - GTS Fancy Vivillon (JPN) (F).wc6
similarity index 100%
rename from Released/Gen 6/Wondercards/JPN/1503 XY - GTS Fancy Forme Vivillon (JPN).wc6
rename to Released/Gen 6/Wondercards/JPN/1503 XY - GTS Fancy Vivillon (JPN) (F).wc6
diff --git a/Released/Gen 6/Wondercards/JPN/1503 XY - GTS Fancy Vivillon (JPN) (M).wc6 b/Released/Gen 6/Wondercards/JPN/1503 XY - GTS Fancy Vivillon (JPN) (M).wc6
new file mode 100644
index 00000000..ae2adf88
Binary files /dev/null and b/Released/Gen 6/Wondercards/JPN/1503 XY - GTS Fancy Vivillon (JPN) (M).wc6 differ
diff --git a/Released/Gen 6/Wondercards/KOR/1503 XY - GTS Fancy Forme Vivillon (KOR) (F).wc6 b/Released/Gen 6/Wondercards/KOR/1503 XY - GTS Fancy Vivillon (KOR) (F).wc6
similarity index 100%
rename from Released/Gen 6/Wondercards/KOR/1503 XY - GTS Fancy Forme Vivillon (KOR) (F).wc6
rename to Released/Gen 6/Wondercards/KOR/1503 XY - GTS Fancy Vivillon (KOR) (F).wc6
diff --git a/Released/Gen 6/Wondercards/KOR/1503 XY - GTS Fancy Forme Vivillon (KOR) (M).wc6 b/Released/Gen 6/Wondercards/KOR/1503 XY - GTS Fancy Vivillon (KOR) (M).wc6
similarity index 100%
rename from Released/Gen 6/Wondercards/KOR/1503 XY - GTS Fancy Forme Vivillon (KOR) (M).wc6
rename to Released/Gen 6/Wondercards/KOR/1503 XY - GTS Fancy Vivillon (KOR) (M).wc6
diff --git a/Released/Gen 6/Wondercards/SPA/0511 XY - VERANO 2014 (8064) Poké Ball Forme Vivillon (SPA).wc6 b/Released/Gen 6/Wondercards/SPA/0511 XY - VERANO 2014 (8064) Poké Ball Vivillon (SPA).wc6
similarity index 100%
rename from Released/Gen 6/Wondercards/SPA/0511 XY - VERANO 2014 (8064) Poké Ball Forme Vivillon (SPA).wc6
rename to Released/Gen 6/Wondercards/SPA/0511 XY - VERANO 2014 (8064) Poké Ball Vivillon (SPA).wc6
diff --git a/Released/Gen 6/Wondercards/SPA/0511 XY - VERANO 2014 (8134) Poké Ball Forme Vivillon (SPA).wc6 b/Released/Gen 6/Wondercards/SPA/0511 XY - VERANO 2014 (8134) Poké Ball Vivillon (SPA).wc6
similarity index 100%
rename from Released/Gen 6/Wondercards/SPA/0511 XY - VERANO 2014 (8134) Poké Ball Forme Vivillon (SPA).wc6
rename to Released/Gen 6/Wondercards/SPA/0511 XY - VERANO 2014 (8134) Poké Ball Vivillon (SPA).wc6
diff --git a/Released/Gen 6/Wondercards/SPA/1503 XY - GTS Fancy Forme Vivillon (SPA) (F).wc6 b/Released/Gen 6/Wondercards/SPA/1503 XY - GTS Fancy Vivillon (SPA) (F).wc6
similarity index 100%
rename from Released/Gen 6/Wondercards/SPA/1503 XY - GTS Fancy Forme Vivillon (SPA) (F).wc6
rename to Released/Gen 6/Wondercards/SPA/1503 XY - GTS Fancy Vivillon (SPA) (F).wc6