add more consistent names

12 files changed, 360 insertions, 360 deletions

diff --git a/data/battle_frontier/battle_frontier_trainers.inc b/data/battle_frontier/battle_frontier_trainers.inc
index 034c1b62c..8b05d88eb 100644
--- a/data/battle_frontier/battle_frontier_trainers.inc
+++ b/data/battle_frontier/battle_frontier_trainers.inc
@@ -625,7 +625,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Lauren
 
 @ 24
-	.4byte FACILITY_CLASS_TUBER_2
+	.4byte FACILITY_CLASS_TUBER_M
 	.string "KIPP$", 8
 @ pre-battle speech
 	.2byte EC_WORD_IF_I_WIN
@@ -651,7 +651,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Kipp
 
 @ 25
-	.4byte FACILITY_CLASS_TUBER_2
+	.4byte FACILITY_CLASS_TUBER_M
 	.string "JASON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_TEACH
@@ -677,7 +677,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Jason
 
 @ 26
-	.4byte FACILITY_CLASS_TUBER_2
+	.4byte FACILITY_CLASS_TUBER_M
 	.string "JOHN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM
@@ -703,7 +703,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_John
 
 @ 27
-	.4byte FACILITY_CLASS_TUBER_1
+	.4byte FACILITY_CLASS_TUBER_F
 	.string "ANN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_IT_S
@@ -729,7 +729,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Ann
 
 @ 28
-	.4byte FACILITY_CLASS_TUBER_1
+	.4byte FACILITY_CLASS_TUBER_F
 	.string "EILEEN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_LET_S
@@ -755,7 +755,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Eileen
 
 @ 29
-	.4byte FACILITY_CLASS_TUBER_1
+	.4byte FACILITY_CLASS_TUBER_F
 	.string "CARLIE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_MY
@@ -937,7 +937,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Kathy
 
 @ 36
-	.4byte FACILITY_CLASS_POKEFAN_1
+	.4byte FACILITY_CLASS_POKEFAN_M
 	.string "PEYTON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM
@@ -963,7 +963,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Peyton
 
 @ 37
-	.4byte FACILITY_CLASS_POKEFAN_1
+	.4byte FACILITY_CLASS_POKEFAN_M
 	.string "JULIAN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_YOU
@@ -989,7 +989,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Julian
 
 @ 38
-	.4byte FACILITY_CLASS_POKEFAN_1
+	.4byte FACILITY_CLASS_POKEFAN_M
 	.string "QUINN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_MY
@@ -1015,7 +1015,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Quinn
 
 @ 39
-	.4byte FACILITY_CLASS_POKEFAN_2
+	.4byte FACILITY_CLASS_POKEFAN_F
 	.string "HAYLEE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -1041,7 +1041,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Haylee
 
 @ 40
-	.4byte FACILITY_CLASS_POKEFAN_2
+	.4byte FACILITY_CLASS_POKEFAN_F
 	.string "AMANDA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -1067,7 +1067,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Amanda
 
 @ 41
-	.4byte FACILITY_CLASS_POKEFAN_2
+	.4byte FACILITY_CLASS_POKEFAN_F
 	.string "STACY$", 8
 @ pre-battle speech
 	.2byte EC_WORD_ALL
@@ -1093,7 +1093,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Stacy
 
 @ 42
-	.4byte FACILITY_CLASS_PKMN_BREEDER_2
+	.4byte FACILITY_CLASS_PKMN_BREEDER_M
 	.string "RAFAEL$", 8
 @ pre-battle speech
 	.2byte EC_WORD_COME_ON
@@ -1119,7 +1119,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Rafael
 
 @ 43
-	.4byte FACILITY_CLASS_PKMN_BREEDER_2
+	.4byte FACILITY_CLASS_PKMN_BREEDER_M
 	.string "OLIVER$", 8
 @ pre-battle speech
 	.2byte EC_WORD_A
@@ -1145,7 +1145,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Oliver
 
 @ 44
-	.4byte FACILITY_CLASS_PKMN_BREEDER_2
+	.4byte FACILITY_CLASS_PKMN_BREEDER_M
 	.string "PAYTON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -1171,7 +1171,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Payton
 
 @ 45
-	.4byte FACILITY_CLASS_PKMN_BREEDER_1
+	.4byte FACILITY_CLASS_POKEMON_BREEDER_F
 	.string "PAMELA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_ALL
@@ -1197,7 +1197,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Pamela
 
 @ 46
-	.4byte FACILITY_CLASS_PKMN_BREEDER_1
+	.4byte FACILITY_CLASS_POKEMON_BREEDER_F
 	.string "ELIZA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -1223,7 +1223,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Eliza
 
 @ 47
-	.4byte FACILITY_CLASS_PKMN_BREEDER_1
+	.4byte FACILITY_CLASS_POKEMON_BREEDER_F
 	.string "MARISA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -2341,7 +2341,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Nash
 
 @ 90
-	.4byte FACILITY_CLASS_TRIATHLETE_3
+	.4byte FACILITY_CLASS_RUNNING_TRIATHLETE_M
 	.string "ROBBY$", 8
 @ pre-battle speech
 	.2byte EC_WORD_HAHAHA
@@ -2367,7 +2367,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Robby
 
 @ 91
-	.4byte FACILITY_CLASS_TRIATHLETE_3
+	.4byte FACILITY_CLASS_RUNNING_TRIATHLETE_M
 	.string "REECE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_MY
@@ -2393,7 +2393,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Reece
 
 @ 92
-	.4byte FACILITY_CLASS_TRIATHLETE_4
+	.4byte FACILITY_CLASS_RUNNING_TRIATHLETE_F
 	.string "KATHRYN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -2419,7 +2419,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Kathryn
 
 @ 93
-	.4byte FACILITY_CLASS_TRIATHLETE_4
+	.4byte FACILITY_CLASS_RUNNING_TRIATHLETE_F
 	.string "ELLEN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_CRUSH
@@ -2445,7 +2445,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Ellen
 
 @ 94
-	.4byte FACILITY_CLASS_TRIATHLETE_5
+	.4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_M
 	.string "RAMON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_OKAY
@@ -2471,7 +2471,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Ramon
 
 @ 95
-	.4byte FACILITY_CLASS_TRIATHLETE_5
+	.4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_M
 	.string "ARTHUR$", 8
 @ pre-battle speech
 	.2byte EC_WORD_HERE_I_COME
@@ -2497,7 +2497,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Arthur
 
 @ 96
-	.4byte FACILITY_CLASS_TRIATHLETE_6
+	.4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_F
 	.string "ALONDRA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_EVERY
@@ -2523,7 +2523,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Alondra
 
 @ 97
-	.4byte FACILITY_CLASS_TRIATHLETE_6
+	.4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_F
 	.string "ADRIANA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_COME
@@ -2549,7 +2549,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Adriana
 
 @ 98
-	.4byte FACILITY_CLASS_TRIATHLETE_1
+	.4byte FACILITY_CLASS_CYCLING_TRIATHLETE_M
 	.string "MALIK$", 8
 @ pre-battle speech
 	.2byte EC_WORD_OH
@@ -2575,7 +2575,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Malik
 
 @ 99
-	.4byte FACILITY_CLASS_TRIATHLETE_2
+	.4byte FACILITY_CLASS_CYCLING_TRIATHLETE_F
 	.string "JILL$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM
@@ -2601,7 +2601,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Jill
 
 @ 100
-	.4byte FACILITY_CLASS_TRIATHLETE_3
+	.4byte FACILITY_CLASS_RUNNING_TRIATHLETE_M
 	.string "ERIK$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM
@@ -2627,7 +2627,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Erik
 
 @ 101
-	.4byte FACILITY_CLASS_TRIATHLETE_4
+	.4byte FACILITY_CLASS_RUNNING_TRIATHLETE_F
 	.string "YAZMIN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -2653,7 +2653,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Yazmin
 
 @ 102
-	.4byte FACILITY_CLASS_TRIATHLETE_5
+	.4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_M
 	.string "JAMAL$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM
@@ -2679,7 +2679,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Jamal
 
 @ 103
-	.4byte FACILITY_CLASS_TRIATHLETE_6
+	.4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_F
 	.string "LESLIE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM
@@ -2705,7 +2705,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Leslie
 
 @ 104
-	.4byte FACILITY_CLASS_TRIATHLETE_1
+	.4byte FACILITY_CLASS_CYCLING_TRIATHLETE_M
 	.string "DAVE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_WHAT
@@ -2731,7 +2731,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Dave
 
 @ 105
-	.4byte FACILITY_CLASS_TRIATHLETE_1
+	.4byte FACILITY_CLASS_CYCLING_TRIATHLETE_M
 	.string "CARLO$", 8
 @ pre-battle speech
 	.2byte EC_WORD_HAH
@@ -2757,7 +2757,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Carlo
 
 @ 106
-	.4byte FACILITY_CLASS_TRIATHLETE_2
+	.4byte FACILITY_CLASS_CYCLING_TRIATHLETE_F
 	.string "EMILIA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_ME
@@ -2783,7 +2783,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Emilia
 
 @ 107
-	.4byte FACILITY_CLASS_TRIATHLETE_2
+	.4byte FACILITY_CLASS_CYCLING_TRIATHLETE_F
 	.string "DALIA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_MY
@@ -3043,7 +3043,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Joel
 
 @ 117
-	.4byte FACILITY_CLASS_EXPERT_2
+	.4byte FACILITY_CLASS_EXPERT_F
 	.string "KRISTEN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_HAHAHA
@@ -3069,7 +3069,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Kristen
 
 @ 118
-	.4byte FACILITY_CLASS_EXPERT_2
+	.4byte FACILITY_CLASS_EXPERT_F
 	.string "SELPHY$", 8
 @ pre-battle speech
 	.2byte EC_WORD_HUH_QUES
@@ -3095,7 +3095,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Selphy
 
 @ 119
-	.4byte FACILITY_CLASS_EXPERT_2
+	.4byte FACILITY_CLASS_EXPERT_F
 	.string "CHLOE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_COME
@@ -4057,7 +4057,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Graham
 
 @ 156
