diff --git a/Gen 5/Japanese/Trade for Evolution/022 TFE TokyoG Electabuzz JPN [PPorg].pgf b/Gen 5/Japanese/Trade for Evolution/022 BW - もえた Electabuzz (JPN).pgf
similarity index 100%
rename from Gen 5/Japanese/Trade for Evolution/022 TFE TokyoG Electabuzz JPN [PPorg].pgf
rename to Gen 5/Japanese/Trade for Evolution/022 BW - もえた Electabuzz (JPN).pgf
diff --git a/Gen 5/Japanese/Trade for Evolution/022 TFE TokyoG Haunter JPN [PPorg].pgf b/Gen 5/Japanese/Trade for Evolution/022 BW - もえた Haunter (JPN).pgf
similarity index 100%
rename from Gen 5/Japanese/Trade for Evolution/022 TFE TokyoG Haunter JPN [PPorg].pgf
rename to Gen 5/Japanese/Trade for Evolution/022 BW - もえた Haunter (JPN).pgf
diff --git a/Gen 5/Japanese/Trade for Evolution/022 TFE TokyoG Karrablast JPN [PPorg].pgf b/Gen 5/Japanese/Trade for Evolution/022 BW - もえた Kerrablast (JPN).pgf
similarity index 100%
rename from Gen 5/Japanese/Trade for Evolution/022 TFE TokyoG Karrablast JPN [PPorg].pgf
rename to Gen 5/Japanese/Trade for Evolution/022 BW - もえた Kerrablast (JPN).pgf
diff --git a/Gen 5/Japanese/Trade for Evolution/022 TFE TokyoG Machoke JPN [PPorg].pgf b/Gen 5/Japanese/Trade for Evolution/022 BW - もえた Machoke (JPN).pgf
similarity index 100%
rename from Gen 5/Japanese/Trade for Evolution/022 TFE TokyoG Machoke JPN [PPorg].pgf
rename to Gen 5/Japanese/Trade for Evolution/022 BW - もえた Machoke (JPN).pgf
diff --git a/Gen 5/Japanese/Trade for Evolution/022 TFE TokyoG Magmar JPN [PPorg].pgf b/Gen 5/Japanese/Trade for Evolution/022 BW - もえた Magmar (JPN).pgf
similarity index 100%
rename from Gen 5/Japanese/Trade for Evolution/022 TFE TokyoG Magmar JPN [PPorg].pgf
rename to Gen 5/Japanese/Trade for Evolution/022 BW - もえた Magmar (JPN).pgf
diff --git a/Gen 5/Japanese/Trade for Evolution/022 TFE TokyoG Scyther JPN [PPorg].pgf b/Gen 5/Japanese/Trade for Evolution/022 BW - もえた Scyther (JPN).pgf
similarity index 100%
rename from Gen 5/Japanese/Trade for Evolution/022 TFE TokyoG Scyther JPN [PPorg].pgf
rename to Gen 5/Japanese/Trade for Evolution/022 BW - もえた Scyther (JPN).pgf
diff --git a/Gen 5/Japanese/Trade for Evolution/022 TFE TokyoG Shelmet JPN [PPorg].pgf b/Gen 5/Japanese/Trade for Evolution/022 BW - もえた Shelmet (JPN).pgf
similarity index 100%
rename from Gen 5/Japanese/Trade for Evolution/022 TFE TokyoG Shelmet JPN [PPorg].pgf
rename to Gen 5/Japanese/Trade for Evolution/022 BW - もえた Shelmet (JPN).pgf
diff --git a/Gen 5/Japanese/Trade for Evolution/022 TFE TokyoG Slowpoke JPN [PPorg].pgf b/Gen 5/Japanese/Trade for Evolution/022 BW - もえた Slowpoke (JPN).pgf
similarity index 100%
rename from Gen 5/Japanese/Trade for Evolution/022 TFE TokyoG Slowpoke JPN [PPorg].pgf
rename to Gen 5/Japanese/Trade for Evolution/022 BW - もえた Slowpoke (JPN).pgf
diff --git a/Gen 5/Japanese/Trade for Evolution/023 TFE Wakayama Electabuzz JPN [PPorg].pgf b/Gen 5/Japanese/Trade for Evolution/023 BW - わだいさい Electabuzz (JPN).pgf
similarity index 100%
rename from Gen 5/Japanese/Trade for Evolution/023 TFE Wakayama Electabuzz JPN [PPorg].pgf
rename to Gen 5/Japanese/Trade for Evolution/023 BW - わだいさい Electabuzz (JPN).pgf
diff --git a/Gen 5/Japanese/Trade for Evolution/023 TFE Wakayama Haunter JPN [PPorg].pgf b/Gen 5/Japanese/Trade for Evolution/023 BW - わだいさい Haunter (JPN).pgf
similarity index 100%
rename from Gen 5/Japanese/Trade for Evolution/023 TFE Wakayama Haunter JPN [PPorg].pgf
rename to Gen 5/Japanese/Trade for Evolution/023 BW - わだいさい Haunter (JPN).pgf
diff --git a/Gen 5/Japanese/Trade for Evolution/023 TFE Wakayama Karrablast JPN [PPorg].pgf b/Gen 5/Japanese/Trade for Evolution/023 BW - わだいさい Kerrablast (JPN).pgf
similarity index 100%
rename from Gen 5/Japanese/Trade for Evolution/023 TFE Wakayama Karrablast JPN [PPorg].pgf
rename to Gen 5/Japanese/Trade for Evolution/023 BW - わだいさい Kerrablast (JPN).pgf
diff --git a/Gen 5/Japanese/Trade for Evolution/023 TFE Wakayama Machoke JPN [PPorg].pgf b/Gen 5/Japanese/Trade for Evolution/023 BW - わだいさい Machoke (JPN).pgf
similarity index 100%
rename from Gen 5/Japanese/Trade for Evolution/023 TFE Wakayama Machoke JPN [PPorg].pgf
rename to Gen 5/Japanese/Trade for Evolution/023 BW - わだいさい Machoke (JPN).pgf
diff --git a/Gen 5/Japanese/Trade for Evolution/023 TFE Wakayama Magmar JPN [PPorg].pgf b/Gen 5/Japanese/Trade for Evolution/023 BW - わだいさい Magmar (JPN).pgf
similarity index 100%
rename from Gen 5/Japanese/Trade for Evolution/023 TFE Wakayama Magmar JPN [PPorg].pgf
rename to Gen 5/Japanese/Trade for Evolution/023 BW - わだいさい Magmar (JPN).pgf
diff --git a/Gen 5/Japanese/Trade for Evolution/023 TFE Wakayama Scyther JPN [PPorg].pgf b/Gen 5/Japanese/Trade for Evolution/023 BW - わだいさい Scyther (JPN).pgf
similarity index 100%
rename from Gen 5/Japanese/Trade for Evolution/023 TFE Wakayama Scyther JPN [PPorg].pgf
rename to Gen 5/Japanese/Trade for Evolution/023 BW - わだいさい Scyther (JPN).pgf
diff --git a/Gen 5/Japanese/Trade for Evolution/023 TFE Wakayama Shelmet JPN [PPorg].pgf b/Gen 5/Japanese/Trade for Evolution/023 BW - わだいさい Shelmet (JPN).pgf
similarity index 100%
rename from Gen 5/Japanese/Trade for Evolution/023 TFE Wakayama Shelmet JPN [PPorg].pgf
rename to Gen 5/Japanese/Trade for Evolution/023 BW - わだいさい Shelmet (JPN).pgf
diff --git a/Gen 5/Japanese/Trade for Evolution/023 TFE Wakayama Slowpoke JPN [PPorg].pgf b/Gen 5/Japanese/Trade for Evolution/023 BW - わだいさい Slowpoke (JPN).pgf
similarity index 100%
rename from Gen 5/Japanese/Trade for Evolution/023 TFE Wakayama Slowpoke JPN [PPorg].pgf
rename to Gen 5/Japanese/Trade for Evolution/023 BW - わだいさい Slowpoke (JPN).pgf
diff --git a/Gen 5/Japanese/Trade for Evolution/025 TFE Okayama Electabuzz JPN [PPorg].pgf b/Gen 5/Japanese/Trade for Evolution/025 BW - ピーチくん Electabuzz (JPN).pgf
similarity index 100%
rename from Gen 5/Japanese/Trade for Evolution/025 TFE Okayama Electabuzz JPN [PPorg].pgf
rename to Gen 5/Japanese/Trade for Evolution/025 BW - ピーチくん Electabuzz (JPN).pgf
diff --git a/Gen 5/Japanese/Trade for Evolution/025 TFE Okayama Haunter JPN [PPorg].pgf b/Gen 5/Japanese/Trade for Evolution/025 BW - ピーチくん Haunter (JPN).pgf
similarity index 100%
rename from Gen 5/Japanese/Trade for Evolution/025 TFE Okayama Haunter JPN [PPorg].pgf
rename to Gen 5/Japanese/Trade for Evolution/025 BW - ピーチくん Haunter (JPN).pgf
diff --git a/Gen 5/Japanese/Trade for Evolution/025 TFE Okayama Karrablast JPN [PPorg].pgf b/Gen 5/Japanese/Trade for Evolution/025 BW - ピーチくん Kerrablast (JPN).pgf
similarity index 100%
rename from Gen 5/Japanese/Trade for Evolution/025 TFE Okayama Karrablast JPN [PPorg].pgf
rename to Gen 5/Japanese/Trade for Evolution/025 BW - ピーチくん Kerrablast (JPN).pgf
diff --git a/Gen 5/Japanese/Trade for Evolution/025 TFE Okayama Machoke JPN [PPorg].pgf b/Gen 5/Japanese/Trade for Evolution/025 BW - ピーチくん Machoke (JPN).pgf
similarity index 100%
rename from Gen 5/Japanese/Trade for Evolution/025 TFE Okayama Machoke JPN [PPorg].pgf
rename to Gen 5/Japanese/Trade for Evolution/025 BW - ピーチくん Machoke (JPN).pgf
diff --git a/Gen 5/Japanese/Trade for Evolution/025 TFE Okayama Magmar JPN [PPorg].pgf b/Gen 5/Japanese/Trade for Evolution/025 BW - ピーチくん Magmar (JPN).pgf
similarity index 100%
rename from Gen 5/Japanese/Trade for Evolution/025 TFE Okayama Magmar JPN [PPorg].pgf
rename to Gen 5/Japanese/Trade for Evolution/025 BW - ピーチくん Magmar (JPN).pgf
diff --git a/Gen 5/Japanese/Trade for Evolution/025 TFE Okayama Scyther JPN [PPorg].pgf b/Gen 5/Japanese/Trade for Evolution/025 BW - ピーチくん Scyther (JPN).pgf
similarity index 100%
rename from Gen 5/Japanese/Trade for Evolution/025 TFE Okayama Scyther JPN [PPorg].pgf
rename to Gen 5/Japanese/Trade for Evolution/025 BW - ピーチくん Scyther (JPN).pgf
diff --git a/Gen 5/Japanese/Trade for Evolution/025 TFE Okayama Shelmet JPN [PPorg].pgf b/Gen 5/Japanese/Trade for Evolution/025 BW - ピーチくん Shelmet (JPN).pgf
similarity index 100%
rename from Gen 5/Japanese/Trade for Evolution/025 TFE Okayama Shelmet JPN [PPorg].pgf
rename to Gen 5/Japanese/Trade for Evolution/025 BW - ピーチくん Shelmet (JPN).pgf
diff --git a/Gen 5/Japanese/Trade for Evolution/025 TFE Okayama Slowpoke JPN [PPorg].pgf b/Gen 5/Japanese/Trade for Evolution/025 BW - ピーチくん Slowpoke (JPN).pgf
similarity index 100%
rename from Gen 5/Japanese/Trade for Evolution/025 TFE Okayama Slowpoke JPN [PPorg].pgf
rename to Gen 5/Japanese/Trade for Evolution/025 BW - ピーチくん Slowpoke (JPN).pgf