diff --git a/audio/music/bugcatchingcontestresults.asm b/audio/music/contestresults.asm
similarity index 100%
rename from audio/music/bugcatchingcontestresults.asm
rename to audio/music/contestresults.asm
diff --git a/audio/music/johtogymleaderbattle.asm b/audio/music/johtogymbattle.asm
similarity index 100%
rename from audio/music/johtogymleaderbattle.asm
rename to audio/music/johtogymbattle.asm
diff --git a/audio/music/johtowildpokemonbattle.asm b/audio/music/johtowildbattle.asm
similarity index 100%
rename from audio/music/johtowildpokemonbattle.asm
rename to audio/music/johtowildbattle.asm
diff --git a/audio/music/johtowildpokemonbattlenight.asm b/audio/music/johtowildbattlenight.asm
similarity index 100%
rename from audio/music/johtowildpokemonbattlenight.asm
rename to audio/music/johtowildbattlenight.asm
diff --git a/audio/music/kantogymleaderbattle.asm b/audio/music/kantogymbattle.asm
similarity index 100%
rename from audio/music/kantogymleaderbattle.asm
rename to audio/music/kantogymbattle.asm
diff --git a/audio/music/kantowildpokemonbattle.asm b/audio/music/kantowildbattle.asm
similarity index 100%
rename from audio/music/kantowildpokemonbattle.asm
rename to audio/music/kantowildbattle.asm
diff --git a/audio/music/lakeofragerocketsradiosignal.asm b/audio/music/lakeofragerocketradio.asm
similarity index 100%
rename from audio/music/lakeofragerocketsradiosignal.asm
rename to audio/music/lakeofragerocketradio.asm
diff --git a/audio/music/ruinsofalphradiosignal.asm b/audio/music/ruinsofalphradio.asm
similarity index 100%
rename from audio/music/ruinsofalphradiosignal.asm
rename to audio/music/ruinsofalphradio.asm
diff --git a/main.asm b/main.asm
index a4a2959a0..70e7fa018 100644
--- a/main.asm
+++ b/main.asm
@@ -64875,7 +64875,7 @@ Music_RivalBattle:          INCLUDE "audio/music/rivalbattle.asm"
 Music_RocketBattle:         INCLUDE "audio/music/rocketbattle.asm"
 Music_ElmsLab:              INCLUDE "audio/music/elmslab.asm"
 Music_DarkCave:             INCLUDE "audio/music/darkcave.asm"
-Music_JohtoGymBattle:       INCLUDE "audio/music/johtogymleaderbattle.asm"
+Music_JohtoGymBattle:       INCLUDE "audio/music/johtogymbattle.asm"
 Music_ChampionBattle:       INCLUDE "audio/music/championbattle.asm"
 Music_SSAqua:               INCLUDE "audio/music/ssaqua.asm"
 Music_NewBarkTown:          INCLUDE "audio/music/newbarktown.asm"
@@ -64894,9 +64894,9 @@ SECTION "bank3B",ROMX,BANK[$3B]
 Music_Route1:               INCLUDE "audio/music/route1.asm"
 Music_Route3:               INCLUDE "audio/music/route3.asm"
 Music_Route12:              INCLUDE "audio/music/route12.asm"
-Music_KantoGymBattle:       INCLUDE "audio/music/kantogymleaderbattle.asm"
+Music_KantoGymBattle:       INCLUDE "audio/music/kantogymbattle.asm"
 Music_KantoTrainerBattle:   INCLUDE "audio/music/kantotrainerbattle.asm"
-Music_KantoWildBattle:      INCLUDE "audio/music/kantowildpokemonbattle.asm"
+Music_KantoWildBattle:      INCLUDE "audio/music/kantowildbattle.asm"
 Music_PokemonCenter:        INCLUDE "audio/music/pokemoncenter.asm"
 Music_LookLass:             INCLUDE "audio/music/looklass.asm"
 Music_LookOfficer:          INCLUDE "audio/music/lookofficer.asm"
@@ -64913,15 +64913,15 @@ Music_IndigoPlateau:        INCLUDE "audio/music/indigoplateau.asm"
 Music_Route37:              INCLUDE "audio/music/route37.asm"
 Music_RocketHideout:        INCLUDE "audio/music/rockethideout.asm"
 Music_DragonsDen:           INCLUDE "audio/music/dragonsden.asm"
-Music_RuinsOfAlphRadio:     INCLUDE "audio/music/ruinsofalphradiosignal.asm"
+Music_RuinsOfAlphRadio:     INCLUDE "audio/music/ruinsofalphradio.asm"
 Music_LookBeauty:           INCLUDE "audio/music/lookbeauty.asm"
 Music_Route26:              INCLUDE "audio/music/route26.asm"
 Music_EcruteakCity:         INCLUDE "audio/music/ecruteakcity.asm"
-Music_LakeOfRageRocketRadio:INCLUDE "audio/music/lakeofragerocketsradiosignal.asm"
+Music_LakeOfRageRocketRadio:INCLUDE "audio/music/lakeofragerocketradio.asm"
 Music_MagnetTrain:          INCLUDE "audio/music/magnettrain.asm"
 Music_LavenderTown:         INCLUDE "audio/music/lavendertown.asm"
 Music_DancingHall:          INCLUDE "audio/music/dancinghall.asm"
-Music_ContestResults:       INCLUDE "audio/music/bugcatchingcontestresults.asm"
+Music_ContestResults:       INCLUDE "audio/music/contestresults.asm"
 Music_Route30:              INCLUDE "audio/music/route30.asm"
 
 SECTION "bank3C",ROMX,BANK[$3C]
@@ -64964,8 +64964,8 @@ Music_NationalPark:         INCLUDE "audio/music/nationalpark.asm"
 Music_AzaleaTown:           INCLUDE "audio/music/azaleatown.asm"
 Music_CherrygroveCity:      INCLUDE "audio/music/cherrygrovecity.asm"
 Music_UnionCave:            INCLUDE "audio/music/unioncave.asm"
-Music_JohtoWildBattle:      INCLUDE "audio/music/johtowildpokemonbattle.asm"
-Music_JohtoWildBattleNight: INCLUDE "audio/music/johtowildpokemonbattlenight.asm"
+Music_JohtoWildBattle:      INCLUDE "audio/music/johtowildbattle.asm"
+Music_JohtoWildBattleNight: INCLUDE "audio/music/johtowildbattlenight.asm"
 Music_JohtoTrainerBattle:   INCLUDE "audio/music/johtotrainerbattle.asm"
 Music_LookYoungster:        INCLUDE "audio/music/lookyoungster.asm"
 Music_TinTower:             INCLUDE "audio/music/tintower.asm"