-	.4byte FACILITY_CLASS_POKEFAN_1
+	.4byte FACILITY_CLASS_POKEFAN_M
 	.string "TYLOR$", 8
 @ pre-battle speech
 	.2byte EC_WORD_ARE
@@ -4083,7 +4083,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Tylor
 
 @ 157
-	.4byte FACILITY_CLASS_POKEFAN_2
+	.4byte FACILITY_CLASS_POKEFAN_F
 	.string "JAREN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_FIGHTING
@@ -4109,7 +4109,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Jaren
 
 @ 158
-	.4byte FACILITY_CLASS_PKMN_BREEDER_2
+	.4byte FACILITY_CLASS_PKMN_BREEDER_M
 	.string "CORDELL$", 8
 @ pre-battle speech
 	.2byte EC_WORD_A
@@ -4135,7 +4135,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Cordell
 
 @ 159
-	.4byte FACILITY_CLASS_PKMN_BREEDER_1
+	.4byte FACILITY_CLASS_POKEMON_BREEDER_F
 	.string "JAZLYN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_IS
@@ -4577,7 +4577,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Gunnar
 
 @ 176
-	.4byte FACILITY_CLASS_TUBER_2
+	.4byte FACILITY_CLASS_TUBER_M
 	.string "CRAIG$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -4603,7 +4603,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Craig
 
 @ 177
-	.4byte FACILITY_CLASS_TUBER_2
+	.4byte FACILITY_CLASS_TUBER_M
 	.string "PIERCE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_THERE
@@ -4629,7 +4629,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Pierce
 
 @ 178
-	.4byte FACILITY_CLASS_TUBER_1
+	.4byte FACILITY_CLASS_TUBER_F
 	.string "REGINA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -4655,7 +4655,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Regina
 
 @ 179
-	.4byte FACILITY_CLASS_TUBER_1
+	.4byte FACILITY_CLASS_TUBER_F
 	.string "ALISON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_THIS
@@ -5513,7 +5513,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Joyce
 
 @ 212
-	.4byte FACILITY_CLASS_POKEFAN_1
+	.4byte FACILITY_CLASS_POKEFAN_M
 	.string "TODD$", 8
 @ pre-battle speech
 	.2byte EC_WORD_YOU_RE
@@ -5539,7 +5539,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Todd
 
 @ 213
-	.4byte FACILITY_CLASS_POKEFAN_1
+	.4byte FACILITY_CLASS_POKEFAN_M
 	.string "GAVIN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -5565,7 +5565,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Gavin
 
 @ 214
-	.4byte FACILITY_CLASS_POKEFAN_2
+	.4byte FACILITY_CLASS_POKEFAN_F
 	.string "MALORY$", 8
 @ pre-battle speech
 	.2byte EC_WORD_PROMISE
@@ -5591,7 +5591,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Malory
 
 @ 215
-	.4byte FACILITY_CLASS_POKEFAN_2
+	.4byte FACILITY_CLASS_POKEFAN_F
 	.string "ESTHER$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -5617,7 +5617,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Esther
 
 @ 216
-	.4byte FACILITY_CLASS_PKMN_BREEDER_2
+	.4byte FACILITY_CLASS_PKMN_BREEDER_M
 	.string "OSCAR$", 8
 @ pre-battle speech
 	.2byte EC_WORD_LET_S
@@ -5643,7 +5643,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Oscar
 
 @ 217
-	.4byte FACILITY_CLASS_PKMN_BREEDER_2
+	.4byte FACILITY_CLASS_PKMN_BREEDER_M
 	.string "WILSON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_WORK
@@ -5669,7 +5669,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Wilson
 
 @ 218
-	.4byte FACILITY_CLASS_PKMN_BREEDER_1
+	.4byte FACILITY_CLASS_POKEMON_BREEDER_F
 	.string "CLARE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_YAY
@@ -5695,7 +5695,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Clare
 
 @ 219
-	.4byte FACILITY_CLASS_PKMN_BREEDER_1
+	.4byte FACILITY_CLASS_POKEMON_BREEDER_F
 	.string "TESS$", 8
 @ pre-battle speech
 	.2byte EC_WORD_WANT
@@ -6397,7 +6397,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Jasper
 
 @ 246
-	.4byte FACILITY_CLASS_EXPERT_2
+	.4byte FACILITY_CLASS_EXPERT_F
 	.string "NADIA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_YOU
@@ -6423,7 +6423,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Nadia
 
 @ 247
-	.4byte FACILITY_CLASS_EXPERT_2
+	.4byte FACILITY_CLASS_EXPERT_F
 	.string "MIRANDA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_WELL
@@ -6449,7 +6449,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Miranda
 
 @ 248
-	.4byte FACILITY_CLASS_EXPERT_2
+	.4byte FACILITY_CLASS_EXPERT_F
 	.string "EMMA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_VE
@@ -6865,7 +6865,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Reese
 
 @ 264
-	.4byte FACILITY_CLASS_TRIATHLETE_3
+	.4byte FACILITY_CLASS_RUNNING_TRIATHLETE_M
 	.string "MASON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_PLEASE
@@ -6891,7 +6891,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Mason
 
 @ 265
-	.4byte FACILITY_CLASS_TRIATHLETE_3
+	.4byte FACILITY_CLASS_RUNNING_TRIATHLETE_M
 	.string "TOBY$", 8
 @ pre-battle speech
 	.2byte EC_WORD_LISTEN
@@ -6917,7 +6917,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Toby
 
 @ 266
-	.4byte FACILITY_CLASS_TRIATHLETE_4
+	.4byte FACILITY_CLASS_RUNNING_TRIATHLETE_F
 	.string "DOROTHY$", 8
 @ pre-battle speech
 	.2byte EC_WORD_THE
@@ -6943,7 +6943,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Dorothy
 
 @ 267
-	.4byte FACILITY_CLASS_TRIATHLETE_4
+	.4byte FACILITY_CLASS_RUNNING_TRIATHLETE_F
 	.string "PIPER$", 8
 @ pre-battle speech
 	.2byte EC_WORD_COME_ON
@@ -6969,7 +6969,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Piper
 
 @ 268
-	.4byte FACILITY_CLASS_TRIATHLETE_5
+	.4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_M
 	.string "FINN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_NOT
@@ -6995,7 +6995,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Finn
 
 @ 269
-	.4byte FACILITY_CLASS_TRIATHLETE_5
+	.4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_M
 	.string "SAMIR$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -7021,7 +7021,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Samir
 
 @ 270
-	.4byte FACILITY_CLASS_TRIATHLETE_6
+	.4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_F
 	.string "FIONA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_DID
@@ -7047,7 +7047,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Fiona
 
 @ 271
-	.4byte FACILITY_CLASS_TRIATHLETE_6
+	.4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_F
 	.string "GLORIA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -7073,7 +7073,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Gloria
 
 @ 272
-	.4byte FACILITY_CLASS_TRIATHLETE_1
+	.4byte FACILITY_CLASS_CYCLING_TRIATHLETE_M
 	.string "NICO$", 8
 @ pre-battle speech
 	.2byte EC_WORD_LIKE
@@ -7099,7 +7099,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Nico
 
 @ 273
-	.4byte FACILITY_CLASS_TRIATHLETE_1
+	.4byte FACILITY_CLASS_CYCLING_TRIATHLETE_M
 	.string "JEREMY$", 8
 @ pre-battle speech
 	.2byte EC_WORD_A
@@ -7125,7 +7125,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Jeremy
 
 @ 274
-	.4byte FACILITY_CLASS_TRIATHLETE_2
+	.4byte FACILITY_CLASS_CYCLING_TRIATHLETE_F
 	.string "CAITLIN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_DON_T
@@ -7151,7 +7151,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Caitlin
 
 @ 275
-	.4byte FACILITY_CLASS_TRIATHLETE_2
+	.4byte FACILITY_CLASS_CYCLING_TRIATHLETE_F
 	.string "REENA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM
diff --git a/data/battle_frontier/fallarbor_battle_tent_trainers.inc b/data/battle_frontier/fallarbor_battle_tent_trainers.inc
index 675314eb3..f1e2f8c4c 100644
--- a/data/battle_frontier/fallarbor_battle_tent_trainers.inc
+++ b/data/battle_frontier/fallarbor_battle_tent_trainers.inc
@@ -53,7 +53,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
 	.4byte gFallarborBattleTentTrainerMons_Javier
 
 @ 2
-	.4byte FACILITY_CLASS_TUBER_1
+	.4byte FACILITY_CLASS_TUBER_F
 	.string "NATALIE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_THE
@@ -79,7 +79,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
 	.4byte gFallarborBattleTentTrainerMons_Natalie
 
 @ 3
-	.4byte FACILITY_CLASS_TUBER_2
+	.4byte FACILITY_CLASS_TUBER_M
 	.string "TREVE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_LOOK
@@ -417,7 +417,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
 	.4byte gFallarborBattleTentTrainerMons_Mariana
 
 @ 16
-	.4byte FACILITY_CLASS_POKEFAN_1
+	.4byte FACILITY_CLASS_POKEFAN_M
 	.string "SHELDON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_A
@@ -443,7 +443,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
 	.4byte gFallarborBattleTentTrainerMons_Sheldon
 
 @ 17
-	.4byte FACILITY_CLASS_POKEFAN_2
+	.4byte FACILITY_CLASS_POKEFAN_F
 	.string "GIANNA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_AHAHA
@@ -495,7 +495,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
 	.4byte gFallarborBattleTentTrainerMons_Yahir
 
 @ 19
-	.4byte FACILITY_CLASS_EXPERT_2
+	.4byte FACILITY_CLASS_EXPERT_F
 	.string "BRITNEY$", 8
 @ pre-battle speech
 	.2byte EC_WORD_IT
diff --git a/data/battle_frontier/slateport_battle_tent_trainers.inc b/data/battle_frontier/slateport_battle_tent_trainers.inc
index 051514b94..92a2f2518 100644
--- a/data/battle_frontier/slateport_battle_tent_trainers.inc
+++ b/data/battle_frontier/slateport_battle_tent_trainers.inc
@@ -53,7 +53,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
 	.4byte gSlateportBattleTentTrainerMons_Malachi
 
 @ 2
-	.4byte FACILITY_CLASS_TUBER_1
+	.4byte FACILITY_CLASS_TUBER_F
 	.string "KELSIE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_GO
@@ -79,7 +79,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
 	.4byte gSlateportBattleTentTrainerMons_Kelsie
 
 @ 3
-	.4byte FACILITY_CLASS_TUBER_2
+	.4byte FACILITY_CLASS_TUBER_M
 	.string "DAVON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_YEAH_YEAH
@@ -417,7 +417,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
 	.4byte gSlateportBattleTentTrainerMons_Rebecca
 
 @ 16
-	.4byte FACILITY_CLASS_POKEFAN_1
+	.4byte FACILITY_CLASS_POKEFAN_M
 	.string "REGGIE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_POKEMON
@@ -443,7 +443,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
 	.4byte gSlateportBattleTentTrainerMons_Reggie
 
 @ 17
-	.4byte FACILITY_CLASS_POKEFAN_2
+	.4byte FACILITY_CLASS_POKEFAN_F
 	.string "JANAE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -495,7 +495,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
 	.4byte gSlateportBattleTentTrainerMons_Caiden
 
 @ 19
-	.4byte FACILITY_CLASS_EXPERT_2
+	.4byte FACILITY_CLASS_EXPERT_F
 	.string "KIRSTEN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_HUH_QUES
diff --git a/data/battle_frontier/verdanturf_battle_tent_trainers.inc b/data/battle_frontier/verdanturf_battle_tent_trainers.inc
index b375ce811..5f4dad133 100644
--- a/data/battle_frontier/verdanturf_battle_tent_trainers.inc
+++ b/data/battle_frontier/verdanturf_battle_tent_trainers.inc
@@ -53,7 +53,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
 	.4byte gVerdanturfBattleTentTrainerMons_Dilan
 
 @ 2
-	.4byte FACILITY_CLASS_TUBER_1
+	.4byte FACILITY_CLASS_TUBER_F
 	.string "ELIANA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM
@@ -79,7 +79,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
 	.4byte gVerdanturfBattleTentTrainerMons_Eliana
 
 @ 3
-	.4byte FACILITY_CLASS_TUBER_2
+	.4byte FACILITY_CLASS_TUBER_M
 	.string "MARKUS$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM
@@ -417,7 +417,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
 	.4byte gVerdanturfBattleTentTrainerMons_Ashlyn
 
 @ 16
-	.4byte FACILITY_CLASS_POKEFAN_1
+	.4byte FACILITY_CLASS_POKEFAN_M
 	.string "ADDISON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_YES
@@ -443,7 +443,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
 	.4byte gVerdanturfBattleTentTrainerMons_Addison
 
 @ 17
-	.4byte FACILITY_CLASS_POKEFAN_2
+	.4byte FACILITY_CLASS_POKEFAN_F
 	.string "JUSTINE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_YES
@@ -495,7 +495,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
 	.4byte gVerdanturfBattleTentTrainerMons_Tyson
 
 @ 19
-	.4byte FACILITY_CLASS_EXPERT_2
+	.4byte FACILITY_CLASS_EXPERT_F
 	.string "LAILA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_A
diff --git a/include/constants/trainers.h b/include/constants/trainers.h
index a87624eb6..d7832754e 100644
--- a/include/constants/trainers.h
+++ b/include/constants/trainers.h
@@ -17,7 +17,7 @@
 #define TRAINER_PIC_HIKER                  0
 #define TRAINER_PIC_AQUA_GRUNT_M           1
 #define TRAINER_PIC_POKEMON_BREEDER_F      2
-#define TRAINER_PIC_COOL_TRAINER_M         3
+#define TRAINER_PIC_COOLTRAINER_M         3
 #define TRAINER_PIC_BIRD_KEEPER            4
 #define TRAINER_PIC_COLLECTOR              5
 #define TRAINER_PIC_AQUA_GRUNT_F           6
@@ -34,7 +34,7 @@
 #define TRAINER_PIC_INTERVIEWER           17
 #define TRAINER_PIC_TUBER_F               18
 #define TRAINER_PIC_TUBER_M               19
-#define TRAINER_PIC_COOL_TRAINER_F        20
+#define TRAINER_PIC_COOLTRAINER_F        20
 #define TRAINER_PIC_LADY                  21
 #define TRAINER_PIC_BEAUTY                22
 #define TRAINER_PIC_RICH_BOY              23
@@ -105,8 +105,8 @@
 #define TRAINER_PIC_PYRAMID_KING_BRANDON  88
 #define TRAINER_PIC_RED                   89
 #define TRAINER_PIC_LEAF                  90
-#define TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN 91
-#define TRAINER_PIC_RUBY_SAPPHIRE_MAY     92
+#define TRAINER_PIC_RS_BRENDAN 91
+#define TRAINER_PIC_RS_MAY     92
 
 #define TRAINER_BACK_PIC_BRENDAN                0
 #define TRAINER_BACK_PIC_MAY                    1
@@ -118,30 +118,30 @@
 #define TRAINER_BACK_PIC_STEVEN                 7
 
 #define FACILITY_CLASS_HIKER           0x0
-#define FACILITY_CLASS_TEAM_AQUA_1     0x1
-#define FACILITY_CLASS_PKMN_BREEDER_1  0x2
+#define FACILITY_CLASS_AQUA_GRUNT_M     0x1
+#define FACILITY_CLASS_POKEMON_BREEDER_F  0x2
 #define FACILITY_CLASS_COOLTRAINER_M   0x3
 #define FACILITY_CLASS_BIRD_KEEPER     0x4
 #define FACILITY_CLASS_COLLECTOR       0x5
-#define FACILITY_CLASS_TEAM_AQUA_2     0x6
+#define FACILITY_CLASS_AQUA_GRUNT_F     0x6
 #define FACILITY_CLASS_SWIMMER_M       0x7
-#define FACILITY_CLASS_TEAM_MAGMA_1    0x8
+#define FACILITY_CLASS_MAGMA_GRUNT_M    0x8
 #define FACILITY_CLASS_EXPERT_M        0x9
 #define FACILITY_CLASS_BLACK_BELT      0xa
-#define FACILITY_CLASS_AQUA_LEADER     0xb
+#define FACILITY_CLASS_AQUA_LEADER_ARCHIE     0xb
 #define FACILITY_CLASS_HEX_MANIAC      0xc
 #define FACILITY_CLASS_AROMA_LADY      0xd
 #define FACILITY_CLASS_RUIN_MANIAC     0xe
 #define FACILITY_CLASS_INTERVIEWER     0xf
-#define FACILITY_CLASS_TUBER_1         0x10
-#define FACILITY_CLASS_TUBER_2         0x11
+#define FACILITY_CLASS_TUBER_F         0x10
+#define FACILITY_CLASS_TUBER_M         0x11
 #define FACILITY_CLASS_COOLTRAINER_F   0x12
 #define FACILITY_CLASS_LADY            0x13
 #define FACILITY_CLASS_BEAUTY          0x14
 #define FACILITY_CLASS_RICH_BOY        0x15
-#define FACILITY_CLASS_EXPERT_2        0x16
+#define FACILITY_CLASS_EXPERT_F        0x16
 #define FACILITY_CLASS_POKEMANIAC      0x17
-#define FACILITY_CLASS_TEAM_MAGMA_2    0x18
+#define FACILITY_CLASS_MAGMA_GRUNT_F    0x18
 #define FACILITY_CLASS_GUITARIST       0x19
 #define FACILITY_CLASS_KINDLER         0x1a
 #define FACILITY_CLASS_CAMPER          0x1b
@@ -150,25 +150,25 @@
 #define FACILITY_CLASS_PSYCHIC_M       0x1e
 #define FACILITY_CLASS_PSYCHIC_F       0x1f
 #define FACILITY_CLASS_GENTLEMAN       0x20
-#define FACILITY_CLASS_ELITE_FOUR_1    0x21
-#define FACILITY_CLASS_ELITE_FOUR_2    0x22
-#define FACILITY_CLASS_LEADER_1        0x23
-#define FACILITY_CLASS_LEADER_2        0x24
-#define FACILITY_CLASS_LEADER_3        0x25
+#define FACILITY_CLASS_ELITE_FOUR_SIDNEY    0x21
+#define FACILITY_CLASS_ELITE_FOUR_PHOEBE    0x22
+#define FACILITY_CLASS_LEADER_ROXANNE        0x23
+#define FACILITY_CLASS_LEADER_BRAWLY        0x24
+#define FACILITY_CLASS_LEADER_TATE_AND_LIZA        0x25
 #define FACILITY_CLASS_SCHOOL_KID_M    0x26
 #define FACILITY_CLASS_SCHOOL_KID_F    0x27
 #define FACILITY_CLASS_SR_AND_JR       0x28
-#define FACILITY_CLASS_POKEFAN_1       0x29
-#define FACILITY_CLASS_POKEFAN_2       0x2a
+#define FACILITY_CLASS_POKEFAN_M       0x29
+#define FACILITY_CLASS_POKEFAN_F       0x2a
 #define FACILITY_CLASS_YOUNGSTER       0x2b
-#define FACILITY_CLASS_CHAMPION        0x2c
+#define FACILITY_CLASS_CHAMPION_WALLACE        0x2c
 #define FACILITY_CLASS_FISHERMAN       0x2d
-#define FACILITY_CLASS_TRIATHLETE_1    0x2e
-#define FACILITY_CLASS_TRIATHLETE_2    0x2f
-#define FACILITY_CLASS_TRIATHLETE_3    0x30
-#define FACILITY_CLASS_TRIATHLETE_4    0x31
-#define FACILITY_CLASS_TRIATHLETE_5    0x32
-#define FACILITY_CLASS_TRIATHLETE_6    0x33
+#define FACILITY_CLASS_CYCLING_TRIATHLETE_M    0x2e
+#define FACILITY_CLASS_CYCLING_TRIATHLETE_F    0x2f
+#define FACILITY_CLASS_RUNNING_TRIATHLETE_M    0x30
+#define FACILITY_CLASS_RUNNING_TRIATHLETE_F    0x31
+#define FACILITY_CLASS_SWIMMING_TRIATHLETE_M    0x32
+#define FACILITY_CLASS_SWIMMING_TRIATHLETE_F    0x33
 #define FACILITY_CLASS_DRAGON_TAMER    0x34
 #define FACILITY_CLASS_NINJA_BOY       0x35
 #define FACILITY_CLASS_BATTLE_GIRL     0x36
