diff --git a/data/trainers/parties_new_classes.asm b/data/trainers/parties_new_classes.asm
index 785af36..88a8544 100644
--- a/data/trainers/parties_new_classes.asm
+++ b/data/trainers/parties_new_classes.asm
@@ -379,7 +379,7 @@ ImposterOakGroup:
 	db BODY_SLAM, HYPER_BEAM, FIRE_BLAST, THUNDERBOLT
 	db 60
 	dw EXEGGUTOR
-	db MIRACLESEED
+	db MIRACLE_SEED
 	db SLEEP_POWDER, GIGA_DRAIN, PSYCHIC_M, STUN_SPORE
 	db 60
 	dw ARCANINE
@@ -387,7 +387,7 @@ ImposterOakGroup:
 	db FIRE_BLAST, EXTREMESPEED, BODY_SLAM, REST
 	db 60
 	dw GYARADOS
-	db MYSTICWATER
+	db MYSTIC_WATER
 	db HYDRO_PUMP, THUNDERBOLT, DOUBLE_EDGE, ROAR
 	db 60
 	dw WEEZING
@@ -445,7 +445,7 @@ LeaderGiovanniGroup: ; since he uses different sprites
 	db BELLY_DRUM, EARTHQUAKE, BODY_SLAM, ROCK_SLIDE
 	db 60
 	dw NIDOQUEEN
-	db MYSTICWATER
+	db MYSTIC_WATER
 	db SURF, FIRE_BLAST, EARTHQUAKE, BODY_SLAM
 	db 60
 	dw MAROWAK ; GUARDIA
@@ -475,7 +475,7 @@ GreenGroup:
 	db THUNDERBOLT, REST, DOUBLE_KICK, THUNDER_WAVE
 	db 60
 	dw LAPRAS
-	db MYSTICWATER
+	db MYSTIC_WATER
 	db THUNDERBOLT, ICE_BEAM, SURF, CONFUSE_RAY
 	db 60
 	dw AERODACTYL
@@ -487,7 +487,7 @@ GreenGroup:
 	db THUNDERBOLT, HYDRO_PUMP, TWISTER, ICE_BEAM
 	db 60
 	dw VENUSAUR
-	db MIRACLESEED
+	db MIRACLE_SEED
 	db GIGA_DRAIN, SLUDGE_BOMB, SWORDS_DANCE, BODY_SLAM
 	db -1 ; end
 	end_list_items
diff --git a/data/trainers/party_pointers.asm b/data/trainers/party_pointers.asm
index e692108..25c9a7b 100644
--- a/data/trainers/party_pointers.asm
+++ b/data/trainers/party_pointers.asm
@@ -85,8 +85,9 @@ TrainerGroups:
 	dba WalkerGroup
 	dba LoreleiGroup
 	dba XXXGroup
+	dba ImposterOakGroup
 	dba AgathaGroup
-	dba Giovanni3Group
+	dba LeaderGiovanniGroup
 	dba GreenGroup
 	dba KurtGroup
 	assert_table_length NUM_TRAINER_CLASSES
diff --git a/gfx/sprites.asm b/gfx/sprites.asm
index 5576ce0..9d613fe 100644
--- a/gfx/sprites.asm
+++ b/gfx/sprites.asm
@@ -120,7 +120,7 @@ TopazRunSpriteGFX::             INCBIN "gfx/sprites/topaz_run.2bpp"
 TsukushiGFX::             INCBIN "gfx/sprites/tsukushi.2bpp"
 MikanGFX::             INCBIN "gfx/sprites/mikan.2bpp"
 MediumSpriteGFX::             INCBIN "gfx/sprites/medium.2bpp"
-AgathaGFX::             INCBIN "gfx/sprites/agatha.2bpp"
+AgathaGFX::             INCBIN "gfx/sprites/kikuko.2bpp"
 HelmetBikerGFX::             INCBIN "gfx/sprites/helmet.2bpp"
 WalkerGFX::             INCBIN "gfx/sprites/hayato.2bpp"
 SpaceworldGirlGFX::             INCBIN "gfx/sprites/girl.2bpp"
diff --git a/gfx/trainers/agatha.png b/gfx/trainers/agatha.png
index 656c663..745f4c8 100644
Binary files a/gfx/trainers/agatha.png and b/gfx/trainers/agatha.png differ
diff --git a/gfx/trainers/engineer.png b/gfx/trainers/engineer.png
index 79b741c..4546534 100644
Binary files a/gfx/trainers/engineer.png and b/gfx/trainers/engineer.png differ
diff --git a/gfx/trainers/giovanni3.png b/gfx/trainers/giovanni3.png
index 07bae6a..55551ba 100644
Binary files a/gfx/trainers/giovanni3.png and b/gfx/trainers/giovanni3.png differ
diff --git a/gfx/trainers/kurt.png b/gfx/trainers/kurt.png
index fc43526..324c7bf 100644
Binary files a/gfx/trainers/kurt.png and b/gfx/trainers/kurt.png differ
diff --git a/gfx/trainers/lorelei.png b/gfx/trainers/lorelei.png
index 0b1a5fb..3c46482 100644
Binary files a/gfx/trainers/lorelei.png and b/gfx/trainers/lorelei.png differ
diff --git a/gfx/trainers/soldier.png b/gfx/trainers/soldier.png
index f4890a4..26bf56e 100644
Binary files a/gfx/trainers/soldier.png and b/gfx/trainers/soldier.png differ
diff --git a/gfx/trainers/sportsman.png b/gfx/trainers/sportsman.png
index e5849a1..a554e26 100644
Binary files a/gfx/trainers/sportsman.png and b/gfx/trainers/sportsman.png differ
diff --git a/gfx/trainers/teacherm.png b/gfx/trainers/teacherm.png
index abeffc5..63d8aeb 100644
Binary files a/gfx/trainers/teacherm.png and b/gfx/trainers/teacherm.png differ