diff --git a/include/palette.h b/include/palette.h
index c05dde873f..27b8976607 100644
--- a/include/palette.h
+++ b/include/palette.h
@@ -1,10 +1,10 @@
 #ifndef GUARD_PALETTE_H
 #define GUARD_PALETTE_H
 
-#define gPaletteFade_selectedPalettes (gPaletteFade.multipurpose1) // normal and fast fade
-#define gPaletteFade_blendCnt         (gPaletteFade.multipurpose1) // hardware fade
-#define gPaletteFade_delay            (gPaletteFade.multipurpose2) // normal and hardware fade
-#define gPaletteFade_submode          (gPaletteFade.multipurpose2) // fast fade
+#define gPaletteFadeSelectedPalettes (gPaletteFade.multipurpose1) // normal and fast fade
+#define gPaletteFadeBlendCnt         (gPaletteFade.multipurpose1) // hardware fade
+#define gPaletteFadeDelay            (gPaletteFade.multipurpose2) // normal and hardware fade
+#define gPaletteFadeSubmode          (gPaletteFade.multipurpose2) // fast fade
 
 #define PLTT_BUFFER_SIZE (PLTT_SIZE / sizeof(u16))
 
diff --git a/src/palette.c b/src/palette.c
index 3e8a370723..2979ca9076 100644
--- a/src/palette.c
+++ b/src/palette.c
@@ -128,9 +128,9 @@ bool32 BeginNormalPaletteFade(u32 selectedPalettes, s8 delay, u8 startY, u8 targ
             delay = 0;
         }
 
-        gPaletteFade_selectedPalettes = selectedPalettes;
+        gPaletteFadeSelectedPalettes = selectedPalettes;
         gPaletteFade.delayCounter = delay;
-        gPaletteFade_delay = delay;
+        gPaletteFadeDelay = delay;
         gPaletteFade.y = startY;
         gPaletteFade.targetY = targetY;
         gPaletteFade.blendColor = blendColor;
@@ -171,9 +171,9 @@ bool32 BeginTimeOfDayPaletteFade(u32 selectedPalettes, s8 delay, u8 startY, u8 t
         delay = 0;
     }
 
-    gPaletteFade_selectedPalettes = selectedPalettes;
+    gPaletteFadeSelectedPalettes = selectedPalettes;
     gPaletteFade.delayCounter = delay;
-    gPaletteFade_delay = delay;
+    gPaletteFadeDelay = delay;
     gPaletteFade.y = startY;
     gPaletteFade.targetY = targetY;
     gPaletteFade.active = 1;