@@ -176,36 +176,36 @@
 #define FACILITY_CLASS_SWIMMER_F       0x38
 #define FACILITY_CLASS_TWINS           0x39
 #define FACILITY_CLASS_SAILOR          0x3a
-#define FACILITY_CLASS_PKMN_TRAINER_1  0x3b
+#define FACILITY_CLASS_PKMN_TRAINER_WALLY  0x3b
 #define FACILITY_CLASS_PKMN_TRAINER_BRENDAN  0x3c
-#define FACILITY_CLASS_PKMN_TRAINER_3  0x3d
-#define FACILITY_CLASS_PKMN_TRAINER_4  0x3e
+#define FACILITY_CLASS_PKMN_TRAINER_BRENDAN_2  0x3d
+#define FACILITY_CLASS_PKMN_TRAINER_BRENDAN_3  0x3e
 #define FACILITY_CLASS_PKMN_TRAINER_MAY  0x3f
-#define FACILITY_CLASS_PKMN_TRAINER_6  0x40
-#define FACILITY_CLASS_PKMN_TRAINER_7  0x41
-#define FACILITY_CLASS_PKMN_BREEDER_2  0x42
+#define FACILITY_CLASS_PKMN_TRAINER_MAY_2  0x40
+#define FACILITY_CLASS_PKMN_TRAINER_MAY_3  0x41
+#define FACILITY_CLASS_PKMN_BREEDER_M  0x42
 #define FACILITY_CLASS_BUG_CATCHER     0x43
 #define FACILITY_CLASS_PKMN_RANGER_M   0x44
 #define FACILITY_CLASS_PKMN_RANGER_F   0x45
-#define FACILITY_CLASS_MAGMA_LEADER    0x46
+#define FACILITY_CLASS_MAGMA_LEADER_MAXIE    0x46
 #define FACILITY_CLASS_LASS            0x47
 #define FACILITY_CLASS_YOUNG_COUPLE    0x48
 #define FACILITY_CLASS_OLD_COUPLE      0x49
 #define FACILITY_CLASS_SIS_AND_BRO     0x4a
-#define FACILITY_CLASS_PKMN_TRAINER_STEVEN  0x4b
-#define FACILITY_CLASS_SALON_MAIDEN    0x4c
-#define FACILITY_CLASS_DOME_ACE        0x4d
-#define FACILITY_CLASS_PKMN_TRAINER_RED  0x4e
-#define FACILITY_CLASS_PKMN_TRAINER_LEAF 0x4f
-#define FACILITY_CLASS_PKMN_TRAINER_RS_BRENDAN 0x50
-#define FACILITY_CLASS_PKMN_TRAINER_RS_MAY 0x51
+#define FACILITY_CLASS_STEVEN  0x4b
+#define FACILITY_CLASS_SALON_MAIDEN_ANABEL    0x4c
+#define FACILITY_CLASS_DOME_ACE_TUCKER        0x4d
+#define FACILITY_CLASS_RED  0x4e
+#define FACILITY_CLASS_LEAF 0x4f
+#define FACILITY_CLASS_RS_BRENDAN 0x50
+#define FACILITY_CLASS_RS_MAY 0x51
 
 #define TRAINER_CLASS_PKMN_TRAINER_1 0x0
 #define TRAINER_CLASS_PKMN_TRAINER_2 0x1
 #define TRAINER_CLASS_HIKER          0x2
 #define TRAINER_CLASS_TEAM_AQUA      0x3
 #define TRAINER_CLASS_PKMN_BREEDER   0x4
-#define TRAINER_CLASS_COOLTRAINER_1  0x5
+#define TRAINER_CLASS_COOLTRAINER  0x5
 #define TRAINER_CLASS_BIRD_KEEPER    0x6
 #define TRAINER_CLASS_COLLECTOR      0x7
 #define TRAINER_CLASS_SWIMMER_M      0x8
@@ -218,8 +218,8 @@
 #define TRAINER_CLASS_AROMA_LADY     0xf
 #define TRAINER_CLASS_RUIN_MANIAC    0x10
 #define TRAINER_CLASS_INTERVIEWER    0x11
-#define TRAINER_CLASS_TUBER_1        0x12
-#define TRAINER_CLASS_TUBER_2        0x13
+#define TRAINER_CLASS_TUBER_F       0x12
+#define TRAINER_CLASS_TUBER_M        0x13
 #define TRAINER_CLASS_LADY           0x14
 #define TRAINER_CLASS_BEAUTY         0x15
 #define TRAINER_CLASS_RICH_BOY       0x16
@@ -248,7 +248,7 @@
 #define TRAINER_CLASS_SWIMMER_F      0x2d
 #define TRAINER_CLASS_TWINS          0x2e
 #define TRAINER_CLASS_SAILOR         0x2f
-#define TRAINER_CLASS_COOLTRAINER_2  0x30
+#define TRAINER_CLASS_COOLTRAINER_UNUSED  0x30
 #define TRAINER_CLASS_MAGMA_ADMIN    0x31
 #define TRAINER_CLASS_PKMN_TRAINER_3 0x32
 #define TRAINER_CLASS_BUG_CATCHER    0x33
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index 0cec046e4..a34f3f20f 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -1251,17 +1251,17 @@ static void LinkOpponentHandleDrawTrainerPic(void)
             || (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_LEAF_GREEN)
             {
                 if (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender != MALE)
-                    trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_LEAF];
+                    trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_LEAF];
                 else
-                    trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_RED];
+                    trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RED];
             }
             else if ((gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_RUBY
                      || (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_SAPPHIRE)
             {
                 if (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender != MALE)
-                    trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_RS_MAY];
+                    trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RS_MAY];
                 else
-                    trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_RS_BRENDAN];
+                    trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RS_BRENDAN];
             }
             else
             {
@@ -1280,17 +1280,17 @@ static void LinkOpponentHandleDrawTrainerPic(void)
                  || (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_LEAF_GREEN)
         {
             if (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].gender != 0)
-                trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_LEAF];
+                trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_LEAF];
             else
-                trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_RED];
+                trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RED];
         }
         else if ((gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_RUBY
                  || (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_SAPPHIRE)
         {
             if (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].gender != 0)
-                trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_RS_MAY];
+                trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RS_MAY];
             else
