diff --git a/include/z64.h b/include/z64.h
index bfd4dc59b..6fdff9951 100644
--- a/include/z64.h
+++ b/include/z64.h
@@ -586,17 +586,17 @@ typedef enum {
     /*  0 */ HUD_MODE_IDLE,
     /*  1 */ HUD_MODE_OFF,
     /*  2 */ HUD_MODE_OFF_ALT, // Identical to HUD_MODE_OFF
-    /*  3 */ HUD_MODE_HEARTS_W_OVERWRITE, // Uses Interface_DimButtonAlphas so gives the opportunity to overwrite
+    /*  3 */ HUD_MODE_HEARTS_WITH_DIM_BTN, // Uses Interface_DimButtonAlphas so gives the opportunity to dim only disabled buttons
     /*  4 */ HUD_MODE_A,
-    /*  5 */ HUD_MODE_A_HEARTS_MAGIC_W_OVERWRITE, // Uses Interface_DimButtonAlphas so gives the opportunity to overwrite
-    /*  6 */ HUD_MODE_A_HEARTS_MAGIC_MINIMAP_W_OVERWRITE, // Uses Interface_DimButtonAlphas so gives the opportunity to overwrite
+    /*  5 */ HUD_MODE_A_HEARTS_MAGIC_WITH_DIM_BTN, // Uses Interface_DimButtonAlphas so gives the opportunity to dim only disabled buttons
+    /*  6 */ HUD_MODE_A_HEARTS_MAGIC_MINIMAP_WITH_DIM_BTN, // Uses Interface_DimButtonAlphas so gives the opportunity to dim only disabled buttons
     /*  7 */ HUD_MODE_ALL_NO_MINIMAP_W_DISABLED, // Only raises button alphas if not disabled
     /*  8 */ HUD_MODE_B_FAST, // reaches target twice as fast
     /*  9 */ HUD_MODE_HEARTS_MAGIC,
     /* 10 */ HUD_MODE_B,
     /* 11 */ HUD_MODE_HEARTS,
     /* 12 */ HUD_MODE_A_B_MINIMAP,
-    /* 13 */ HUD_MODE_HEARTS_MAGIC_W_OVERWRITE, // Uses Interface_DimButtonAlphas so gives the opportunity to overwrite
+    /* 13 */ HUD_MODE_HEARTS_MAGIC_WITH_DIM_BTN, // Uses Interface_DimButtonAlphas so gives the opportunity to dim only disabled buttons
     /* 14 */ HUD_MODE_HEARTS_MAGIC_C,
     /* 15 */ HUD_MODE_ALL_NO_MINIMAP,
     /* 16 */ HUD_MODE_A_B_C,
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c
index 20b7cbff0..7be34d362 100644
--- a/src/code/z_parameter.c
+++ b/src/code/z_parameter.c
@@ -854,7 +854,7 @@ void Interface_UpdateHudAlphas(PlayState* play, s16 dimmingAlpha) {
 
             break;
 
-        case HUD_MODE_HEARTS_W_OVERWRITE:
+        case HUD_MODE_HEARTS_WITH_DIM_BTN:
             // aAlpha is immediately overwritten in Interface_DimButtonAlphas
             if ((interfaceCtx->aAlpha != 0) && (interfaceCtx->aAlpha > dimmingAlpha)) {
                 interfaceCtx->aAlpha = dimmingAlpha;
@@ -916,7 +916,7 @@ void Interface_UpdateHudAlphas(PlayState* play, s16 dimmingAlpha) {
 
             break;
 
-        case HUD_MODE_A_HEARTS_MAGIC_W_OVERWRITE:
+        case HUD_MODE_A_HEARTS_MAGIC_WITH_DIM_BTN:
             Interface_DimButtonAlphas(play, dimmingAlpha, risingAlpha);
 
             if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > dimmingAlpha)) {
@@ -938,7 +938,7 @@ void Interface_UpdateHudAlphas(PlayState* play, s16 dimmingAlpha) {
 
             break;
 
-        case HUD_MODE_A_HEARTS_MAGIC_MINIMAP_W_OVERWRITE:
+        case HUD_MODE_A_HEARTS_MAGIC_MINIMAP_WITH_DIM_BTN:
             Interface_DimButtonAlphas(play, dimmingAlpha, risingAlpha);
 
             // aAlpha overwrites the value set in Interface_DimButtonAlphas
@@ -1129,7 +1129,7 @@ void Interface_UpdateHudAlphas(PlayState* play, s16 dimmingAlpha) {
 
             break;
 
-        case HUD_MODE_HEARTS_MAGIC_W_OVERWRITE:
+        case HUD_MODE_HEARTS_MAGIC_WITH_DIM_BTN:
             Interface_DimButtonAlphas(play, dimmingAlpha, risingAlpha);
 
             if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > dimmingAlpha)) {
@@ -2004,7 +2004,7 @@ void func_80111CB4(PlayState* play) {
                             gSaveContext.buttonStatus[EQUIP_SLOT_C_LEFT] = BTN_DISABLED;
                             gSaveContext.buttonStatus[EQUIP_SLOT_C_DOWN] = BTN_DISABLED;
                             gSaveContext.buttonStatus[EQUIP_SLOT_C_RIGHT] = BTN_DISABLED;
-                            Interface_ChangeHudMode(HUD_MODE_A_HEARTS_MAGIC_MINIMAP_W_OVERWRITE);
+                            Interface_ChangeHudMode(HUD_MODE_A_HEARTS_MAGIC_MINIMAP_WITH_DIM_BTN);
                         }
                     }
 
@@ -2064,7 +2064,7 @@ void func_80111CB4(PlayState* play) {
                 gSaveContext.buttonStatus[EQUIP_SLOT_C_LEFT] = BTN_DISABLED;
                 gSaveContext.buttonStatus[EQUIP_SLOT_C_DOWN] = BTN_DISABLED;
                 gSaveContext.buttonStatus[EQUIP_SLOT_C_RIGHT] = BTN_DISABLED;
-                Interface_ChangeHudMode(HUD_MODE_A_HEARTS_MAGIC_MINIMAP_W_OVERWRITE);
+                Interface_ChangeHudMode(HUD_MODE_A_HEARTS_MAGIC_MINIMAP_WITH_DIM_BTN);
 
                 if (play->transitionMode != 0) {
                     Interface_ChangeHudMode(HUD_MODE_OFF);
@@ -3751,7 +3751,7 @@ void Interface_DrawItemButtons(PlayState* play) {
             gDPPipeSync(OVERLAY_DISP++);
 
             if ((gSaveContext.curHudMode == HUD_MODE_OFF) || (gSaveContext.curHudMode == HUD_MODE_OFF_ALT) ||
-                (gSaveContext.curHudMode == HUD_MODE_A_HEARTS_MAGIC_W_OVERWRITE) || (msgCtx->msgMode != 0)) {
+                (gSaveContext.curHudMode == HUD_MODE_A_HEARTS_MAGIC_WITH_DIM_BTN) || (msgCtx->msgMode != 0)) {
                 temp = 0;
             } else if (player->stateFlags1 & 0x200000) {
                 temp = 70;
@@ -6309,16 +6309,16 @@ void Interface_Update(PlayState* play) {
             }
             break;
 
-        case HUD_MODE_HEARTS_W_OVERWRITE:
+        case HUD_MODE_HEARTS_WITH_DIM_BTN:
         case HUD_MODE_A:
-        case HUD_MODE_A_HEARTS_MAGIC_W_OVERWRITE:
-        case HUD_MODE_A_HEARTS_MAGIC_MINIMAP_W_OVERWRITE:
+        case HUD_MODE_A_HEARTS_MAGIC_WITH_DIM_BTN:
+        case HUD_MODE_A_HEARTS_MAGIC_MINIMAP_WITH_DIM_BTN:
         case HUD_MODE_ALL_NO_MINIMAP_W_DISABLED:
         case HUD_MODE_HEARTS_MAGIC:
         case HUD_MODE_B:
         case HUD_MODE_HEARTS:
         case HUD_MODE_A_B_MINIMAP:
-        case HUD_MODE_HEARTS_MAGIC_W_OVERWRITE:
+        case HUD_MODE_HEARTS_MAGIC_WITH_DIM_BTN:
         case HUD_MODE_HEARTS_MAGIC_C:
         case HUD_MODE_ALL_NO_MINIMAP:
         case HUD_MODE_A_B_C: