diff --git a/graphics/battle_environment/building/palette2.pal b/graphics/battle_environment/building/gym.pal
similarity index 100%
rename from graphics/battle_environment/building/palette2.pal
rename to graphics/battle_environment/building/gym.pal
diff --git a/graphics/battle_environment/building/palette3.pal b/graphics/battle_environment/building/leader.pal
similarity index 100%
rename from graphics/battle_environment/building/palette3.pal
rename to graphics/battle_environment/building/leader.pal
diff --git a/graphics/battle_environment/stadium/palette1.pal b/graphics/battle_environment/stadium/aqua.pal
similarity index 100%
rename from graphics/battle_environment/stadium/palette1.pal
rename to graphics/battle_environment/stadium/aqua.pal
diff --git a/graphics/battle_environment/stadium/palette6.pal b/graphics/battle_environment/stadium/drake.pal
similarity index 100%
rename from graphics/battle_environment/stadium/palette6.pal
rename to graphics/battle_environment/stadium/drake.pal
diff --git a/graphics/battle_environment/stadium/palette5.pal b/graphics/battle_environment/stadium/glacia.pal
similarity index 100%
rename from graphics/battle_environment/stadium/palette5.pal
rename to graphics/battle_environment/stadium/glacia.pal
diff --git a/graphics/battle_environment/stadium/palette2.pal b/graphics/battle_environment/stadium/magma.pal
similarity index 100%
rename from graphics/battle_environment/stadium/palette2.pal
rename to graphics/battle_environment/stadium/magma.pal
diff --git a/graphics/battle_environment/stadium/palette4.pal b/graphics/battle_environment/stadium/phoebe.pal
similarity index 100%
rename from graphics/battle_environment/stadium/palette4.pal
rename to graphics/battle_environment/stadium/phoebe.pal
diff --git a/graphics/battle_environment/stadium/palette3.pal b/graphics/battle_environment/stadium/sidney.pal
similarity index 100%
rename from graphics/battle_environment/stadium/palette3.pal
rename to graphics/battle_environment/stadium/sidney.pal
diff --git a/graphics/battle_environment/stadium/palette7.pal b/graphics/battle_environment/stadium/wallace.pal
similarity index 100%
rename from graphics/battle_environment/stadium/palette7.pal
rename to graphics/battle_environment/stadium/wallace.pal
diff --git a/src/data/graphics/battle_environment.h b/src/data/graphics/battle_environment.h
index d1abc026de..3d3ab733cc 100644
--- a/src/data/graphics/battle_environment.h
+++ b/src/data/graphics/battle_environment.h
@@ -46,15 +46,15 @@ const u32 gBattleEnvironmentPalette_Building[] = INCBIN_U32("graphics/battle_env
 
 const u32 gBattleEnvironmentPalette_Kyogre[] = INCBIN_U32("graphics/battle_environment/water/kyogre.gbapal.lz");
 const u32 gBattleEnvironmentPalette_Groudon[] = INCBIN_U32("graphics/battle_environment/cave/groudon.gbapal.lz");
-const u32 gBattleEnvironmentPalette_BuildingGym[] = INCBIN_U32("graphics/battle_environment/building/palette2.gbapal.lz");
-const u32 gBattleEnvironmentPalette_BuildingLeader[] = INCBIN_U32("graphics/battle_environment/building/palette3.gbapal.lz");
-const u32 gBattleEnvironmentPalette_StadiumAqua[] = INCBIN_U32("graphics/battle_environment/stadium/palette1.gbapal.lz");
-const u32 gBattleEnvironmentPalette_StadiumMagma[] = INCBIN_U32("graphics/battle_environment/stadium/palette2.gbapal.lz");
-const u32 gBattleEnvironmentPalette_StadiumSidney[] = INCBIN_U32("graphics/battle_environment/stadium/palette3.gbapal.lz");
-const u32 gBattleEnvironmentPalette_StadiumPhoebe[] = INCBIN_U32("graphics/battle_environment/stadium/palette4.gbapal.lz");
-const u32 gBattleEnvironmentPalette_StadiumGlacia[] = INCBIN_U32("graphics/battle_environment/stadium/palette5.gbapal.lz");
-const u32 gBattleEnvironmentPalette_StadiumDrake[] = INCBIN_U32("graphics/battle_environment/stadium/palette6.gbapal.lz");
-const u32 gBattleEnvironmentPalette_StadiumWallace[] = INCBIN_U32("graphics/battle_environment/stadium/palette7.gbapal.lz");
+const u32 gBattleEnvironmentPalette_BuildingGym[] = INCBIN_U32("graphics/battle_environment/building/gym.gbapal.lz");
+const u32 gBattleEnvironmentPalette_BuildingLeader[] = INCBIN_U32("graphics/battle_environment/building/leader.gbapal.lz");
+const u32 gBattleEnvironmentPalette_StadiumAqua[] = INCBIN_U32("graphics/battle_environment/stadium/aqua.gbapal.lz");
+const u32 gBattleEnvironmentPalette_StadiumMagma[] = INCBIN_U32("graphics/battle_environment/stadium/magma.gbapal.lz");
+const u32 gBattleEnvironmentPalette_StadiumSidney[] = INCBIN_U32("graphics/battle_environment/stadium/sidney.gbapal.lz");
+const u32 gBattleEnvironmentPalette_StadiumPhoebe[] = INCBIN_U32("graphics/battle_environment/stadium/phoebe.gbapal.lz");
+const u32 gBattleEnvironmentPalette_StadiumGlacia[] = INCBIN_U32("graphics/battle_environment/stadium/glacia.gbapal.lz");
+const u32 gBattleEnvironmentPalette_StadiumDrake[] = INCBIN_U32("graphics/battle_environment/stadium/drake.gbapal.lz");
+const u32 gBattleEnvironmentPalette_StadiumWallace[] = INCBIN_U32("graphics/battle_environment/stadium/wallace.gbapal.lz");
 const u32 gBattleEnvironmentPalette_Rayquaza[] = INCBIN_U32("graphics/battle_environment/sky/palette.gbapal.lz");
 
 const u32 gBattleEnvironmentAnimTiles_TallGrass[] = INCBIN_U32("graphics/battle_environment/tall_grass/anim_tiles.4bpp.lz");