-                trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PKMN_TRAINER_RS_BRENDAN];
+                trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RS_BRENDAN];
         }
         else
         {
diff --git a/src/battle_main.c b/src/battle_main.c
index 8bdd2220b..de0becd2a 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -451,10 +451,10 @@ const struct TrainerMoney gTrainerMoneyTable[] =
     {TRAINER_CLASS_AROMA_LADY, 10},
     {TRAINER_CLASS_RUIN_MANIAC, 15},
     {TRAINER_CLASS_INTERVIEWER, 12},
-    {TRAINER_CLASS_TUBER_1, 1},
-    {TRAINER_CLASS_TUBER_2, 1},
+    {TRAINER_CLASS_TUBER_F, 1},
+    {TRAINER_CLASS_TUBER_M, 1},
     {TRAINER_CLASS_SIS_AND_BRO, 3},
-    {TRAINER_CLASS_COOLTRAINER_1, 12},
+    {TRAINER_CLASS_COOLTRAINER, 12},
     {TRAINER_CLASS_HEX_MANIAC, 6},
     {TRAINER_CLASS_LADY, 50},
     {TRAINER_CLASS_BEAUTY, 20},
diff --git a/src/data/pokemon/trainer_class_lookups.h b/src/data/pokemon/trainer_class_lookups.h
index 0d3cd0fe7..4d3492e8b 100644
--- a/src/data/pokemon/trainer_class_lookups.h
+++ b/src/data/pokemon/trainer_class_lookups.h
@@ -4,30 +4,30 @@
 const u8 gFacilityClassToPicIndex[] =
 {
     [FACILITY_CLASS_HIKER] = TRAINER_PIC_HIKER,
-    [FACILITY_CLASS_TEAM_AQUA_1] = TRAINER_PIC_AQUA_GRUNT_M,
-    [FACILITY_CLASS_PKMN_BREEDER_1] = TRAINER_PIC_POKEMON_BREEDER_F,
-    [FACILITY_CLASS_COOLTRAINER_M] = TRAINER_PIC_COOL_TRAINER_M,
+    [FACILITY_CLASS_AQUA_GRUNT_M] = TRAINER_PIC_AQUA_GRUNT_M,
+    [FACILITY_CLASS_POKEMON_BREEDER_F] = TRAINER_PIC_POKEMON_BREEDER_F,
+    [FACILITY_CLASS_COOLTRAINER_M] = TRAINER_PIC_COOLTRAINER_M,
     [FACILITY_CLASS_BIRD_KEEPER] = TRAINER_PIC_BIRD_KEEPER,
     [FACILITY_CLASS_COLLECTOR] = TRAINER_PIC_COLLECTOR,
-    [FACILITY_CLASS_TEAM_AQUA_2] = TRAINER_PIC_AQUA_GRUNT_F,
+    [FACILITY_CLASS_AQUA_GRUNT_F] = TRAINER_PIC_AQUA_GRUNT_F,
     [FACILITY_CLASS_SWIMMER_M] = TRAINER_PIC_SWIMMER_M,
-    [FACILITY_CLASS_TEAM_MAGMA_1] = TRAINER_PIC_MAGMA_GRUNT_M,
+    [FACILITY_CLASS_MAGMA_GRUNT_M] = TRAINER_PIC_MAGMA_GRUNT_M,
     [FACILITY_CLASS_EXPERT_M] = TRAINER_PIC_EXPERT_M,
     [FACILITY_CLASS_BLACK_BELT] = TRAINER_PIC_BLACK_BELT,
-    [FACILITY_CLASS_AQUA_LEADER] = TRAINER_PIC_AQUA_LEADER_ARCHIE,
+    [FACILITY_CLASS_AQUA_LEADER_ARCHIE] = TRAINER_PIC_AQUA_LEADER_ARCHIE,
     [FACILITY_CLASS_HEX_MANIAC] = TRAINER_PIC_HEX_MANIAC,
     [FACILITY_CLASS_AROMA_LADY] = TRAINER_PIC_AROMA_LADY,
     [FACILITY_CLASS_RUIN_MANIAC] = TRAINER_PIC_RUIN_MANIAC,
     [FACILITY_CLASS_INTERVIEWER] = TRAINER_PIC_INTERVIEWER,
-    [FACILITY_CLASS_TUBER_1] = TRAINER_PIC_TUBER_F,
-    [FACILITY_CLASS_TUBER_2] = TRAINER_PIC_TUBER_M,
-    [FACILITY_CLASS_COOLTRAINER_F] = TRAINER_PIC_COOL_TRAINER_F,
+    [FACILITY_CLASS_TUBER_F] = TRAINER_PIC_TUBER_F,
+    [FACILITY_CLASS_TUBER_M] = TRAINER_PIC_TUBER_M,
+    [FACILITY_CLASS_COOLTRAINER_F] = TRAINER_PIC_COOLTRAINER_F,
     [FACILITY_CLASS_LADY] = TRAINER_PIC_LADY,
     [FACILITY_CLASS_BEAUTY] = TRAINER_PIC_BEAUTY,
     [FACILITY_CLASS_RICH_BOY] = TRAINER_PIC_RICH_BOY,
-    [FACILITY_CLASS_EXPERT_2] = TRAINER_PIC_EXPERT_F,
+    [FACILITY_CLASS_EXPERT_F] = TRAINER_PIC_EXPERT_F,
     [FACILITY_CLASS_POKEMANIAC] = TRAINER_PIC_POKEMANIAC,
-    [FACILITY_CLASS_TEAM_MAGMA_2] = TRAINER_PIC_MAGMA_GRUNT_F,
+    [FACILITY_CLASS_MAGMA_GRUNT_F] = TRAINER_PIC_MAGMA_GRUNT_F,
     [FACILITY_CLASS_GUITARIST] = TRAINER_PIC_GUITARIST,
     [FACILITY_CLASS_KINDLER] = TRAINER_PIC_KINDLER,
     [FACILITY_CLASS_CAMPER] = TRAINER_PIC_CAMPER,
@@ -36,25 +36,25 @@ const u8 gFacilityClassToPicIndex[] =
     [FACILITY_CLASS_PSYCHIC_M] = TRAINER_PIC_PSYCHIC_M,
     [FACILITY_CLASS_PSYCHIC_F] = TRAINER_PIC_PSYCHIC_F,
     [FACILITY_CLASS_GENTLEMAN] = TRAINER_PIC_GENTLEMAN,
-    [FACILITY_CLASS_ELITE_FOUR_1] = TRAINER_PIC_ELITE_FOUR_SIDNEY,
-    [FACILITY_CLASS_ELITE_FOUR_2] = TRAINER_PIC_ELITE_FOUR_PHOEBE,
-    [FACILITY_CLASS_LEADER_1] = TRAINER_PIC_LEADER_ROXANNE,
-    [FACILITY_CLASS_LEADER_2] = TRAINER_PIC_LEADER_BRAWLY,
-    [FACILITY_CLASS_LEADER_3] = TRAINER_PIC_LEADER_TATE_AND_LIZA,
+    [FACILITY_CLASS_ELITE_FOUR_SIDNEY] = TRAINER_PIC_ELITE_FOUR_SIDNEY,
+    [FACILITY_CLASS_ELITE_FOUR_PHOEBE] = TRAINER_PIC_ELITE_FOUR_PHOEBE,
+    [FACILITY_CLASS_LEADER_ROXANNE] = TRAINER_PIC_LEADER_ROXANNE,
+    [FACILITY_CLASS_LEADER_BRAWLY] = TRAINER_PIC_LEADER_BRAWLY,
+    [FACILITY_CLASS_LEADER_TATE_AND_LIZA] = TRAINER_PIC_LEADER_TATE_AND_LIZA,
     [FACILITY_CLASS_SCHOOL_KID_M] = TRAINER_PIC_SCHOOL_KID_M,
     [FACILITY_CLASS_SCHOOL_KID_F] = TRAINER_PIC_SCHOOL_KID_F,
     [FACILITY_CLASS_SR_AND_JR] = TRAINER_PIC_SR_AND_JR,
-    [FACILITY_CLASS_POKEFAN_1] = TRAINER_PIC_POKEFAN_M,
-    [FACILITY_CLASS_POKEFAN_2] = TRAINER_PIC_POKEFAN_F,
+    [FACILITY_CLASS_POKEFAN_M] = TRAINER_PIC_POKEFAN_M,
+    [FACILITY_CLASS_POKEFAN_F] = TRAINER_PIC_POKEFAN_F,
     [FACILITY_CLASS_YOUNGSTER] = TRAINER_PIC_YOUNGSTER,
-    [FACILITY_CLASS_CHAMPION] = TRAINER_PIC_CHAMPION_WALLACE,
+    [FACILITY_CLASS_CHAMPION_WALLACE] = TRAINER_PIC_CHAMPION_WALLACE,
     [FACILITY_CLASS_FISHERMAN] = TRAINER_PIC_FISHERMAN,
-    [FACILITY_CLASS_TRIATHLETE_1] = TRAINER_PIC_CYCLING_TRIATHLETE_M,
-    [FACILITY_CLASS_TRIATHLETE_2] = TRAINER_PIC_CYCLING_TRIATHLETE_F,
-    [FACILITY_CLASS_TRIATHLETE_3] = TRAINER_PIC_RUNNING_TRIATHLETE_M,
-    [FACILITY_CLASS_TRIATHLETE_4] = TRAINER_PIC_RUNNING_TRIATHLETE_F,
-    [FACILITY_CLASS_TRIATHLETE_5] = TRAINER_PIC_SWIMMING_TRIATHLETE_M,
-    [FACILITY_CLASS_TRIATHLETE_6] = TRAINER_PIC_SWIMMING_TRIATHLETE_F,
+    [FACILITY_CLASS_CYCLING_TRIATHLETE_M] = TRAINER_PIC_CYCLING_TRIATHLETE_M,
+    [FACILITY_CLASS_CYCLING_TRIATHLETE_F] = TRAINER_PIC_CYCLING_TRIATHLETE_F,
+    [FACILITY_CLASS_RUNNING_TRIATHLETE_M] = TRAINER_PIC_RUNNING_TRIATHLETE_M,
+    [FACILITY_CLASS_RUNNING_TRIATHLETE_F] = TRAINER_PIC_RUNNING_TRIATHLETE_F,
+    [FACILITY_CLASS_SWIMMING_TRIATHLETE_M] = TRAINER_PIC_SWIMMING_TRIATHLETE_M,
+    [FACILITY_CLASS_SWIMMING_TRIATHLETE_F] = TRAINER_PIC_SWIMMING_TRIATHLETE_F,
     [FACILITY_CLASS_DRAGON_TAMER] = TRAINER_PIC_DRAGON_TAMER,
     [FACILITY_CLASS_NINJA_BOY] = TRAINER_PIC_NINJA_BOY,
     [FACILITY_CLASS_BATTLE_GIRL] = TRAINER_PIC_BATTLE_GIRL,
@@ -62,58 +62,58 @@ const u8 gFacilityClassToPicIndex[] =
     [FACILITY_CLASS_SWIMMER_F] = TRAINER_PIC_SWIMMER_F,
     [FACILITY_CLASS_TWINS] = TRAINER_PIC_TWINS,
     [FACILITY_CLASS_SAILOR] = TRAINER_PIC_SAILOR,
-    [FACILITY_CLASS_PKMN_TRAINER_1] = TRAINER_PIC_WALLY,
+    [FACILITY_CLASS_PKMN_TRAINER_WALLY] = TRAINER_PIC_WALLY,
     [FACILITY_CLASS_PKMN_TRAINER_BRENDAN] = TRAINER_PIC_BRENDAN,
-    [FACILITY_CLASS_PKMN_TRAINER_3] = TRAINER_PIC_BRENDAN,
-    [FACILITY_CLASS_PKMN_TRAINER_4] = TRAINER_PIC_BRENDAN,
+    [FACILITY_CLASS_PKMN_TRAINER_BRENDAN_2] = TRAINER_PIC_BRENDAN,
+    [FACILITY_CLASS_PKMN_TRAINER_BRENDAN_3] = TRAINER_PIC_BRENDAN,
     [FACILITY_CLASS_PKMN_TRAINER_MAY] = TRAINER_PIC_MAY,
-    [FACILITY_CLASS_PKMN_TRAINER_6] = TRAINER_PIC_MAY,
-    [FACILITY_CLASS_PKMN_TRAINER_7] = TRAINER_PIC_MAY,
-    [FACILITY_CLASS_PKMN_BREEDER_2] = TRAINER_PIC_POKEMON_BREEDER_M,
+    [FACILITY_CLASS_PKMN_TRAINER_MAY_2] = TRAINER_PIC_MAY,
+    [FACILITY_CLASS_PKMN_TRAINER_MAY_3] = TRAINER_PIC_MAY,
+    [FACILITY_CLASS_PKMN_BREEDER_M] = TRAINER_PIC_POKEMON_BREEDER_M,
     [FACILITY_CLASS_BUG_CATCHER] = TRAINER_PIC_BUG_CATCHER,
     [FACILITY_CLASS_PKMN_RANGER_M] = TRAINER_PIC_POKEMON_RANGER_M,
     [FACILITY_CLASS_PKMN_RANGER_F] = TRAINER_PIC_POKEMON_RANGER_F,
-    [FACILITY_CLASS_MAGMA_LEADER] = TRAINER_PIC_MAGMA_LEADER_MAXIE,
+    [FACILITY_CLASS_MAGMA_LEADER_MAXIE] = TRAINER_PIC_MAGMA_LEADER_MAXIE,
     [FACILITY_CLASS_LASS] = TRAINER_PIC_LASS,
     [FACILITY_CLASS_YOUNG_COUPLE] = TRAINER_PIC_YOUNG_COUPLE,
     [FACILITY_CLASS_OLD_COUPLE] = TRAINER_PIC_OLD_COUPLE,
     [FACILITY_CLASS_SIS_AND_BRO] = TRAINER_PIC_SIS_AND_BRO,
-    [FACILITY_CLASS_PKMN_TRAINER_STEVEN] = TRAINER_PIC_STEVEN,
-    [FACILITY_CLASS_SALON_MAIDEN] = TRAINER_PIC_SALON_MAIDEN_ANABEL,
-    [FACILITY_CLASS_DOME_ACE] = TRAINER_PIC_DOME_ACE_TUCKER,
-    [FACILITY_CLASS_PKMN_TRAINER_RED] = TRAINER_PIC_RED,
-    [FACILITY_CLASS_PKMN_TRAINER_LEAF] = TRAINER_PIC_LEAF,
-    [FACILITY_CLASS_PKMN_TRAINER_RS_BRENDAN] = TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN,
-    [FACILITY_CLASS_PKMN_TRAINER_RS_MAY] = TRAINER_PIC_RUBY_SAPPHIRE_MAY,
+    [FACILITY_CLASS_STEVEN] = TRAINER_PIC_STEVEN,
+    [FACILITY_CLASS_SALON_MAIDEN_ANABEL] = TRAINER_PIC_SALON_MAIDEN_ANABEL,
+    [FACILITY_CLASS_DOME_ACE_TUCKER] = TRAINER_PIC_DOME_ACE_TUCKER,
+    [FACILITY_CLASS_RED] = TRAINER_PIC_RED,
+    [FACILITY_CLASS_LEAF] = TRAINER_PIC_LEAF,
+    [FACILITY_CLASS_RS_BRENDAN] = TRAINER_PIC_RS_BRENDAN,
+    [FACILITY_CLASS_RS_MAY] = TRAINER_PIC_RS_MAY,
 };
 
 const u8 gFacilityClassToTrainerClass[] =
 {
     [FACILITY_CLASS_HIKER] = TRAINER_CLASS_HIKER,
-    [FACILITY_CLASS_TEAM_AQUA_1] = TRAINER_CLASS_TEAM_AQUA,
-    [FACILITY_CLASS_PKMN_BREEDER_1] = TRAINER_CLASS_PKMN_BREEDER,
-    [FACILITY_CLASS_COOLTRAINER_M] = TRAINER_CLASS_COOLTRAINER_1,
+    [FACILITY_CLASS_AQUA_GRUNT_M] = TRAINER_CLASS_TEAM_AQUA,
+    [FACILITY_CLASS_POKEMON_BREEDER_F] = TRAINER_CLASS_PKMN_BREEDER,
+    [FACILITY_CLASS_COOLTRAINER_M] = TRAINER_CLASS_COOLTRAINER,
     [FACILITY_CLASS_BIRD_KEEPER] = TRAINER_CLASS_BIRD_KEEPER,
     [FACILITY_CLASS_COLLECTOR] = TRAINER_CLASS_COLLECTOR,
-    [FACILITY_CLASS_TEAM_AQUA_2] = TRAINER_CLASS_TEAM_AQUA,
+    [FACILITY_CLASS_AQUA_GRUNT_F] = TRAINER_CLASS_TEAM_AQUA,
     [FACILITY_CLASS_SWIMMER_M] = TRAINER_CLASS_SWIMMER_M,
-    [FACILITY_CLASS_TEAM_MAGMA_1] = TRAINER_CLASS_TEAM_MAGMA,
+    [FACILITY_CLASS_MAGMA_GRUNT_M] = TRAINER_CLASS_TEAM_MAGMA,
     [FACILITY_CLASS_EXPERT_M] = TRAINER_CLASS_EXPERT,
     [FACILITY_CLASS_BLACK_BELT] = TRAINER_CLASS_BLACK_BELT,
-    [FACILITY_CLASS_AQUA_LEADER] = TRAINER_CLASS_AQUA_LEADER,
+    [FACILITY_CLASS_AQUA_LEADER_ARCHIE] = TRAINER_CLASS_AQUA_LEADER,
     [FACILITY_CLASS_HEX_MANIAC] = TRAINER_CLASS_HEX_MANIAC,
     [FACILITY_CLASS_AROMA_LADY] = TRAINER_CLASS_AROMA_LADY,
     [FACILITY_CLASS_RUIN_MANIAC] = TRAINER_CLASS_RUIN_MANIAC,
     [FACILITY_CLASS_INTERVIEWER] = TRAINER_CLASS_INTERVIEWER,
-    [FACILITY_CLASS_TUBER_1] = TRAINER_CLASS_TUBER_1,
-    [FACILITY_CLASS_TUBER_2] = TRAINER_CLASS_TUBER_2,
-    [FACILITY_CLASS_COOLTRAINER_F] = TRAINER_CLASS_COOLTRAINER_1,
+    [FACILITY_CLASS_TUBER_F] = TRAINER_CLASS_TUBER_F,
+    [FACILITY_CLASS_TUBER_M] = TRAINER_CLASS_TUBER_M,
+    [FACILITY_CLASS_COOLTRAINER_F] = TRAINER_CLASS_COOLTRAINER,
     [FACILITY_CLASS_LADY] = TRAINER_CLASS_LADY,
     [FACILITY_CLASS_BEAUTY] = TRAINER_CLASS_BEAUTY,
     [FACILITY_CLASS_RICH_BOY] = TRAINER_CLASS_RICH_BOY,
-    [FACILITY_CLASS_EXPERT_2] = TRAINER_CLASS_EXPERT,
+    [FACILITY_CLASS_EXPERT_F] = TRAINER_CLASS_EXPERT,
     [FACILITY_CLASS_POKEMANIAC] = TRAINER_CLASS_POKEMANIAC,
-    [FACILITY_CLASS_TEAM_MAGMA_2] = TRAINER_CLASS_TEAM_MAGMA,
+    [FACILITY_CLASS_MAGMA_GRUNT_F] = TRAINER_CLASS_TEAM_MAGMA,
     [FACILITY_CLASS_GUITARIST] = TRAINER_CLASS_GUITARIST,
     [FACILITY_CLASS_KINDLER] = TRAINER_CLASS_KINDLER,
     [FACILITY_CLASS_CAMPER] = TRAINER_CLASS_CAMPER,
@@ -122,25 +122,25 @@ const u8 gFacilityClassToTrainerClass[] =
     [FACILITY_CLASS_PSYCHIC_M] = TRAINER_CLASS_PSYCHIC,
     [FACILITY_CLASS_PSYCHIC_F] = TRAINER_CLASS_PSYCHIC,
     [FACILITY_CLASS_GENTLEMAN] = TRAINER_CLASS_GENTLEMAN,
-    [FACILITY_CLASS_ELITE_FOUR_1] = TRAINER_CLASS_ELITE_FOUR,
-    [FACILITY_CLASS_ELITE_FOUR_2] = TRAINER_CLASS_ELITE_FOUR,
-    [FACILITY_CLASS_LEADER_1] = TRAINER_CLASS_LEADER,
-    [FACILITY_CLASS_LEADER_2] = TRAINER_CLASS_LEADER,
-    [FACILITY_CLASS_LEADER_3] = TRAINER_CLASS_LEADER,
+    [FACILITY_CLASS_ELITE_FOUR_SIDNEY] = TRAINER_CLASS_ELITE_FOUR,
+    [FACILITY_CLASS_ELITE_FOUR_PHOEBE] = TRAINER_CLASS_ELITE_FOUR,
+    [FACILITY_CLASS_LEADER_ROXANNE] = TRAINER_CLASS_LEADER,
+    [FACILITY_CLASS_LEADER_BRAWLY] = TRAINER_CLASS_LEADER,
+    [FACILITY_CLASS_LEADER_TATE_AND_LIZA] = TRAINER_CLASS_LEADER,
     [FACILITY_CLASS_SCHOOL_KID_M] = TRAINER_CLASS_SCHOOL_KID,
     [FACILITY_CLASS_SCHOOL_KID_F] = TRAINER_CLASS_SCHOOL_KID,
     [FACILITY_CLASS_SR_AND_JR] = TRAINER_CLASS_SR_AND_JR,
-    [FACILITY_CLASS_POKEFAN_1] = TRAINER_CLASS_POKEFAN,
-    [FACILITY_CLASS_POKEFAN_2] = TRAINER_CLASS_POKEFAN,
+    [FACILITY_CLASS_POKEFAN_M] = TRAINER_CLASS_POKEFAN,
+    [FACILITY_CLASS_POKEFAN_F] = TRAINER_CLASS_POKEFAN,
     [FACILITY_CLASS_YOUNGSTER] = TRAINER_CLASS_YOUNGSTER,
-    [FACILITY_CLASS_CHAMPION] = TRAINER_CLASS_CHAMPION,
+    [FACILITY_CLASS_CHAMPION_WALLACE] = TRAINER_CLASS_CHAMPION,
     [FACILITY_CLASS_FISHERMAN] = TRAINER_CLASS_FISHERMAN,
-    [FACILITY_CLASS_TRIATHLETE_1] = TRAINER_CLASS_TRIATHLETE,
-    [FACILITY_CLASS_TRIATHLETE_2] = TRAINER_CLASS_TRIATHLETE,
-    [FACILITY_CLASS_TRIATHLETE_3] = TRAINER_CLASS_TRIATHLETE,
-    [FACILITY_CLASS_TRIATHLETE_4] = TRAINER_CLASS_TRIATHLETE,
-    [FACILITY_CLASS_TRIATHLETE_5] = TRAINER_CLASS_TRIATHLETE,
-    [FACILITY_CLASS_TRIATHLETE_6] = TRAINER_CLASS_TRIATHLETE,
+    [FACILITY_CLASS_CYCLING_TRIATHLETE_M] = TRAINER_CLASS_TRIATHLETE,
+    [FACILITY_CLASS_CYCLING_TRIATHLETE_F] = TRAINER_CLASS_TRIATHLETE,
+    [FACILITY_CLASS_RUNNING_TRIATHLETE_M] = TRAINER_CLASS_TRIATHLETE,
+    [FACILITY_CLASS_RUNNING_TRIATHLETE_F] = TRAINER_CLASS_TRIATHLETE,
+    [FACILITY_CLASS_SWIMMING_TRIATHLETE_M] = TRAINER_CLASS_TRIATHLETE,
+    [FACILITY_CLASS_SWIMMING_TRIATHLETE_F] = TRAINER_CLASS_TRIATHLETE,
     [FACILITY_CLASS_DRAGON_TAMER] = TRAINER_CLASS_DRAGON_TAMER,
     [FACILITY_CLASS_NINJA_BOY] = TRAINER_CLASS_NINJA_BOY,
     [FACILITY_CLASS_BATTLE_GIRL] = TRAINER_CLASS_BATTLE_GIRL,
@@ -148,29 +148,29 @@ const u8 gFacilityClassToTrainerClass[] =
     [FACILITY_CLASS_SWIMMER_F] = TRAINER_CLASS_SWIMMER_F,
     [FACILITY_CLASS_TWINS] = TRAINER_CLASS_TWINS,
     [FACILITY_CLASS_SAILOR] = TRAINER_CLASS_SAILOR,
-    [FACILITY_CLASS_PKMN_TRAINER_1] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_PKMN_TRAINER_WALLY] = TRAINER_CLASS_PKMN_TRAINER_3,
     [FACILITY_CLASS_PKMN_TRAINER_MAY] = TRAINER_CLASS_PKMN_TRAINER_3,
-    [FACILITY_CLASS_PKMN_TRAINER_3] = TRAINER_CLASS_PKMN_TRAINER_3,
-    [FACILITY_CLASS_PKMN_TRAINER_4] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_PKMN_TRAINER_BRENDAN_2] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_PKMN_TRAINER_BRENDAN_3] = TRAINER_CLASS_PKMN_TRAINER_3,
     [FACILITY_CLASS_PKMN_TRAINER_BRENDAN] = TRAINER_CLASS_PKMN_TRAINER_3,
