2 files changed, 20 insertions, 20 deletions

diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm
index 71311f2f7..851486d49 100644
--- a/engine/gfx/cgb_layouts.asm
+++ b/engine/gfx/cgb_layouts.asm
@@ -36,7 +36,7 @@ LoadSGBLayoutCGB:
 	dw _CGB_StatsScreenHPPals
 	dw _CGB_Pokedex
 	dw _CGB_SlotMachine
-	dw _CGB06
+	dw _CGB_BetaTitleScreen
 	dw _CGB_GSIntro
 	dw _CGB_Diploma
 	dw _CGB_MapPals
@@ -47,9 +47,9 @@ LoadSGBLayoutCGB:
 	dw _CGB_MoveList
 	dw _CGB_BetaPikachuMinigame
 	dw _CGB_PokedexSearchOption
-	dw _CGB11
+	dw _CGB_BetaPoker
 	dw _CGB_Pokepic
-	dw _CGB13
+	dw _CGB_MagnetTrain
 	dw _CGB_PackPals
 	dw _CGB_TrainerCard
 	dw _CGB_PokedexUnownMode
@@ -419,8 +419,8 @@ _CGB_SlotMachine:
 	ldh [hCGBPalUpdate], a
 	ret
 
-_CGB06:
-	ld hl, PalPacket_SCGB_06 + 1
+_CGB_BetaTitleScreen:
+	ld hl, PalPacket_BetaTitleScreen + 1
 	call CopyFourPalettes
 	call WipeAttrMap
 	ld de, wOBPals1
@@ -504,7 +504,7 @@ _CGB_GSIntro:
 	call WipeAttrMap
 	ret
 
-_CGB11:
+_CGB_BetaPoker:
 	ld hl, BetaPokerPals
 	ld de, wBGPals1
 	ld bc, 5 palettes
@@ -863,8 +863,8 @@ _CGB_Pokepic:
 	call ApplyAttrMap
 	ret
 
-_CGB13:
-	ld hl, PalPacket_SCGB_13 + 1
+_CGB_MagnetTrain:
+	ld hl, PalPacket_MagnetTrain + 1
 	call CopyFourPalettes
 	call WipeAttrMap
 	hlcoord 0, 4, wAttrMap
diff --git a/engine/gfx/sgb_layouts.asm b/engine/gfx/sgb_layouts.asm
index 7279f9a32..a0727c939 100644
--- a/engine/gfx/sgb_layouts.asm
+++ b/engine/gfx/sgb_layouts.asm
@@ -28,7 +28,7 @@ LoadSGBLayout:
 	dw .SGB_StatsScreenHPPals
 	dw .SGB_Pokedex
 	dw .SGB_SlotMachine
-	dw .SGB06
+	dw .SGB_BetaTitleScreen
 	dw .SGB_GSIntro
 	dw .SGB_Diploma
 	dw .SGB_MapPals
@@ -40,8 +40,8 @@ LoadSGBLayout:
 	dw .SGB_BetaPikachuMinigame
 	dw .SGB_PokedexSearchOption
 	dw .SGB_BetaPoker
-	dw .SGB12
-	dw .SGB13
+	dw .SGB_Pokepic
+	dw .SGB_MagnetTrain
 	dw .SGB_PackPals
 	dw .SGB_TrainerCard
 	dw .SGB_PokedexUnownMode
@@ -283,9 +283,9 @@ LoadSGBLayout:
 	ld de, BlkPacket_SlotMachine
 	ret
 
-.SGB06:
-	ld hl, PalPacket_SCGB_06
-	ld de, BlkPacket_SCGB_06
+.SGB_BetaTitleScreen:
+	ld hl, PalPacket_BetaTitleScreen
+	ld de, BlkPacket_BetaTitleScreen
 	ret
 
 .SGB_Diploma:
@@ -321,9 +321,9 @@ endr
 	ld [wSGBPredef], a
 	ret
 
-.SGB13:
-	ld hl, PalPacket_SCGB_13
-	ld de, BlkPacket_SCGB_13
+.SGB_MagnetTrain:
+	ld hl, PalPacket_MagnetTrain
+	ld de, BlkPacket_MagnetTrain
 	ret
 
 .SGB_BetaPikachuMinigame:
@@ -408,7 +408,7 @@ endr
 	ld de, BlkPacket_9a86
 	ret
 
-.SGB12:
+.SGB_Pokepic:
 	ld hl, PalPacket_9bd6
 	ld de, wSGBPals
 	ld bc, PALPACKET_LENGTH
@@ -535,7 +535,7 @@ endr
 	cp DUNGEON
 	jr z, .cave
 	cp ENVIRONMENT_5
-	jr z, .perm5
+	jr z, .env5
 	cp GATE
 	jr z, .gate
 	ld a, [wMapGroup]
@@ -554,7 +554,7 @@ endr
 	ld a, PREDEFPAL_DUNGEONS
 	ret
 
-.perm5
+.env5
 	ld a, PREDEFPAL_VERMILION
 	ret