diff --git a/PBS/btpokemon.txt b/PBS/battle_tower_pokemon.txt
similarity index 100%
rename from PBS/btpokemon.txt
rename to PBS/battle_tower_pokemon.txt
diff --git a/PBS/bttrainers.txt b/PBS/battle_tower_trainers.txt
similarity index 100%
rename from PBS/bttrainers.txt
rename to PBS/battle_tower_trainers.txt
diff --git a/PBS/fancycuppm.txt b/PBS/cup_fancy_pkmn.txt
similarity index 100%
rename from PBS/fancycuppm.txt
rename to PBS/cup_fancy_pkmn.txt
diff --git a/PBS/fancycupsinglepm.txt b/PBS/cup_fancy_pkmn_single.txt
similarity index 100%
rename from PBS/fancycupsinglepm.txt
rename to PBS/cup_fancy_pkmn_single.txt
diff --git a/PBS/fancycuptr.txt b/PBS/cup_fancy_trainers.txt
similarity index 100%
rename from PBS/fancycuptr.txt
rename to PBS/cup_fancy_trainers.txt
diff --git a/PBS/fancycupsingletr.txt b/PBS/cup_fancy_trainers_single.txt
similarity index 100%
rename from PBS/fancycupsingletr.txt
rename to PBS/cup_fancy_trainers_single.txt
diff --git a/PBS/littlecuppm.txt b/PBS/cup_little_pkmn.txt
similarity index 100%
rename from PBS/littlecuppm.txt
rename to PBS/cup_little_pkmn.txt
diff --git a/PBS/littlecuptr.txt b/PBS/cup_little_trainers.txt
similarity index 100%
rename from PBS/littlecuptr.txt
rename to PBS/cup_little_trainers.txt
diff --git a/PBS/pikacuppm.txt b/PBS/cup_pika_pkmn.txt
similarity index 100%
rename from PBS/pikacuppm.txt
rename to PBS/cup_pika_pkmn.txt
diff --git a/PBS/pikacuptr.txt b/PBS/cup_pika_trainers.txt
similarity index 100%
rename from PBS/pikacuptr.txt
rename to PBS/cup_pika_trainers.txt
diff --git a/PBS/pokecuppm.txt b/PBS/cup_poke_pkmn.txt
similarity index 100%
rename from PBS/pokecuppm.txt
rename to PBS/cup_poke_pkmn.txt
diff --git a/PBS/pokecuptr.txt b/PBS/cup_poke_trainers.txt
similarity index 100%
rename from PBS/pokecuptr.txt
rename to PBS/cup_poke_trainers.txt
diff --git a/PBS/trainerlists.txt b/PBS/trainerlists.txt
index 97b6d4378..ac398e824 100644
--- a/PBS/trainerlists.txt
+++ b/PBS/trainerlists.txt
@@ -1,25 +1,25 @@
 # See the documentation on the wiki to learn how to edit this file.
 #-------------------------------
 [DefaultTrainerList]
-Trainers = bttrainers.txt
-Pokemon = btpokemon.txt
+Trainers = battle_tower_trainers.txt
+Pokemon = battle_tower_pokemon.txt
 #-------------------------------
 [TrainerList]
-Trainers = pokecuptr.txt
-Pokemon = pokecuppm.txt
+Trainers = cup_poke_trainers.txt
+Pokemon = cup_poke_pkmn.txt
 Challenges = pokecupsingle,pokecupdouble
 #-------------------------------
 [TrainerList]
-Trainers = littlecuptr.txt
-Pokemon = littlecuppm.txt
+Trainers = cup_little_trainers.txt
+Pokemon = cup_little_pkmn.txt
 Challenges = littlecupsingle,littlecupdouble
 #-------------------------------
 [TrainerList]
-Trainers = pikacuptr.txt
-Pokemon = pikacuppm.txt
+Trainers = cup_pika_trainers.txt
+Pokemon = cup_pika_pkmn.txt
 Challenges = pikacupsingle,pikacupdouble
 #-------------------------------
 [TrainerList]
-Trainers = fancycupsingletr.txt
-Pokemon = fancycupsinglepm.txt
+Trainers = cup_fancy_trainers_single.txt
+Pokemon = cup_fancy_pkmn_single.txt
 Challenges = fancycupsingle,fancycupdouble