-    [FACILITY_CLASS_PKMN_TRAINER_6] = TRAINER_CLASS_PKMN_TRAINER_3,
-    [FACILITY_CLASS_PKMN_TRAINER_7] = TRAINER_CLASS_PKMN_TRAINER_3,
-    [FACILITY_CLASS_PKMN_BREEDER_2] = TRAINER_CLASS_PKMN_BREEDER,
+    [FACILITY_CLASS_PKMN_TRAINER_MAY_2] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_PKMN_TRAINER_MAY_3] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_PKMN_BREEDER_M] = TRAINER_CLASS_PKMN_BREEDER,
     [FACILITY_CLASS_BUG_CATCHER] = TRAINER_CLASS_BUG_CATCHER,
     [FACILITY_CLASS_PKMN_RANGER_M] = TRAINER_CLASS_PKMN_RANGER,
     [FACILITY_CLASS_PKMN_RANGER_F] = TRAINER_CLASS_PKMN_RANGER,
-    [FACILITY_CLASS_MAGMA_LEADER] = TRAINER_CLASS_MAGMA_LEADER,
+    [FACILITY_CLASS_MAGMA_LEADER_MAXIE] = TRAINER_CLASS_MAGMA_LEADER,
     [FACILITY_CLASS_LASS] = TRAINER_CLASS_LASS,
     [FACILITY_CLASS_YOUNG_COUPLE] = TRAINER_CLASS_YOUNG_COUPLE,
     [FACILITY_CLASS_OLD_COUPLE] = TRAINER_CLASS_OLD_COUPLE,
     [FACILITY_CLASS_SIS_AND_BRO] = TRAINER_CLASS_SIS_AND_BRO,