@@ -239,7 +239,7 @@ static u8 UpdateTimeOfDayPaletteFade(void)
 
     if (!gPaletteFade.objPaletteToggle)
     {
-        if (gPaletteFade.delayCounter < gPaletteFade_delay)
+        if (gPaletteFade.delayCounter < gPaletteFadeDelay)
         {
             gPaletteFade.delayCounter++;
             return PALETTE_FADE_STATUS_DELAY;
@@ -251,11 +251,11 @@ static u8 UpdateTimeOfDayPaletteFade(void)
 
     if (!gPaletteFade.objPaletteToggle)
     {
-        selectedPalettes = gPaletteFade_selectedPalettes;
+        selectedPalettes = gPaletteFadeSelectedPalettes;
     }
     else
     {
-        selectedPalettes = gPaletteFade_selectedPalettes >> 16;
+        selectedPalettes = gPaletteFadeSelectedPalettes >> 16;
         paletteOffset = 256;
     }
 
@@ -303,7 +303,7 @@ static u8 UpdateTimeOfDayPaletteFade(void)
     {
         if ((gPaletteFade.yDec && gPaletteFade.y == 0) || (!gPaletteFade.yDec && gPaletteFade.y == gPaletteFade.targetY))
         {
-            gPaletteFade_selectedPalettes = 0;
+            gPaletteFadeSelectedPalettes = 0;
             gPaletteFade.softwareFadeFinishing = 1;
         }
         else
@@ -348,7 +348,7 @@ static u32 UpdateNormalPaletteFade(void)
     {
         if (!gPaletteFade.objPaletteToggle)
         {
-            if (gPaletteFade.delayCounter < gPaletteFade_delay)
+            if (gPaletteFade.delayCounter < gPaletteFadeDelay)
             {
                 gPaletteFade.delayCounter++;
                 return PALETTE_FADE_STATUS_DELAY;
@@ -360,11 +360,11 @@ static u32 UpdateNormalPaletteFade(void)
 
         if (!gPaletteFade.objPaletteToggle)
         {
-            selectedPalettes = gPaletteFade_selectedPalettes;
+            selectedPalettes = gPaletteFadeSelectedPalettes;
         }
         else
         {
-            selectedPalettes = gPaletteFade_selectedPalettes >> 16;
+            selectedPalettes = gPaletteFadeSelectedPalettes >> 16;
             paletteOffset = OBJ_PLTT_OFFSET;
         }
 
@@ -386,7 +386,7 @@ static u32 UpdateNormalPaletteFade(void)
         {
             if (gPaletteFade.y == gPaletteFade.targetY)
             {
-                gPaletteFade_selectedPalettes = 0;
+                gPaletteFadeSelectedPalettes = 0;
                 gPaletteFade.softwareFadeFinishing = TRUE;
             }
             else
@@ -483,7 +483,7 @@ void BeginFastPaletteFade(u32 submode)
 static void BeginFastPaletteFadeInternal(u32 submode)
 {
     gPaletteFade.y = 31;
-    gPaletteFade_submode = submode & 0x3F;
+    gPaletteFadeSubmode = submode & 0x3F;
     gPaletteFade.active = TRUE;
     gPaletteFade.mode = FAST_FADE;
 
@@ -526,7 +526,7 @@ static u32 UpdateFastPaletteFade(void)
         paletteOffsetEnd = OBJ_PLTT_OFFSET;
     }
 
-    switch (gPaletteFade_submode)
+    switch (gPaletteFadeSubmode)
     {
     case FAST_FADE_IN_FROM_WHITE:
         for (i = paletteOffsetStart; i < paletteOffsetEnd; i++)
@@ -631,7 +631,7 @@ static u32 UpdateFastPaletteFade(void)
 
     if (gPaletteFade.y == 0)
     {
-        switch (gPaletteFade_submode)
+        switch (gPaletteFadeSubmode)
         {
         case FAST_FADE_IN_FROM_WHITE:
         case FAST_FADE_IN_FROM_BLACK:
@@ -656,9 +656,9 @@ static u32 UpdateFastPaletteFade(void)
 
 void BeginHardwarePaletteFade(u32 blendCnt, u32 delay, u32 y, u32 targetY, u32 shouldResetBlendRegisters)
 {
-    gPaletteFade_blendCnt = blendCnt;
+    gPaletteFadeBlendCnt = blendCnt;
     gPaletteFade.delayCounter = delay;
-    gPaletteFade_delay = delay;
+    gPaletteFadeDelay = delay;
     gPaletteFade.y = y;
     gPaletteFade.targetY = targetY;
     gPaletteFade.active = TRUE;
@@ -677,7 +677,7 @@ static u32 UpdateHardwarePaletteFade(void)
     if (!gPaletteFade.active)
         return PALETTE_FADE_STATUS_DONE;
 
-    if (gPaletteFade.delayCounter < gPaletteFade_delay)
+    if (gPaletteFade.delayCounter < gPaletteFadeDelay)
     {
         gPaletteFade.delayCounter++;
         return PALETTE_FADE_STATUS_DELAY;
@@ -709,7 +709,7 @@ static u32 UpdateHardwarePaletteFade(void)
         if (gPaletteFade.shouldResetBlendRegisters)
         {
             // clear TGT1
-            gPaletteFade_blendCnt &= ~0xFF;
+            gPaletteFadeBlendCnt &= ~0xFF;
             gPaletteFade.y = 0;
         }
         gPaletteFade.shouldResetBlendRegisters = FALSE;
@@ -723,7 +723,7 @@ static u32 UpdateHardwarePaletteFade(void)
 // Only called for hardware fades
 static void UpdateBlendRegisters(void)
 {
-    SetGpuReg(REG_OFFSET_BLDCNT, (u16)gPaletteFade_blendCnt);
+    SetGpuReg(REG_OFFSET_BLDCNT, (u16)gPaletteFadeBlendCnt);
     SetGpuReg(REG_OFFSET_BLDY, gPaletteFade.y);
     // If fade-out, also adjust BLDALPHA and DISPCNT
     if (!gPaletteFade.yDec)
@@ -733,7 +733,7 @@ static void UpdateBlendRegisters(void)
         u8 tgt2 = BLDALPHA_TGT2(bldAlpha);
         u8 bldFade;
 
-        switch (gPaletteFade_blendCnt & BLDCNT_EFFECT_EFF_MASK)
+        switch (gPaletteFadeBlendCnt & BLDCNT_EFFECT_EFF_MASK)
         {
         // FADE_TO_BLACK
         case BLDCNT_EFFECT_DARKEN:
@@ -761,7 +761,7 @@ static void UpdateBlendRegisters(void)
     {
         gPaletteFade.hardwareFadeFinishing = FALSE;
         gPaletteFade.mode = 0;
-        gPaletteFade_blendCnt = 0;
+        gPaletteFadeBlendCnt = 0;
         gPaletteFade.y = 0;
         gPaletteFade.active = FALSE;
     }