From 2c446d2d0b64cde6f8fffe73b4fab2dcb234fa07 Mon Sep 17 00:00:00 2001
From: Marty-D <Marty-D@users.noreply.github.com>
Date: Wed, 13 May 2020 11:59:55 -0400
Subject: [PATCH] Rename trainers

and remove duplicates
---
 .../red-blue/{agatha-gen1rb.png => Agatha.png}    | Bin
 .../red-blue/{beauty-gen1rb.png => Beauty.png}    | Bin
 .../gen1/red-blue/{biker-gen1rb.png => Biker.png} | Bin
 .../{birdkeeper-gen1rb.png => Bird_Keeper.png}    | Bin
 .../{blackbelt-gen1rb.png => Blackbelt.png}       | Bin
 .../red-blue/{blaine-gen1rb.png => Blaine.png}    | Bin
 .../red-blue/{blue-gen1rbtwo.png => Blue-2.png}   | Bin
 ...{blue-gen1rbchampion.png => Blue-Champion.png} | Bin
 .../gen1/red-blue/{blue-gen1rb.png => Blue.png}   | Bin
 .../gen1/red-blue/{brock-gen1rb.png => Brock.png} | Bin
 .../gen1/red-blue/{bruno-gen1rb.png => Bruno.png} | Bin
 .../{bugcatcher-gen1rb.png => Bug_Catcher.png}    | Bin
 .../red-blue/{burglar-gen1rb.png => Burglar.png}  | Bin
 .../{channeler-gen1rb.png => Channeler.png}       | Bin
 .../{acetrainer-gen1rb.png => Cooltrainer.png}    | Bin
 .../{acetrainerf-gen1rb.png => Cooltrainer~F.png} | Bin
 .../red-blue/{cueball-gen1rb.png => Cue_Ball.png} | Bin
 .../{engineer-gen1rb.png => Engineer.png}         | Bin
 .../gen1/red-blue/{erika-gen1rb.png => Erika.png} | Bin
 .../{fisherman-gen1rb.png => Fisherman.png}       | Bin
 .../red-blue/{gambler-gen1rb.png => Gambler.png}  | Bin
 .../{gentleman-gen1rb.png => Gentleman.png}       | Bin
 .../{giovanni-gen1rb.png => Giovanni.png}         | Bin
 .../gen1/red-blue/{hiker-gen1rb.png => Hiker.png} | Bin
 .../{jrtrainer-gen1rb.png => Jr._Trainer.png}     | Bin
 .../{jrtrainerf-gen1rb.png => Jr._Trainer~F.png}  | Bin
 .../red-blue/{juggler-gen1rb.png => Juggler.png}  | Bin
 .../gen1/red-blue/{koga-gen1rb.png => Koga.png}   | Bin
 .../gen1/red-blue/{lance-gen1rb.png => Lance.png} | Bin
 .../gen1/red-blue/{lass-gen1rb.png => Lass.png}   | Bin
 .../red-blue/{lorelei-gen1rb.png => Lorelei.png}  | Bin
 .../{ltsurge-gen1rb.png => Lt._Surge.png}         | Bin
 .../gen1/red-blue/{misty-gen1rb.png => Misty.png} | Bin
 .../gen1/red-blue/{oak-gen1rb.png => Oak.png}     | Bin
 ...okemaniac-gen1rb.png => Poke__0301_Maniac.png} | Bin
 .../red-blue/{psychic-gen1rb.png => Psychic.png}  | Bin
 .../red-blue/{red-gen1rb.png => Red-Title.png}    | Bin
 .../{red-gen1title.png => Red-Title~JPN.png}      | Bin
 .../gen1/red-blue/{red-gen1main.png => Red.png}   | Bin
 .../red-blue/{rocker-gen1rb.png => Rocker.png}    | Bin
 .../red-blue/{rocket-gen1rb.png => Rocket.png}    | Bin
 .../red-blue/{sabrina-gen1rb.png => Sabrina.png}  | Bin
 .../red-blue/{sailor-gen1rb.png => Sailor.png}    | Bin
 .../{scientist-gen1rb.png => Scientist.png}       | Bin
 .../{supernerd-gen1rb.png => Super_Nerd.png}      | Bin
 .../red-blue/{swimmer-gen1rb.png => Swimmer.png}  | Bin
 .../gen1/red-blue/{tamer-gen1rb.png => Tamer.png} | Bin
 .../{youngster-gen1rb.png => Youngster.png}       | Bin
 .../gen1/yellow/{agatha-gen1.png => Agatha.png}   | Bin
 .../gen1/yellow/{beauty-gen1.png => Beauty.png}   | Bin
 .../gen1/yellow/{biker-gen1.png => Biker.png}     | Bin
 .../{birdkeeper-gen1.png => Bird_Keeper.png}      | Bin
 .../yellow/{blackbelt-gen1.png => Blackbelt.png}  | Bin
 .../gen1/yellow/{blaine-gen1.png => Blaine.png}   | Bin
 .../gen1/yellow/{blue-gen1two.png => Blue-2.png}  | Bin
 .../{blue-gen1champion.png => Blue-Champion.png}  | Bin
 .../gen1/yellow/{blue-gen1.png => Blue.png}       | Bin
 .../gen1/yellow/{brock-gen1.png => Brock.png}     | Bin
 .../gen1/yellow/{bruno-gen1.png => Bruno.png}     | Bin
 .../{bugcatcher-gen1.png => Bug_Catcher.png}      | Bin
 .../gen1/yellow/{burglar-gen1.png => Burglar.png} | Bin
 .../yellow/{channeler-gen1.png => Channeler.png}  | Bin
 .../{acetrainer-gen1.png => Cooltrainer.png}      | Bin
 .../{acetrainerf-gen1.png => Cooltrainer~F.png}   | Bin
 .../yellow/{cueball-gen1.png => Cue_Ball.png}     | Bin
 .../yellow/{engineer-gen1.png => Engineer.png}    | Bin
 .../gen1/yellow/{erika-gen1.png => Erika.png}     | Bin
 .../yellow/{fisherman-gen1.png => Fisherman.png}  | Bin
 .../gen1/yellow/{gambler-gen1.png => Gambler.png} | Bin
 .../yellow/{gentleman-gen1.png => Gentleman.png}  | Bin
 .../yellow/{giovanni-gen1.png => Giovanni.png}    | Bin
 .../gen1/yellow/{hiker-gen1.png => Hiker.png}     | Bin
 .../{jrtrainer-gen1.png => Jr._Trainer.png}       | Bin
 .../{jrtrainerf-gen1.png => Jr._Trainer~F.png}    | Bin
 .../gen1/yellow/{juggler-gen1.png => Juggler.png} | Bin
 .../gen1/yellow/{koga-gen1.png => Koga.png}       | Bin
 .../gen1/yellow/{lance-gen1.png => Lance.png}     | Bin
 .../gen1/yellow/{lass-gen1.png => Lass.png}       | Bin
 .../gen1/yellow/{lorelei-gen1.png => Lorelei.png} | Bin
 .../yellow/{ltsurge-gen1.png => Lt._Surge.png}    | Bin
 .../gen1/yellow/{misty-gen1.png => Misty.png}     | Bin
 .../gen1/yellow/{oak-gen1.png => Oak.png}         | Bin
 ...{pokemaniac-gen1.png => Poke__0301_Maniac.png} | Bin
 .../gen1/yellow/{psychic-gen1.png => Psychic.png} | Bin
 .../gen1/yellow/{red-gen1.png => Red.png}         | Bin
 .../gen1/yellow/{rocker-gen1.png => Rocker.png}   | Bin
 .../gen1/yellow/{rocket-gen1.png => Rocket.png}   | Bin
 .../gen1/yellow/{sabrina-gen1.png => Sabrina.png} | Bin
 .../gen1/yellow/{sailor-gen1.png => Sailor.png}   | Bin
 .../yellow/{scientist-gen1.png => Scientist.png}  | Bin
 .../yellow/{supernerd-gen1.png => Super_Nerd.png} | Bin
 .../gen1/yellow/{swimmer-gen1.png => Swimmer.png} | Bin
 .../gen1/yellow/{tamer-gen1.png => Tamer.png}     | Bin
 .../{jessiejames-gen1.png => Team_Rocket.png}     | Bin
 .../yellow/{youngster-gen1.png => Youngster.png}  | Bin
 .../gen2/crystal/{ethan-gen2c.png => Ethan.png}   | Bin
 .../gen2/crystal/{eusine-gen2.png => Eusine.png}  | Bin
 .../gen2/crystal/{kris-gen2.png => Kris.png}      | Bin
 .../{beauty-gen2jp.png => Beauty-JPN.png}         | Bin
 .../gold-silver/{beauty-gen2.png => Beauty.png}   | Bin
 .../gold-silver/{biker-gen2.png => Biker.png}     | Bin
 .../{birdkeeper-gen2.png => Bird_Keeper.png}      | Bin
 .../{blackbelt-gen2.png => Blackbelt.png}         | Bin
 .../gold-silver/{blaine-gen2.png => Blaine.png}   | Bin
 .../gen2/gold-silver/{blue-gen2.png => Blue.png}  | Bin
 .../gold-silver/{boarder-gen2.png => Boarder.png} | Bin
 .../gold-silver/{brock-gen2.png => Brock.png}     | Bin
 .../gold-silver/{bruno-gen2.png => Bruno.png}     | Bin
 .../{bugcatcher-gen2.png => Bug_Catcher.png}      | Bin
 .../gold-silver/{bugsy-gen2.png => Bugsy.png}     | Bin
 .../gold-silver/{burglar-gen2.png => Burglar.png} | Bin
 .../gold-silver/{camper-gen2.png => Camper.png}   | Bin
 .../gold-silver/{chuck-gen2.png => Chuck.png}     | Bin
 .../gold-silver/{clair-gen2.png => Clair.png}     | Bin
 .../{acetrainer-gen2.png => Cooltrainer.png}      | Bin
 .../{acetrainerf-gen2.png => Cooltrainer~F.png}   | Bin
 .../gold-silver/{erika-gen2.png => Erika.png}     | Bin
 .../gold-silver/{ethan-gen2.png => Ethan.png}     | Bin
 .../gold-silver/{falkner-gen2.png => Falkner.png} | Bin
 .../{firebreather-gen2.png => Firebreather.png}   | Bin
 .../{fisherman-gen2jp.png => Fisherman-JPN.png}   | Bin
 .../{gentleman-gen2.png => Gentleman.png}         | Bin
 .../gold-silver/{hiker-gen2.png => Hiker.png}     | Bin
 .../gold-silver/{janine-gen2.png => Janine.png}   | Bin
 .../gold-silver/{jasmine-gen2.png => Jasmine.png} | Bin
 .../gold-silver/{juggler-gen2.png => Juggler.png} | Bin
 .../gold-silver/{karen-gen2.png => Karen.png}     | Bin
 .../{kimonogirl-gen2.png => Kimono_Girl.png}      | Bin
 .../gen2/gold-silver/{koga-gen2.png => Koga.png}  | Bin
 .../gold-silver/{lance-gen2.png => Lance.png}     | Bin
 .../gen2/gold-silver/{lass-gen2.png => Lass.png}  | Bin
 .../{ltsurge-gen2.png => Lt._Surge.png}           | Bin
 .../{medium-gen2jp.png => Medium-JPN.png}         | Bin
 .../gold-silver/{misty-gen2.png => Misty.png}     | Bin
 .../gold-silver/{morty-gen2.png => Morty.png}     | Bin
 .../gen2/gold-silver/{oak-gen2.png => Oak.png}    | Bin
 .../gold-silver/{officer-gen2.png => Officer.png} | Bin
 .../{picnicker-gen2.png => Picnicker.png}         | Bin
 .../{pokefan-gen2.png => Poke__0301fan.png}       | Bin
 .../{pokefanf-gen2.png => Poke__0301fan~F.png}    | Bin
 .../gold-silver/{pryce-gen2.png => Pryce.png}     | Bin
 .../gold-silver/{psychic-gen2.png => Psychic.png} | Bin
 .../gen2/gold-silver/{red-gen2.png => Red.png}    | Bin
 ...ketexecutive-gen2.png => Rocket_Executive.png} | Bin
 ...executivef-gen2.png => Rocket_Executive~F.png} | Bin
 .../{rocketgrunt-gen2.png => Rocket_Grunt.png}    | Bin
 .../{rocketgruntf-gen2.png => Rocket_Grunt~F.png} | Bin
 .../gold-silver/{sabrina-gen2.png => Sabrina.png} | Bin
 .../gold-silver/{sage-gen2jp.png => Sage-JPN.png} | Bin
 .../gen2/gold-silver/{sage-gen2.png => Sage.png}  | Bin
 .../gold-silver/{sailor-gen2.png => Sailor.png}   | Bin
 .../{schoolboy-gen2.png => Schoolboy.png}         | Bin
 .../{scientist-gen2.png => Scientist.png}         | Bin
 .../{silver-gen2kanto.png => Silver-2.png}        | Bin
 .../gold-silver/{silver-gen2.png => Silver.png}   | Bin
 .../gold-silver/{skier-gen2.png => Skier.png}     | Bin
 .../{supernerd-gen2.png => Super_Nerd.png}        | Bin
 .../{swimmerm-gen2.png => Swimmer.png}            | Bin
 .../{swimmerfjp-gen2.png => Swimmer~F-JPN.png}    | Bin
 .../{swimmerf-gen2.png => Swimmer~F.png}          | Bin
 .../gold-silver/{teacher-gen2.png => Teacher.png} | Bin
 .../gold-silver/{twins-gen2.png => Twins.png}     | Bin
 .../gold-silver/{whitney-gen2.png => Whitney.png} | Bin
 .../gen2/gold-silver/{will-gen2.png => Will.png}  | Bin
 .../{youngster-gen2.png => Youngster.png}         | Bin
 .../gen3/emerald/{anabel-gen3.png => Anabel.png}  | Bin
 .../emerald/{brandon-gen3.png => Brandon.png}     | Bin
 .../emerald/{brendan-gen3.png => Brendan.png}     | Bin
 .../gen3/emerald/{greta-gen3.png => Greta.png}    | Bin
 .../gen3/emerald/{juan-gen3.png => Juan.png}      | Bin
 .../gen3/emerald/{lucy-gen3.png => Lucy.png}      | Bin
 .../gen3/emerald/{may-gen3.png => May.png}        | Bin
 .../gen3/emerald/{noland-gen3.png => Noland.png}  | Bin
 .../emerald/{spenser-gen3.png => Spenser.png}     | Bin
 .../gen3/emerald/{tucker-gen3.png => Tucker.png}  | Bin
 .../emerald/{wallace-gen3.png => Wallace.png}     | Bin
 .../{agatha-gen3.png => Agatha.png}               | Bin
 .../{aromalady-gen3.png => Aroma_Lady.png}        | Bin
 .../{beauty-gen3.png => Beauty.png}               | Bin
 .../{biker-gen3.png => Biker.png}                 | Bin
 .../firered-leafgreen/{bill-gen3.png => Bill.png} | Bin
 .../{birdkeeper-gen3.png => Bird_Keeper.png}      | Bin
 .../{blackbelt-gen3.png => Blackbelt.png}         | Bin
 .../{blaine-gen3.png => Blaine.png}               | Bin
 .../{blue-gen3two.png => Blue-2.png}              | Bin
 .../{blue-gen3champion.png => Blue-Champion.png}  | Bin
 .../firered-leafgreen/{blue-gen3.png => Blue.png} | Bin
 .../{brock-gen3.png => Brock.png}                 | Bin
 .../{bruno-gen3.png => Bruno.png}                 | Bin
 .../{bugcatcher-gen3.png => Bug_Catcher.png}      | Bin
 .../{burglar-gen3.png => Burglar.png}             | Bin
 .../{camper-gen3.png => Camper.png}               | Bin
 .../{channeler-gen3.png => Channeler.png}         | Bin
 ...{acetrainercouple-gen3.png => Cool_Couple.png} | Bin
 .../{acetrainer-gen3.png => Cooltrainer.png}      | Bin
 .../{acetrainerf-gen3.png => Cooltrainer~F.png}   | Bin
 .../{crushgirl-gen3.png => Crush_Girl.png}        | Bin
 .../{crushkin-gen3.png => Crush_Kin.png}          | Bin
 .../{cueball-gen3.png => Cue_Ball.png}            | Bin
 .../{engineer-gen3.png => Engineer.png}           | Bin
 .../{erika-gen3.png => Erika.png}                 | Bin
 .../{fisherman-gen3.png => Fisherman.png}         | Bin
 .../{gamer-gen3.png => Gamer.png}                 | Bin
 .../{gentleman-gen3.png => Gentleman.png}         | Bin
 .../{giovanni-gen3.png => Giovanni.png}           | Bin
 .../{hiker-gen3.png => Hiker.png}                 | Bin
 .../{juggler-gen3.png => Juggler.png}             | Bin
 .../firered-leafgreen/{koga-gen3.png => Koga.png} | Bin
 .../firered-leafgreen/{lady-gen3.png => Lady.png} | Bin
 .../{lance-gen3.png => Lance.png}                 | Bin
 .../firered-leafgreen/{lass-gen3.png => Lass.png} | Bin
 .../firered-leafgreen/{leaf-gen3.png => Leaf.png} | Bin
 .../{lorelei-gen3.png => Lorelei.png}             | Bin
 .../{ltsurge-gen3.png => Lt._Surge.png}           | Bin
 .../{misty-gen3.png => Misty.png}                 | Bin
 .../{mrfuji-gen3.png => Mr._Fuji.png}             | Bin
 .../firered-leafgreen/{oak-gen3.png => Oak.png}   | Bin
 .../{painter-gen3.png => Painter.png}             | Bin
 .../{picnicker-gen3.png => Picnicker.png}         | Bin
 ...{pokemaniac-gen3.png => Poke__0301_Maniac.png} | Bin
 ...f-gen3frlg.png => Poke__0301mon_Breeder~F.png} | Bin
 ...onranger-gen3.png => Poke__0301mon_Ranger.png} | Bin
 ...angerf-gen3.png => Poke__0301mon_Ranger~F.png} | Bin
 .../{psychic-gen3.png => Psychic.png}             | Bin
 .../{psychicf-gen3.png => Psychic~F.png}          | Bin
 .../firered-leafgreen/{red-gen3.png => Red.png}   | Bin
 .../{rocker-gen3.png => Rocker.png}               | Bin
 .../{ruinmaniac-gen3.png => Ruin_Maniac.png}      | Bin
 .../{sabrina-gen3.png => Sabrina.png}             | Bin
 .../{sailor-gen3.png => Sailor.png}               | Bin
 .../{scientist-gen3.png => Scientist.png}         | Bin
 .../{sisandbro-gen3.png => Sis_and_Bro.png}       | Bin
 .../{supernerd-gen3.png => Super_Nerd.png}        | Bin
 .../{swimmerm-gen3.png => Swimmer.png}            | Bin
 .../{swimmerf-gen3.png => Swimmer~F.png}          | Bin
 .../{tamer-gen3.png => Tamer.png}                 | Bin
 ...ocketgruntm-gen3.png => Team_Rocket_Grunt.png} | Bin
 ...ketgruntf-gen3.png => Team_Rocket_Grunt~F.png} | Bin
 .../{tuberf-gen3.png => Tuber~F.png}              | Bin
 .../{twins-gen3.png => Twins.png}                 | Bin
 .../{youngcouple-gen3.png => Young_Couple.png}    | Bin
 .../{youngster-gen3.png => Youngster.png}         | Bin
 .../ruby-sapphire/{archie-gen3.png => Archie.png} | Bin
 .../{aromalady-gen3rs.png => Aroma_Lady.png}      | Bin
 .../{battlegirl-gen3.png => Battle_Girl.png}      | Bin
 .../{beauty-gen3rs.png => Beauty.png}             | Bin
 .../ruby-sapphire/{birch-gen3.png => Birch.png}   | Bin
 .../{birdkeeper-gen3rs.png => Bird_Keeper.png}    | Bin
 .../{blackbelt-gen3rs.png => Blackbelt.png}       | Bin
 .../ruby-sapphire/{brawly-gen3.png => Brawly.png} | Bin
 .../{brendan-gen3rs.png => Brendan.png}           | Bin
 .../{bugcatcher-gen3rs.png => Bug_Catcher.png}    | Bin
 .../{bugmaniac-gen3.png => Bug_Maniac.png}        | Bin
 .../{camper-gen3rs.png => Camper.png}             | Bin
 .../{collector-gen3.png => Collector.png}         | Bin
 ...{acetrainer-gen3jp.png => Cooltrainer-JPN.png} | Bin
 .../{acetrainer-gen3rs.png => Cooltrainer.png}    | Bin
 .../{acetrainerf-gen3rs.png => Cooltrainer~F.png} | Bin
 .../{courtney-gen3.png => Courtney.png}           | Bin
 .../{dragontamer-gen3.png => Dragon_Tamer.png}    | Bin
 .../ruby-sapphire/{drake-gen3.png => Drake.png}   | Bin
 .../ruby-sapphire/{expert-gen3.png => Expert.png} | Bin
 .../{expertf-gen3.png => Expert~F.png}            | Bin
 .../{fisherman-gen3rs.png => Fisherman.png}       | Bin
 .../{flannery-gen3.png => Flannery.png}           | Bin
 .../{gentleman-gen3rs.png => Gentleman.png}       | Bin
 .../ruby-sapphire/{glacia-gen3.png => Glacia.png} | Bin
 .../{guitarist-gen3.png => Guitarist.png}         | Bin
 .../{hexmaniac-gen3jp.png => Hex_Maniac-JPN.png}  | Bin
 .../{hexmaniac-gen3.png => Hex_Maniac.png}        | Bin
 .../ruby-sapphire/{hiker-gen3rs.png => Hiker.png} | Bin
 .../{interviewers-gen3.png => Interviewers.png}   | Bin
 .../{kindler-gen3.png => Kindler.png}             | Bin
 .../ruby-sapphire/{lady-gen3rs.png => Lady.png}   | Bin
 .../ruby-sapphire/{lass-gen3rs.png => Lass.png}   | Bin
 .../ruby-sapphire/{matt-gen3.png => Matt.png}     | Bin
 .../ruby-sapphire/{maxie-gen3.png => Maxie.png}   | Bin
 .../ruby-sapphire/{may-gen3rs.png => May.png}     | Bin
 .../{ninjaboy-gen3.png => Ninja_Boy.png}          | Bin
 .../ruby-sapphire/{norman-gen3.png => Norman.png} | Bin
 .../{oldcouple-gen3.png => Old_Couple.png}        | Bin
 .../{parasollady-gen3.png => Parasol_Lady.png}    | Bin
 .../ruby-sapphire/{phoebe-gen3.png => Phoebe.png} | Bin
 .../{picnicker-gen3rs.png => Picnicker.png}       | Bin
 ...okemaniac-gen3rs.png => Poke__0301_Maniac.png} | Bin
 .../{pokefan-gen3.png => Poke__0301fan.png}       | Bin
 .../{pokefanf-gen3.png => Poke__0301fan~F.png}    | Bin
 ...breeder-gen3.png => Poke__0301mon_Breeder.png} | Bin
 ...ederf-gen3.png => Poke__0301mon_Breeder~F.png} | Bin
 ...ranger-gen3rs.png => Poke__0301mon_Ranger.png} | Bin
 ...gerf-gen3rs.png => Poke__0301mon_Ranger~F.png} | Bin
 .../{psychic-gen3rs.png => Psychic.png}           | Bin
 .../{psychicfjp-gen3.png => Psychic~F-JPN.png}    | Bin
 .../{psychicf-gen3rs.png => Psychic~F.png}        | Bin
 .../{richboy-gen3.png => Rich_Boy.png}            | Bin
 .../{roxanne-gen3.png => Roxanne.png}             | Bin
 .../{ruinmaniac-gen3rs.png => Ruin_Maniac.png}    | Bin
 .../{sailor-gen3jp.png => Sailor-JPN.png}         | Bin
 .../{sailor-gen3rs.png => Sailor.png}             | Bin
 .../{schoolkid-gen3.png => School_Kid.png}        | Bin
 .../{schoolkidf-gen3.png => School_Kid~F.png}     | Bin
 .../ruby-sapphire/{shelly-gen3.png => Shelly.png} | Bin
 .../ruby-sapphire/{sidney-gen3.png => Sidney.png} | Bin
 .../{sisandbro-gen3rs.png => Sis_and_Bro.png}     | Bin
 .../{srandjr-gen3.png => Sr._and_Jr..png}         | Bin
 .../ruby-sapphire/{steven-gen3.png => Steven.png} | Bin
 .../{swimmerm-gen3rs.png => Swimmer.png}          | Bin
 .../{swimmerf-gen3rs.png => Swimmer~F.png}        | Bin
 .../{tabitha-gen3.png => Tabitha.png}             | Bin
 .../{tateandliza-gen3.png => Tate_and_Liza.png}   | Bin
 ...aquabeta-gen3.png => Team_Aqua_Grunt-Beta.png} | Bin
 ...eamaquagruntm-gen3.png => Team_Aqua_Grunt.png} | Bin
 ...maquagruntf-gen3.png => Team_Aqua_Grunt~F.png} | Bin
 ...mmagmagruntm-gen3.png => Team_Magma_Grunt.png} | Bin
 ...agmagruntf-gen3.png => Team_Magma_Grunt~F.png} | Bin
 ...thletebikerm-gen3.png => Triathlete-Biker.png} | Bin
 ...leterunnerm-gen3.png => Triathlete-Runner.png} | Bin
 ...teswimmerm-gen3.png => Triathlete-Swimmer.png} | Bin
 ...letebikerf-gen3.png => Triathlete~F-Biker.png} | Bin
 ...terunnerf-gen3.png => Triathlete~F-Runner.png} | Bin
 ...swimmerf-gen3.png => Triathlete~F-Swimmer.png} | Bin
 .../ruby-sapphire/{tuber-gen3.png => Tuber.png}   | Bin
 .../{tuberf-gen3rs.png => Tuber~F.png}            | Bin
 .../ruby-sapphire/{twins-gen3rs.png => Twins.png} | Bin
 .../{wallace-gen3rs.png => Wallace.png}           | Bin
 .../ruby-sapphire/{wally-gen3.png => Wally.png}   | Bin
 .../{wattson-gen3.png => Wattson.png}             | Bin
 .../ruby-sapphire/{winona-gen3.png => Winona.png} | Bin
 .../{youngcouple-gen3rs.png => Young_Couple.png}  | Bin
 .../{youngster-gen3rs.png => Youngster.png}       | Bin
 .../{acetrainersnow.png => Ace_Trainer-Snow.png}  | Bin
 .../{acetrainer-gen4dp.png => Ace_Trainer.png}    | Bin
 ...acetrainersnowf.png => Ace_Trainer~F-Snow.png} | Bin
 .../{acetrainerf-gen4dp.png => Ace_Trainer~F.png} | Bin
 .../{aromalady.png => Aroma_Lady.png}             | Bin
 .../diamond-pearl/{artist-gen4.png => Artist.png} | Bin
 .../{battlegirl-gen4.png => Battle_Girl.png}      | Bin
 .../{beauty-gen4dp.png => Beauty.png}             | Bin
 .../{bellepa.png => Belle___0026_Pa.png}          | Bin
 .../{birdkeeper-gen4dp.png => Bird_Keeper.png}    | Bin
 .../{blackbelt-gen4dp.png => Blackbelt.png}       | Bin
 .../{bugcatcher.png => Bug_Catcher.png}           | Bin
 .../{crasherwake.png => Crasher_Wake.png}         | Bin
 .../{cyclist-gen4.png => Cyclist.png}             | Bin
 .../{cyclistf-gen4.png => Cyclist~F.png}          | Bin
 .../{cynthia-gen4.png => Cynthia.png}             | Bin
 .../{doubleteam.png => Double_Team.png}           | Bin
 .../{dragontamer.png => Dragon_Tamer.png}         | Bin
 .../{fisherman-gen4.png => Fisherman.png}         | Bin
 .../{galacticgrunt.png => Galactic_Grunt.png}     | Bin
 .../{galacticgruntf.png => Galactic_Grunt~F.png}  | Bin
 .../{gentleman-gen4dp.png => Gentleman.png}       | Bin
 .../{guitarist-gen4.png => Guitarist.png}         | Bin
 .../diamond-pearl/{hiker-gen4.png => Hiker.png}   | Bin
 .../diamond-pearl/{lady-gen4.png => Lady.png}     | Bin
 .../diamond-pearl/{lass-gen4dp.png => Lass.png}   | Bin
 .../diamond-pearl/{ninjaboy.png => Ninja_Boy.png} | Bin
 .../gen4/diamond-pearl/{gambler.png => PI.png}    | Bin
 .../{parasollady-gen4.png => Parasol_Lady.png}    | Bin
 .../{pokekid.png => Poke__0301_Kid.png}           | Bin
 .../{pokefan-gen4.png => Poke__0301fan.png}       | Bin
 .../{pokefanf-gen4.png => Poke__0301fan~F.png}    | Bin
 ...breeder-gen4.png => Poke__0301mon_Breeder.png} | Bin
 ...ederf-gen4.png => Poke__0301mon_Breeder~F.png} | Bin
 ...onranger-gen4.png => Poke__0301mon_Ranger.png} | Bin
 ...angerf-gen4.png => Poke__0301mon_Ranger~F.png} | Bin
 .../{policeman-gen4.png => Policeman.png}         | Bin
 .../{psychic-gen4.png => Psychic.png}             | Bin
 .../{psychicf-gen4.png => Psychic~F.png}          | Bin
 .../{richboy-gen4.png => Rich_Boy.png}            | Bin
 .../{roughneck-gen4.png => Roughneck.png}         | Bin
 .../{ruinmaniac.png => Ruin_Maniac.png}           | Bin
 .../{schoolkid-gen4dp.png => School_Kid.png}      | Bin
 .../{schoolkidf-gen4.png => School_Kid~F.png}     | Bin
 .../{scientist-gen4dp.png => Scientist.png}       | Bin
 .../{sisandbro.png => Sis_and_Bro-Beta.png}       | Bin
 .../{skierf-gen4dp.png => Skier~F.png}            | Bin
 .../{madame-gen4dp.png => Socialite.png}          | Bin
 .../{swimmer-gen4dp.png => Swimmer.png}           | Bin
 .../{swimmerf-gen4dp.png => Swimmer~F.png}        | Bin
 .../diamond-pearl/{tuberf.png => Tuber~F.png}     | Bin
 .../diamond-pearl/{twins-gen4dp.png => Twins.png} | Bin
 .../{veteran-gen4.png => Veteran.png}             | Bin
 .../{waiter-gen4dp.png => Waiter.png}             | Bin
 .../{waitress-gen4.png => Waitress.png}           | Bin
 .../diamond-pearl/{worker-gen4.png => Worker.png} | Bin
 .../{youngcouple-gen4dp.png => Young_Couple.png}  | Bin
 .../{youngster-gen4.png => Youngster.png}         | Bin
 .../trainers/gen4/diamond-pearl/madame-gen4.png   | Bin 556 -> 0 bytes
 .../trainers/gen4/diamond-pearl/waiter-gen4.png   | Bin 635 -> 0 bytes
 .../{acetrainer-gen4.png => Ace_Trainer.png}      | Bin
 .../{acetrainerf-gen4.png => Ace_Trainer~F.png}   | Bin
 .../{biker-gen4.png => Biker.png}                 | Bin
 .../{birdkeeper.png => Bird_Keeper.png}           | Bin
 .../{blackbelt-gen4.png => Blackbelt.png}         | Bin
 .../{acetrainercouple.png => Double_Team.png}     | Bin
 .../{gentleman-gen4.png => Gentleman.png}         | Bin
 .../{kimonogirl.png => Kimono_Girl.png}           | Bin
 .../{lass-gen4.png => Lass.png}                   | Bin
 .../{ltsurge.png => Lt._Surge.png}                | Bin
 .../{pokemaniac.png => Poke__0301_Maniac.png}     | Bin
 .../{rocketgrunt.png => Rocket_Grunt.png}         | Bin
 .../{rocketgruntf.png => Rocket_Grunt~F.png}      | Bin
 .../{schoolkid-gen4.png => School_Kid.png}        | Bin
 .../{scientist-gen4.png => Scientist.png}         | Bin
 .../{skierf.png => Skier.png}                     | Bin
 .../{supernerd.png => Super_Nerd.png}             | Bin
 .../{swimmer-gen4.png => Swimmer.png}             | Bin
 .../{swimmerf-gen4.png => Swimmer~F.png}          | Bin
 .../{twins-gen4.png => Twins.png}                 | Bin
 .../{youngcouple.png => Young_Couple.png}         | Bin
 .../gen4/platinum/{dawn-gen4pt.png => Dawn.png}   | Bin
 .../gen4/platinum/{lucas-gen4pt.png => Lucas.png} | Bin
 .../{acetrainer.png => Ace_Trainer.png}           | Bin
 .../{acetrainerf.png => Ace_Trainer~F.png}        | Bin
 .../black-white/{backersf.png => Backers~F.png}   | Bin
 .../{backpackerf.png => Backpacker~F.png}         | Bin
 .../{battlegirl.png => Battle_Girl.png}           | Bin
 .../black-white/{clerk-boss.png => Clerk-2.png}   | Bin
 .../gen5/black-white/{clerkf.png => Clerk~F.png}  | Bin
 .../black-white/{cyclistf.png => Cyclist~F.png}   | Bin
 .../{depotagent.png => Depot_Agent.png}           | Bin
 .../{ghetsis-gen5bw.png => Ghetsis.png}           | Bin
 .../{hilbert-dueldisk.png => Hilbert-2.png}       | Bin
 .../{hilda-dueldisk.png => Hilda-2.png}           | Bin
 .../{nurseryaide.png => Nursery_Aide.png}         | Bin
 .../{parasollady.png => Parasol_Lady.png}         | Bin
 .../{plasmagrunt-gen5bw.png => Plasma_Grunt.png}  | Bin
 ...plasmagruntf-gen5bw.png => Plasma_Grunt~F.png} | Bin
 .../{pokefan.png => Poke__0301fan.png}            | Bin
 .../{pokefanf.png => Poke__0301fan~F.png}         | Bin
 ...kemonbreeder.png => Poke__0301mon_Breeder.png} | Bin
 ...onbreederf.png => Poke__0301mon_Breeder~F.png} | Bin
 ...pokemonranger.png => Poke__0301mon_Ranger.png} | Bin
 ...emonrangerf.png => Poke__0301mon_Ranger~F.png} | Bin
 .../{preschoolerf.png => Preschooler~F.png}       | Bin
 .../black-white/{psychicf.png => Psychic~F.png}   | Bin
 .../black-white/{richboy.png => Rich_Boy.png}     | Bin
 .../black-white/{schoolkid.png => School_Kid.png} | Bin
 .../{schoolkidf.png => School_Kid~F.png}          | Bin
 .../{scientistf.png => Scientist~F.png}           | Bin
 .../black-white/{madame.png => Socialite.png}     | Bin
 .../black-white/{swimmerf.png => Swimmer~F.png}   | Bin
 .../black-white/{veteranf.png => Veteran~F.png}   | Bin
 .../{workerice.png => Worker-Snow.png}            | Bin
 .../{beauty-gen5bw2.png => Beauty.png}            | Bin
 .../black2-white2/{bianca-pwt.png => Bianca.png}  | Bin
 .../{cheren-gen5bw2.png => Cheren.png}            | Bin
 .../{elesa-gen5bw2.png => Elesa.png}              | Bin
 .../black2-white2/{iris-gen5bw2.png => Iris.png}  | Bin
 .../{nate-dueldisk.png => Nate-2.png}             | Bin
 .../{plasmagrunt.png => Plasma_Grunt.png}         | Bin
 .../{plasmagruntf.png => Plasma_Grunt~F.png}      | Bin
 .../{rosa-dueldisk.png => Rosa-2.png}             | Bin
 .../{shadowtriad.png => Shadow_Triad.png}         | Bin
 .../gen5/black-white/{youngn.png => N-Young.png}  | Bin
 .../{brawly-gen6.png => Brawly.png}               | Bin
 .../{wallace-gen6.png => Wallace.png}             | Bin
 .../{winona-gen6.png => Winona.png}               | Bin
 ...sodegirl-black.png => Furisode_Girl-Black.png} | Bin
 ...risodegirl-pink.png => Furisode_Girl-Pink.png} | Bin
 ...aetherfoundation.png => Aether_Foundation.png} | Bin
 ...mployee.png => Aether_Foundation_Employee.png} | Bin
 ...oyeef.png => Aether_Foundation_Employee~F.png} | Bin
 ...herfoundationf.png => Aether_Foundation~F.png} | Bin
 .../gen7/sun-moon/{beauty-gen7.png => Beauty.png} | Bin
 .../gen7/sun-moon/{blue-gen7.png => Blue.png}     | Bin
 .../sun-moon/{colress-gen7.png => Colress.png}    | Bin
 .../{gladion-stance.png => Gladion-2.png}         | Bin
 .../sun-moon/{grimsley-gen7.png => Grimsley.png}  | Bin
 .../gen7/sun-moon/{hau-stance.png => Hau-2.png}   | Bin
 .../gen7/sun-moon/{hiker-gen7.png => Hiker.png}   | Bin
 .../sun-moon/{kukui-stand.png => Kukui-2.png}     | Bin
 .../gen7/sun-moon/{lass-gen7.png => Lass.png}     | Bin
 .../gen7/sun-moon/{lillie-z.png => Lillie-2.png}  | Bin
 .../{lusamine-nihilego.png => Lusamine-2.png}     | Bin
 .../sun-moon/{theroyal.png => Masked_Royal.png}   | Bin
 .../{officeworker.png => Office_Worker.png}       | Bin
 ...breeder-gen7.png => Poke__0301mon_Breeder.png} | Bin
 ...ederf-gen7.png => Poke__0301mon_Breeder~F.png} | Bin
 .../gen7/sun-moon/{red-gen7.png => Red.png}       | Bin
 .../sun-moon/{risingstar.png => Rising_Star.png}  | Bin
 .../{risingstarf.png => Rising_Star~F.png}        | Bin
 .../sun-moon/{samsonoak.png => Samson_Oak.png}    | Bin
 .../sun-moon/{teacher-gen7.png => Teacher.png}    | Bin
 .../{youngathlete.png => Young_Athlete.png}       | Bin
 .../{youngathletef.png => Young_Athlete~F.png}    | Bin
 .../{youngster-gen7.png => Youngster.png}         | Bin
 .../{ash-capbackward.png => Ash-Cap_Backward.png} | Bin
 .../misc/{teamrocket.png => Team_Rocket.png}      | Bin
 .../trainers/misc/{unknownf.png => Unknown~F.png} | Bin
 491 files changed, 0 insertions(+), 0 deletions(-)
 rename src/canonical/trainers/gen1/red-blue/{agatha-gen1rb.png => Agatha.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{beauty-gen1rb.png => Beauty.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{biker-gen1rb.png => Biker.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{birdkeeper-gen1rb.png => Bird_Keeper.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{blackbelt-gen1rb.png => Blackbelt.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{blaine-gen1rb.png => Blaine.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{blue-gen1rbtwo.png => Blue-2.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{blue-gen1rbchampion.png => Blue-Champion.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{blue-gen1rb.png => Blue.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{brock-gen1rb.png => Brock.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{bruno-gen1rb.png => Bruno.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{bugcatcher-gen1rb.png => Bug_Catcher.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{burglar-gen1rb.png => Burglar.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{channeler-gen1rb.png => Channeler.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{acetrainer-gen1rb.png => Cooltrainer.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{acetrainerf-gen1rb.png => Cooltrainer~F.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{cueball-gen1rb.png => Cue_Ball.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{engineer-gen1rb.png => Engineer.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{erika-gen1rb.png => Erika.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{fisherman-gen1rb.png => Fisherman.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{gambler-gen1rb.png => Gambler.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{gentleman-gen1rb.png => Gentleman.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{giovanni-gen1rb.png => Giovanni.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{hiker-gen1rb.png => Hiker.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{jrtrainer-gen1rb.png => Jr._Trainer.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{jrtrainerf-gen1rb.png => Jr._Trainer~F.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{juggler-gen1rb.png => Juggler.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{koga-gen1rb.png => Koga.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{lance-gen1rb.png => Lance.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{lass-gen1rb.png => Lass.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{lorelei-gen1rb.png => Lorelei.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{ltsurge-gen1rb.png => Lt._Surge.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{misty-gen1rb.png => Misty.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{oak-gen1rb.png => Oak.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{pokemaniac-gen1rb.png => Poke__0301_Maniac.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{psychic-gen1rb.png => Psychic.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{red-gen1rb.png => Red-Title.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{red-gen1title.png => Red-Title~JPN.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{red-gen1main.png => Red.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{rocker-gen1rb.png => Rocker.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{rocket-gen1rb.png => Rocket.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{sabrina-gen1rb.png => Sabrina.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{sailor-gen1rb.png => Sailor.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{scientist-gen1rb.png => Scientist.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{supernerd-gen1rb.png => Super_Nerd.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{swimmer-gen1rb.png => Swimmer.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{tamer-gen1rb.png => Tamer.png} (100%)
 rename src/canonical/trainers/gen1/red-blue/{youngster-gen1rb.png => Youngster.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{agatha-gen1.png => Agatha.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{beauty-gen1.png => Beauty.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{biker-gen1.png => Biker.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{birdkeeper-gen1.png => Bird_Keeper.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{blackbelt-gen1.png => Blackbelt.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{blaine-gen1.png => Blaine.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{blue-gen1two.png => Blue-2.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{blue-gen1champion.png => Blue-Champion.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{blue-gen1.png => Blue.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{brock-gen1.png => Brock.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{bruno-gen1.png => Bruno.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{bugcatcher-gen1.png => Bug_Catcher.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{burglar-gen1.png => Burglar.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{channeler-gen1.png => Channeler.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{acetrainer-gen1.png => Cooltrainer.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{acetrainerf-gen1.png => Cooltrainer~F.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{cueball-gen1.png => Cue_Ball.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{engineer-gen1.png => Engineer.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{erika-gen1.png => Erika.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{fisherman-gen1.png => Fisherman.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{gambler-gen1.png => Gambler.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{gentleman-gen1.png => Gentleman.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{giovanni-gen1.png => Giovanni.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{hiker-gen1.png => Hiker.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{jrtrainer-gen1.png => Jr._Trainer.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{jrtrainerf-gen1.png => Jr._Trainer~F.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{juggler-gen1.png => Juggler.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{koga-gen1.png => Koga.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{lance-gen1.png => Lance.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{lass-gen1.png => Lass.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{lorelei-gen1.png => Lorelei.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{ltsurge-gen1.png => Lt._Surge.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{misty-gen1.png => Misty.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{oak-gen1.png => Oak.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{pokemaniac-gen1.png => Poke__0301_Maniac.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{psychic-gen1.png => Psychic.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{red-gen1.png => Red.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{rocker-gen1.png => Rocker.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{rocket-gen1.png => Rocket.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{sabrina-gen1.png => Sabrina.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{sailor-gen1.png => Sailor.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{scientist-gen1.png => Scientist.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{supernerd-gen1.png => Super_Nerd.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{swimmer-gen1.png => Swimmer.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{tamer-gen1.png => Tamer.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{jessiejames-gen1.png => Team_Rocket.png} (100%)
 rename src/canonical/trainers/gen1/yellow/{youngster-gen1.png => Youngster.png} (100%)
 rename src/canonical/trainers/gen2/crystal/{ethan-gen2c.png => Ethan.png} (100%)
 rename src/canonical/trainers/gen2/crystal/{eusine-gen2.png => Eusine.png} (100%)
 rename src/canonical/trainers/gen2/crystal/{kris-gen2.png => Kris.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{beauty-gen2jp.png => Beauty-JPN.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{beauty-gen2.png => Beauty.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{biker-gen2.png => Biker.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{birdkeeper-gen2.png => Bird_Keeper.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{blackbelt-gen2.png => Blackbelt.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{blaine-gen2.png => Blaine.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{blue-gen2.png => Blue.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{boarder-gen2.png => Boarder.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{brock-gen2.png => Brock.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{bruno-gen2.png => Bruno.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{bugcatcher-gen2.png => Bug_Catcher.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{bugsy-gen2.png => Bugsy.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{burglar-gen2.png => Burglar.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{camper-gen2.png => Camper.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{chuck-gen2.png => Chuck.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{clair-gen2.png => Clair.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{acetrainer-gen2.png => Cooltrainer.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{acetrainerf-gen2.png => Cooltrainer~F.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{erika-gen2.png => Erika.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{ethan-gen2.png => Ethan.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{falkner-gen2.png => Falkner.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{firebreather-gen2.png => Firebreather.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{fisherman-gen2jp.png => Fisherman-JPN.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{gentleman-gen2.png => Gentleman.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{hiker-gen2.png => Hiker.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{janine-gen2.png => Janine.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{jasmine-gen2.png => Jasmine.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{juggler-gen2.png => Juggler.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{karen-gen2.png => Karen.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{kimonogirl-gen2.png => Kimono_Girl.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{koga-gen2.png => Koga.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{lance-gen2.png => Lance.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{lass-gen2.png => Lass.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{ltsurge-gen2.png => Lt._Surge.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{medium-gen2jp.png => Medium-JPN.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{misty-gen2.png => Misty.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{morty-gen2.png => Morty.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{oak-gen2.png => Oak.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{officer-gen2.png => Officer.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{picnicker-gen2.png => Picnicker.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{pokefan-gen2.png => Poke__0301fan.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{pokefanf-gen2.png => Poke__0301fan~F.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{pryce-gen2.png => Pryce.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{psychic-gen2.png => Psychic.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{red-gen2.png => Red.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{rocketexecutive-gen2.png => Rocket_Executive.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{rocketexecutivef-gen2.png => Rocket_Executive~F.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{rocketgrunt-gen2.png => Rocket_Grunt.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{rocketgruntf-gen2.png => Rocket_Grunt~F.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{sabrina-gen2.png => Sabrina.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{sage-gen2jp.png => Sage-JPN.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{sage-gen2.png => Sage.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{sailor-gen2.png => Sailor.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{schoolboy-gen2.png => Schoolboy.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{scientist-gen2.png => Scientist.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{silver-gen2kanto.png => Silver-2.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{silver-gen2.png => Silver.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{skier-gen2.png => Skier.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{supernerd-gen2.png => Super_Nerd.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{swimmerm-gen2.png => Swimmer.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{swimmerfjp-gen2.png => Swimmer~F-JPN.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{swimmerf-gen2.png => Swimmer~F.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{teacher-gen2.png => Teacher.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{twins-gen2.png => Twins.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{whitney-gen2.png => Whitney.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{will-gen2.png => Will.png} (100%)
 rename src/canonical/trainers/gen2/gold-silver/{youngster-gen2.png => Youngster.png} (100%)
 rename src/canonical/trainers/gen3/emerald/{anabel-gen3.png => Anabel.png} (100%)
 rename src/canonical/trainers/gen3/emerald/{brandon-gen3.png => Brandon.png} (100%)
 rename src/canonical/trainers/gen3/emerald/{brendan-gen3.png => Brendan.png} (100%)
 rename src/canonical/trainers/gen3/emerald/{greta-gen3.png => Greta.png} (100%)
 rename src/canonical/trainers/gen3/emerald/{juan-gen3.png => Juan.png} (100%)
 rename src/canonical/trainers/gen3/emerald/{lucy-gen3.png => Lucy.png} (100%)
 rename src/canonical/trainers/gen3/emerald/{may-gen3.png => May.png} (100%)
 rename src/canonical/trainers/gen3/emerald/{noland-gen3.png => Noland.png} (100%)
 rename src/canonical/trainers/gen3/emerald/{spenser-gen3.png => Spenser.png} (100%)
 rename src/canonical/trainers/gen3/emerald/{tucker-gen3.png => Tucker.png} (100%)
 rename src/canonical/trainers/gen3/emerald/{wallace-gen3.png => Wallace.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{agatha-gen3.png => Agatha.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{aromalady-gen3.png => Aroma_Lady.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{beauty-gen3.png => Beauty.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{biker-gen3.png => Biker.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{bill-gen3.png => Bill.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{birdkeeper-gen3.png => Bird_Keeper.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{blackbelt-gen3.png => Blackbelt.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{blaine-gen3.png => Blaine.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{blue-gen3two.png => Blue-2.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{blue-gen3champion.png => Blue-Champion.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{blue-gen3.png => Blue.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{brock-gen3.png => Brock.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{bruno-gen3.png => Bruno.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{bugcatcher-gen3.png => Bug_Catcher.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{burglar-gen3.png => Burglar.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{camper-gen3.png => Camper.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{channeler-gen3.png => Channeler.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{acetrainercouple-gen3.png => Cool_Couple.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{acetrainer-gen3.png => Cooltrainer.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{acetrainerf-gen3.png => Cooltrainer~F.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{crushgirl-gen3.png => Crush_Girl.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{crushkin-gen3.png => Crush_Kin.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{cueball-gen3.png => Cue_Ball.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{engineer-gen3.png => Engineer.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{erika-gen3.png => Erika.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{fisherman-gen3.png => Fisherman.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{gamer-gen3.png => Gamer.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{gentleman-gen3.png => Gentleman.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{giovanni-gen3.png => Giovanni.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{hiker-gen3.png => Hiker.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{juggler-gen3.png => Juggler.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{koga-gen3.png => Koga.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{lady-gen3.png => Lady.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{lance-gen3.png => Lance.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{lass-gen3.png => Lass.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{leaf-gen3.png => Leaf.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{lorelei-gen3.png => Lorelei.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{ltsurge-gen3.png => Lt._Surge.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{misty-gen3.png => Misty.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{mrfuji-gen3.png => Mr._Fuji.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{oak-gen3.png => Oak.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{painter-gen3.png => Painter.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{picnicker-gen3.png => Picnicker.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{pokemaniac-gen3.png => Poke__0301_Maniac.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{pokemonbreederf-gen3frlg.png => Poke__0301mon_Breeder~F.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{pokemonranger-gen3.png => Poke__0301mon_Ranger.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{pokemonrangerf-gen3.png => Poke__0301mon_Ranger~F.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{psychic-gen3.png => Psychic.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{psychicf-gen3.png => Psychic~F.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{red-gen3.png => Red.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{rocker-gen3.png => Rocker.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{ruinmaniac-gen3.png => Ruin_Maniac.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{sabrina-gen3.png => Sabrina.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{sailor-gen3.png => Sailor.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{scientist-gen3.png => Scientist.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{sisandbro-gen3.png => Sis_and_Bro.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{supernerd-gen3.png => Super_Nerd.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{swimmerm-gen3.png => Swimmer.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{swimmerf-gen3.png => Swimmer~F.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{tamer-gen3.png => Tamer.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{teamrocketgruntm-gen3.png => Team_Rocket_Grunt.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{teamrocketgruntf-gen3.png => Team_Rocket_Grunt~F.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{tuberf-gen3.png => Tuber~F.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{twins-gen3.png => Twins.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{youngcouple-gen3.png => Young_Couple.png} (100%)
 rename src/canonical/trainers/gen3/firered-leafgreen/{youngster-gen3.png => Youngster.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{archie-gen3.png => Archie.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{aromalady-gen3rs.png => Aroma_Lady.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{battlegirl-gen3.png => Battle_Girl.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{beauty-gen3rs.png => Beauty.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{birch-gen3.png => Birch.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{birdkeeper-gen3rs.png => Bird_Keeper.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{blackbelt-gen3rs.png => Blackbelt.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{brawly-gen3.png => Brawly.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{brendan-gen3rs.png => Brendan.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{bugcatcher-gen3rs.png => Bug_Catcher.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{bugmaniac-gen3.png => Bug_Maniac.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{camper-gen3rs.png => Camper.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{collector-gen3.png => Collector.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{acetrainer-gen3jp.png => Cooltrainer-JPN.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{acetrainer-gen3rs.png => Cooltrainer.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{acetrainerf-gen3rs.png => Cooltrainer~F.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{courtney-gen3.png => Courtney.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{dragontamer-gen3.png => Dragon_Tamer.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{drake-gen3.png => Drake.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{expert-gen3.png => Expert.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{expertf-gen3.png => Expert~F.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{fisherman-gen3rs.png => Fisherman.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{flannery-gen3.png => Flannery.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{gentleman-gen3rs.png => Gentleman.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{glacia-gen3.png => Glacia.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{guitarist-gen3.png => Guitarist.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{hexmaniac-gen3jp.png => Hex_Maniac-JPN.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{hexmaniac-gen3.png => Hex_Maniac.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{hiker-gen3rs.png => Hiker.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{interviewers-gen3.png => Interviewers.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{kindler-gen3.png => Kindler.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{lady-gen3rs.png => Lady.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{lass-gen3rs.png => Lass.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{matt-gen3.png => Matt.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{maxie-gen3.png => Maxie.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{may-gen3rs.png => May.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{ninjaboy-gen3.png => Ninja_Boy.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{norman-gen3.png => Norman.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{oldcouple-gen3.png => Old_Couple.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{parasollady-gen3.png => Parasol_Lady.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{phoebe-gen3.png => Phoebe.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{picnicker-gen3rs.png => Picnicker.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{pokemaniac-gen3rs.png => Poke__0301_Maniac.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{pokefan-gen3.png => Poke__0301fan.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{pokefanf-gen3.png => Poke__0301fan~F.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{pokemonbreeder-gen3.png => Poke__0301mon_Breeder.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{pokemonbreederf-gen3.png => Poke__0301mon_Breeder~F.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{pokemonranger-gen3rs.png => Poke__0301mon_Ranger.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{pokemonrangerf-gen3rs.png => Poke__0301mon_Ranger~F.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{psychic-gen3rs.png => Psychic.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{psychicfjp-gen3.png => Psychic~F-JPN.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{psychicf-gen3rs.png => Psychic~F.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{richboy-gen3.png => Rich_Boy.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{roxanne-gen3.png => Roxanne.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{ruinmaniac-gen3rs.png => Ruin_Maniac.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{sailor-gen3jp.png => Sailor-JPN.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{sailor-gen3rs.png => Sailor.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{schoolkid-gen3.png => School_Kid.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{schoolkidf-gen3.png => School_Kid~F.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{shelly-gen3.png => Shelly.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{sidney-gen3.png => Sidney.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{sisandbro-gen3rs.png => Sis_and_Bro.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{srandjr-gen3.png => Sr._and_Jr..png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{steven-gen3.png => Steven.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{swimmerm-gen3rs.png => Swimmer.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{swimmerf-gen3rs.png => Swimmer~F.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{tabitha-gen3.png => Tabitha.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{tateandliza-gen3.png => Tate_and_Liza.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{teamaquabeta-gen3.png => Team_Aqua_Grunt-Beta.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{teamaquagruntm-gen3.png => Team_Aqua_Grunt.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{teamaquagruntf-gen3.png => Team_Aqua_Grunt~F.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{teammagmagruntm-gen3.png => Team_Magma_Grunt.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{teammagmagruntf-gen3.png => Team_Magma_Grunt~F.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{triathletebikerm-gen3.png => Triathlete-Biker.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{triathleterunnerm-gen3.png => Triathlete-Runner.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{triathleteswimmerm-gen3.png => Triathlete-Swimmer.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{triathletebikerf-gen3.png => Triathlete~F-Biker.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{triathleterunnerf-gen3.png => Triathlete~F-Runner.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{triathleteswimmerf-gen3.png => Triathlete~F-Swimmer.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{tuber-gen3.png => Tuber.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{tuberf-gen3rs.png => Tuber~F.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{twins-gen3rs.png => Twins.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{wallace-gen3rs.png => Wallace.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{wally-gen3.png => Wally.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{wattson-gen3.png => Wattson.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{winona-gen3.png => Winona.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{youngcouple-gen3rs.png => Young_Couple.png} (100%)
 rename src/canonical/trainers/gen3/ruby-sapphire/{youngster-gen3rs.png => Youngster.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{acetrainersnow.png => Ace_Trainer-Snow.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{acetrainer-gen4dp.png => Ace_Trainer.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{acetrainersnowf.png => Ace_Trainer~F-Snow.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{acetrainerf-gen4dp.png => Ace_Trainer~F.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{aromalady.png => Aroma_Lady.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{artist-gen4.png => Artist.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{battlegirl-gen4.png => Battle_Girl.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{beauty-gen4dp.png => Beauty.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{bellepa.png => Belle___0026_Pa.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{birdkeeper-gen4dp.png => Bird_Keeper.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{blackbelt-gen4dp.png => Blackbelt.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{bugcatcher.png => Bug_Catcher.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{crasherwake.png => Crasher_Wake.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{cyclist-gen4.png => Cyclist.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{cyclistf-gen4.png => Cyclist~F.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{cynthia-gen4.png => Cynthia.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{doubleteam.png => Double_Team.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{dragontamer.png => Dragon_Tamer.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{fisherman-gen4.png => Fisherman.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{galacticgrunt.png => Galactic_Grunt.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{galacticgruntf.png => Galactic_Grunt~F.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{gentleman-gen4dp.png => Gentleman.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{guitarist-gen4.png => Guitarist.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{hiker-gen4.png => Hiker.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{lady-gen4.png => Lady.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{lass-gen4dp.png => Lass.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{ninjaboy.png => Ninja_Boy.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{gambler.png => PI.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{parasollady-gen4.png => Parasol_Lady.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{pokekid.png => Poke__0301_Kid.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{pokefan-gen4.png => Poke__0301fan.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{pokefanf-gen4.png => Poke__0301fan~F.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{pokemonbreeder-gen4.png => Poke__0301mon_Breeder.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{pokemonbreederf-gen4.png => Poke__0301mon_Breeder~F.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{pokemonranger-gen4.png => Poke__0301mon_Ranger.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{pokemonrangerf-gen4.png => Poke__0301mon_Ranger~F.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{policeman-gen4.png => Policeman.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{psychic-gen4.png => Psychic.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{psychicf-gen4.png => Psychic~F.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{richboy-gen4.png => Rich_Boy.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{roughneck-gen4.png => Roughneck.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{ruinmaniac.png => Ruin_Maniac.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{schoolkid-gen4dp.png => School_Kid.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{schoolkidf-gen4.png => School_Kid~F.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{scientist-gen4dp.png => Scientist.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{sisandbro.png => Sis_and_Bro-Beta.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{skierf-gen4dp.png => Skier~F.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{madame-gen4dp.png => Socialite.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{swimmer-gen4dp.png => Swimmer.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{swimmerf-gen4dp.png => Swimmer~F.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{tuberf.png => Tuber~F.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{twins-gen4dp.png => Twins.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{veteran-gen4.png => Veteran.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{waiter-gen4dp.png => Waiter.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{waitress-gen4.png => Waitress.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{worker-gen4.png => Worker.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{youngcouple-gen4dp.png => Young_Couple.png} (100%)
 rename src/canonical/trainers/gen4/diamond-pearl/{youngster-gen4.png => Youngster.png} (100%)
 delete mode 100644 src/canonical/trainers/gen4/diamond-pearl/madame-gen4.png
 delete mode 100644 src/canonical/trainers/gen4/diamond-pearl/waiter-gen4.png
 rename src/canonical/trainers/gen4/heartgold-soulsilver/{acetrainer-gen4.png => Ace_Trainer.png} (100%)
 rename src/canonical/trainers/gen4/heartgold-soulsilver/{acetrainerf-gen4.png => Ace_Trainer~F.png} (100%)
 rename src/canonical/trainers/gen4/heartgold-soulsilver/{biker-gen4.png => Biker.png} (100%)
 rename src/canonical/trainers/gen4/heartgold-soulsilver/{birdkeeper.png => Bird_Keeper.png} (100%)
 rename src/canonical/trainers/gen4/heartgold-soulsilver/{blackbelt-gen4.png => Blackbelt.png} (100%)
 rename src/canonical/trainers/gen4/heartgold-soulsilver/{acetrainercouple.png => Double_Team.png} (100%)
 rename src/canonical/trainers/gen4/heartgold-soulsilver/{gentleman-gen4.png => Gentleman.png} (100%)
 rename src/canonical/trainers/gen4/heartgold-soulsilver/{kimonogirl.png => Kimono_Girl.png} (100%)
 rename src/canonical/trainers/gen4/heartgold-soulsilver/{lass-gen4.png => Lass.png} (100%)
 rename src/canonical/trainers/gen4/heartgold-soulsilver/{ltsurge.png => Lt._Surge.png} (100%)
 rename src/canonical/trainers/gen4/heartgold-soulsilver/{pokemaniac.png => Poke__0301_Maniac.png} (100%)
 rename src/canonical/trainers/gen4/heartgold-soulsilver/{rocketgrunt.png => Rocket_Grunt.png} (100%)
 rename src/canonical/trainers/gen4/heartgold-soulsilver/{rocketgruntf.png => Rocket_Grunt~F.png} (100%)
 rename src/canonical/trainers/gen4/heartgold-soulsilver/{schoolkid-gen4.png => School_Kid.png} (100%)
 rename src/canonical/trainers/gen4/heartgold-soulsilver/{scientist-gen4.png => Scientist.png} (100%)
 rename src/canonical/trainers/gen4/heartgold-soulsilver/{skierf.png => Skier.png} (100%)
 rename src/canonical/trainers/gen4/heartgold-soulsilver/{supernerd.png => Super_Nerd.png} (100%)
 rename src/canonical/trainers/gen4/heartgold-soulsilver/{swimmer-gen4.png => Swimmer.png} (100%)
 rename src/canonical/trainers/gen4/heartgold-soulsilver/{swimmerf-gen4.png => Swimmer~F.png} (100%)
 rename src/canonical/trainers/gen4/heartgold-soulsilver/{twins-gen4.png => Twins.png} (100%)
 rename src/canonical/trainers/gen4/heartgold-soulsilver/{youngcouple.png => Young_Couple.png} (100%)
 rename src/canonical/trainers/gen4/platinum/{dawn-gen4pt.png => Dawn.png} (100%)
 rename src/canonical/trainers/gen4/platinum/{lucas-gen4pt.png => Lucas.png} (100%)
 rename src/canonical/trainers/gen5/black-white/{acetrainer.png => Ace_Trainer.png} (100%)
 rename src/canonical/trainers/gen5/black-white/{acetrainerf.png => Ace_Trainer~F.png} (100%)
 rename src/canonical/trainers/gen5/black-white/{backersf.png => Backers~F.png} (100%)
 rename src/canonical/trainers/gen5/black-white/{backpackerf.png => Backpacker~F.png} (100%)
 rename src/canonical/trainers/gen5/black-white/{battlegirl.png => Battle_Girl.png} (100%)
 rename src/canonical/trainers/gen5/black-white/{clerk-boss.png => Clerk-2.png} (100%)
 rename src/canonical/trainers/gen5/black-white/{clerkf.png => Clerk~F.png} (100%)
 rename src/canonical/trainers/gen5/black-white/{cyclistf.png => Cyclist~F.png} (100%)
 rename src/canonical/trainers/gen5/black-white/{depotagent.png => Depot_Agent.png} (100%)
 rename src/canonical/trainers/gen5/black-white/{ghetsis-gen5bw.png => Ghetsis.png} (100%)
 rename src/canonical/trainers/gen5/black-white/{hilbert-dueldisk.png => Hilbert-2.png} (100%)
 rename src/canonical/trainers/gen5/black-white/{hilda-dueldisk.png => Hilda-2.png} (100%)
 rename src/canonical/trainers/gen5/black-white/{nurseryaide.png => Nursery_Aide.png} (100%)
 rename src/canonical/trainers/gen5/black-white/{parasollady.png => Parasol_Lady.png} (100%)
 rename src/canonical/trainers/gen5/black-white/{plasmagrunt-gen5bw.png => Plasma_Grunt.png} (100%)
 rename src/canonical/trainers/gen5/black-white/{plasmagruntf-gen5bw.png => Plasma_Grunt~F.png} (100%)
 rename src/canonical/trainers/gen5/black-white/{pokefan.png => Poke__0301fan.png} (100%)
 rename src/canonical/trainers/gen5/black-white/{pokefanf.png => Poke__0301fan~F.png} (100%)
 rename src/canonical/trainers/gen5/black-white/{pokemonbreeder.png => Poke__0301mon_Breeder.png} (100%)
 rename src/canonical/trainers/gen5/black-white/{pokemonbreederf.png => Poke__0301mon_Breeder~F.png} (100%)
 rename src/canonical/trainers/gen5/black-white/{pokemonranger.png => Poke__0301mon_Ranger.png} (100%)
 rename src/canonical/trainers/gen5/black-white/{pokemonrangerf.png => Poke__0301mon_Ranger~F.png} (100%)
 rename src/canonical/trainers/gen5/black-white/{preschoolerf.png => Preschooler~F.png} (100%)
 rename src/canonical/trainers/gen5/black-white/{psychicf.png => Psychic~F.png} (100%)
 rename src/canonical/trainers/gen5/black-white/{richboy.png => Rich_Boy.png} (100%)
 rename src/canonical/trainers/gen5/black-white/{schoolkid.png => School_Kid.png} (100%)
 rename src/canonical/trainers/gen5/black-white/{schoolkidf.png => School_Kid~F.png} (100%)
 rename src/canonical/trainers/gen5/black-white/{scientistf.png => Scientist~F.png} (100%)
 rename src/canonical/trainers/gen5/black-white/{madame.png => Socialite.png} (100%)
 rename src/canonical/trainers/gen5/black-white/{swimmerf.png => Swimmer~F.png} (100%)
 rename src/canonical/trainers/gen5/black-white/{veteranf.png => Veteran~F.png} (100%)
 rename src/canonical/trainers/gen5/black-white/{workerice.png => Worker-Snow.png} (100%)
 rename src/canonical/trainers/gen5/black2-white2/{beauty-gen5bw2.png => Beauty.png} (100%)
 rename src/canonical/trainers/gen5/black2-white2/{bianca-pwt.png => Bianca.png} (100%)
 rename src/canonical/trainers/gen5/black2-white2/{cheren-gen5bw2.png => Cheren.png} (100%)
 rename src/canonical/trainers/gen5/black2-white2/{elesa-gen5bw2.png => Elesa.png} (100%)
 rename src/canonical/trainers/gen5/black2-white2/{iris-gen5bw2.png => Iris.png} (100%)
 rename src/canonical/trainers/gen5/black2-white2/{nate-dueldisk.png => Nate-2.png} (100%)
 rename src/canonical/trainers/gen5/black2-white2/{plasmagrunt.png => Plasma_Grunt.png} (100%)
 rename src/canonical/trainers/gen5/black2-white2/{plasmagruntf.png => Plasma_Grunt~F.png} (100%)
 rename src/canonical/trainers/gen5/black2-white2/{rosa-dueldisk.png => Rosa-2.png} (100%)
 rename src/canonical/trainers/gen5/black2-white2/{shadowtriad.png => Shadow_Triad.png} (100%)
 rename src/noncanonical/trainers/gen5/black-white/{youngn.png => N-Young.png} (100%)
 rename src/noncanonical/trainers/gen6/omegaruby-alphasapphire/{brawly-gen6.png => Brawly.png} (100%)
 rename src/noncanonical/trainers/gen6/omegaruby-alphasapphire/{wallace-gen6.png => Wallace.png} (100%)
 rename src/noncanonical/trainers/gen6/omegaruby-alphasapphire/{winona-gen6.png => Winona.png} (100%)
 rename src/noncanonical/trainers/gen6/x-y/{furisodegirl-black.png => Furisode_Girl-Black.png} (100%)
 rename src/noncanonical/trainers/gen6/x-y/{furisodegirl-pink.png => Furisode_Girl-Pink.png} (100%)
 rename src/noncanonical/trainers/gen7/sun-moon/{aetherfoundation.png => Aether_Foundation.png} (100%)
 rename src/noncanonical/trainers/gen7/sun-moon/{aetheremployee.png => Aether_Foundation_Employee.png} (100%)
 rename src/noncanonical/trainers/gen7/sun-moon/{aetheremployeef.png => Aether_Foundation_Employee~F.png} (100%)
 rename src/noncanonical/trainers/gen7/sun-moon/{aetherfoundationf.png => Aether_Foundation~F.png} (100%)
 rename src/noncanonical/trainers/gen7/sun-moon/{beauty-gen7.png => Beauty.png} (100%)
 rename src/noncanonical/trainers/gen7/sun-moon/{blue-gen7.png => Blue.png} (100%)
 rename src/noncanonical/trainers/gen7/sun-moon/{colress-gen7.png => Colress.png} (100%)
 rename src/noncanonical/trainers/gen7/sun-moon/{gladion-stance.png => Gladion-2.png} (100%)
 rename src/noncanonical/trainers/gen7/sun-moon/{grimsley-gen7.png => Grimsley.png} (100%)
 rename src/noncanonical/trainers/gen7/sun-moon/{hau-stance.png => Hau-2.png} (100%)
 rename src/noncanonical/trainers/gen7/sun-moon/{hiker-gen7.png => Hiker.png} (100%)
 rename src/noncanonical/trainers/gen7/sun-moon/{kukui-stand.png => Kukui-2.png} (100%)
 rename src/noncanonical/trainers/gen7/sun-moon/{lass-gen7.png => Lass.png} (100%)
 rename src/noncanonical/trainers/gen7/sun-moon/{lillie-z.png => Lillie-2.png} (100%)
 rename src/noncanonical/trainers/gen7/sun-moon/{lusamine-nihilego.png => Lusamine-2.png} (100%)
 rename src/noncanonical/trainers/gen7/sun-moon/{theroyal.png => Masked_Royal.png} (100%)
 rename src/noncanonical/trainers/gen7/sun-moon/{officeworker.png => Office_Worker.png} (100%)
 rename src/noncanonical/trainers/gen7/sun-moon/{pokemonbreeder-gen7.png => Poke__0301mon_Breeder.png} (100%)
 rename src/noncanonical/trainers/gen7/sun-moon/{pokemonbreederf-gen7.png => Poke__0301mon_Breeder~F.png} (100%)
 rename src/noncanonical/trainers/gen7/sun-moon/{red-gen7.png => Red.png} (100%)
 rename src/noncanonical/trainers/gen7/sun-moon/{risingstar.png => Rising_Star.png} (100%)
 rename src/noncanonical/trainers/gen7/sun-moon/{risingstarf.png => Rising_Star~F.png} (100%)
 rename src/noncanonical/trainers/gen7/sun-moon/{samsonoak.png => Samson_Oak.png} (100%)
 rename src/noncanonical/trainers/gen7/sun-moon/{teacher-gen7.png => Teacher.png} (100%)
 rename src/noncanonical/trainers/gen7/sun-moon/{youngathlete.png => Young_Athlete.png} (100%)
 rename src/noncanonical/trainers/gen7/sun-moon/{youngathletef.png => Young_Athlete~F.png} (100%)
 rename src/noncanonical/trainers/gen7/sun-moon/{youngster-gen7.png => Youngster.png} (100%)
 rename src/noncanonical/trainers/misc/{ash-capbackward.png => Ash-Cap_Backward.png} (100%)
 rename src/noncanonical/trainers/misc/{teamrocket.png => Team_Rocket.png} (100%)
 rename src/noncanonical/trainers/misc/{unknownf.png => Unknown~F.png} (100%)

diff --git a/src/canonical/trainers/gen1/red-blue/agatha-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Agatha.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/agatha-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Agatha.png
diff --git a/src/canonical/trainers/gen1/red-blue/beauty-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Beauty.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/beauty-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Beauty.png
diff --git a/src/canonical/trainers/gen1/red-blue/biker-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Biker.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/biker-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Biker.png
diff --git a/src/canonical/trainers/gen1/red-blue/birdkeeper-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Bird_Keeper.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/birdkeeper-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Bird_Keeper.png
diff --git a/src/canonical/trainers/gen1/red-blue/blackbelt-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Blackbelt.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/blackbelt-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Blackbelt.png
diff --git a/src/canonical/trainers/gen1/red-blue/blaine-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Blaine.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/blaine-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Blaine.png
diff --git a/src/canonical/trainers/gen1/red-blue/blue-gen1rbtwo.png b/src/canonical/trainers/gen1/red-blue/Blue-2.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/blue-gen1rbtwo.png
rename to src/canonical/trainers/gen1/red-blue/Blue-2.png
diff --git a/src/canonical/trainers/gen1/red-blue/blue-gen1rbchampion.png b/src/canonical/trainers/gen1/red-blue/Blue-Champion.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/blue-gen1rbchampion.png
rename to src/canonical/trainers/gen1/red-blue/Blue-Champion.png
diff --git a/src/canonical/trainers/gen1/red-blue/blue-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Blue.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/blue-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Blue.png
diff --git a/src/canonical/trainers/gen1/red-blue/brock-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Brock.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/brock-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Brock.png
diff --git a/src/canonical/trainers/gen1/red-blue/bruno-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Bruno.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/bruno-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Bruno.png
diff --git a/src/canonical/trainers/gen1/red-blue/bugcatcher-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Bug_Catcher.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/bugcatcher-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Bug_Catcher.png
diff --git a/src/canonical/trainers/gen1/red-blue/burglar-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Burglar.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/burglar-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Burglar.png
diff --git a/src/canonical/trainers/gen1/red-blue/channeler-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Channeler.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/channeler-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Channeler.png
diff --git a/src/canonical/trainers/gen1/red-blue/acetrainer-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Cooltrainer.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/acetrainer-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Cooltrainer.png
diff --git a/src/canonical/trainers/gen1/red-blue/acetrainerf-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Cooltrainer~F.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/acetrainerf-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Cooltrainer~F.png
diff --git a/src/canonical/trainers/gen1/red-blue/cueball-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Cue_Ball.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/cueball-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Cue_Ball.png
diff --git a/src/canonical/trainers/gen1/red-blue/engineer-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Engineer.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/engineer-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Engineer.png
diff --git a/src/canonical/trainers/gen1/red-blue/erika-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Erika.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/erika-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Erika.png
diff --git a/src/canonical/trainers/gen1/red-blue/fisherman-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Fisherman.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/fisherman-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Fisherman.png
diff --git a/src/canonical/trainers/gen1/red-blue/gambler-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Gambler.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/gambler-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Gambler.png
diff --git a/src/canonical/trainers/gen1/red-blue/gentleman-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Gentleman.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/gentleman-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Gentleman.png
diff --git a/src/canonical/trainers/gen1/red-blue/giovanni-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Giovanni.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/giovanni-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Giovanni.png
diff --git a/src/canonical/trainers/gen1/red-blue/hiker-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Hiker.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/hiker-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Hiker.png
diff --git a/src/canonical/trainers/gen1/red-blue/jrtrainer-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Jr._Trainer.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/jrtrainer-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Jr._Trainer.png
diff --git a/src/canonical/trainers/gen1/red-blue/jrtrainerf-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Jr._Trainer~F.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/jrtrainerf-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Jr._Trainer~F.png
diff --git a/src/canonical/trainers/gen1/red-blue/juggler-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Juggler.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/juggler-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Juggler.png
diff --git a/src/canonical/trainers/gen1/red-blue/koga-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Koga.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/koga-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Koga.png
diff --git a/src/canonical/trainers/gen1/red-blue/lance-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Lance.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/lance-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Lance.png
diff --git a/src/canonical/trainers/gen1/red-blue/lass-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Lass.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/lass-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Lass.png
diff --git a/src/canonical/trainers/gen1/red-blue/lorelei-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Lorelei.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/lorelei-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Lorelei.png
diff --git a/src/canonical/trainers/gen1/red-blue/ltsurge-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Lt._Surge.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/ltsurge-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Lt._Surge.png
diff --git a/src/canonical/trainers/gen1/red-blue/misty-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Misty.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/misty-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Misty.png
diff --git a/src/canonical/trainers/gen1/red-blue/oak-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Oak.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/oak-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Oak.png
diff --git a/src/canonical/trainers/gen1/red-blue/pokemaniac-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Poke__0301_Maniac.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/pokemaniac-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Poke__0301_Maniac.png
diff --git a/src/canonical/trainers/gen1/red-blue/psychic-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Psychic.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/psychic-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Psychic.png
diff --git a/src/canonical/trainers/gen1/red-blue/red-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Red-Title.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/red-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Red-Title.png
diff --git a/src/canonical/trainers/gen1/red-blue/red-gen1title.png b/src/canonical/trainers/gen1/red-blue/Red-Title~JPN.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/red-gen1title.png
rename to src/canonical/trainers/gen1/red-blue/Red-Title~JPN.png
diff --git a/src/canonical/trainers/gen1/red-blue/red-gen1main.png b/src/canonical/trainers/gen1/red-blue/Red.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/red-gen1main.png
rename to src/canonical/trainers/gen1/red-blue/Red.png
diff --git a/src/canonical/trainers/gen1/red-blue/rocker-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Rocker.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/rocker-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Rocker.png
diff --git a/src/canonical/trainers/gen1/red-blue/rocket-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Rocket.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/rocket-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Rocket.png
diff --git a/src/canonical/trainers/gen1/red-blue/sabrina-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Sabrina.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/sabrina-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Sabrina.png
diff --git a/src/canonical/trainers/gen1/red-blue/sailor-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Sailor.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/sailor-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Sailor.png
diff --git a/src/canonical/trainers/gen1/red-blue/scientist-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Scientist.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/scientist-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Scientist.png
diff --git a/src/canonical/trainers/gen1/red-blue/supernerd-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Super_Nerd.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/supernerd-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Super_Nerd.png
diff --git a/src/canonical/trainers/gen1/red-blue/swimmer-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Swimmer.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/swimmer-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Swimmer.png
diff --git a/src/canonical/trainers/gen1/red-blue/tamer-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Tamer.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/tamer-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Tamer.png
diff --git a/src/canonical/trainers/gen1/red-blue/youngster-gen1rb.png b/src/canonical/trainers/gen1/red-blue/Youngster.png
similarity index 100%
rename from src/canonical/trainers/gen1/red-blue/youngster-gen1rb.png
rename to src/canonical/trainers/gen1/red-blue/Youngster.png
diff --git a/src/canonical/trainers/gen1/yellow/agatha-gen1.png b/src/canonical/trainers/gen1/yellow/Agatha.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/agatha-gen1.png
rename to src/canonical/trainers/gen1/yellow/Agatha.png
diff --git a/src/canonical/trainers/gen1/yellow/beauty-gen1.png b/src/canonical/trainers/gen1/yellow/Beauty.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/beauty-gen1.png
rename to src/canonical/trainers/gen1/yellow/Beauty.png
diff --git a/src/canonical/trainers/gen1/yellow/biker-gen1.png b/src/canonical/trainers/gen1/yellow/Biker.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/biker-gen1.png
rename to src/canonical/trainers/gen1/yellow/Biker.png
diff --git a/src/canonical/trainers/gen1/yellow/birdkeeper-gen1.png b/src/canonical/trainers/gen1/yellow/Bird_Keeper.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/birdkeeper-gen1.png
rename to src/canonical/trainers/gen1/yellow/Bird_Keeper.png
diff --git a/src/canonical/trainers/gen1/yellow/blackbelt-gen1.png b/src/canonical/trainers/gen1/yellow/Blackbelt.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/blackbelt-gen1.png
rename to src/canonical/trainers/gen1/yellow/Blackbelt.png
diff --git a/src/canonical/trainers/gen1/yellow/blaine-gen1.png b/src/canonical/trainers/gen1/yellow/Blaine.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/blaine-gen1.png
rename to src/canonical/trainers/gen1/yellow/Blaine.png
diff --git a/src/canonical/trainers/gen1/yellow/blue-gen1two.png b/src/canonical/trainers/gen1/yellow/Blue-2.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/blue-gen1two.png
rename to src/canonical/trainers/gen1/yellow/Blue-2.png
diff --git a/src/canonical/trainers/gen1/yellow/blue-gen1champion.png b/src/canonical/trainers/gen1/yellow/Blue-Champion.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/blue-gen1champion.png
rename to src/canonical/trainers/gen1/yellow/Blue-Champion.png
diff --git a/src/canonical/trainers/gen1/yellow/blue-gen1.png b/src/canonical/trainers/gen1/yellow/Blue.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/blue-gen1.png
rename to src/canonical/trainers/gen1/yellow/Blue.png
diff --git a/src/canonical/trainers/gen1/yellow/brock-gen1.png b/src/canonical/trainers/gen1/yellow/Brock.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/brock-gen1.png
rename to src/canonical/trainers/gen1/yellow/Brock.png
diff --git a/src/canonical/trainers/gen1/yellow/bruno-gen1.png b/src/canonical/trainers/gen1/yellow/Bruno.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/bruno-gen1.png
rename to src/canonical/trainers/gen1/yellow/Bruno.png
diff --git a/src/canonical/trainers/gen1/yellow/bugcatcher-gen1.png b/src/canonical/trainers/gen1/yellow/Bug_Catcher.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/bugcatcher-gen1.png
rename to src/canonical/trainers/gen1/yellow/Bug_Catcher.png
diff --git a/src/canonical/trainers/gen1/yellow/burglar-gen1.png b/src/canonical/trainers/gen1/yellow/Burglar.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/burglar-gen1.png
rename to src/canonical/trainers/gen1/yellow/Burglar.png
diff --git a/src/canonical/trainers/gen1/yellow/channeler-gen1.png b/src/canonical/trainers/gen1/yellow/Channeler.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/channeler-gen1.png
rename to src/canonical/trainers/gen1/yellow/Channeler.png
diff --git a/src/canonical/trainers/gen1/yellow/acetrainer-gen1.png b/src/canonical/trainers/gen1/yellow/Cooltrainer.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/acetrainer-gen1.png
rename to src/canonical/trainers/gen1/yellow/Cooltrainer.png
diff --git a/src/canonical/trainers/gen1/yellow/acetrainerf-gen1.png b/src/canonical/trainers/gen1/yellow/Cooltrainer~F.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/acetrainerf-gen1.png
rename to src/canonical/trainers/gen1/yellow/Cooltrainer~F.png
diff --git a/src/canonical/trainers/gen1/yellow/cueball-gen1.png b/src/canonical/trainers/gen1/yellow/Cue_Ball.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/cueball-gen1.png
rename to src/canonical/trainers/gen1/yellow/Cue_Ball.png
diff --git a/src/canonical/trainers/gen1/yellow/engineer-gen1.png b/src/canonical/trainers/gen1/yellow/Engineer.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/engineer-gen1.png
rename to src/canonical/trainers/gen1/yellow/Engineer.png
diff --git a/src/canonical/trainers/gen1/yellow/erika-gen1.png b/src/canonical/trainers/gen1/yellow/Erika.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/erika-gen1.png
rename to src/canonical/trainers/gen1/yellow/Erika.png
diff --git a/src/canonical/trainers/gen1/yellow/fisherman-gen1.png b/src/canonical/trainers/gen1/yellow/Fisherman.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/fisherman-gen1.png
rename to src/canonical/trainers/gen1/yellow/Fisherman.png
diff --git a/src/canonical/trainers/gen1/yellow/gambler-gen1.png b/src/canonical/trainers/gen1/yellow/Gambler.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/gambler-gen1.png
rename to src/canonical/trainers/gen1/yellow/Gambler.png
diff --git a/src/canonical/trainers/gen1/yellow/gentleman-gen1.png b/src/canonical/trainers/gen1/yellow/Gentleman.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/gentleman-gen1.png
rename to src/canonical/trainers/gen1/yellow/Gentleman.png
diff --git a/src/canonical/trainers/gen1/yellow/giovanni-gen1.png b/src/canonical/trainers/gen1/yellow/Giovanni.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/giovanni-gen1.png
rename to src/canonical/trainers/gen1/yellow/Giovanni.png
diff --git a/src/canonical/trainers/gen1/yellow/hiker-gen1.png b/src/canonical/trainers/gen1/yellow/Hiker.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/hiker-gen1.png
rename to src/canonical/trainers/gen1/yellow/Hiker.png
diff --git a/src/canonical/trainers/gen1/yellow/jrtrainer-gen1.png b/src/canonical/trainers/gen1/yellow/Jr._Trainer.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/jrtrainer-gen1.png
rename to src/canonical/trainers/gen1/yellow/Jr._Trainer.png
diff --git a/src/canonical/trainers/gen1/yellow/jrtrainerf-gen1.png b/src/canonical/trainers/gen1/yellow/Jr._Trainer~F.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/jrtrainerf-gen1.png
rename to src/canonical/trainers/gen1/yellow/Jr._Trainer~F.png
diff --git a/src/canonical/trainers/gen1/yellow/juggler-gen1.png b/src/canonical/trainers/gen1/yellow/Juggler.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/juggler-gen1.png
rename to src/canonical/trainers/gen1/yellow/Juggler.png
diff --git a/src/canonical/trainers/gen1/yellow/koga-gen1.png b/src/canonical/trainers/gen1/yellow/Koga.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/koga-gen1.png
rename to src/canonical/trainers/gen1/yellow/Koga.png
diff --git a/src/canonical/trainers/gen1/yellow/lance-gen1.png b/src/canonical/trainers/gen1/yellow/Lance.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/lance-gen1.png
rename to src/canonical/trainers/gen1/yellow/Lance.png
diff --git a/src/canonical/trainers/gen1/yellow/lass-gen1.png b/src/canonical/trainers/gen1/yellow/Lass.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/lass-gen1.png
rename to src/canonical/trainers/gen1/yellow/Lass.png
diff --git a/src/canonical/trainers/gen1/yellow/lorelei-gen1.png b/src/canonical/trainers/gen1/yellow/Lorelei.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/lorelei-gen1.png
rename to src/canonical/trainers/gen1/yellow/Lorelei.png
diff --git a/src/canonical/trainers/gen1/yellow/ltsurge-gen1.png b/src/canonical/trainers/gen1/yellow/Lt._Surge.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/ltsurge-gen1.png
rename to src/canonical/trainers/gen1/yellow/Lt._Surge.png
diff --git a/src/canonical/trainers/gen1/yellow/misty-gen1.png b/src/canonical/trainers/gen1/yellow/Misty.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/misty-gen1.png
rename to src/canonical/trainers/gen1/yellow/Misty.png
diff --git a/src/canonical/trainers/gen1/yellow/oak-gen1.png b/src/canonical/trainers/gen1/yellow/Oak.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/oak-gen1.png
rename to src/canonical/trainers/gen1/yellow/Oak.png
diff --git a/src/canonical/trainers/gen1/yellow/pokemaniac-gen1.png b/src/canonical/trainers/gen1/yellow/Poke__0301_Maniac.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/pokemaniac-gen1.png
rename to src/canonical/trainers/gen1/yellow/Poke__0301_Maniac.png
diff --git a/src/canonical/trainers/gen1/yellow/psychic-gen1.png b/src/canonical/trainers/gen1/yellow/Psychic.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/psychic-gen1.png
rename to src/canonical/trainers/gen1/yellow/Psychic.png
diff --git a/src/canonical/trainers/gen1/yellow/red-gen1.png b/src/canonical/trainers/gen1/yellow/Red.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/red-gen1.png
rename to src/canonical/trainers/gen1/yellow/Red.png
diff --git a/src/canonical/trainers/gen1/yellow/rocker-gen1.png b/src/canonical/trainers/gen1/yellow/Rocker.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/rocker-gen1.png
rename to src/canonical/trainers/gen1/yellow/Rocker.png
diff --git a/src/canonical/trainers/gen1/yellow/rocket-gen1.png b/src/canonical/trainers/gen1/yellow/Rocket.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/rocket-gen1.png
rename to src/canonical/trainers/gen1/yellow/Rocket.png
diff --git a/src/canonical/trainers/gen1/yellow/sabrina-gen1.png b/src/canonical/trainers/gen1/yellow/Sabrina.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/sabrina-gen1.png
rename to src/canonical/trainers/gen1/yellow/Sabrina.png
diff --git a/src/canonical/trainers/gen1/yellow/sailor-gen1.png b/src/canonical/trainers/gen1/yellow/Sailor.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/sailor-gen1.png
rename to src/canonical/trainers/gen1/yellow/Sailor.png
diff --git a/src/canonical/trainers/gen1/yellow/scientist-gen1.png b/src/canonical/trainers/gen1/yellow/Scientist.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/scientist-gen1.png
rename to src/canonical/trainers/gen1/yellow/Scientist.png
diff --git a/src/canonical/trainers/gen1/yellow/supernerd-gen1.png b/src/canonical/trainers/gen1/yellow/Super_Nerd.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/supernerd-gen1.png
rename to src/canonical/trainers/gen1/yellow/Super_Nerd.png
diff --git a/src/canonical/trainers/gen1/yellow/swimmer-gen1.png b/src/canonical/trainers/gen1/yellow/Swimmer.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/swimmer-gen1.png
rename to src/canonical/trainers/gen1/yellow/Swimmer.png
diff --git a/src/canonical/trainers/gen1/yellow/tamer-gen1.png b/src/canonical/trainers/gen1/yellow/Tamer.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/tamer-gen1.png
rename to src/canonical/trainers/gen1/yellow/Tamer.png
diff --git a/src/canonical/trainers/gen1/yellow/jessiejames-gen1.png b/src/canonical/trainers/gen1/yellow/Team_Rocket.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/jessiejames-gen1.png
rename to src/canonical/trainers/gen1/yellow/Team_Rocket.png
diff --git a/src/canonical/trainers/gen1/yellow/youngster-gen1.png b/src/canonical/trainers/gen1/yellow/Youngster.png
similarity index 100%
rename from src/canonical/trainers/gen1/yellow/youngster-gen1.png
rename to src/canonical/trainers/gen1/yellow/Youngster.png
diff --git a/src/canonical/trainers/gen2/crystal/ethan-gen2c.png b/src/canonical/trainers/gen2/crystal/Ethan.png
similarity index 100%
rename from src/canonical/trainers/gen2/crystal/ethan-gen2c.png
rename to src/canonical/trainers/gen2/crystal/Ethan.png
diff --git a/src/canonical/trainers/gen2/crystal/eusine-gen2.png b/src/canonical/trainers/gen2/crystal/Eusine.png
similarity index 100%
rename from src/canonical/trainers/gen2/crystal/eusine-gen2.png
rename to src/canonical/trainers/gen2/crystal/Eusine.png
diff --git a/src/canonical/trainers/gen2/crystal/kris-gen2.png b/src/canonical/trainers/gen2/crystal/Kris.png
similarity index 100%
rename from src/canonical/trainers/gen2/crystal/kris-gen2.png
rename to src/canonical/trainers/gen2/crystal/Kris.png
diff --git a/src/canonical/trainers/gen2/gold-silver/beauty-gen2jp.png b/src/canonical/trainers/gen2/gold-silver/Beauty-JPN.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/beauty-gen2jp.png
rename to src/canonical/trainers/gen2/gold-silver/Beauty-JPN.png
diff --git a/src/canonical/trainers/gen2/gold-silver/beauty-gen2.png b/src/canonical/trainers/gen2/gold-silver/Beauty.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/beauty-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Beauty.png
diff --git a/src/canonical/trainers/gen2/gold-silver/biker-gen2.png b/src/canonical/trainers/gen2/gold-silver/Biker.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/biker-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Biker.png
diff --git a/src/canonical/trainers/gen2/gold-silver/birdkeeper-gen2.png b/src/canonical/trainers/gen2/gold-silver/Bird_Keeper.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/birdkeeper-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Bird_Keeper.png
diff --git a/src/canonical/trainers/gen2/gold-silver/blackbelt-gen2.png b/src/canonical/trainers/gen2/gold-silver/Blackbelt.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/blackbelt-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Blackbelt.png
diff --git a/src/canonical/trainers/gen2/gold-silver/blaine-gen2.png b/src/canonical/trainers/gen2/gold-silver/Blaine.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/blaine-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Blaine.png
diff --git a/src/canonical/trainers/gen2/gold-silver/blue-gen2.png b/src/canonical/trainers/gen2/gold-silver/Blue.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/blue-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Blue.png
diff --git a/src/canonical/trainers/gen2/gold-silver/boarder-gen2.png b/src/canonical/trainers/gen2/gold-silver/Boarder.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/boarder-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Boarder.png
diff --git a/src/canonical/trainers/gen2/gold-silver/brock-gen2.png b/src/canonical/trainers/gen2/gold-silver/Brock.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/brock-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Brock.png
diff --git a/src/canonical/trainers/gen2/gold-silver/bruno-gen2.png b/src/canonical/trainers/gen2/gold-silver/Bruno.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/bruno-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Bruno.png
diff --git a/src/canonical/trainers/gen2/gold-silver/bugcatcher-gen2.png b/src/canonical/trainers/gen2/gold-silver/Bug_Catcher.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/bugcatcher-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Bug_Catcher.png
diff --git a/src/canonical/trainers/gen2/gold-silver/bugsy-gen2.png b/src/canonical/trainers/gen2/gold-silver/Bugsy.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/bugsy-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Bugsy.png
diff --git a/src/canonical/trainers/gen2/gold-silver/burglar-gen2.png b/src/canonical/trainers/gen2/gold-silver/Burglar.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/burglar-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Burglar.png
diff --git a/src/canonical/trainers/gen2/gold-silver/camper-gen2.png b/src/canonical/trainers/gen2/gold-silver/Camper.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/camper-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Camper.png
diff --git a/src/canonical/trainers/gen2/gold-silver/chuck-gen2.png b/src/canonical/trainers/gen2/gold-silver/Chuck.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/chuck-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Chuck.png
diff --git a/src/canonical/trainers/gen2/gold-silver/clair-gen2.png b/src/canonical/trainers/gen2/gold-silver/Clair.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/clair-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Clair.png
diff --git a/src/canonical/trainers/gen2/gold-silver/acetrainer-gen2.png b/src/canonical/trainers/gen2/gold-silver/Cooltrainer.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/acetrainer-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Cooltrainer.png
diff --git a/src/canonical/trainers/gen2/gold-silver/acetrainerf-gen2.png b/src/canonical/trainers/gen2/gold-silver/Cooltrainer~F.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/acetrainerf-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Cooltrainer~F.png
diff --git a/src/canonical/trainers/gen2/gold-silver/erika-gen2.png b/src/canonical/trainers/gen2/gold-silver/Erika.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/erika-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Erika.png
diff --git a/src/canonical/trainers/gen2/gold-silver/ethan-gen2.png b/src/canonical/trainers/gen2/gold-silver/Ethan.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/ethan-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Ethan.png
diff --git a/src/canonical/trainers/gen2/gold-silver/falkner-gen2.png b/src/canonical/trainers/gen2/gold-silver/Falkner.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/falkner-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Falkner.png
diff --git a/src/canonical/trainers/gen2/gold-silver/firebreather-gen2.png b/src/canonical/trainers/gen2/gold-silver/Firebreather.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/firebreather-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Firebreather.png
diff --git a/src/canonical/trainers/gen2/gold-silver/fisherman-gen2jp.png b/src/canonical/trainers/gen2/gold-silver/Fisherman-JPN.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/fisherman-gen2jp.png
rename to src/canonical/trainers/gen2/gold-silver/Fisherman-JPN.png
diff --git a/src/canonical/trainers/gen2/gold-silver/gentleman-gen2.png b/src/canonical/trainers/gen2/gold-silver/Gentleman.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/gentleman-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Gentleman.png
diff --git a/src/canonical/trainers/gen2/gold-silver/hiker-gen2.png b/src/canonical/trainers/gen2/gold-silver/Hiker.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/hiker-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Hiker.png
diff --git a/src/canonical/trainers/gen2/gold-silver/janine-gen2.png b/src/canonical/trainers/gen2/gold-silver/Janine.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/janine-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Janine.png
diff --git a/src/canonical/trainers/gen2/gold-silver/jasmine-gen2.png b/src/canonical/trainers/gen2/gold-silver/Jasmine.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/jasmine-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Jasmine.png
diff --git a/src/canonical/trainers/gen2/gold-silver/juggler-gen2.png b/src/canonical/trainers/gen2/gold-silver/Juggler.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/juggler-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Juggler.png
diff --git a/src/canonical/trainers/gen2/gold-silver/karen-gen2.png b/src/canonical/trainers/gen2/gold-silver/Karen.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/karen-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Karen.png
diff --git a/src/canonical/trainers/gen2/gold-silver/kimonogirl-gen2.png b/src/canonical/trainers/gen2/gold-silver/Kimono_Girl.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/kimonogirl-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Kimono_Girl.png
diff --git a/src/canonical/trainers/gen2/gold-silver/koga-gen2.png b/src/canonical/trainers/gen2/gold-silver/Koga.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/koga-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Koga.png
diff --git a/src/canonical/trainers/gen2/gold-silver/lance-gen2.png b/src/canonical/trainers/gen2/gold-silver/Lance.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/lance-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Lance.png
diff --git a/src/canonical/trainers/gen2/gold-silver/lass-gen2.png b/src/canonical/trainers/gen2/gold-silver/Lass.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/lass-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Lass.png
diff --git a/src/canonical/trainers/gen2/gold-silver/ltsurge-gen2.png b/src/canonical/trainers/gen2/gold-silver/Lt._Surge.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/ltsurge-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Lt._Surge.png
diff --git a/src/canonical/trainers/gen2/gold-silver/medium-gen2jp.png b/src/canonical/trainers/gen2/gold-silver/Medium-JPN.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/medium-gen2jp.png
rename to src/canonical/trainers/gen2/gold-silver/Medium-JPN.png
diff --git a/src/canonical/trainers/gen2/gold-silver/misty-gen2.png b/src/canonical/trainers/gen2/gold-silver/Misty.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/misty-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Misty.png
diff --git a/src/canonical/trainers/gen2/gold-silver/morty-gen2.png b/src/canonical/trainers/gen2/gold-silver/Morty.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/morty-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Morty.png
diff --git a/src/canonical/trainers/gen2/gold-silver/oak-gen2.png b/src/canonical/trainers/gen2/gold-silver/Oak.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/oak-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Oak.png
diff --git a/src/canonical/trainers/gen2/gold-silver/officer-gen2.png b/src/canonical/trainers/gen2/gold-silver/Officer.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/officer-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Officer.png
diff --git a/src/canonical/trainers/gen2/gold-silver/picnicker-gen2.png b/src/canonical/trainers/gen2/gold-silver/Picnicker.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/picnicker-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Picnicker.png
diff --git a/src/canonical/trainers/gen2/gold-silver/pokefan-gen2.png b/src/canonical/trainers/gen2/gold-silver/Poke__0301fan.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/pokefan-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Poke__0301fan.png
diff --git a/src/canonical/trainers/gen2/gold-silver/pokefanf-gen2.png b/src/canonical/trainers/gen2/gold-silver/Poke__0301fan~F.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/pokefanf-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Poke__0301fan~F.png
diff --git a/src/canonical/trainers/gen2/gold-silver/pryce-gen2.png b/src/canonical/trainers/gen2/gold-silver/Pryce.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/pryce-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Pryce.png
diff --git a/src/canonical/trainers/gen2/gold-silver/psychic-gen2.png b/src/canonical/trainers/gen2/gold-silver/Psychic.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/psychic-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Psychic.png
diff --git a/src/canonical/trainers/gen2/gold-silver/red-gen2.png b/src/canonical/trainers/gen2/gold-silver/Red.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/red-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Red.png
diff --git a/src/canonical/trainers/gen2/gold-silver/rocketexecutive-gen2.png b/src/canonical/trainers/gen2/gold-silver/Rocket_Executive.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/rocketexecutive-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Rocket_Executive.png
diff --git a/src/canonical/trainers/gen2/gold-silver/rocketexecutivef-gen2.png b/src/canonical/trainers/gen2/gold-silver/Rocket_Executive~F.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/rocketexecutivef-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Rocket_Executive~F.png
diff --git a/src/canonical/trainers/gen2/gold-silver/rocketgrunt-gen2.png b/src/canonical/trainers/gen2/gold-silver/Rocket_Grunt.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/rocketgrunt-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Rocket_Grunt.png
diff --git a/src/canonical/trainers/gen2/gold-silver/rocketgruntf-gen2.png b/src/canonical/trainers/gen2/gold-silver/Rocket_Grunt~F.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/rocketgruntf-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Rocket_Grunt~F.png
diff --git a/src/canonical/trainers/gen2/gold-silver/sabrina-gen2.png b/src/canonical/trainers/gen2/gold-silver/Sabrina.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/sabrina-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Sabrina.png
diff --git a/src/canonical/trainers/gen2/gold-silver/sage-gen2jp.png b/src/canonical/trainers/gen2/gold-silver/Sage-JPN.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/sage-gen2jp.png
rename to src/canonical/trainers/gen2/gold-silver/Sage-JPN.png
diff --git a/src/canonical/trainers/gen2/gold-silver/sage-gen2.png b/src/canonical/trainers/gen2/gold-silver/Sage.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/sage-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Sage.png
diff --git a/src/canonical/trainers/gen2/gold-silver/sailor-gen2.png b/src/canonical/trainers/gen2/gold-silver/Sailor.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/sailor-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Sailor.png
diff --git a/src/canonical/trainers/gen2/gold-silver/schoolboy-gen2.png b/src/canonical/trainers/gen2/gold-silver/Schoolboy.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/schoolboy-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Schoolboy.png
diff --git a/src/canonical/trainers/gen2/gold-silver/scientist-gen2.png b/src/canonical/trainers/gen2/gold-silver/Scientist.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/scientist-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Scientist.png
diff --git a/src/canonical/trainers/gen2/gold-silver/silver-gen2kanto.png b/src/canonical/trainers/gen2/gold-silver/Silver-2.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/silver-gen2kanto.png
rename to src/canonical/trainers/gen2/gold-silver/Silver-2.png
diff --git a/src/canonical/trainers/gen2/gold-silver/silver-gen2.png b/src/canonical/trainers/gen2/gold-silver/Silver.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/silver-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Silver.png
diff --git a/src/canonical/trainers/gen2/gold-silver/skier-gen2.png b/src/canonical/trainers/gen2/gold-silver/Skier.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/skier-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Skier.png
diff --git a/src/canonical/trainers/gen2/gold-silver/supernerd-gen2.png b/src/canonical/trainers/gen2/gold-silver/Super_Nerd.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/supernerd-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Super_Nerd.png
diff --git a/src/canonical/trainers/gen2/gold-silver/swimmerm-gen2.png b/src/canonical/trainers/gen2/gold-silver/Swimmer.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/swimmerm-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Swimmer.png
diff --git a/src/canonical/trainers/gen2/gold-silver/swimmerfjp-gen2.png b/src/canonical/trainers/gen2/gold-silver/Swimmer~F-JPN.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/swimmerfjp-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Swimmer~F-JPN.png
diff --git a/src/canonical/trainers/gen2/gold-silver/swimmerf-gen2.png b/src/canonical/trainers/gen2/gold-silver/Swimmer~F.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/swimmerf-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Swimmer~F.png
diff --git a/src/canonical/trainers/gen2/gold-silver/teacher-gen2.png b/src/canonical/trainers/gen2/gold-silver/Teacher.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/teacher-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Teacher.png
diff --git a/src/canonical/trainers/gen2/gold-silver/twins-gen2.png b/src/canonical/trainers/gen2/gold-silver/Twins.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/twins-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Twins.png
diff --git a/src/canonical/trainers/gen2/gold-silver/whitney-gen2.png b/src/canonical/trainers/gen2/gold-silver/Whitney.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/whitney-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Whitney.png
diff --git a/src/canonical/trainers/gen2/gold-silver/will-gen2.png b/src/canonical/trainers/gen2/gold-silver/Will.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/will-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Will.png
diff --git a/src/canonical/trainers/gen2/gold-silver/youngster-gen2.png b/src/canonical/trainers/gen2/gold-silver/Youngster.png
similarity index 100%
rename from src/canonical/trainers/gen2/gold-silver/youngster-gen2.png
rename to src/canonical/trainers/gen2/gold-silver/Youngster.png
diff --git a/src/canonical/trainers/gen3/emerald/anabel-gen3.png b/src/canonical/trainers/gen3/emerald/Anabel.png
similarity index 100%
rename from src/canonical/trainers/gen3/emerald/anabel-gen3.png
rename to src/canonical/trainers/gen3/emerald/Anabel.png
diff --git a/src/canonical/trainers/gen3/emerald/brandon-gen3.png b/src/canonical/trainers/gen3/emerald/Brandon.png
similarity index 100%
rename from src/canonical/trainers/gen3/emerald/brandon-gen3.png
rename to src/canonical/trainers/gen3/emerald/Brandon.png
diff --git a/src/canonical/trainers/gen3/emerald/brendan-gen3.png b/src/canonical/trainers/gen3/emerald/Brendan.png
similarity index 100%
rename from src/canonical/trainers/gen3/emerald/brendan-gen3.png
rename to src/canonical/trainers/gen3/emerald/Brendan.png
diff --git a/src/canonical/trainers/gen3/emerald/greta-gen3.png b/src/canonical/trainers/gen3/emerald/Greta.png
similarity index 100%
rename from src/canonical/trainers/gen3/emerald/greta-gen3.png
rename to src/canonical/trainers/gen3/emerald/Greta.png
diff --git a/src/canonical/trainers/gen3/emerald/juan-gen3.png b/src/canonical/trainers/gen3/emerald/Juan.png
similarity index 100%
rename from src/canonical/trainers/gen3/emerald/juan-gen3.png
rename to src/canonical/trainers/gen3/emerald/Juan.png
diff --git a/src/canonical/trainers/gen3/emerald/lucy-gen3.png b/src/canonical/trainers/gen3/emerald/Lucy.png
similarity index 100%
rename from src/canonical/trainers/gen3/emerald/lucy-gen3.png
rename to src/canonical/trainers/gen3/emerald/Lucy.png
diff --git a/src/canonical/trainers/gen3/emerald/may-gen3.png b/src/canonical/trainers/gen3/emerald/May.png
similarity index 100%
rename from src/canonical/trainers/gen3/emerald/may-gen3.png
rename to src/canonical/trainers/gen3/emerald/May.png
diff --git a/src/canonical/trainers/gen3/emerald/noland-gen3.png b/src/canonical/trainers/gen3/emerald/Noland.png
similarity index 100%
rename from src/canonical/trainers/gen3/emerald/noland-gen3.png
rename to src/canonical/trainers/gen3/emerald/Noland.png
diff --git a/src/canonical/trainers/gen3/emerald/spenser-gen3.png b/src/canonical/trainers/gen3/emerald/Spenser.png
similarity index 100%
rename from src/canonical/trainers/gen3/emerald/spenser-gen3.png
rename to src/canonical/trainers/gen3/emerald/Spenser.png
diff --git a/src/canonical/trainers/gen3/emerald/tucker-gen3.png b/src/canonical/trainers/gen3/emerald/Tucker.png
similarity index 100%
rename from src/canonical/trainers/gen3/emerald/tucker-gen3.png
rename to src/canonical/trainers/gen3/emerald/Tucker.png
diff --git a/src/canonical/trainers/gen3/emerald/wallace-gen3.png b/src/canonical/trainers/gen3/emerald/Wallace.png
similarity index 100%
rename from src/canonical/trainers/gen3/emerald/wallace-gen3.png
rename to src/canonical/trainers/gen3/emerald/Wallace.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/agatha-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Agatha.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/agatha-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Agatha.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/aromalady-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Aroma_Lady.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/aromalady-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Aroma_Lady.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/beauty-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Beauty.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/beauty-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Beauty.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/biker-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Biker.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/biker-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Biker.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/bill-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Bill.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/bill-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Bill.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/birdkeeper-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Bird_Keeper.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/birdkeeper-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Bird_Keeper.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/blackbelt-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Blackbelt.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/blackbelt-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Blackbelt.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/blaine-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Blaine.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/blaine-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Blaine.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/blue-gen3two.png b/src/canonical/trainers/gen3/firered-leafgreen/Blue-2.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/blue-gen3two.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Blue-2.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/blue-gen3champion.png b/src/canonical/trainers/gen3/firered-leafgreen/Blue-Champion.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/blue-gen3champion.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Blue-Champion.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/blue-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Blue.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/blue-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Blue.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/brock-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Brock.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/brock-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Brock.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/bruno-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Bruno.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/bruno-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Bruno.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/bugcatcher-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Bug_Catcher.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/bugcatcher-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Bug_Catcher.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/burglar-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Burglar.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/burglar-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Burglar.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/camper-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Camper.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/camper-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Camper.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/channeler-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Channeler.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/channeler-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Channeler.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/acetrainercouple-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Cool_Couple.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/acetrainercouple-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Cool_Couple.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/acetrainer-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Cooltrainer.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/acetrainer-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Cooltrainer.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/acetrainerf-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Cooltrainer~F.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/acetrainerf-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Cooltrainer~F.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/crushgirl-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Crush_Girl.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/crushgirl-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Crush_Girl.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/crushkin-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Crush_Kin.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/crushkin-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Crush_Kin.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/cueball-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Cue_Ball.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/cueball-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Cue_Ball.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/engineer-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Engineer.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/engineer-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Engineer.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/erika-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Erika.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/erika-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Erika.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/fisherman-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Fisherman.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/fisherman-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Fisherman.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/gamer-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Gamer.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/gamer-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Gamer.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/gentleman-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Gentleman.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/gentleman-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Gentleman.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/giovanni-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Giovanni.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/giovanni-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Giovanni.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/hiker-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Hiker.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/hiker-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Hiker.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/juggler-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Juggler.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/juggler-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Juggler.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/koga-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Koga.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/koga-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Koga.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/lady-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Lady.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/lady-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Lady.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/lance-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Lance.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/lance-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Lance.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/lass-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Lass.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/lass-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Lass.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/leaf-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Leaf.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/leaf-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Leaf.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/lorelei-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Lorelei.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/lorelei-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Lorelei.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/ltsurge-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Lt._Surge.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/ltsurge-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Lt._Surge.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/misty-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Misty.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/misty-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Misty.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/mrfuji-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Mr._Fuji.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/mrfuji-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Mr._Fuji.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/oak-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Oak.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/oak-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Oak.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/painter-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Painter.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/painter-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Painter.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/picnicker-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Picnicker.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/picnicker-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Picnicker.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/pokemaniac-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Poke__0301_Maniac.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/pokemaniac-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Poke__0301_Maniac.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/pokemonbreederf-gen3frlg.png b/src/canonical/trainers/gen3/firered-leafgreen/Poke__0301mon_Breeder~F.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/pokemonbreederf-gen3frlg.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Poke__0301mon_Breeder~F.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/pokemonranger-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Poke__0301mon_Ranger.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/pokemonranger-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Poke__0301mon_Ranger.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/pokemonrangerf-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Poke__0301mon_Ranger~F.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/pokemonrangerf-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Poke__0301mon_Ranger~F.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/psychic-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Psychic.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/psychic-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Psychic.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/psychicf-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Psychic~F.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/psychicf-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Psychic~F.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/red-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Red.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/red-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Red.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/rocker-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Rocker.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/rocker-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Rocker.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/ruinmaniac-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Ruin_Maniac.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/ruinmaniac-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Ruin_Maniac.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/sabrina-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Sabrina.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/sabrina-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Sabrina.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/sailor-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Sailor.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/sailor-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Sailor.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/scientist-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Scientist.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/scientist-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Scientist.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/sisandbro-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Sis_and_Bro.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/sisandbro-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Sis_and_Bro.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/supernerd-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Super_Nerd.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/supernerd-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Super_Nerd.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/swimmerm-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Swimmer.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/swimmerm-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Swimmer.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/swimmerf-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Swimmer~F.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/swimmerf-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Swimmer~F.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/tamer-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Tamer.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/tamer-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Tamer.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/teamrocketgruntm-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Team_Rocket_Grunt.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/teamrocketgruntm-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Team_Rocket_Grunt.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/teamrocketgruntf-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Team_Rocket_Grunt~F.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/teamrocketgruntf-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Team_Rocket_Grunt~F.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/tuberf-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Tuber~F.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/tuberf-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Tuber~F.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/twins-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Twins.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/twins-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Twins.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/youngcouple-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Young_Couple.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/youngcouple-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Young_Couple.png
diff --git a/src/canonical/trainers/gen3/firered-leafgreen/youngster-gen3.png b/src/canonical/trainers/gen3/firered-leafgreen/Youngster.png
similarity index 100%
rename from src/canonical/trainers/gen3/firered-leafgreen/youngster-gen3.png
rename to src/canonical/trainers/gen3/firered-leafgreen/Youngster.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/archie-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Archie.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/archie-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Archie.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/aromalady-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/Aroma_Lady.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/aromalady-gen3rs.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Aroma_Lady.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/battlegirl-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Battle_Girl.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/battlegirl-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Battle_Girl.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/beauty-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/Beauty.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/beauty-gen3rs.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Beauty.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/birch-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Birch.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/birch-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Birch.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/birdkeeper-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/Bird_Keeper.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/birdkeeper-gen3rs.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Bird_Keeper.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/blackbelt-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/Blackbelt.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/blackbelt-gen3rs.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Blackbelt.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/brawly-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Brawly.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/brawly-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Brawly.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/brendan-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/Brendan.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/brendan-gen3rs.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Brendan.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/bugcatcher-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/Bug_Catcher.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/bugcatcher-gen3rs.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Bug_Catcher.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/bugmaniac-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Bug_Maniac.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/bugmaniac-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Bug_Maniac.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/camper-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/Camper.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/camper-gen3rs.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Camper.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/collector-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Collector.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/collector-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Collector.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/acetrainer-gen3jp.png b/src/canonical/trainers/gen3/ruby-sapphire/Cooltrainer-JPN.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/acetrainer-gen3jp.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Cooltrainer-JPN.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/acetrainer-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/Cooltrainer.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/acetrainer-gen3rs.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Cooltrainer.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/acetrainerf-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/Cooltrainer~F.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/acetrainerf-gen3rs.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Cooltrainer~F.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/courtney-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Courtney.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/courtney-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Courtney.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/dragontamer-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Dragon_Tamer.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/dragontamer-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Dragon_Tamer.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/drake-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Drake.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/drake-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Drake.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/expert-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Expert.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/expert-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Expert.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/expertf-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Expert~F.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/expertf-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Expert~F.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/fisherman-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/Fisherman.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/fisherman-gen3rs.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Fisherman.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/flannery-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Flannery.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/flannery-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Flannery.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/gentleman-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/Gentleman.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/gentleman-gen3rs.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Gentleman.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/glacia-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Glacia.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/glacia-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Glacia.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/guitarist-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Guitarist.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/guitarist-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Guitarist.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/hexmaniac-gen3jp.png b/src/canonical/trainers/gen3/ruby-sapphire/Hex_Maniac-JPN.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/hexmaniac-gen3jp.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Hex_Maniac-JPN.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/hexmaniac-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Hex_Maniac.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/hexmaniac-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Hex_Maniac.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/hiker-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/Hiker.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/hiker-gen3rs.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Hiker.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/interviewers-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Interviewers.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/interviewers-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Interviewers.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/kindler-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Kindler.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/kindler-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Kindler.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/lady-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/Lady.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/lady-gen3rs.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Lady.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/lass-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/Lass.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/lass-gen3rs.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Lass.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/matt-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Matt.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/matt-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Matt.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/maxie-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Maxie.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/maxie-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Maxie.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/may-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/May.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/may-gen3rs.png
rename to src/canonical/trainers/gen3/ruby-sapphire/May.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/ninjaboy-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Ninja_Boy.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/ninjaboy-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Ninja_Boy.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/norman-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Norman.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/norman-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Norman.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/oldcouple-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Old_Couple.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/oldcouple-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Old_Couple.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/parasollady-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Parasol_Lady.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/parasollady-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Parasol_Lady.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/phoebe-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Phoebe.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/phoebe-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Phoebe.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/picnicker-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/Picnicker.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/picnicker-gen3rs.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Picnicker.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/pokemaniac-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/Poke__0301_Maniac.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/pokemaniac-gen3rs.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Poke__0301_Maniac.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/pokefan-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Poke__0301fan.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/pokefan-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Poke__0301fan.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/pokefanf-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Poke__0301fan~F.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/pokefanf-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Poke__0301fan~F.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/pokemonbreeder-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Poke__0301mon_Breeder.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/pokemonbreeder-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Poke__0301mon_Breeder.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/pokemonbreederf-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Poke__0301mon_Breeder~F.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/pokemonbreederf-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Poke__0301mon_Breeder~F.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/pokemonranger-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/Poke__0301mon_Ranger.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/pokemonranger-gen3rs.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Poke__0301mon_Ranger.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/pokemonrangerf-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/Poke__0301mon_Ranger~F.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/pokemonrangerf-gen3rs.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Poke__0301mon_Ranger~F.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/psychic-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/Psychic.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/psychic-gen3rs.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Psychic.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/psychicfjp-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Psychic~F-JPN.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/psychicfjp-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Psychic~F-JPN.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/psychicf-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/Psychic~F.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/psychicf-gen3rs.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Psychic~F.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/richboy-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Rich_Boy.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/richboy-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Rich_Boy.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/roxanne-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Roxanne.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/roxanne-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Roxanne.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/ruinmaniac-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/Ruin_Maniac.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/ruinmaniac-gen3rs.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Ruin_Maniac.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/sailor-gen3jp.png b/src/canonical/trainers/gen3/ruby-sapphire/Sailor-JPN.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/sailor-gen3jp.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Sailor-JPN.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/sailor-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/Sailor.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/sailor-gen3rs.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Sailor.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/schoolkid-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/School_Kid.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/schoolkid-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/School_Kid.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/schoolkidf-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/School_Kid~F.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/schoolkidf-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/School_Kid~F.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/shelly-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Shelly.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/shelly-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Shelly.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/sidney-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Sidney.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/sidney-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Sidney.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/sisandbro-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/Sis_and_Bro.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/sisandbro-gen3rs.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Sis_and_Bro.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/srandjr-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Sr._and_Jr..png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/srandjr-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Sr._and_Jr..png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/steven-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Steven.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/steven-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Steven.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/swimmerm-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/Swimmer.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/swimmerm-gen3rs.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Swimmer.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/swimmerf-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/Swimmer~F.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/swimmerf-gen3rs.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Swimmer~F.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/tabitha-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Tabitha.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/tabitha-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Tabitha.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/tateandliza-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Tate_and_Liza.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/tateandliza-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Tate_and_Liza.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/teamaquabeta-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Team_Aqua_Grunt-Beta.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/teamaquabeta-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Team_Aqua_Grunt-Beta.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/teamaquagruntm-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Team_Aqua_Grunt.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/teamaquagruntm-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Team_Aqua_Grunt.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/teamaquagruntf-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Team_Aqua_Grunt~F.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/teamaquagruntf-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Team_Aqua_Grunt~F.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/teammagmagruntm-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Team_Magma_Grunt.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/teammagmagruntm-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Team_Magma_Grunt.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/teammagmagruntf-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Team_Magma_Grunt~F.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/teammagmagruntf-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Team_Magma_Grunt~F.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/triathletebikerm-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Triathlete-Biker.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/triathletebikerm-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Triathlete-Biker.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/triathleterunnerm-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Triathlete-Runner.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/triathleterunnerm-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Triathlete-Runner.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/triathleteswimmerm-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Triathlete-Swimmer.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/triathleteswimmerm-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Triathlete-Swimmer.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/triathletebikerf-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Triathlete~F-Biker.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/triathletebikerf-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Triathlete~F-Biker.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/triathleterunnerf-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Triathlete~F-Runner.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/triathleterunnerf-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Triathlete~F-Runner.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/triathleteswimmerf-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Triathlete~F-Swimmer.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/triathleteswimmerf-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Triathlete~F-Swimmer.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/tuber-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Tuber.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/tuber-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Tuber.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/tuberf-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/Tuber~F.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/tuberf-gen3rs.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Tuber~F.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/twins-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/Twins.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/twins-gen3rs.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Twins.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/wallace-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/Wallace.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/wallace-gen3rs.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Wallace.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/wally-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Wally.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/wally-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Wally.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/wattson-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Wattson.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/wattson-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Wattson.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/winona-gen3.png b/src/canonical/trainers/gen3/ruby-sapphire/Winona.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/winona-gen3.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Winona.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/youngcouple-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/Young_Couple.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/youngcouple-gen3rs.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Young_Couple.png
diff --git a/src/canonical/trainers/gen3/ruby-sapphire/youngster-gen3rs.png b/src/canonical/trainers/gen3/ruby-sapphire/Youngster.png
similarity index 100%
rename from src/canonical/trainers/gen3/ruby-sapphire/youngster-gen3rs.png
rename to src/canonical/trainers/gen3/ruby-sapphire/Youngster.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/acetrainersnow.png b/src/canonical/trainers/gen4/diamond-pearl/Ace_Trainer-Snow.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/acetrainersnow.png
rename to src/canonical/trainers/gen4/diamond-pearl/Ace_Trainer-Snow.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/acetrainer-gen4dp.png b/src/canonical/trainers/gen4/diamond-pearl/Ace_Trainer.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/acetrainer-gen4dp.png
rename to src/canonical/trainers/gen4/diamond-pearl/Ace_Trainer.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/acetrainersnowf.png b/src/canonical/trainers/gen4/diamond-pearl/Ace_Trainer~F-Snow.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/acetrainersnowf.png
rename to src/canonical/trainers/gen4/diamond-pearl/Ace_Trainer~F-Snow.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/acetrainerf-gen4dp.png b/src/canonical/trainers/gen4/diamond-pearl/Ace_Trainer~F.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/acetrainerf-gen4dp.png
rename to src/canonical/trainers/gen4/diamond-pearl/Ace_Trainer~F.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/aromalady.png b/src/canonical/trainers/gen4/diamond-pearl/Aroma_Lady.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/aromalady.png
rename to src/canonical/trainers/gen4/diamond-pearl/Aroma_Lady.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/artist-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/Artist.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/artist-gen4.png
rename to src/canonical/trainers/gen4/diamond-pearl/Artist.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/battlegirl-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/Battle_Girl.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/battlegirl-gen4.png
rename to src/canonical/trainers/gen4/diamond-pearl/Battle_Girl.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/beauty-gen4dp.png b/src/canonical/trainers/gen4/diamond-pearl/Beauty.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/beauty-gen4dp.png
rename to src/canonical/trainers/gen4/diamond-pearl/Beauty.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/bellepa.png b/src/canonical/trainers/gen4/diamond-pearl/Belle___0026_Pa.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/bellepa.png
rename to src/canonical/trainers/gen4/diamond-pearl/Belle___0026_Pa.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/birdkeeper-gen4dp.png b/src/canonical/trainers/gen4/diamond-pearl/Bird_Keeper.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/birdkeeper-gen4dp.png
rename to src/canonical/trainers/gen4/diamond-pearl/Bird_Keeper.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/blackbelt-gen4dp.png b/src/canonical/trainers/gen4/diamond-pearl/Blackbelt.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/blackbelt-gen4dp.png
rename to src/canonical/trainers/gen4/diamond-pearl/Blackbelt.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/bugcatcher.png b/src/canonical/trainers/gen4/diamond-pearl/Bug_Catcher.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/bugcatcher.png
rename to src/canonical/trainers/gen4/diamond-pearl/Bug_Catcher.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/crasherwake.png b/src/canonical/trainers/gen4/diamond-pearl/Crasher_Wake.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/crasherwake.png
rename to src/canonical/trainers/gen4/diamond-pearl/Crasher_Wake.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/cyclist-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/Cyclist.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/cyclist-gen4.png
rename to src/canonical/trainers/gen4/diamond-pearl/Cyclist.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/cyclistf-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/Cyclist~F.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/cyclistf-gen4.png
rename to src/canonical/trainers/gen4/diamond-pearl/Cyclist~F.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/cynthia-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/Cynthia.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/cynthia-gen4.png
rename to src/canonical/trainers/gen4/diamond-pearl/Cynthia.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/doubleteam.png b/src/canonical/trainers/gen4/diamond-pearl/Double_Team.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/doubleteam.png
rename to src/canonical/trainers/gen4/diamond-pearl/Double_Team.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/dragontamer.png b/src/canonical/trainers/gen4/diamond-pearl/Dragon_Tamer.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/dragontamer.png
rename to src/canonical/trainers/gen4/diamond-pearl/Dragon_Tamer.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/fisherman-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/Fisherman.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/fisherman-gen4.png
rename to src/canonical/trainers/gen4/diamond-pearl/Fisherman.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/galacticgrunt.png b/src/canonical/trainers/gen4/diamond-pearl/Galactic_Grunt.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/galacticgrunt.png
rename to src/canonical/trainers/gen4/diamond-pearl/Galactic_Grunt.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/galacticgruntf.png b/src/canonical/trainers/gen4/diamond-pearl/Galactic_Grunt~F.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/galacticgruntf.png
rename to src/canonical/trainers/gen4/diamond-pearl/Galactic_Grunt~F.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/gentleman-gen4dp.png b/src/canonical/trainers/gen4/diamond-pearl/Gentleman.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/gentleman-gen4dp.png
rename to src/canonical/trainers/gen4/diamond-pearl/Gentleman.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/guitarist-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/Guitarist.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/guitarist-gen4.png
rename to src/canonical/trainers/gen4/diamond-pearl/Guitarist.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/hiker-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/Hiker.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/hiker-gen4.png
rename to src/canonical/trainers/gen4/diamond-pearl/Hiker.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/lady-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/Lady.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/lady-gen4.png
rename to src/canonical/trainers/gen4/diamond-pearl/Lady.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/lass-gen4dp.png b/src/canonical/trainers/gen4/diamond-pearl/Lass.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/lass-gen4dp.png
rename to src/canonical/trainers/gen4/diamond-pearl/Lass.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/ninjaboy.png b/src/canonical/trainers/gen4/diamond-pearl/Ninja_Boy.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/ninjaboy.png
rename to src/canonical/trainers/gen4/diamond-pearl/Ninja_Boy.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/gambler.png b/src/canonical/trainers/gen4/diamond-pearl/PI.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/gambler.png
rename to src/canonical/trainers/gen4/diamond-pearl/PI.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/parasollady-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/Parasol_Lady.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/parasollady-gen4.png
rename to src/canonical/trainers/gen4/diamond-pearl/Parasol_Lady.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/pokekid.png b/src/canonical/trainers/gen4/diamond-pearl/Poke__0301_Kid.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/pokekid.png
rename to src/canonical/trainers/gen4/diamond-pearl/Poke__0301_Kid.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/pokefan-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/Poke__0301fan.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/pokefan-gen4.png
rename to src/canonical/trainers/gen4/diamond-pearl/Poke__0301fan.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/pokefanf-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/Poke__0301fan~F.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/pokefanf-gen4.png
rename to src/canonical/trainers/gen4/diamond-pearl/Poke__0301fan~F.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/pokemonbreeder-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/Poke__0301mon_Breeder.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/pokemonbreeder-gen4.png
rename to src/canonical/trainers/gen4/diamond-pearl/Poke__0301mon_Breeder.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/pokemonbreederf-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/Poke__0301mon_Breeder~F.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/pokemonbreederf-gen4.png
rename to src/canonical/trainers/gen4/diamond-pearl/Poke__0301mon_Breeder~F.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/pokemonranger-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/Poke__0301mon_Ranger.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/pokemonranger-gen4.png
rename to src/canonical/trainers/gen4/diamond-pearl/Poke__0301mon_Ranger.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/pokemonrangerf-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/Poke__0301mon_Ranger~F.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/pokemonrangerf-gen4.png
rename to src/canonical/trainers/gen4/diamond-pearl/Poke__0301mon_Ranger~F.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/policeman-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/Policeman.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/policeman-gen4.png
rename to src/canonical/trainers/gen4/diamond-pearl/Policeman.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/psychic-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/Psychic.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/psychic-gen4.png
rename to src/canonical/trainers/gen4/diamond-pearl/Psychic.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/psychicf-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/Psychic~F.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/psychicf-gen4.png
rename to src/canonical/trainers/gen4/diamond-pearl/Psychic~F.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/richboy-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/Rich_Boy.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/richboy-gen4.png
rename to src/canonical/trainers/gen4/diamond-pearl/Rich_Boy.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/roughneck-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/Roughneck.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/roughneck-gen4.png
rename to src/canonical/trainers/gen4/diamond-pearl/Roughneck.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/ruinmaniac.png b/src/canonical/trainers/gen4/diamond-pearl/Ruin_Maniac.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/ruinmaniac.png
rename to src/canonical/trainers/gen4/diamond-pearl/Ruin_Maniac.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/schoolkid-gen4dp.png b/src/canonical/trainers/gen4/diamond-pearl/School_Kid.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/schoolkid-gen4dp.png
rename to src/canonical/trainers/gen4/diamond-pearl/School_Kid.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/schoolkidf-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/School_Kid~F.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/schoolkidf-gen4.png
rename to src/canonical/trainers/gen4/diamond-pearl/School_Kid~F.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/scientist-gen4dp.png b/src/canonical/trainers/gen4/diamond-pearl/Scientist.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/scientist-gen4dp.png
rename to src/canonical/trainers/gen4/diamond-pearl/Scientist.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/sisandbro.png b/src/canonical/trainers/gen4/diamond-pearl/Sis_and_Bro-Beta.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/sisandbro.png
rename to src/canonical/trainers/gen4/diamond-pearl/Sis_and_Bro-Beta.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/skierf-gen4dp.png b/src/canonical/trainers/gen4/diamond-pearl/Skier~F.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/skierf-gen4dp.png
rename to src/canonical/trainers/gen4/diamond-pearl/Skier~F.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/madame-gen4dp.png b/src/canonical/trainers/gen4/diamond-pearl/Socialite.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/madame-gen4dp.png
rename to src/canonical/trainers/gen4/diamond-pearl/Socialite.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/swimmer-gen4dp.png b/src/canonical/trainers/gen4/diamond-pearl/Swimmer.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/swimmer-gen4dp.png
rename to src/canonical/trainers/gen4/diamond-pearl/Swimmer.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/swimmerf-gen4dp.png b/src/canonical/trainers/gen4/diamond-pearl/Swimmer~F.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/swimmerf-gen4dp.png
rename to src/canonical/trainers/gen4/diamond-pearl/Swimmer~F.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/tuberf.png b/src/canonical/trainers/gen4/diamond-pearl/Tuber~F.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/tuberf.png
rename to src/canonical/trainers/gen4/diamond-pearl/Tuber~F.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/twins-gen4dp.png b/src/canonical/trainers/gen4/diamond-pearl/Twins.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/twins-gen4dp.png
rename to src/canonical/trainers/gen4/diamond-pearl/Twins.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/veteran-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/Veteran.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/veteran-gen4.png
rename to src/canonical/trainers/gen4/diamond-pearl/Veteran.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/waiter-gen4dp.png b/src/canonical/trainers/gen4/diamond-pearl/Waiter.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/waiter-gen4dp.png
rename to src/canonical/trainers/gen4/diamond-pearl/Waiter.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/waitress-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/Waitress.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/waitress-gen4.png
rename to src/canonical/trainers/gen4/diamond-pearl/Waitress.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/worker-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/Worker.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/worker-gen4.png
rename to src/canonical/trainers/gen4/diamond-pearl/Worker.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/youngcouple-gen4dp.png b/src/canonical/trainers/gen4/diamond-pearl/Young_Couple.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/youngcouple-gen4dp.png
rename to src/canonical/trainers/gen4/diamond-pearl/Young_Couple.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/youngster-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/Youngster.png
similarity index 100%
rename from src/canonical/trainers/gen4/diamond-pearl/youngster-gen4.png
rename to src/canonical/trainers/gen4/diamond-pearl/Youngster.png
diff --git a/src/canonical/trainers/gen4/diamond-pearl/madame-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/madame-gen4.png
deleted file mode 100644
index 2fcbccfae86f4fd1030aadb520503e25807089e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 556
zcmV+{0@MA8P)<h;3K|Lk000e1NJLTq000~S002w~0{{R3NnIyV0000mP)t-s0RR91
z002xqHNlcpfMraiL{$HFiOa#uR7^}gCM}7HfYy>_|I4mrHAL#_|E^_B&#}A+00001
zbW%=J06^y0W&i*Is!2paRCwBA7^(o!NqwNl0m48O{zf3`0{6dd2BiUkwCC=hv9|+w
zk%)5+Z*ty4M6N{h0v_0mq)MXk<3z6^=nso&Lk+4S8wq0h6*YUC#aOnf_#DgtvlV4t
zP-n#Ir<4c-1~&tYQvH0W8v;CDCb9YxsT7tPDv>S55-F96J_+N%lxi(?OyiMrNHpQc
zs0UJq8LOkLNKFZp+FGp@J?)yBf}kYyNL)h*p<$MKjK{QvS<b2{l><Rxs##Mky?eQ#
z=@r#5r|#UTG}A1}IVamCYV8|}KT-IX8k^>Y=w(C4U;CWlsrwY)P&@!bY)CWY4}L@8
zk1+G5Y#Hvj2ghHUId?%PKb~u++JHx_17W|)IUC9a^SndPDHn#}hFlm@wV7fuqPX6R
z-R=`*$Ihfc4cFU&10ur(vuZJfW;5?(LG;pNFPKE6E>omLhLPEE3j&MTa_4VkdO?%>
z(!h+D_Js_;$G6H!#P^WNhSzCpH>1uMnl>KB+Gziav^U;_HR{vG8}US18Kc!Frh!_C
u4@IdJ4=gAQxGIp!e0aacslSjqTkH$7gBF6<;kiu!0000<MNUMnLSTY$oAvwv

diff --git a/src/canonical/trainers/gen4/diamond-pearl/waiter-gen4.png b/src/canonical/trainers/gen4/diamond-pearl/waiter-gen4.png
deleted file mode 100644
index 67867341856d2cb64cfaace832256db14c2456a4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 635
zcmV->0)+jEP)<h;3K|Lk000e1NJLTq001rk002k`0{{R3zREX30000mP)t-s0RR9d
z8X80`CU!(70002il4bwPuC8TFWi>?BJw&dqxc~qEZf<r=Ol2k}Ej2Yn(<uJG00001
zbW%=J06^y0W&i*I`AI}URCwCO){TnhAPj}!njTvlHQxW-?g=8xmf49P?65CI1Rg{9
z@A0on=@TsHiBIq;f^9qlHuS<C_Vw~xS~j^XFR@P|Y0dUSB;d;nza-8BpVNGhV(t9Q
zSMst%oJr34x~|MGOHM}+@^xQ~OR;i96%lGiyumTC^Au`!UwP^qp=BT~<<5Ca(@V}z
z#;#TcP-<;^zU!HLt+u<1oPeMkb~HIZ^4?<)?Et2(6`|JNtzzm8ZqDmGYYVtJAB#uh
zq0Y6|&PVjR&Bp+F3$)r8+<6S=`u#R&ZE|xC`;G%Xyp6?C|GIqd9Z!AeF$R^vxhcaJ
zSQX`A=#!TVgPU1vZ|)dO-9w$1Qm$JoYuehM-X}j#fodt7uAueW<f?dUZe1$9Lc4PC
zofqf&Uk!K8l>ELgFW<ykt-XeKa_UO!x?>a$2jHCJk2hBoRXFy$8E-u7YhH-}Ok6RB
zu`$S%e({xQ<pYn?Kutf`;%^Vs8Gr+mTOX=z@mFAO*#=*|xzPrm+&zAh5A<&I&VeK3
zX7onxHs(NQ0QEL!Kg18);<h+;IQ`<oxdobRaiboHxGm1hKBwQ|REx9!&ezK5A!oKc
zMjt)o_|55K?)ro2X5_omky0{q<=*1|Ymt<kgU=EIE(}EEB77Tou(g)3#pA$U`WJ|P
VD-!wNF6{sS002ovPDHLkV1nW_F0%jt

diff --git a/src/canonical/trainers/gen4/heartgold-soulsilver/acetrainer-gen4.png b/src/canonical/trainers/gen4/heartgold-soulsilver/Ace_Trainer.png
similarity index 100%
rename from src/canonical/trainers/gen4/heartgold-soulsilver/acetrainer-gen4.png
rename to src/canonical/trainers/gen4/heartgold-soulsilver/Ace_Trainer.png
diff --git a/src/canonical/trainers/gen4/heartgold-soulsilver/acetrainerf-gen4.png b/src/canonical/trainers/gen4/heartgold-soulsilver/Ace_Trainer~F.png
similarity index 100%
rename from src/canonical/trainers/gen4/heartgold-soulsilver/acetrainerf-gen4.png
rename to src/canonical/trainers/gen4/heartgold-soulsilver/Ace_Trainer~F.png
diff --git a/src/canonical/trainers/gen4/heartgold-soulsilver/biker-gen4.png b/src/canonical/trainers/gen4/heartgold-soulsilver/Biker.png
similarity index 100%
rename from src/canonical/trainers/gen4/heartgold-soulsilver/biker-gen4.png
rename to src/canonical/trainers/gen4/heartgold-soulsilver/Biker.png
diff --git a/src/canonical/trainers/gen4/heartgold-soulsilver/birdkeeper.png b/src/canonical/trainers/gen4/heartgold-soulsilver/Bird_Keeper.png
similarity index 100%
rename from src/canonical/trainers/gen4/heartgold-soulsilver/birdkeeper.png
rename to src/canonical/trainers/gen4/heartgold-soulsilver/Bird_Keeper.png
diff --git a/src/canonical/trainers/gen4/heartgold-soulsilver/blackbelt-gen4.png b/src/canonical/trainers/gen4/heartgold-soulsilver/Blackbelt.png
similarity index 100%
rename from src/canonical/trainers/gen4/heartgold-soulsilver/blackbelt-gen4.png
rename to src/canonical/trainers/gen4/heartgold-soulsilver/Blackbelt.png
diff --git a/src/canonical/trainers/gen4/heartgold-soulsilver/acetrainercouple.png b/src/canonical/trainers/gen4/heartgold-soulsilver/Double_Team.png
similarity index 100%
rename from src/canonical/trainers/gen4/heartgold-soulsilver/acetrainercouple.png
rename to src/canonical/trainers/gen4/heartgold-soulsilver/Double_Team.png
diff --git a/src/canonical/trainers/gen4/heartgold-soulsilver/gentleman-gen4.png b/src/canonical/trainers/gen4/heartgold-soulsilver/Gentleman.png
similarity index 100%
rename from src/canonical/trainers/gen4/heartgold-soulsilver/gentleman-gen4.png
rename to src/canonical/trainers/gen4/heartgold-soulsilver/Gentleman.png
diff --git a/src/canonical/trainers/gen4/heartgold-soulsilver/kimonogirl.png b/src/canonical/trainers/gen4/heartgold-soulsilver/Kimono_Girl.png
similarity index 100%
rename from src/canonical/trainers/gen4/heartgold-soulsilver/kimonogirl.png
rename to src/canonical/trainers/gen4/heartgold-soulsilver/Kimono_Girl.png
diff --git a/src/canonical/trainers/gen4/heartgold-soulsilver/lass-gen4.png b/src/canonical/trainers/gen4/heartgold-soulsilver/Lass.png
similarity index 100%
rename from src/canonical/trainers/gen4/heartgold-soulsilver/lass-gen4.png
rename to src/canonical/trainers/gen4/heartgold-soulsilver/Lass.png
diff --git a/src/canonical/trainers/gen4/heartgold-soulsilver/ltsurge.png b/src/canonical/trainers/gen4/heartgold-soulsilver/Lt._Surge.png
similarity index 100%
rename from src/canonical/trainers/gen4/heartgold-soulsilver/ltsurge.png
rename to src/canonical/trainers/gen4/heartgold-soulsilver/Lt._Surge.png
diff --git a/src/canonical/trainers/gen4/heartgold-soulsilver/pokemaniac.png b/src/canonical/trainers/gen4/heartgold-soulsilver/Poke__0301_Maniac.png
similarity index 100%
rename from src/canonical/trainers/gen4/heartgold-soulsilver/pokemaniac.png
rename to src/canonical/trainers/gen4/heartgold-soulsilver/Poke__0301_Maniac.png
diff --git a/src/canonical/trainers/gen4/heartgold-soulsilver/rocketgrunt.png b/src/canonical/trainers/gen4/heartgold-soulsilver/Rocket_Grunt.png
similarity index 100%
rename from src/canonical/trainers/gen4/heartgold-soulsilver/rocketgrunt.png
rename to src/canonical/trainers/gen4/heartgold-soulsilver/Rocket_Grunt.png
diff --git a/src/canonical/trainers/gen4/heartgold-soulsilver/rocketgruntf.png b/src/canonical/trainers/gen4/heartgold-soulsilver/Rocket_Grunt~F.png
similarity index 100%
rename from src/canonical/trainers/gen4/heartgold-soulsilver/rocketgruntf.png
rename to src/canonical/trainers/gen4/heartgold-soulsilver/Rocket_Grunt~F.png
diff --git a/src/canonical/trainers/gen4/heartgold-soulsilver/schoolkid-gen4.png b/src/canonical/trainers/gen4/heartgold-soulsilver/School_Kid.png
similarity index 100%
rename from src/canonical/trainers/gen4/heartgold-soulsilver/schoolkid-gen4.png
rename to src/canonical/trainers/gen4/heartgold-soulsilver/School_Kid.png
diff --git a/src/canonical/trainers/gen4/heartgold-soulsilver/scientist-gen4.png b/src/canonical/trainers/gen4/heartgold-soulsilver/Scientist.png
similarity index 100%
rename from src/canonical/trainers/gen4/heartgold-soulsilver/scientist-gen4.png
rename to src/canonical/trainers/gen4/heartgold-soulsilver/Scientist.png
diff --git a/src/canonical/trainers/gen4/heartgold-soulsilver/skierf.png b/src/canonical/trainers/gen4/heartgold-soulsilver/Skier.png
similarity index 100%
rename from src/canonical/trainers/gen4/heartgold-soulsilver/skierf.png
rename to src/canonical/trainers/gen4/heartgold-soulsilver/Skier.png
diff --git a/src/canonical/trainers/gen4/heartgold-soulsilver/supernerd.png b/src/canonical/trainers/gen4/heartgold-soulsilver/Super_Nerd.png
similarity index 100%
rename from src/canonical/trainers/gen4/heartgold-soulsilver/supernerd.png
rename to src/canonical/trainers/gen4/heartgold-soulsilver/Super_Nerd.png
diff --git a/src/canonical/trainers/gen4/heartgold-soulsilver/swimmer-gen4.png b/src/canonical/trainers/gen4/heartgold-soulsilver/Swimmer.png
similarity index 100%
rename from src/canonical/trainers/gen4/heartgold-soulsilver/swimmer-gen4.png
rename to src/canonical/trainers/gen4/heartgold-soulsilver/Swimmer.png
diff --git a/src/canonical/trainers/gen4/heartgold-soulsilver/swimmerf-gen4.png b/src/canonical/trainers/gen4/heartgold-soulsilver/Swimmer~F.png
similarity index 100%
rename from src/canonical/trainers/gen4/heartgold-soulsilver/swimmerf-gen4.png
rename to src/canonical/trainers/gen4/heartgold-soulsilver/Swimmer~F.png
diff --git a/src/canonical/trainers/gen4/heartgold-soulsilver/twins-gen4.png b/src/canonical/trainers/gen4/heartgold-soulsilver/Twins.png
similarity index 100%
rename from src/canonical/trainers/gen4/heartgold-soulsilver/twins-gen4.png
rename to src/canonical/trainers/gen4/heartgold-soulsilver/Twins.png
diff --git a/src/canonical/trainers/gen4/heartgold-soulsilver/youngcouple.png b/src/canonical/trainers/gen4/heartgold-soulsilver/Young_Couple.png
similarity index 100%
rename from src/canonical/trainers/gen4/heartgold-soulsilver/youngcouple.png
rename to src/canonical/trainers/gen4/heartgold-soulsilver/Young_Couple.png
diff --git a/src/canonical/trainers/gen4/platinum/dawn-gen4pt.png b/src/canonical/trainers/gen4/platinum/Dawn.png
similarity index 100%
rename from src/canonical/trainers/gen4/platinum/dawn-gen4pt.png
rename to src/canonical/trainers/gen4/platinum/Dawn.png
diff --git a/src/canonical/trainers/gen4/platinum/lucas-gen4pt.png b/src/canonical/trainers/gen4/platinum/Lucas.png
similarity index 100%
rename from src/canonical/trainers/gen4/platinum/lucas-gen4pt.png
rename to src/canonical/trainers/gen4/platinum/Lucas.png
diff --git a/src/canonical/trainers/gen5/black-white/acetrainer.png b/src/canonical/trainers/gen5/black-white/Ace_Trainer.png
similarity index 100%
rename from src/canonical/trainers/gen5/black-white/acetrainer.png
rename to src/canonical/trainers/gen5/black-white/Ace_Trainer.png
diff --git a/src/canonical/trainers/gen5/black-white/acetrainerf.png b/src/canonical/trainers/gen5/black-white/Ace_Trainer~F.png
similarity index 100%
rename from src/canonical/trainers/gen5/black-white/acetrainerf.png
rename to src/canonical/trainers/gen5/black-white/Ace_Trainer~F.png
diff --git a/src/canonical/trainers/gen5/black-white/backersf.png b/src/canonical/trainers/gen5/black-white/Backers~F.png
similarity index 100%
rename from src/canonical/trainers/gen5/black-white/backersf.png
rename to src/canonical/trainers/gen5/black-white/Backers~F.png
diff --git a/src/canonical/trainers/gen5/black-white/backpackerf.png b/src/canonical/trainers/gen5/black-white/Backpacker~F.png
similarity index 100%
rename from src/canonical/trainers/gen5/black-white/backpackerf.png
rename to src/canonical/trainers/gen5/black-white/Backpacker~F.png
diff --git a/src/canonical/trainers/gen5/black-white/battlegirl.png b/src/canonical/trainers/gen5/black-white/Battle_Girl.png
similarity index 100%
rename from src/canonical/trainers/gen5/black-white/battlegirl.png
rename to src/canonical/trainers/gen5/black-white/Battle_Girl.png
diff --git a/src/canonical/trainers/gen5/black-white/clerk-boss.png b/src/canonical/trainers/gen5/black-white/Clerk-2.png
similarity index 100%
rename from src/canonical/trainers/gen5/black-white/clerk-boss.png
rename to src/canonical/trainers/gen5/black-white/Clerk-2.png
diff --git a/src/canonical/trainers/gen5/black-white/clerkf.png b/src/canonical/trainers/gen5/black-white/Clerk~F.png
similarity index 100%
rename from src/canonical/trainers/gen5/black-white/clerkf.png
rename to src/canonical/trainers/gen5/black-white/Clerk~F.png
diff --git a/src/canonical/trainers/gen5/black-white/cyclistf.png b/src/canonical/trainers/gen5/black-white/Cyclist~F.png
similarity index 100%
rename from src/canonical/trainers/gen5/black-white/cyclistf.png
rename to src/canonical/trainers/gen5/black-white/Cyclist~F.png
diff --git a/src/canonical/trainers/gen5/black-white/depotagent.png b/src/canonical/trainers/gen5/black-white/Depot_Agent.png
similarity index 100%
rename from src/canonical/trainers/gen5/black-white/depotagent.png
rename to src/canonical/trainers/gen5/black-white/Depot_Agent.png
diff --git a/src/canonical/trainers/gen5/black-white/ghetsis-gen5bw.png b/src/canonical/trainers/gen5/black-white/Ghetsis.png
similarity index 100%
rename from src/canonical/trainers/gen5/black-white/ghetsis-gen5bw.png
rename to src/canonical/trainers/gen5/black-white/Ghetsis.png
diff --git a/src/canonical/trainers/gen5/black-white/hilbert-dueldisk.png b/src/canonical/trainers/gen5/black-white/Hilbert-2.png
similarity index 100%
rename from src/canonical/trainers/gen5/black-white/hilbert-dueldisk.png
rename to src/canonical/trainers/gen5/black-white/Hilbert-2.png
diff --git a/src/canonical/trainers/gen5/black-white/hilda-dueldisk.png b/src/canonical/trainers/gen5/black-white/Hilda-2.png
similarity index 100%
rename from src/canonical/trainers/gen5/black-white/hilda-dueldisk.png
rename to src/canonical/trainers/gen5/black-white/Hilda-2.png
diff --git a/src/canonical/trainers/gen5/black-white/nurseryaide.png b/src/canonical/trainers/gen5/black-white/Nursery_Aide.png
similarity index 100%
rename from src/canonical/trainers/gen5/black-white/nurseryaide.png
rename to src/canonical/trainers/gen5/black-white/Nursery_Aide.png
diff --git a/src/canonical/trainers/gen5/black-white/parasollady.png b/src/canonical/trainers/gen5/black-white/Parasol_Lady.png
similarity index 100%
rename from src/canonical/trainers/gen5/black-white/parasollady.png
rename to src/canonical/trainers/gen5/black-white/Parasol_Lady.png
diff --git a/src/canonical/trainers/gen5/black-white/plasmagrunt-gen5bw.png b/src/canonical/trainers/gen5/black-white/Plasma_Grunt.png
similarity index 100%
rename from src/canonical/trainers/gen5/black-white/plasmagrunt-gen5bw.png
rename to src/canonical/trainers/gen5/black-white/Plasma_Grunt.png
diff --git a/src/canonical/trainers/gen5/black-white/plasmagruntf-gen5bw.png b/src/canonical/trainers/gen5/black-white/Plasma_Grunt~F.png
similarity index 100%
rename from src/canonical/trainers/gen5/black-white/plasmagruntf-gen5bw.png
rename to src/canonical/trainers/gen5/black-white/Plasma_Grunt~F.png
diff --git a/src/canonical/trainers/gen5/black-white/pokefan.png b/src/canonical/trainers/gen5/black-white/Poke__0301fan.png
similarity index 100%
rename from src/canonical/trainers/gen5/black-white/pokefan.png
rename to src/canonical/trainers/gen5/black-white/Poke__0301fan.png
diff --git a/src/canonical/trainers/gen5/black-white/pokefanf.png b/src/canonical/trainers/gen5/black-white/Poke__0301fan~F.png
similarity index 100%
rename from src/canonical/trainers/gen5/black-white/pokefanf.png
rename to src/canonical/trainers/gen5/black-white/Poke__0301fan~F.png
diff --git a/src/canonical/trainers/gen5/black-white/pokemonbreeder.png b/src/canonical/trainers/gen5/black-white/Poke__0301mon_Breeder.png
similarity index 100%
rename from src/canonical/trainers/gen5/black-white/pokemonbreeder.png
rename to src/canonical/trainers/gen5/black-white/Poke__0301mon_Breeder.png
diff --git a/src/canonical/trainers/gen5/black-white/pokemonbreederf.png b/src/canonical/trainers/gen5/black-white/Poke__0301mon_Breeder~F.png
similarity index 100%
rename from src/canonical/trainers/gen5/black-white/pokemonbreederf.png
rename to src/canonical/trainers/gen5/black-white/Poke__0301mon_Breeder~F.png
diff --git a/src/canonical/trainers/gen5/black-white/pokemonranger.png b/src/canonical/trainers/gen5/black-white/Poke__0301mon_Ranger.png
similarity index 100%
rename from src/canonical/trainers/gen5/black-white/pokemonranger.png
rename to src/canonical/trainers/gen5/black-white/Poke__0301mon_Ranger.png
diff --git a/src/canonical/trainers/gen5/black-white/pokemonrangerf.png b/src/canonical/trainers/gen5/black-white/Poke__0301mon_Ranger~F.png
similarity index 100%
rename from src/canonical/trainers/gen5/black-white/pokemonrangerf.png
rename to src/canonical/trainers/gen5/black-white/Poke__0301mon_Ranger~F.png
diff --git a/src/canonical/trainers/gen5/black-white/preschoolerf.png b/src/canonical/trainers/gen5/black-white/Preschooler~F.png
similarity index 100%
rename from src/canonical/trainers/gen5/black-white/preschoolerf.png
rename to src/canonical/trainers/gen5/black-white/Preschooler~F.png
diff --git a/src/canonical/trainers/gen5/black-white/psychicf.png b/src/canonical/trainers/gen5/black-white/Psychic~F.png
similarity index 100%
rename from src/canonical/trainers/gen5/black-white/psychicf.png
rename to src/canonical/trainers/gen5/black-white/Psychic~F.png
diff --git a/src/canonical/trainers/gen5/black-white/richboy.png b/src/canonical/trainers/gen5/black-white/Rich_Boy.png
similarity index 100%
rename from src/canonical/trainers/gen5/black-white/richboy.png
rename to src/canonical/trainers/gen5/black-white/Rich_Boy.png
diff --git a/src/canonical/trainers/gen5/black-white/schoolkid.png b/src/canonical/trainers/gen5/black-white/School_Kid.png
similarity index 100%
rename from src/canonical/trainers/gen5/black-white/schoolkid.png
rename to src/canonical/trainers/gen5/black-white/School_Kid.png
diff --git a/src/canonical/trainers/gen5/black-white/schoolkidf.png b/src/canonical/trainers/gen5/black-white/School_Kid~F.png
similarity index 100%
rename from src/canonical/trainers/gen5/black-white/schoolkidf.png
rename to src/canonical/trainers/gen5/black-white/School_Kid~F.png
diff --git a/src/canonical/trainers/gen5/black-white/scientistf.png b/src/canonical/trainers/gen5/black-white/Scientist~F.png
similarity index 100%
rename from src/canonical/trainers/gen5/black-white/scientistf.png
rename to src/canonical/trainers/gen5/black-white/Scientist~F.png
diff --git a/src/canonical/trainers/gen5/black-white/madame.png b/src/canonical/trainers/gen5/black-white/Socialite.png
similarity index 100%
rename from src/canonical/trainers/gen5/black-white/madame.png
rename to src/canonical/trainers/gen5/black-white/Socialite.png
diff --git a/src/canonical/trainers/gen5/black-white/swimmerf.png b/src/canonical/trainers/gen5/black-white/Swimmer~F.png
similarity index 100%
rename from src/canonical/trainers/gen5/black-white/swimmerf.png
rename to src/canonical/trainers/gen5/black-white/Swimmer~F.png
diff --git a/src/canonical/trainers/gen5/black-white/veteranf.png b/src/canonical/trainers/gen5/black-white/Veteran~F.png
similarity index 100%
rename from src/canonical/trainers/gen5/black-white/veteranf.png
rename to src/canonical/trainers/gen5/black-white/Veteran~F.png
diff --git a/src/canonical/trainers/gen5/black-white/workerice.png b/src/canonical/trainers/gen5/black-white/Worker-Snow.png
similarity index 100%
rename from src/canonical/trainers/gen5/black-white/workerice.png
rename to src/canonical/trainers/gen5/black-white/Worker-Snow.png
diff --git a/src/canonical/trainers/gen5/black2-white2/beauty-gen5bw2.png b/src/canonical/trainers/gen5/black2-white2/Beauty.png
similarity index 100%
rename from src/canonical/trainers/gen5/black2-white2/beauty-gen5bw2.png
rename to src/canonical/trainers/gen5/black2-white2/Beauty.png
diff --git a/src/canonical/trainers/gen5/black2-white2/bianca-pwt.png b/src/canonical/trainers/gen5/black2-white2/Bianca.png
similarity index 100%
rename from src/canonical/trainers/gen5/black2-white2/bianca-pwt.png
rename to src/canonical/trainers/gen5/black2-white2/Bianca.png
diff --git a/src/canonical/trainers/gen5/black2-white2/cheren-gen5bw2.png b/src/canonical/trainers/gen5/black2-white2/Cheren.png
similarity index 100%
rename from src/canonical/trainers/gen5/black2-white2/cheren-gen5bw2.png
rename to src/canonical/trainers/gen5/black2-white2/Cheren.png
diff --git a/src/canonical/trainers/gen5/black2-white2/elesa-gen5bw2.png b/src/canonical/trainers/gen5/black2-white2/Elesa.png
similarity index 100%
rename from src/canonical/trainers/gen5/black2-white2/elesa-gen5bw2.png
rename to src/canonical/trainers/gen5/black2-white2/Elesa.png
diff --git a/src/canonical/trainers/gen5/black2-white2/iris-gen5bw2.png b/src/canonical/trainers/gen5/black2-white2/Iris.png
similarity index 100%
rename from src/canonical/trainers/gen5/black2-white2/iris-gen5bw2.png
rename to src/canonical/trainers/gen5/black2-white2/Iris.png
diff --git a/src/canonical/trainers/gen5/black2-white2/nate-dueldisk.png b/src/canonical/trainers/gen5/black2-white2/Nate-2.png
similarity index 100%
rename from src/canonical/trainers/gen5/black2-white2/nate-dueldisk.png
rename to src/canonical/trainers/gen5/black2-white2/Nate-2.png
diff --git a/src/canonical/trainers/gen5/black2-white2/plasmagrunt.png b/src/canonical/trainers/gen5/black2-white2/Plasma_Grunt.png
similarity index 100%
rename from src/canonical/trainers/gen5/black2-white2/plasmagrunt.png
rename to src/canonical/trainers/gen5/black2-white2/Plasma_Grunt.png
diff --git a/src/canonical/trainers/gen5/black2-white2/plasmagruntf.png b/src/canonical/trainers/gen5/black2-white2/Plasma_Grunt~F.png
similarity index 100%
rename from src/canonical/trainers/gen5/black2-white2/plasmagruntf.png
rename to src/canonical/trainers/gen5/black2-white2/Plasma_Grunt~F.png
diff --git a/src/canonical/trainers/gen5/black2-white2/rosa-dueldisk.png b/src/canonical/trainers/gen5/black2-white2/Rosa-2.png
similarity index 100%
rename from src/canonical/trainers/gen5/black2-white2/rosa-dueldisk.png
rename to src/canonical/trainers/gen5/black2-white2/Rosa-2.png
diff --git a/src/canonical/trainers/gen5/black2-white2/shadowtriad.png b/src/canonical/trainers/gen5/black2-white2/Shadow_Triad.png
similarity index 100%
rename from src/canonical/trainers/gen5/black2-white2/shadowtriad.png
rename to src/canonical/trainers/gen5/black2-white2/Shadow_Triad.png
diff --git a/src/noncanonical/trainers/gen5/black-white/youngn.png b/src/noncanonical/trainers/gen5/black-white/N-Young.png
similarity index 100%
rename from src/noncanonical/trainers/gen5/black-white/youngn.png
rename to src/noncanonical/trainers/gen5/black-white/N-Young.png
diff --git a/src/noncanonical/trainers/gen6/omegaruby-alphasapphire/brawly-gen6.png b/src/noncanonical/trainers/gen6/omegaruby-alphasapphire/Brawly.png
similarity index 100%
rename from src/noncanonical/trainers/gen6/omegaruby-alphasapphire/brawly-gen6.png
rename to src/noncanonical/trainers/gen6/omegaruby-alphasapphire/Brawly.png
diff --git a/src/noncanonical/trainers/gen6/omegaruby-alphasapphire/wallace-gen6.png b/src/noncanonical/trainers/gen6/omegaruby-alphasapphire/Wallace.png
similarity index 100%
rename from src/noncanonical/trainers/gen6/omegaruby-alphasapphire/wallace-gen6.png
rename to src/noncanonical/trainers/gen6/omegaruby-alphasapphire/Wallace.png
diff --git a/src/noncanonical/trainers/gen6/omegaruby-alphasapphire/winona-gen6.png b/src/noncanonical/trainers/gen6/omegaruby-alphasapphire/Winona.png
similarity index 100%
rename from src/noncanonical/trainers/gen6/omegaruby-alphasapphire/winona-gen6.png
rename to src/noncanonical/trainers/gen6/omegaruby-alphasapphire/Winona.png
diff --git a/src/noncanonical/trainers/gen6/x-y/furisodegirl-black.png b/src/noncanonical/trainers/gen6/x-y/Furisode_Girl-Black.png
similarity index 100%
rename from src/noncanonical/trainers/gen6/x-y/furisodegirl-black.png
rename to src/noncanonical/trainers/gen6/x-y/Furisode_Girl-Black.png
diff --git a/src/noncanonical/trainers/gen6/x-y/furisodegirl-pink.png b/src/noncanonical/trainers/gen6/x-y/Furisode_Girl-Pink.png
similarity index 100%
rename from src/noncanonical/trainers/gen6/x-y/furisodegirl-pink.png
rename to src/noncanonical/trainers/gen6/x-y/Furisode_Girl-Pink.png
diff --git a/src/noncanonical/trainers/gen7/sun-moon/aetherfoundation.png b/src/noncanonical/trainers/gen7/sun-moon/Aether_Foundation.png
similarity index 100%
rename from src/noncanonical/trainers/gen7/sun-moon/aetherfoundation.png
rename to src/noncanonical/trainers/gen7/sun-moon/Aether_Foundation.png
diff --git a/src/noncanonical/trainers/gen7/sun-moon/aetheremployee.png b/src/noncanonical/trainers/gen7/sun-moon/Aether_Foundation_Employee.png
similarity index 100%
rename from src/noncanonical/trainers/gen7/sun-moon/aetheremployee.png
rename to src/noncanonical/trainers/gen7/sun-moon/Aether_Foundation_Employee.png
diff --git a/src/noncanonical/trainers/gen7/sun-moon/aetheremployeef.png b/src/noncanonical/trainers/gen7/sun-moon/Aether_Foundation_Employee~F.png
similarity index 100%
rename from src/noncanonical/trainers/gen7/sun-moon/aetheremployeef.png
rename to src/noncanonical/trainers/gen7/sun-moon/Aether_Foundation_Employee~F.png
diff --git a/src/noncanonical/trainers/gen7/sun-moon/aetherfoundationf.png b/src/noncanonical/trainers/gen7/sun-moon/Aether_Foundation~F.png
similarity index 100%
rename from src/noncanonical/trainers/gen7/sun-moon/aetherfoundationf.png
rename to src/noncanonical/trainers/gen7/sun-moon/Aether_Foundation~F.png
diff --git a/src/noncanonical/trainers/gen7/sun-moon/beauty-gen7.png b/src/noncanonical/trainers/gen7/sun-moon/Beauty.png
similarity index 100%
rename from src/noncanonical/trainers/gen7/sun-moon/beauty-gen7.png
rename to src/noncanonical/trainers/gen7/sun-moon/Beauty.png
diff --git a/src/noncanonical/trainers/gen7/sun-moon/blue-gen7.png b/src/noncanonical/trainers/gen7/sun-moon/Blue.png
similarity index 100%
rename from src/noncanonical/trainers/gen7/sun-moon/blue-gen7.png
rename to src/noncanonical/trainers/gen7/sun-moon/Blue.png
diff --git a/src/noncanonical/trainers/gen7/sun-moon/colress-gen7.png b/src/noncanonical/trainers/gen7/sun-moon/Colress.png
similarity index 100%
rename from src/noncanonical/trainers/gen7/sun-moon/colress-gen7.png
rename to src/noncanonical/trainers/gen7/sun-moon/Colress.png
diff --git a/src/noncanonical/trainers/gen7/sun-moon/gladion-stance.png b/src/noncanonical/trainers/gen7/sun-moon/Gladion-2.png
similarity index 100%
rename from src/noncanonical/trainers/gen7/sun-moon/gladion-stance.png
rename to src/noncanonical/trainers/gen7/sun-moon/Gladion-2.png
diff --git a/src/noncanonical/trainers/gen7/sun-moon/grimsley-gen7.png b/src/noncanonical/trainers/gen7/sun-moon/Grimsley.png
similarity index 100%
rename from src/noncanonical/trainers/gen7/sun-moon/grimsley-gen7.png
rename to src/noncanonical/trainers/gen7/sun-moon/Grimsley.png
diff --git a/src/noncanonical/trainers/gen7/sun-moon/hau-stance.png b/src/noncanonical/trainers/gen7/sun-moon/Hau-2.png
similarity index 100%
rename from src/noncanonical/trainers/gen7/sun-moon/hau-stance.png
rename to src/noncanonical/trainers/gen7/sun-moon/Hau-2.png
diff --git a/src/noncanonical/trainers/gen7/sun-moon/hiker-gen7.png b/src/noncanonical/trainers/gen7/sun-moon/Hiker.png
similarity index 100%
rename from src/noncanonical/trainers/gen7/sun-moon/hiker-gen7.png
rename to src/noncanonical/trainers/gen7/sun-moon/Hiker.png
diff --git a/src/noncanonical/trainers/gen7/sun-moon/kukui-stand.png b/src/noncanonical/trainers/gen7/sun-moon/Kukui-2.png
similarity index 100%
rename from src/noncanonical/trainers/gen7/sun-moon/kukui-stand.png
rename to src/noncanonical/trainers/gen7/sun-moon/Kukui-2.png
diff --git a/src/noncanonical/trainers/gen7/sun-moon/lass-gen7.png b/src/noncanonical/trainers/gen7/sun-moon/Lass.png
similarity index 100%
rename from src/noncanonical/trainers/gen7/sun-moon/lass-gen7.png
rename to src/noncanonical/trainers/gen7/sun-moon/Lass.png
diff --git a/src/noncanonical/trainers/gen7/sun-moon/lillie-z.png b/src/noncanonical/trainers/gen7/sun-moon/Lillie-2.png
similarity index 100%
rename from src/noncanonical/trainers/gen7/sun-moon/lillie-z.png
rename to src/noncanonical/trainers/gen7/sun-moon/Lillie-2.png
diff --git a/src/noncanonical/trainers/gen7/sun-moon/lusamine-nihilego.png b/src/noncanonical/trainers/gen7/sun-moon/Lusamine-2.png
similarity index 100%
rename from src/noncanonical/trainers/gen7/sun-moon/lusamine-nihilego.png
rename to src/noncanonical/trainers/gen7/sun-moon/Lusamine-2.png
diff --git a/src/noncanonical/trainers/gen7/sun-moon/theroyal.png b/src/noncanonical/trainers/gen7/sun-moon/Masked_Royal.png
similarity index 100%
rename from src/noncanonical/trainers/gen7/sun-moon/theroyal.png
rename to src/noncanonical/trainers/gen7/sun-moon/Masked_Royal.png
diff --git a/src/noncanonical/trainers/gen7/sun-moon/officeworker.png b/src/noncanonical/trainers/gen7/sun-moon/Office_Worker.png
similarity index 100%
rename from src/noncanonical/trainers/gen7/sun-moon/officeworker.png
rename to src/noncanonical/trainers/gen7/sun-moon/Office_Worker.png
diff --git a/src/noncanonical/trainers/gen7/sun-moon/pokemonbreeder-gen7.png b/src/noncanonical/trainers/gen7/sun-moon/Poke__0301mon_Breeder.png
similarity index 100%
rename from src/noncanonical/trainers/gen7/sun-moon/pokemonbreeder-gen7.png
rename to src/noncanonical/trainers/gen7/sun-moon/Poke__0301mon_Breeder.png
diff --git a/src/noncanonical/trainers/gen7/sun-moon/pokemonbreederf-gen7.png b/src/noncanonical/trainers/gen7/sun-moon/Poke__0301mon_Breeder~F.png
similarity index 100%
rename from src/noncanonical/trainers/gen7/sun-moon/pokemonbreederf-gen7.png
rename to src/noncanonical/trainers/gen7/sun-moon/Poke__0301mon_Breeder~F.png
diff --git a/src/noncanonical/trainers/gen7/sun-moon/red-gen7.png b/src/noncanonical/trainers/gen7/sun-moon/Red.png
similarity index 100%
rename from src/noncanonical/trainers/gen7/sun-moon/red-gen7.png
rename to src/noncanonical/trainers/gen7/sun-moon/Red.png
diff --git a/src/noncanonical/trainers/gen7/sun-moon/risingstar.png b/src/noncanonical/trainers/gen7/sun-moon/Rising_Star.png
similarity index 100%
rename from src/noncanonical/trainers/gen7/sun-moon/risingstar.png
rename to src/noncanonical/trainers/gen7/sun-moon/Rising_Star.png
diff --git a/src/noncanonical/trainers/gen7/sun-moon/risingstarf.png b/src/noncanonical/trainers/gen7/sun-moon/Rising_Star~F.png
similarity index 100%
rename from src/noncanonical/trainers/gen7/sun-moon/risingstarf.png
rename to src/noncanonical/trainers/gen7/sun-moon/Rising_Star~F.png
diff --git a/src/noncanonical/trainers/gen7/sun-moon/samsonoak.png b/src/noncanonical/trainers/gen7/sun-moon/Samson_Oak.png
similarity index 100%
rename from src/noncanonical/trainers/gen7/sun-moon/samsonoak.png
rename to src/noncanonical/trainers/gen7/sun-moon/Samson_Oak.png
diff --git a/src/noncanonical/trainers/gen7/sun-moon/teacher-gen7.png b/src/noncanonical/trainers/gen7/sun-moon/Teacher.png
similarity index 100%
rename from src/noncanonical/trainers/gen7/sun-moon/teacher-gen7.png
rename to src/noncanonical/trainers/gen7/sun-moon/Teacher.png
diff --git a/src/noncanonical/trainers/gen7/sun-moon/youngathlete.png b/src/noncanonical/trainers/gen7/sun-moon/Young_Athlete.png
similarity index 100%
rename from src/noncanonical/trainers/gen7/sun-moon/youngathlete.png
rename to src/noncanonical/trainers/gen7/sun-moon/Young_Athlete.png
diff --git a/src/noncanonical/trainers/gen7/sun-moon/youngathletef.png b/src/noncanonical/trainers/gen7/sun-moon/Young_Athlete~F.png
similarity index 100%
rename from src/noncanonical/trainers/gen7/sun-moon/youngathletef.png
rename to src/noncanonical/trainers/gen7/sun-moon/Young_Athlete~F.png
diff --git a/src/noncanonical/trainers/gen7/sun-moon/youngster-gen7.png b/src/noncanonical/trainers/gen7/sun-moon/Youngster.png
similarity index 100%
rename from src/noncanonical/trainers/gen7/sun-moon/youngster-gen7.png
rename to src/noncanonical/trainers/gen7/sun-moon/Youngster.png
diff --git a/src/noncanonical/trainers/misc/ash-capbackward.png b/src/noncanonical/trainers/misc/Ash-Cap_Backward.png
similarity index 100%
rename from src/noncanonical/trainers/misc/ash-capbackward.png
rename to src/noncanonical/trainers/misc/Ash-Cap_Backward.png
diff --git a/src/noncanonical/trainers/misc/teamrocket.png b/src/noncanonical/trainers/misc/Team_Rocket.png
similarity index 100%
rename from src/noncanonical/trainers/misc/teamrocket.png
rename to src/noncanonical/trainers/misc/Team_Rocket.png
diff --git a/src/noncanonical/trainers/misc/unknownf.png b/src/noncanonical/trainers/misc/Unknown~F.png
similarity index 100%
rename from src/noncanonical/trainers/misc/unknownf.png
rename to src/noncanonical/trainers/misc/Unknown~F.png