-    [FACILITY_CLASS_PKMN_TRAINER_STEVEN] = TRAINER_CLASS_PKMN_TRAINER_3,
-    [FACILITY_CLASS_SALON_MAIDEN] = TRAINER_CLASS_SALON_MAIDEN,
-    [FACILITY_CLASS_DOME_ACE] = TRAINER_CLASS_DOME_ACE,
-    [FACILITY_CLASS_PKMN_TRAINER_RED] = TRAINER_CLASS_PKMN_TRAINER_3,
-    [FACILITY_CLASS_PKMN_TRAINER_LEAF] = TRAINER_CLASS_PKMN_TRAINER_3,
-    [FACILITY_CLASS_PKMN_TRAINER_RS_BRENDAN] = TRAINER_CLASS_PKMN_TRAINER_4,
-    [FACILITY_CLASS_PKMN_TRAINER_RS_MAY] = TRAINER_CLASS_PKMN_TRAINER_4,
+    [FACILITY_CLASS_STEVEN] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_SALON_MAIDEN_ANABEL] = TRAINER_CLASS_SALON_MAIDEN,
+    [FACILITY_CLASS_DOME_ACE_TUCKER] = TRAINER_CLASS_DOME_ACE,
+    [FACILITY_CLASS_RED] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_LEAF] = TRAINER_CLASS_PKMN_TRAINER_3,
+    [FACILITY_CLASS_RS_BRENDAN] = TRAINER_CLASS_PKMN_TRAINER_4,
+    [FACILITY_CLASS_RS_MAY] = TRAINER_CLASS_PKMN_TRAINER_4,
 };
 
 #endif //POKEEMERALD_TRAINER_CLASS_LOOKUPS_H
diff --git a/src/data/text/trainer_class_names.h b/src/data/text/trainer_class_names.h
index 62529d06e..2abbfc6d1 100644
--- a/src/data/text/trainer_class_names.h
+++ b/src/data/text/trainer_class_names.h
@@ -9,7 +9,7 @@ const u8 gTrainerClassNames[][13] = {
     [TRAINER_CLASS_HIKER] = _("HIKER"),
     [TRAINER_CLASS_TEAM_AQUA] = _("TEAM AQUA"),
     [TRAINER_CLASS_PKMN_BREEDER] = _("{PKMN} BREEDER"),
-    [TRAINER_CLASS_COOLTRAINER_1] = _("COOLTRAINER"),
+    [TRAINER_CLASS_COOLTRAINER] = _("COOLTRAINER"),
     [TRAINER_CLASS_BIRD_KEEPER] = _("BIRD KEEPER"),
     [TRAINER_CLASS_COLLECTOR] = _("COLLECTOR"),
     [TRAINER_CLASS_SWIMMER_M] = _("SWIMMER♂"),
@@ -22,8 +22,8 @@ const u8 gTrainerClassNames[][13] = {
     [TRAINER_CLASS_AROMA_LADY] = _("AROMA LADY"),
     [TRAINER_CLASS_RUIN_MANIAC] = _("RUIN MANIAC"),
     [TRAINER_CLASS_INTERVIEWER] = _("INTERVIEWER"),
-    [TRAINER_CLASS_TUBER_1] = _("TUBER"),
-    [TRAINER_CLASS_TUBER_2] = _("TUBER"),
+    [TRAINER_CLASS_TUBER_F] = _("TUBER"),
+    [TRAINER_CLASS_TUBER_M] = _("TUBER"),
     [TRAINER_CLASS_LADY] = _("LADY"),
     [TRAINER_CLASS_BEAUTY] = _("BEAUTY"),
     [TRAINER_CLASS_RICH_BOY] = _("RICH BOY"),
@@ -52,7 +52,7 @@ const u8 gTrainerClassNames[][13] = {
     [TRAINER_CLASS_SWIMMER_F] = _("SWIMMER♀"),
     [TRAINER_CLASS_TWINS] = _("TWINS"),
     [TRAINER_CLASS_SAILOR] = _("SAILOR"),
-    [TRAINER_CLASS_COOLTRAINER_2] = _("COOLTRAINER"),
+    [TRAINER_CLASS_COOLTRAINER_UNUSED] = _("COOLTRAINER"),
     [TRAINER_CLASS_MAGMA_ADMIN] = _("MAGMA ADMIN"),
     [TRAINER_CLASS_PKMN_TRAINER_3] = _("{PKMN} TRAINER"),
     [TRAINER_CLASS_BUG_CATCHER] = _("BUG CATCHER"),
diff --git a/src/data/trainer_graphics/front_pic_anims.h b/src/data/trainer_graphics/front_pic_anims.h
index 537cd557c..11fb1797f 100644
--- a/src/data/trainer_graphics/front_pic_anims.h
+++ b/src/data/trainer_graphics/front_pic_anims.h
@@ -375,7 +375,7 @@ const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[] =
     gTrainerFrontAnims_Hiker,                 // TRAINER_PIC_HIKER
     gTrainerFrontAnims_AquaGruntM,            // TRAINER_PIC_AQUA_GRUNT_M
     gTrainerFrontAnims_PokemonBreederF,       // TRAINER_PIC_POKEMON_BREEDER_F
-    gTrainerFrontAnims_CoolTrainerM,          // TRAINER_PIC_COOL_TRAINER_M
+    gTrainerFrontAnims_CoolTrainerM,          // TRAINER_PIC_COOLTRAINER_M
     gTrainerFrontAnims_BirdKeeper,            // TRAINER_PIC_BIRD_KEEPER
     gTrainerFrontAnims_Collector,             // TRAINER_PIC_COLLECTOR
     gTrainerFrontAnims_AquaGruntF,            // TRAINER_PIC_AQUA_GRUNT_F
@@ -392,7 +392,7 @@ const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[] =
     gTrainerFrontAnims_Interviewer,           // TRAINER_PIC_INTERVIEWER
     gTrainerFrontAnims_TuberF,                // TRAINER_PIC_TUBER_F
     gTrainerFrontAnims_TuberM,                // TRAINER_PIC_TUBER_M
-    gTrainerFrontAnims_CoolTrainerF,          // TRAINER_PIC_COOL_TRAINER_F
+    gTrainerFrontAnims_CoolTrainerF,          // TRAINER_PIC_COOLTRAINER_F
     gTrainerFrontAnims_Lady,                  // TRAINER_PIC_LADY
     gTrainerFrontAnims_Beauty,                // TRAINER_PIC_BEAUTY
     gTrainerFrontAnims_RichBoy,               // TRAINER_PIC_RICH_BOY
@@ -463,6 +463,6 @@ const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[] =
     gTrainerFrontAnims_PyramidKingBrandon,    // TRAINER_PIC_PYRAMID_KING_BRANDON
     gTrainerFrontAnims_Red,                   // TRAINER_PIC_RED
     gTrainerFrontAnims_Leaf,                  // TRAINER_PIC_LEAF
-    gTrainerFrontAnims_RubySapphireBrendan,   // TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN
-    gTrainerFrontAnims_RubySapphireMay,       // TRAINER_PIC_RUBY_SAPPHIRE_MAY
+    gTrainerFrontAnims_RubySapphireBrendan,   // TRAINER_PIC_RS_BRENDAN
+    gTrainerFrontAnims_RubySapphireMay,       // TRAINER_PIC_RS_MAY
 };
diff --git a/src/data/trainers.h b/src/data/trainers.h
index fe087d166..7ec297eb3 100644
--- a/src/data/trainers.h
+++ b/src/data/trainers.h
@@ -156,9 +156,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_MARCEL] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("MARCEL"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -534,9 +534,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_FELIX] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("FELIX"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -800,7 +800,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_LOLA_1] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_TUBER_1,
+        .trainerClass = TRAINER_CLASS_TUBER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_F,
         .trainerName = _("LOLA"),
@@ -814,7 +814,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_AUSTINA] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_TUBER_1,
+        .trainerClass = TRAINER_CLASS_TUBER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_F,
         .trainerName = _("AUSTINA"),
@@ -828,7 +828,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_GWEN] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_TUBER_1,
+        .trainerClass = TRAINER_CLASS_TUBER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_F,
         .trainerName = _("GWEN"),
@@ -842,7 +842,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_LOLA_2] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_TUBER_1,
+        .trainerClass = TRAINER_CLASS_TUBER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_F,
         .trainerName = _("LOLA"),
@@ -856,7 +856,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_LOLA_3] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_TUBER_1,
+        .trainerClass = TRAINER_CLASS_TUBER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_F,
         .trainerName = _("LOLA"),
@@ -870,7 +870,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_LOLA_4] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_TUBER_1,
+        .trainerClass = TRAINER_CLASS_TUBER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_F,
         .trainerName = _("LOLA"),
@@ -884,7 +884,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_LOLA_5] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_TUBER_1,
+        .trainerClass = TRAINER_CLASS_TUBER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_F,
         .trainerName = _("LOLA"),
@@ -898,7 +898,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_RICKY_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_TUBER_2,
+        .trainerClass = TRAINER_CLASS_TUBER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_M,
         .trainerName = _("RICKY"),
@@ -912,7 +912,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_SIMON] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_TUBER_2,
+        .trainerClass = TRAINER_CLASS_TUBER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_M,
         .trainerName = _("SIMON"),
@@ -926,7 +926,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_CHARLIE] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_TUBER_2,
+        .trainerClass = TRAINER_CLASS_TUBER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_M,
         .trainerName = _("CHARLIE"),
@@ -940,7 +940,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_RICKY_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_TUBER_2,
+        .trainerClass = TRAINER_CLASS_TUBER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_M,
         .trainerName = _("RICKY"),
@@ -954,7 +954,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_RICKY_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_TUBER_2,
+        .trainerClass = TRAINER_CLASS_TUBER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_M,
         .trainerName = _("RICKY"),
@@ -968,7 +968,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_RICKY_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_TUBER_2,
+        .trainerClass = TRAINER_CLASS_TUBER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_M,
         .trainerName = _("RICKY"),
@@ -982,7 +982,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_RICKY_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_TUBER_2,
+        .trainerClass = TRAINER_CLASS_TUBER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_M,
         .trainerName = _("RICKY"),
@@ -996,9 +996,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_RANDALL] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("RANDALL"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1010,9 +1010,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_PARKER] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("PARKER"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1024,9 +1024,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_GEORGE] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("GEORGE"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1038,9 +1038,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_BERKE] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("BERKE"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1052,9 +1052,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_BRAXTON] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("BRAXTON"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1066,9 +1066,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_VINCENT] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("VINCENT"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1080,9 +1080,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_LEROY] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("LEROY"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1094,9 +1094,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_WILTON_1] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("WILTON"),
         .items = {ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1108,9 +1108,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_EDGAR] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("EDGAR"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1122,9 +1122,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_ALBERT] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("ALBERT"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1136,9 +1136,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_SAMUEL] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("SAMUEL"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1150,9 +1150,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_VITO] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("VITO"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1164,9 +1164,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_OWEN] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("OWEN"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1178,9 +1178,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_WILTON_2] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("WILTON"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1192,9 +1192,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_WILTON_3] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("WILTON"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1206,9 +1206,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_WILTON_4] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("WILTON"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1220,9 +1220,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_WILTON_5] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("WILTON"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1234,9 +1234,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_WARREN] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("WARREN"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1248,9 +1248,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_MARY] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("MARY"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1262,9 +1262,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_ALEXIA] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("ALEXIA"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1276,9 +1276,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_JODY] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("JODY"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1290,9 +1290,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_WENDY] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("WENDY"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1304,9 +1304,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_KEIRA] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("KEIRA"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1318,9 +1318,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_BROOKE_1] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("BROOKE"),
         .items = {ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1332,9 +1332,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_JENNIFER] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("JENNIFER"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1346,9 +1346,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_HOPE] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("HOPE"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1360,9 +1360,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_SHANNON] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("SHANNON"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1374,9 +1374,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_MICHELLE] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("MICHELLE"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1388,9 +1388,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_CAROLINE] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("CAROLINE"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1402,9 +1402,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_JULIE] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("JULIE"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1416,9 +1416,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_BROOKE_2] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("BROOKE"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1430,9 +1430,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_BROOKE_3] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("BROOKE"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1444,9 +1444,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_BROOKE_4] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("BROOKE"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -1458,9 +1458,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_BROOKE_5] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("BROOKE"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -4538,9 +4538,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_QUINCY] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("QUINCY"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -4552,9 +4552,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_KATELYNN] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("KATELYNN"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -5840,9 +5840,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_DIANNE] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("DIANNE"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -5854,7 +5854,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_JANI] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_TUBER_1,
+        .trainerClass = TRAINER_CLASS_TUBER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_F,
         .trainerName = _("JANI"),
@@ -7044,9 +7044,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_JAZMYN] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_2,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER_UNUSED,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("JAZMYN"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -7114,9 +7114,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_MARLEY] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("MARLEY"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -7562,9 +7562,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_MITCHELL] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("MITCHELL"),
         .items = {},
         .doubleBattle = FALSE,
@@ -7646,9 +7646,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_HALLE] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("HALLE"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -8080,9 +8080,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_ATHENA] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("ATHENA"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -8374,9 +8374,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_JONATHAN] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("JONATHAN"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -9074,9 +9074,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_GERALD] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("GERALD"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -9382,9 +9382,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_ALEXA] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("ALEXA"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -9396,9 +9396,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_RUBEN] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("RUBEN"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -9760,7 +9760,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_HAILEY] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_TUBER_1,
+        .trainerClass = TRAINER_CLASS_TUBER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_F,
         .trainerName = _("HAILEY"),
@@ -9774,7 +9774,7 @@ const struct Trainer gTrainers[] = {
     [TRAINER_CHANDLER] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_TUBER_2,
+        .trainerClass = TRAINER_CLASS_TUBER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_M,
         .trainerName = _("CHANDLER"),
@@ -10264,9 +10264,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_DARCY] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("DARCY"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -10376,9 +10376,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_CAROLINA] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("CAROLINA"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -10670,9 +10670,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_LEONEL] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_M,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_M,
         .trainerName = _("LEONEL"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -10740,9 +10740,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_CRISTIN_1] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("CRISTIN"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -11594,9 +11594,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_CRISTIN_2] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("CRISTIN"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -11608,9 +11608,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_CRISTIN_3] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("CRISTIN"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -11622,9 +11622,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_CRISTIN_4] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("CRISTIN"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -11636,9 +11636,9 @@ const struct Trainer gTrainers[] = {
     [TRAINER_CRISTIN_5] =
     {
         .partyFlags = 0,
-        .trainerClass = TRAINER_CLASS_COOLTRAINER_1,
+        .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
-        .trainerPic = TRAINER_PIC_COOL_TRAINER_F,
+        .trainerPic = TRAINER_PIC_COOLTRAINER_F,
         .trainerName = _("CRISTIN"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
@@ -11946,7 +11946,7 @@ const struct Trainer gTrainers[] = {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_4,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
-        .trainerPic = TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN,
+        .trainerPic = TRAINER_PIC_RS_BRENDAN,
         .trainerName = _("BRENDAN"),
         .items = {},
         .doubleBattle = FALSE,
@@ -11960,7 +11960,7 @@ const struct Trainer gTrainers[] = {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_4,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE,
-        .trainerPic = TRAINER_PIC_RUBY_SAPPHIRE_MAY,
+        .trainerPic = TRAINER_PIC_RS_MAY,
         .trainerName = _("MAY"),
         .items = {},
         .doubleBattle = FALSE,
diff --git a/src/pokemon.c b/src/pokemon.c
index 0f7c80b77..d4d9f2ac1 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -2269,9 +2269,9 @@ const u16 gUnknown_08329D54[] =
 {
     FACILITY_CLASS_COOLTRAINER_M, FACILITY_CLASS_BLACK_BELT, FACILITY_CLASS_CAMPER,
     FACILITY_CLASS_YOUNGSTER, FACILITY_CLASS_PSYCHIC_M, FACILITY_CLASS_BUG_CATCHER,
-    FACILITY_CLASS_PKMN_BREEDER_2, FACILITY_CLASS_GUITARIST, FACILITY_CLASS_COOLTRAINER_F,
+    FACILITY_CLASS_PKMN_BREEDER_M, FACILITY_CLASS_GUITARIST, FACILITY_CLASS_COOLTRAINER_F,
     FACILITY_CLASS_HEX_MANIAC, FACILITY_CLASS_PICNICKER, FACILITY_CLASS_LASS,
-    FACILITY_CLASS_PSYCHIC_F, FACILITY_CLASS_BATTLE_GIRL, FACILITY_CLASS_PKMN_BREEDER_1,
+    FACILITY_CLASS_PSYCHIC_F, FACILITY_CLASS_BATTLE_GIRL, FACILITY_CLASS_POKEMON_BREEDER_F,
     FACILITY_CLASS_BEAUTY
 };