s/gWindowConfig/gWindowTemplate/g

49 files changed, 295 insertions, 295 deletions

diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index dccf73fa8..42cc0b538 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -234,7 +234,7 @@ void InitBattle(void)
     }
     //sub_80895F8(gUnknown_081F9674.unk0, gUnknown_081F9674.unk4, gUnknown_081F9674.unk8);
     sub_80895F8(gUnknown_081F9674);
-    SetUpWindowConfig(&gWindowConfig_81E6C58);
+    SetUpWindowConfig(&gWindowTemplate_81E6C58);
     ResetPaletteFade();
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
@@ -245,9 +245,9 @@ void InitBattle(void)
     gUnknown_030041B0 = 0;
     gUnknown_030041B8 = 0;
     gBattleTerrain = BattleSetup_GetTerrain();
-    Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowConfig_81E6C58);
-    Text_InitWindowWithTemplate(&gUnknown_030041D0, &gWindowConfig_81E71D0);
-    Text_InitWindowWithTemplate(&gUnknown_03004250, &gWindowConfig_81E71EC);
+    Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6C58);
+    Text_InitWindowWithTemplate(&gUnknown_030041D0, &gWindowTemplate_81E71D0);
+    Text_InitWindowWithTemplate(&gUnknown_03004250, &gWindowTemplate_81E71EC);
     sub_800D6D4();
     sub_800DAB8();
     ResetSpriteData();
@@ -1210,7 +1210,7 @@ void c2_8011A1C(void)
         gUnknown_03004DE0[0][i] = 0xFF10;
         gUnknown_03004DE0[1][i] = 0xFF10;
     }
-    SetUpWindowConfig(&gWindowConfig_81E6C58);
+    SetUpWindowConfig(&gWindowTemplate_81E6C58);
     ResetPaletteFade();
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
@@ -1221,9 +1221,9 @@ void c2_8011A1C(void)
     gUnknown_030041B0 = 0;
     gUnknown_030041B8 = 0;
 
-    Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowConfig_81E6C58);
-    Text_InitWindowWithTemplate(&gUnknown_030041D0, &gWindowConfig_81E71D0);
-    Text_InitWindowWithTemplate(&gUnknown_03004250, &gWindowConfig_81E71EC);
+    Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6C58);
+    Text_InitWindowWithTemplate(&gUnknown_030041D0, &gWindowTemplate_81E71D0);
+    Text_InitWindowWithTemplate(&gUnknown_03004250, &gWindowTemplate_81E71EC);
     sub_800D6D4();
     LoadCompressedPalette(gUnknown_08D004E0, 0, 64);
     sub_800D74C();
diff --git a/src/battle/reshow_battle_screen.c b/src/battle/reshow_battle_screen.c
index fded87090..bf77e5c07 100644
--- a/src/battle/reshow_battle_screen.c
+++ b/src/battle/reshow_battle_screen.c
@@ -78,9 +78,9 @@ static void CB2_ReshowBattleScreenAfterMenu(void)
     {
     case 0:
         dp12_8087EA4();
-        SetUpWindowConfig(&gWindowConfig_81E6C58);
+        SetUpWindowConfig(&gWindowTemplate_81E6C58);
         ResetPaletteFade();
-        Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowConfig_81E6C58);
+        Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6C58);
         gBattle_BG0_X = 0;
         gBattle_BG0_Y = 0;
         gBattle_BG1_X = 0;
diff --git a/src/contest.c b/src/contest.c
index c935f0ecb..3677a1d25 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -357,16 +357,16 @@ void LoadContestBgAfterMoveAnim(void)
 
 void SetUpContestWindow(void)
 {
-    SetUpWindowConfig(&gWindowConfig_81E6FD8);
-    Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowConfig_81E6FD8);
-    Text_InitWindowWithTemplate(&gMenuWindow, &gWindowConfig_81E6FF4);
+    SetUpWindowConfig(&gWindowTemplate_81E6FD8);
+    Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6FD8);
+    Text_InitWindowWithTemplate(&gMenuWindow, &gWindowTemplate_81E6FF4);
 }
 
 void sub_80AB350(void)
 {
     u8 i;
 
-    LoadFontDefaultPalette(&gWindowConfig_81E6FD8);
+    LoadFontDefaultPalette(&gWindowTemplate_81E6FD8);
     FillPalette(0, 0, 2);
     for (i = 10; i < 14; i++)
         LoadPalette(gPlttBufferUnfaded + 241, 240 + i, 2);
diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c
index 2c20ba72b..52b83d4b1 100644
--- a/src/debug/matsuda_debug_menu.c
+++ b/src/debug/matsuda_debug_menu.c
@@ -449,8 +449,8 @@ static void sub_80A9F50(void)
 {
     REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP;
     REG_DISPCNT |= DISPCNT_OBJ_ON | DISPCNT_BG0_ON;
-    SetUpWindowConfig(&gWindowConfig_81E6C3C);
-    Text_InitWindowWithTemplate(&gMenuWindow, &gWindowConfig_81E6C3C);
+    SetUpWindowConfig(&gWindowTemplate_81E6C3C);
+    Text_InitWindowWithTemplate(&gMenuWindow, &gWindowTemplate_81E6C3C);
     REG_MOSAIC = 0;
     REG_BLDCNT = 0;
     REG_BLDALPHA = 0;
@@ -490,7 +490,7 @@ static void sub_80A9FE4(void)
         }
     }
     sub_80034D4((void *)VRAM, ptr);
-    LoadFontDefaultPalette(&gWindowConfig_81E6C3C);
+    LoadFontDefaultPalette(&gWindowTemplate_81E6C3C);
 }
 
 static void sub_80AA064(void)
@@ -1075,9 +1075,9 @@ void unref_sub_80AB084(u8 *text)
             break;
         }
     }
-    SetUpWindowConfig(&gWindowConfig_81E6FD8);
-    Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowConfig_81E6FD8);
-    LoadFontDefaultPalette(&gWindowConfig_81E6FD8);
+    SetUpWindowConfig(&gWindowTemplate_81E6FD8);
+    Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6FD8);
+    LoadFontDefaultPalette(&gWindowTemplate_81E6FD8);
     Text_InitWindowAndPrintText(&gUnknown_03004210, text, 1, 9, 7);
 }
 
diff --git a/src/debug/sound_check_menu.c b/src/debug/sound_check_menu.c
index 4f4a7bd06..411ff6f54 100644
--- a/src/debug/sound_check_menu.c
+++ b/src/debug/sound_check_menu.c
@@ -132,8 +132,8 @@ void CB2_StartSoundCheckMenu(void)
     ResetPaletteFade();
     ResetTasks();
     ResetSpriteData();
-    SetUpWindowConfig(&gWindowConfig_81E6C3C);
-    InitMenuWindow(&gWindowConfig_81E6CE4);
+    SetUpWindowConfig(&gWindowTemplate_81E6C3C);
+    InitMenuWindow(&gWindowTemplate_81E6CE4);
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
     REG_WIN0H = WIN_RANGE(0, 0);
     REG_WIN0V = WIN_RANGE(0, 0);
@@ -1217,8 +1217,8 @@ void Task_InitCryTest(u8 taskId)
     struct CryRelatedStruct cryStruct, cryStruct2;
     u8 zero;
 
-    SetUpWindowConfig(&gWindowConfig_81E6C3C);
-    InitMenuWindow(&gWindowConfig_81E6CE4);
+    SetUpWindowConfig(&gWindowTemplate_81E6C3C);
+    InitMenuWindow(&gWindowTemplate_81E6CE4);
     gSoundTestCryNum = 1;
     ResetSpriteData();
     FreeAllSpritePalettes();
diff --git a/src/easy_chat_1.c b/src/easy_chat_1.c
index 908e4b9d6..8d68adfe9 100644
--- a/src/easy_chat_1.c
+++ b/src/easy_chat_1.c
@@ -16,8 +16,8 @@
 #include "strings.h"
 #include "unknown_task.h"
 
-extern const struct WindowTemplate gWindowConfig_81E6D54;
-extern const struct WindowTemplate gWindowConfig_81E6DA8;
+extern const struct WindowTemplate gWindowTemplate_81E6D54;
+extern const struct WindowTemplate gWindowTemplate_81E6DA8;
 
 extern void sub_80546B8(void);
 
@@ -305,11 +305,11 @@ void sub_80E62F8(void)
         FreeAllSpritePalettes();
         break;
     case 1:
-        SetUpWindowConfig(&gWindowConfig_81E6DA8);
+        SetUpWindowConfig(&gWindowTemplate_81E6DA8);
         break;
     case 2:
-        InitMenuWindow(&gWindowConfig_81E6D54);
-        InitMenuWindow(&gWindowConfig_81E6DA8);
+        InitMenuWindow(&gWindowTemplate_81E6D54);
+        InitMenuWindow(&gWindowTemplate_81E6DA8);
         Menu_EraseScreen();
         break;
     case 3:
diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c
index 5acdba04e..66af7fc04 100644
--- a/src/easy_chat_2.c
+++ b/src/easy_chat_2.c
@@ -1064,7 +1064,7 @@ void sub_80E91B0(const u8 *a, u8 b, u8 c, u8 d)
 
 void sub_80E91D4(u8 a)
 {
-    BasicInitMenuWindow(&gWindowConfig_81E6DA8);
+    BasicInitMenuWindow(&gWindowTemplate_81E6DA8);
 
     if (a == 10)
     {
@@ -1168,7 +1168,7 @@ void sub_80E9368(u8 a)
         break;
     }
 
-    BasicInitMenuWindow(&gWindowConfig_81E6D8C);
+    BasicInitMenuWindow(&gWindowTemplate_81E6D8C);
     gEasyChatStruct->unk9F8E[0] = EXT_CTRL_CODE_BEGIN;
     gEasyChatStruct->unk9F8E[1] = 5;
     gEasyChatStruct->unk9F8E[2] = 1;
@@ -1189,7 +1189,7 @@ void sub_80E9368(u8 a)
         Menu_PrintText(gEasyChatStruct->unk9F8E, 0, 0);
         Menu_PrintText(gEasyChatStruct->unk9F8E, 28, 0);
     }
-    BasicInitMenuWindow(&gWindowConfig_81E6DA8);
+    BasicInitMenuWindow(&gWindowTemplate_81E6DA8);
 }
 
 void sub_80E948C(void)
@@ -1219,7 +1219,7 @@ void sub_80E948C(void)
 
 void sub_80E95A4(void)
 {
-    BasicInitMenuWindow(&gWindowConfig_81E6D8C);
+    BasicInitMenuWindow(&gWindowTemplate_81E6D8C);
     switch (gEasyChatStruct->unk9)
     {
     case 4:
@@ -1241,7 +1241,7 @@ void sub_80E95A4(void)
         sub_80E9620(3, 6);
         break;
     }
-    BasicInitMenuWindow(&gWindowConfig_81E6DA8);
+    BasicInitMenuWindow(&gWindowTemplate_81E6DA8);
 }
 
 void sub_80E9620(u16 a, u16 b)
@@ -1281,7 +1281,7 @@ void sub_80E9620(u16 a, u16 b)
 
 void sub_80E9744(void)
 {
-    BasicInitMenuWindow(&gWindowConfig_81E6D8C);
+    BasicInitMenuWindow(&gWindowTemplate_81E6D8C);
     switch (gEasyChatStruct->unk9)
     {
     case 4:
@@ -1303,7 +1303,7 @@ void sub_80E9744(void)
         sub_80E97C0(3, 6);
         break;
     }
-    BasicInitMenuWindow(&gWindowConfig_81E6DA8);
+    BasicInitMenuWindow(&gWindowTemplate_81E6DA8);
 }
 
 void sub_80E97C0(u16 a, u16 b)
@@ -1348,7 +1348,7 @@ void sub_80E98C4(void)
     u8 r1;
     u8 r3;
 
-    BasicInitMenuWindow(&gWindowConfig_81E6D8C);
+    BasicInitMenuWindow(&gWindowTemplate_81E6D8C);
     switch (gEasyChatStruct->unk9)
     {
     case 4:
@@ -1379,7 +1379,7 @@ void sub_80E98C4(void)
         return;
     }
     Menu_BlankWindowRect(2, r1, 27, r3 * 2 + r1 - 1);
-    BasicInitMenuWindow(&gWindowConfig_81E6DA8);
+    BasicInitMenuWindow(&gWindowTemplate_81E6DA8);
 }
 
 void sub_80E9940(u8 *a, u8 b)
@@ -1420,7 +1420,7 @@ const u8 *const gUnknown_083DBEAC[] =
 
 void sub_80E9974(void)
 {
-    BasicInitMenuWindow(&gWindowConfig_81E6D54);
+    BasicInitMenuWindow(&gWindowTemplate_81E6D54);
     if (gEasyChatStruct->unk26 == 0)
     {
         u16 i;
@@ -1479,7 +1479,7 @@ void sub_80E9AD4(void)
 {
     u16 i;
 
-    BasicInitMenuWindow(&gWindowConfig_81E6D54);
+    BasicInitMenuWindow(&gWindowTemplate_81E6D54);
     for (i = 0; i < 16; i++)
         sub_80E9C74(i);
 }
@@ -1502,16 +1502,16 @@ void sub_80E9AF8(u16 a)
         for (i = 0; i < gEasyChatStruct->unk99A6[a]; i++)
         {
             if (sub_80EB2D4(gEasyChatStruct->unk9A2A[a][i]) == 7)
-                BasicInitMenuWindow(&gWindowConfig_81E6D70);
+                BasicInitMenuWindow(&gWindowTemplate_81E6D70);
             else
-                BasicInitMenuWindow(&gWindowConfig_81E6D54);
+                BasicInitMenuWindow(&gWindowTemplate_81E6D54);
             sub_80EB218(r8, gEasyChatStruct->unk9A2A[a][i], 9);
             sub_80E9A60(gEasyChatStruct->unk9E14, i * 11 + 4, a * 2);
         }
     }
     else
     {
-        BasicInitMenuWindow(&gWindowConfig_81E6D54);
+        BasicInitMenuWindow(&gWindowTemplate_81E6D54);
         for (i = 0; i < gEasyChatStruct->unk99A6[a]; i++)
         {
             sub_80EB218(r8, gEasyChatStruct->unk9A2A[a][i], 9);
@@ -1562,7 +1562,7 @@ void sub_80E9D7C(void)
     u16 r4;
     u16 i;
 
-    BasicInitMenuWindow(&gWindowConfig_81E6D54);
+    BasicInitMenuWindow(&gWindowTemplate_81E6D54);
     if (gEasyChatStruct->unk1C0 < 0)
     {
         r6 = -gEasyChatStruct->unk1C0;
diff --git a/src/engine/clear_save_data_menu.c b/src/engine/clear_save_data_menu.c
index ae6c85180..6a597690a 100644
--- a/src/engine/clear_save_data_menu.c
+++ b/src/engine/clear_save_data_menu.c
@@ -133,8 +133,8 @@ static u8 InitClearSaveDataScreen(void)
         ResetTasks();
         ResetSpriteData();
 
-        SetUpWindowConfig(&gWindowConfig_81E6C3C);
-        InitMenuWindow(&gWindowConfig_81E6CE4);
+        SetUpWindowConfig(&gWindowTemplate_81E6C3C);
+        InitMenuWindow(&gWindowTemplate_81E6CE4);
         BeginNormalPaletteFade(-1, 0, 0x10, 0, 0xffff);
 
         ime = REG_IME;
diff --git a/src/engine/link.c b/src/engine/link.c
index a2df02b5f..d52d0bb7a 100644
--- a/src/engine/link.c
+++ b/src/engine/link.c
@@ -238,8 +238,8 @@ void LinkTestScreen(void)
     FreeAllSpritePalettes();
     ResetTasks();
     SetVBlankCallback(VBlankCB_LinkTest);
-    SetUpWindowConfig(&gWindowConfig_81E6CE4);
-    InitMenuWindow((struct WindowTemplate *)&gWindowConfig_81E6CE4);
+    SetUpWindowConfig(&gWindowTemplate_81E6CE4);
+    InitMenuWindow((struct WindowTemplate *)&gWindowTemplate_81E6CE4);
     ResetBlockSend();
     gLinkType = 0x1111;
     OpenLink();
@@ -1236,8 +1236,8 @@ void CB2_LinkError(void)
     FillPalette(0, 0, 2);
     ResetTasks();
     SetVBlankCallback(VBlankCB_LinkTest);
-    SetUpWindowConfig(&gWindowConfig_81E7198);
-    InitMenuWindow((struct WindowTemplate *)&gWindowConfig_81E7198);
+    SetUpWindowConfig(&gWindowTemplate_81E7198);
+    InitMenuWindow((struct WindowTemplate *)&gWindowTemplate_81E7198);
     Menu_EraseScreen();
     REG_BLDALPHA = 0;
     REG_BG0VOFS = 0;
diff --git a/src/engine/main_menu.c b/src/engine/main_menu.c
index 623969802..723886664 100644
--- a/src/engine/main_menu.c
+++ b/src/engine/main_menu.c
@@ -233,8 +233,8 @@ u32 InitMainMenu(u8 a1)
     ResetTasks();
     ResetSpriteData();
     FreeAllSpritePalettes();
-    SetUpWindowConfig(&gWindowConfig_81E6C3C);
-    InitMenuWindow((struct WindowTemplate *)&gWindowConfig_81E6CE4);
+    SetUpWindowConfig(&gWindowTemplate_81E6C3C);
+    InitMenuWindow((struct WindowTemplate *)&gWindowTemplate_81E6CE4);
 
     if (a1)
         BeginNormalPaletteFade(-1, 0, 0x10, 0, 0x0000); // fade to black
@@ -750,8 +750,8 @@ void PrintBadgeCount(void)
 
 static void Task_NewGameSpeech1(u8 taskId)
 {
-    SetUpWindowConfig(&gWindowConfig_81E6C3C);
-    InitMenuWindow((struct WindowTemplate *)&gWindowConfig_81E6CE4);
+    SetUpWindowConfig(&gWindowTemplate_81E6C3C);
+    InitMenuWindow((struct WindowTemplate *)&gWindowTemplate_81E6CE4);
     REG_WIN0H = 0;
     REG_WIN0V = 0;
     REG_WININ = 0;
@@ -1373,8 +1373,8 @@ void CB_ContinueNewGameSpeechPart2()
     FreeAllSpritePalettes();
     AddBirchSpeechObjects(taskId);
 
-    SetUpWindowConfig(&gWindowConfig_81E6C3C);
-    InitMenuWindow((struct WindowTemplate *)&gWindowConfig_81E6CE4);
+    SetUpWindowConfig(&gWindowTemplate_81E6C3C);
+    InitMenuWindow((struct WindowTemplate *)&gWindowTemplate_81E6CE4);
 
     if (gSaveBlock2.playerGender != MALE)
     {
diff --git a/src/engine/mystery_event_menu.c b/src/engine/mystery_event_menu.c
index abb912938..278760233 100644
--- a/src/engine/mystery_event_menu.c
+++ b/src/engine/mystery_event_menu.c
@@ -45,8 +45,8 @@ void CB2_InitMysteryEventMenu(void)
     FreeAllSpritePalettes();
     ResetTasks();
     SetVBlankCallback(VBlankCB);
-    SetUpWindowConfig(&gWindowConfig_81E6CE4);
-    InitMenuWindow(&gWindowConfig_81E6CE4);
+    SetUpWindowConfig(&gWindowTemplate_81E6CE4);
+    InitMenuWindow(&gWindowTemplate_81E6CE4);
     Menu_EraseScreen();
     REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON;
     REG_BLDCNT = 0;
diff --git a/src/engine/naming_screen.c b/src/engine/naming_screen.c
index 5685584f5..880187dc0 100644
--- a/src/engine/naming_screen.c
+++ b/src/engine/naming_screen.c
@@ -325,8 +325,8 @@ static void NamingScreen_Init(void)
 
 static void NamingScreen_SetUpWindow(void)
 {
-    SetUpWindowConfig(&gWindowConfig_81E6E88);
-    InitMenuWindow(&gWindowConfig_81E6E88);
+    SetUpWindowConfig(&gWindowTemplate_81E6E88);
+    InitMenuWindow(&gWindowTemplate_81E6E88);
 }
 
 static void NamingScreen_ResetObjects(void)
@@ -1610,7 +1610,7 @@ static void DisplaySentToPCMessage(void)
 {
     StringCopy(gStringVar1, namingScreenDataPtr->destBuffer);
     StringExpandPlaceholders(gStringVar4, gOtherText_SentToPC);
-    BasicInitMenuWindow(&gWindowConfig_81E6E88);
+    BasicInitMenuWindow(&gWindowTemplate_81E6E88);
     Menu_DisplayDialogueFrame();
     MenuPrintMessageDefaultCoords(gStringVar4);
 }
@@ -1760,16 +1760,16 @@ static void (*const gUnknown_083CE310[][2])(void) =
 static const struct WindowTemplate *const gUnknown_083CE328[][2][2] =
 {
     {
-        {&gWindowConfig_81E6EDC, &gWindowConfig_81E6EF8},
-        {&gWindowConfig_81E6EA4, &gWindowConfig_81E6EC0},
+        {&gWindowTemplate_81E6EDC, &gWindowTemplate_81E6EF8},
+        {&gWindowTemplate_81E6EA4, &gWindowTemplate_81E6EC0},
     },
     {
-        {&gWindowConfig_81E6EA4, &gWindowConfig_81E6EC0},
-        {&gWindowConfig_81E6F14, &gWindowConfig_81E6F30},
+        {&gWindowTemplate_81E6EA4, &gWindowTemplate_81E6EC0},
+        {&gWindowTemplate_81E6F14, &gWindowTemplate_81E6F30},
     },
     {
-        {&gWindowConfig_81E6F14, &gWindowConfig_81E6F30},
-        {&gWindowConfig_81E6EDC, &gWindowConfig_81E6EF8},
+        {&gWindowTemplate_81E6F14, &gWindowTemplate_81E6F30},
+        {&gWindowTemplate_81E6EDC, &gWindowTemplate_81E6EF8},
     },
 };
 
@@ -1843,7 +1843,7 @@ static void PrintKeyboardCharacters(u8 page)  //print letters on page
 
 static void sub_80B78A8(void)
 {
-    BasicInitMenuWindow(&gWindowConfig_81E6F4C);
+    BasicInitMenuWindow(&gWindowTemplate_81E6F4C);
     gUnknown_083CE358[namingScreenDataPtr->templateNum]();
     gUnknown_083CE368[namingScreenDataPtr->template->unk3]();
     Menu_PrintText(namingScreenDataPtr->template->title, 9, 2);
@@ -1886,7 +1886,7 @@ static void sub_80B7960(void)
     string[5] = 1;
     string += 6;
     StringCopy(string, namingScreenDataPtr->textBuffer);
-    BasicInitMenuWindow(&gWindowConfig_81E6F4C);
+    BasicInitMenuWindow(&gWindowTemplate_81E6F4C);
     Menu_PrintText(gStringVar1, namingScreenDataPtr->unk2, 4);
 }
 
diff --git a/src/engine/option_menu.c b/src/engine/option_menu.c
index f35ed5b5a..2b9412e45 100644
--- a/src/engine/option_menu.c
+++ b/src/engine/option_menu.c
@@ -116,11 +116,11 @@ void CB2_InitOptionMenu(void)
         gMain.state++;
         break;
     case 2:
-        SetUpWindowConfig(&gWindowConfig_81E71B4);
+        SetUpWindowConfig(&gWindowTemplate_81E71B4);
         gMain.state++;
         break;
     case 3:
-        MultistepInitMenuWindowBegin(&gWindowConfig_81E71B4);
+        MultistepInitMenuWindowBegin(&gWindowTemplate_81E71B4);
         gMain.state++;
         break;
     case 4:
diff --git a/src/engine/reset_rtc_screen.c b/src/engine/reset_rtc_screen.c
index eb823b84b..37b1c767e 100644
--- a/src/engine/reset_rtc_screen.c
+++ b/src/engine/reset_rtc_screen.c
@@ -443,8 +443,8 @@ void CB2_InitResetRtcScreen(void)
     ResetSpriteData();
     ResetTasks();
     ResetPaletteFade();
-    SetUpWindowConfig(&gWindowConfig_81E6CE4);
-    InitMenuWindow(&gWindowConfig_81E6CE4);
+    SetUpWindowConfig(&gWindowTemplate_81E6CE4);
+    InitMenuWindow(&gWindowTemplate_81E6CE4);
     REG_DISPCNT = 4352;
     SetVBlankCallback(VBlankCB_ResetRtcScreen);
     SetMainCallback2(CB2_ResetRtcScreen);
diff --git a/src/engine/save_failed_screen.c b/src/engine/save_failed_screen.c
index a4642d241..4609f3fd8 100644
--- a/src/engine/save_failed_screen.c
+++ b/src/engine/save_failed_screen.c
@@ -120,8 +120,8 @@ static void CB2_SaveFailedScreen(void)
         ResetPaletteFade();
         LoadPalette(&gBirchBagGrassPal, 0, sizeof(gBirchBagGrassPal));
         LoadPalette(&gSaveFailedClockPal, 0x100, sizeof(gSaveFailedClockPal));
-        SetUpWindowConfig(&gWindowConfig_81E6C3C);
-        InitMenuWindow(&gWindowConfig_81E6CE4);
+        SetUpWindowConfig(&gWindowTemplate_81E6C3C);
+        InitMenuWindow(&gWindowTemplate_81E6CE4);
         Menu_DrawStdWindowFrame(13, CLOCK_WIN_TOP, 16, CLOCK_WIN_TOP + 3); // clock window
         Menu_DrawStdWindowFrame(1, MSG_WIN_TOP, 28, 19); // message window
         Menu_PrintText(gSystemText_SaveFailedBackupCheck, 2, MSG_WIN_TOP + 1);
diff --git a/src/engine/text.c b/src/engine/text.c
index 2d6d95877..15a535ff0 100644
--- a/src/engine/text.c
+++ b/src/engine/text.c
@@ -492,7 +492,7 @@ static const ShiftGlyphTileShadowedFunc sShiftGlyphTileShadowedFuncs[] =
     ShiftGlyphTile_ShadowedFont_Width8,
 };
 
-const struct WindowTemplate gWindowConfig_81E6C3C =
+const struct WindowTemplate gWindowTemplate_81E6C3C =
 {
     0, // BG number
     2, // BG character base block
@@ -513,7 +513,7 @@ const struct WindowTemplate gWindowConfig_81E6C3C =
     BG_SCREEN_ADDR(31), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E6C58 =
+const struct WindowTemplate gWindowTemplate_81E6C58 =
 {
     0, // BG number
     0, // BG character base block
@@ -534,7 +534,7 @@ const struct WindowTemplate gWindowConfig_81E6C58 =
     BG_SCREEN_ADDR(24), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E6C74 =
+const struct WindowTemplate gWindowTemplate_81E6C74 =
 {
     0, // BG number
     0, // BG character base block
@@ -555,7 +555,7 @@ const struct WindowTemplate gWindowConfig_81E6C74 =
     NULL, // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E6C90 =
+const struct WindowTemplate gWindowTemplate_81E6C90 =
 {
     0, // BG number
     1, // BG character base block
@@ -576,7 +576,7 @@ const struct WindowTemplate gWindowConfig_81E6C90 =
     BG_SCREEN_ADDR(30), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E6CAC =
+const struct WindowTemplate gWindowTemplate_81E6CAC =
 {
     0, // BG number
     0, // BG character base block
@@ -597,7 +597,7 @@ const struct WindowTemplate gWindowConfig_81E6CAC =
     NULL, // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E6CC8 =
+const struct WindowTemplate gWindowTemplate_81E6CC8 =
 {
     2, // BG number
     2, // BG character base block
@@ -618,7 +618,7 @@ const struct WindowTemplate gWindowConfig_81E6CC8 =
     BG_SCREEN_ADDR(15), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E6CE4 =
+const struct WindowTemplate gWindowTemplate_81E6CE4 =
 {
     0, // BG number
     2, // BG character base block
@@ -639,7 +639,7 @@ const struct WindowTemplate gWindowConfig_81E6CE4 =
     BG_SCREEN_ADDR(31), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E6D00 =
+const struct WindowTemplate gWindowTemplate_81E6D00 =
 {
     0, // BG number
     0, // BG character base block
@@ -660,7 +660,7 @@ const struct WindowTemplate gWindowConfig_81E6D00 =
     BG_SCREEN_ADDR(31), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E6D1C =
+const struct WindowTemplate gWindowTemplate_81E6D1C =
 {
     1, // BG number
     0, // BG character base block
@@ -681,7 +681,7 @@ const struct WindowTemplate gWindowConfig_81E6D1C =
     BG_SCREEN_ADDR(31), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E6D38 =
+const struct WindowTemplate gWindowTemplate_81E6D38 =
 {
     0, // BG number
     0, // BG character base block
@@ -702,7 +702,7 @@ const struct WindowTemplate gWindowConfig_81E6D38 =
     NULL, // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E6D54 =
+const struct WindowTemplate gWindowTemplate_81E6D54 =
 {
     3, // BG number
     3, // BG character base block
@@ -723,7 +723,7 @@ const struct WindowTemplate gWindowConfig_81E6D54 =
     BG_SCREEN_ADDR(15), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E6D70 =
+const struct WindowTemplate gWindowTemplate_81E6D70 =
 {
     3, // BG number
     3, // BG character base block
@@ -744,7 +744,7 @@ const struct WindowTemplate gWindowConfig_81E6D70 =
     BG_SCREEN_ADDR(15), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E6D8C =
+const struct WindowTemplate gWindowTemplate_81E6D8C =
 {
     1, // BG number
     0, // BG character base block
@@ -765,7 +765,7 @@ const struct WindowTemplate gWindowConfig_81E6D8C =
     BG_SCREEN_ADDR(14), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E6DA8 =
+const struct WindowTemplate gWindowTemplate_81E6DA8 =
 {
     0, // BG number
     0, // BG character base block
@@ -828,7 +828,7 @@ const struct WindowTemplate WindowConfig_TrainerCard_Back_Labels =
     BG_SCREEN_ADDR(30), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E6DFC =
+const struct WindowTemplate gWindowTemplate_81E6DFC =
 {
     0, // BG number
     2, // BG character base block
@@ -849,7 +849,7 @@ const struct WindowTemplate gWindowConfig_81E6DFC =
     BG_SCREEN_ADDR(31), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E6E18 =
+const struct WindowTemplate gWindowTemplate_81E6E18 =
 {
     0, // BG number
     2, // BG character base block
@@ -870,7 +870,7 @@ const struct WindowTemplate gWindowConfig_81E6E18 =
     BG_SCREEN_ADDR(31), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E6E34 =
+const struct WindowTemplate gWindowTemplate_81E6E34 =
 {
     1, // BG number
     0, // BG character base block
@@ -891,7 +891,7 @@ const struct WindowTemplate gWindowConfig_81E6E34 =
     BG_SCREEN_ADDR(31), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E6E50 =
+const struct WindowTemplate gWindowTemplate_81E6E50 =
 {
     0, // BG number
     2, // BG character base block
@@ -912,7 +912,7 @@ const struct WindowTemplate gWindowConfig_81E6E50 =
     BG_SCREEN_ADDR(28), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E6E6C =
+const struct WindowTemplate gWindowTemplate_81E6E6C =
 {
     0, // BG number
     2, // BG character base block
@@ -933,7 +933,7 @@ const struct WindowTemplate gWindowConfig_81E6E6C =
     BG_SCREEN_ADDR(30), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E6E88 =
+const struct WindowTemplate gWindowTemplate_81E6E88 =
 {
     0, // BG number
     0, // BG character base block
@@ -954,7 +954,7 @@ const struct WindowTemplate gWindowConfig_81E6E88 =
     BG_SCREEN_ADDR(31), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E6EA4 =
+const struct WindowTemplate gWindowTemplate_81E6EA4 =
 {
     1, // BG number
     0, // BG character base block
@@ -975,7 +975,7 @@ const struct WindowTemplate gWindowConfig_81E6EA4 =
     BG_SCREEN_ADDR(28), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E6EC0 =
+const struct WindowTemplate gWindowTemplate_81E6EC0 =
 {
     2, // BG number
     2, // BG character base block
@@ -996,7 +996,7 @@ const struct WindowTemplate gWindowConfig_81E6EC0 =
     BG_SCREEN_ADDR(29), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E6EDC =
+const struct WindowTemplate gWindowTemplate_81E6EDC =
 {
     1, // BG number
     0, // BG character base block
@@ -1017,7 +1017,7 @@ const struct WindowTemplate gWindowConfig_81E6EDC =
     BG_SCREEN_ADDR(28), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E6EF8 =
+const struct WindowTemplate gWindowTemplate_81E6EF8 =
 {
     2, // BG number
     2, // BG character base block
@@ -1038,7 +1038,7 @@ const struct WindowTemplate gWindowConfig_81E6EF8 =
     BG_SCREEN_ADDR(29), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E6F14 =
+const struct WindowTemplate gWindowTemplate_81E6F14 =
 {
     1, // BG number
     0, // BG character base block
@@ -1059,7 +1059,7 @@ const struct WindowTemplate gWindowConfig_81E6F14 =
     BG_SCREEN_ADDR(28), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E6F30 =
+const struct WindowTemplate gWindowTemplate_81E6F30 =
 {
     2, // BG number
     2, // BG character base block
@@ -1080,7 +1080,7 @@ const struct WindowTemplate gWindowConfig_81E6F30 =
     BG_SCREEN_ADDR(29), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E6F4C =
+const struct WindowTemplate gWindowTemplate_81E6F4C =
 {
     3, // BG number
     0, // BG character base block
@@ -1101,7 +1101,7 @@ const struct WindowTemplate gWindowConfig_81E6F4C =
     BG_SCREEN_ADDR(30), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E6F68 =
+const struct WindowTemplate gWindowTemplate_81E6F68 =
 {
     0, // BG number
     2, // BG character base block
@@ -1122,7 +1122,7 @@ const struct WindowTemplate gWindowConfig_81E6F68 =
     BG_SCREEN_ADDR(13), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E6F84 =
+const struct WindowTemplate gWindowTemplate_81E6F84 =
 {
     0, // BG number
     2, // BG character base block
@@ -1143,7 +1143,7 @@ const struct WindowTemplate gWindowConfig_81E6F84 =
     BG_SCREEN_ADDR(31), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E6FA0 =
+const struct WindowTemplate gWindowTemplate_81E6FA0 =
 {
     1, // BG number
     0, // BG character base block
@@ -1164,7 +1164,7 @@ const struct WindowTemplate gWindowConfig_81E6FA0 =
     BG_SCREEN_ADDR(24), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E6FBC =
+const struct WindowTemplate gWindowTemplate_81E6FBC =
 {
     0, // BG number
     0, // BG character base block
@@ -1185,7 +1185,7 @@ const struct WindowTemplate gWindowConfig_81E6FBC =
     BG_SCREEN_ADDR(30), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E6FD8 =
+const struct WindowTemplate gWindowTemplate_81E6FD8 =
 {
     0, // BG number
     0, // BG character base block
@@ -1206,7 +1206,7 @@ const struct WindowTemplate gWindowConfig_81E6FD8 =
     BG_SCREEN_ADDR(24), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E6FF4 =
+const struct WindowTemplate gWindowTemplate_81E6FF4 =
 {
     0, // BG number
     0, // BG character base block
@@ -1227,7 +1227,7 @@ const struct WindowTemplate gWindowConfig_81E6FF4 =
     BG_SCREEN_ADDR(24), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E7010 =
+const struct WindowTemplate gWindowTemplate_81E7010 =
 {
     0, // BG number
     0, // BG character base block
@@ -1248,7 +1248,7 @@ const struct WindowTemplate gWindowConfig_81E7010 =
     BG_SCREEN_ADDR(30), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E702C =
+const struct WindowTemplate gWindowTemplate_81E702C =
 {
     3, // BG number
     2, // BG character base block
@@ -1269,7 +1269,7 @@ const struct WindowTemplate gWindowConfig_81E702C =
     BG_SCREEN_ADDR(15), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E7048 =
+const struct WindowTemplate gWindowTemplate_81E7048 =
 {
     2, // BG number
     2, // BG character base block
@@ -1290,7 +1290,7 @@ const struct WindowTemplate gWindowConfig_81E7048 =
     BG_SCREEN_ADDR(14), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E7064 =
+const struct WindowTemplate gWindowTemplate_81E7064 =
 {
     2, // BG number
     2, // BG character base block
@@ -1311,7 +1311,7 @@ const struct WindowTemplate gWindowConfig_81E7064 =
     BG_SCREEN_ADDR(14), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E7080 =
+const struct WindowTemplate gWindowTemplate_81E7080 =
 {
     3, // BG number
     0, // BG character base block
@@ -1332,7 +1332,7 @@ const struct WindowTemplate gWindowConfig_81E7080 =
     BG_SCREEN_ADDR(30), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E709C =
+const struct WindowTemplate gWindowTemplate_81E709C =
 {
     0, // BG number
     0, // BG character base block
@@ -1353,7 +1353,7 @@ const struct WindowTemplate gWindowConfig_81E709C =
     BG_SCREEN_ADDR(31), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E70B8 =
+const struct WindowTemplate gWindowTemplate_81E70B8 =
 {
     2, // BG number
     0, // BG character base block
@@ -1374,7 +1374,7 @@ const struct WindowTemplate gWindowConfig_81E70B8 =
     BG_SCREEN_ADDR(30), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E70D4 =
+const struct WindowTemplate gWindowTemplate_81E70D4 =
 {
     3, // BG number
     0, // BG character base block
@@ -1395,7 +1395,7 @@ const struct WindowTemplate gWindowConfig_81E70D4 =
     BG_SCREEN_ADDR(30), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E70F0 =
+const struct WindowTemplate gWindowTemplate_81E70F0 =
 {
     0, // BG number
     0, // BG character base block
@@ -1416,7 +1416,7 @@ const struct WindowTemplate gWindowConfig_81E70F0 =
     NULL, // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E710C =
+const struct WindowTemplate gWindowTemplate_81E710C =
 {
     0, // BG number
     0, // BG character base block
@@ -1437,7 +1437,7 @@ const struct WindowTemplate gWindowConfig_81E710C =
     BG_SCREEN_ADDR(31), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E7128 =
+const struct WindowTemplate gWindowTemplate_81E7128 =
 {
     0, // BG number
     2, // BG character base block
@@ -1458,7 +1458,7 @@ const struct WindowTemplate gWindowConfig_81E7128 =
     BG_SCREEN_ADDR(31), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E7144 =
+const struct WindowTemplate gWindowTemplate_81E7144 =
 {
     0, // BG number
     2, // BG character base block
@@ -1479,7 +1479,7 @@ const struct WindowTemplate gWindowConfig_81E7144 =
     BG_SCREEN_ADDR(31), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E7160 =
+const struct WindowTemplate gWindowTemplate_81E7160 =
 {
     1, // BG number
     1, // BG character base block
@@ -1500,7 +1500,7 @@ const struct WindowTemplate gWindowConfig_81E7160 =
     BG_SCREEN_ADDR(10), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E717C =
+const struct WindowTemplate gWindowTemplate_81E717C =
 {
     0, // BG number
     3, // BG character base block
@@ -1521,7 +1521,7 @@ const struct WindowTemplate gWindowConfig_81E717C =
     BG_SCREEN_ADDR(31), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E7198 =
+const struct WindowTemplate gWindowTemplate_81E7198 =
 {
     0, // BG number
     2, // BG character base block
@@ -1542,7 +1542,7 @@ const struct WindowTemplate gWindowConfig_81E7198 =
     BG_SCREEN_ADDR(15), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E71B4 =
+const struct WindowTemplate gWindowTemplate_81E71B4 =
 {
     0, // BG number
     2, // BG character base block
@@ -1563,7 +1563,7 @@ const struct WindowTemplate gWindowConfig_81E71B4 =
     BG_SCREEN_ADDR(15), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E71D0 =
+const struct WindowTemplate gWindowTemplate_81E71D0 =
 {
     1, // BG number
     1, // BG character base block
@@ -1584,7 +1584,7 @@ const struct WindowTemplate gWindowConfig_81E71D0 =
     BG_SCREEN_ADDR(28), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E71EC =
+const struct WindowTemplate gWindowTemplate_81E71EC =
 {
     2, // BG number
     1, // BG character base block
@@ -1605,7 +1605,7 @@ const struct WindowTemplate gWindowConfig_81E71EC =
     BG_SCREEN_ADDR(30), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E7208 =
+const struct WindowTemplate gWindowTemplate_81E7208 =
 {
     0, // BG number
     2, // BG character base block
@@ -1626,7 +1626,7 @@ const struct WindowTemplate gWindowConfig_81E7208 =
     BG_SCREEN_ADDR(28), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E7224 =
+const struct WindowTemplate gWindowTemplate_81E7224 =
 {
     0, // BG number
     0, // BG character base block
@@ -1647,7 +1647,7 @@ const struct WindowTemplate gWindowConfig_81E7224 =
     BG_SCREEN_ADDR(31), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E7240 =
+const struct WindowTemplate gWindowTemplate_81E7240 =
 {
     1, // BG number
     2, // BG character base block
@@ -1668,7 +1668,7 @@ const struct WindowTemplate gWindowConfig_81E7240 =
     BG_SCREEN_ADDR(30), // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E725C =
+const struct WindowTemplate gWindowTemplate_81E725C =
 {
     0, // BG number
     0, // BG character base block
@@ -1689,7 +1689,7 @@ const struct WindowTemplate gWindowConfig_81E725C =
     NULL, // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E7278 =
+const struct WindowTemplate gWindowTemplate_81E7278 =
 {
     0, // BG number
     0, // BG character base block
@@ -1710,7 +1710,7 @@ const struct WindowTemplate gWindowConfig_81E7278 =
     NULL, // tilemap
 };
 
-const struct WindowTemplate gWindowConfig_81E7294 =
+const struct WindowTemplate gWindowTemplate_81E7294 =
 {
     0, // BG number
     0, // BG character base block
@@ -2364,24 +2364,24 @@ u8 sub_8003490(struct Window *win, u8 c, u16 tileDataStartOffset, u8 left, u8 to
 
 void sub_80034D4(u8 *tileData, const u8 *text)
 {
-    sub_8004E3C(&gWindowConfig_81E6C74, tileData, text);
+    sub_8004E3C(&gWindowTemplate_81E6C74, tileData, text);
 }
 
 u8 sub_80034EC(u8 *str)
 {
-    return Text_GetStringWidthFromWindowTemplate((struct WindowTemplate *)&gWindowConfig_81E6C74, str);
+    return Text_GetStringWidthFromWindowTemplate((struct WindowTemplate *)&gWindowTemplate_81E6C74, str);
 }
 
 u8 *sub_8003504(u8 *dest, s32 value, u8 alignAmount, u8 alignType)
 {
-    sTempWindow.template = (struct WindowTemplate *)&gWindowConfig_81E6C74;
+    sTempWindow.template = (struct WindowTemplate *)&gWindowTemplate_81E6C74;
     Text_InitWindow(&sTempWindow, 0, 0, 0, 0);
     return AlignInt2(&sTempWindow, dest, value, alignAmount, alignType);
 }
 
 u8 *sub_8003558(u8 *dest, const u8 *src, u8 alignAmount, u8 alignType)
 {
-    sTempWindow.template = (struct WindowTemplate *)&gWindowConfig_81E6C74;
+    sTempWindow.template = (struct WindowTemplate *)&gWindowTemplate_81E6C74;
     Text_InitWindow(&sTempWindow, src, 0, 0, 0);
     return AlignString(&sTempWindow, dest, src, alignAmount, alignType);
 }
diff --git a/src/engine/trade.c b/src/engine/trade.c
index d37b36f72..30e22b8d5 100644
--- a/src/engine/trade.c
+++ b/src/engine/trade.c
@@ -1016,10 +1016,10 @@ void sub_8047CD8(void)
 static void sub_8047CE8(void)
 {
     u8 mpId;
-    sub_804AFB8(&gWindowConfig_81E725C, gUnknown_020296CC[0], gSaveBlock2.playerName, 0xC);
+    sub_804AFB8(&gWindowTemplate_81E725C, gUnknown_020296CC[0], gSaveBlock2.playerName, 0xC);
     mpId = GetMultiplayerId();
-    sub_804AFB8(&gWindowConfig_81E725C, gUnknown_020296CC[3], gLinkPlayers[mpId ^ 1].name, 0xC);
-    sub_804AFB8(&gWindowConfig_81E725C, gUnknown_020296CC[6], gUnknown_0820C14C[0], 0x8);
+    sub_804AFB8(&gWindowTemplate_81E725C, gUnknown_020296CC[3], gLinkPlayers[mpId ^ 1].name, 0xC);
+    sub_804AFB8(&gWindowTemplate_81E725C, gUnknown_020296CC[6], gUnknown_0820C14C[0], 0x8);
     sub_804ACD8(gUnknown_0820C14C[1], gUnknown_020296CC[8], 0x14);
     nullsub_5(3, 0);
 }
@@ -1087,9 +1087,9 @@ static void sub_8047EC0(void)
             ResetTasks();
             sub_804A964(&gUnknown_03004824->unk_00c8, BG_SCREEN_ADDR(5));
             SetVBlankCallback(sub_80489F4);
-            InitMenuWindow(&gWindowConfig_81E6CE4);
-            SetUpWindowConfig(&gWindowConfig_81E6F84);
-            Text_InitWindowWithTemplate(&gUnknown_03004824->window, &gWindowConfig_81E6F84);
+            InitMenuWindow(&gWindowTemplate_81E6CE4);
+            SetUpWindowConfig(&gWindowTemplate_81E6F84);
+            Text_InitWindowWithTemplate(&gUnknown_03004824->window, &gWindowTemplate_81E6F84);
             gUnknown_03004824->unk_007a = TextWindow_SetBaseTileNum(20);
             TextWindow_LoadStdFrameGraphics(&gUnknown_03004824->window);
             Menu_EraseScreen();
@@ -1267,9 +1267,9 @@ static void sub_80484F4(void)
             ResetTasks();
             sub_804A964(&gUnknown_03004824->unk_00c8, BG_SCREEN_ADDR(5));
             SetVBlankCallback(sub_80489F4);
-            InitMenuWindow(&gWindowConfig_81E6CE4);
-            SetUpWindowConfig(&gWindowConfig_81E6F84);
-            Text_InitWindowWithTemplate(&gUnknown_03004824->window, &gWindowConfig_81E6F84);
+            InitMenuWindow(&gWindowTemplate_81E6CE4);
+            SetUpWindowConfig(&gWindowTemplate_81E6F84);
+            Text_InitWindowWithTemplate(&gUnknown_03004824->window, &gWindowTemplate_81E6F84);
             gUnknown_03004824->unk_007a = TextWindow_SetBaseTileNum(20);
             TextWindow_LoadStdFrameGraphics(&gUnknown_03004824->window);
             Menu_EraseScreen();
@@ -3010,7 +3010,7 @@ u8 sub_804A2B4(u8 *a0, u8 whichParty, u8 whichPokemon)
         GetMonGender(&gEnemyParty[whichPokemon]);
         GetMonData(&gEnemyParty[whichPokemon], MON_DATA_LEVEL);
     }
-    return Text_GetStringWidthFromWindowTemplate(&gWindowConfig_81E7294, a0);
+    return Text_GetStringWidthFromWindowTemplate(&gWindowTemplate_81E7294, a0);
 }
 
 #ifdef NONMATCHING
@@ -3067,7 +3067,7 @@ static void sub_804A41C(u8 whichParty)
         GetMonData(pokemon, MON_DATA_NICKNAME, nickname);
         StringCopy10(string + 6, nickname);
         GetMonGender(pokemon);
-        string[5] = (50 - Text_GetStringWidthFromWindowTemplate(&gWindowConfig_81E7294, string + 6)) / 2;
+        string[5] = (50 - Text_GetStringWidthFromWindowTemplate(&gWindowTemplate_81E7294, string + 6)) / 2;
         Text_InitWindowAndPrintText(&gUnknown_03004824->window, string, gUnknown_03004824->unk_007a + 22 * 6 * whichParty + 22 * i, gTradeMonSpriteCoords[i + 6 * whichParty][0], gTradeMonSpriteCoords[i + 6 * whichParty][1]);
     }
 }
@@ -3141,7 +3141,7 @@ static void sub_804A41C(u8 whichParty)
                     "\tbl GetMonGender\n"
                     "\tmov r1, sp\n"
                     "\tadds r1, 0x22\n"
-                    "\tldr r0, _0804A518 @ =gWindowConfig_81E7294\n"
+                    "\tldr r0, _0804A518 @ =gWindowTemplate_81E7294\n"
                     "\tbl Text_GetStringWidthFromWindowTemplate\n"
                     "\tlsls r0, 24\n"
                     "\tlsrs r0, 24\n"
@@ -3198,7 +3198,7 @@ static void sub_804A41C(u8 whichParty)
                     "\tbx r0\n"
                     "\t.align 2, 0\n"
                     "_0804A514: .4byte gEnemyParty\n"
-                    "_0804A518: .4byte gWindowConfig_81E7294");
+                    "_0804A518: .4byte gWindowTemplate_81E7294");
 }
 #endif
 
@@ -3523,7 +3523,7 @@ static bool8 sub_804ABF8(void)
 
 static void sub_804ACD8(const u8 *src, u8 *dest, u8 a2)
 {
-    sub_804AFB8(&gWindowConfig_81E725C, dest, src, a2);
+    sub_804AFB8(&gWindowTemplate_81E725C, dest, src, a2);
 }
 
 #ifdef NONMATCHING
@@ -4028,8 +4028,8 @@ static void sub_804B41C(void)
             FreeAllSpritePalettes();
             SetVBlankCallback(sub_804B210);
             sub_804B228();
-            SetUpWindowConfig(&gWindowConfig_81E6F84);
-            Text_InitWindowWithTemplate(&gUnknown_03004828->window, &gWindowConfig_81E6F84);
+            SetUpWindowConfig(&gWindowTemplate_81E6F84);
+            Text_InitWindowWithTemplate(&gUnknown_03004828->window, &gWindowTemplate_81E6F84);
             gUnknown_03004828->textWindowBaseTileNum = TextWindow_SetBaseTileNum(2);
             TextWindow_LoadStdFrameGraphics(&gUnknown_03004828->window);
             Menu_EraseScreen();
@@ -4182,7 +4182,7 @@ static __attribute__((naked)) void sub_804B41C(void)
                     "\tldr r0, _0804B578 @ =sub_804B210\n"
                     "\tbl SetVBlankCallback\n"
                     "\tbl sub_804B228\n"
-                    "\tldr r4, _0804B57C @ =gWindowConfig_81E6F84\n"
+                    "\tldr r4, _0804B57C @ =gWindowTemplate_81E6F84\n"
                     "\tadds r0, r4, 0\n"
                     "\tbl SetUpWindowConfig\n"
                     "\tldr r0, [r6]\n"
@@ -4279,7 +4279,7 @@ static __attribute__((naked)) void sub_804B41C(void)
                     "_0804B570: .4byte gUnknown_03004828\n"
                     "_0804B574: .4byte gSharedMem + 0x1F000\n"
                     "_0804B578: .4byte sub_804B210\n"
-                    "_0804B57C: .4byte gWindowConfig_81E6F84\n"
+                    "_0804B57C: .4byte gWindowTemplate_81E6F84\n"
                     "_0804B580: .4byte gLinkType\n"
                     "_0804B584: .4byte 0x00001144\n"
                     "_0804B588: .4byte gMain\n"
@@ -4531,8 +4531,8 @@ static void sub_804B790(void)
             FreeAllSpritePalettes();
             SetVBlankCallback(sub_804B210);
             sub_804B228();
-            SetUpWindowConfig(&gWindowConfig_81E717C);
-            Text_InitWindowWithTemplate(&gUnknown_03004828->window, &gWindowConfig_81E717C);
+            SetUpWindowConfig(&gWindowTemplate_81E717C);
+            Text_InitWindowWithTemplate(&gUnknown_03004828->window, &gWindowTemplate_81E717C);
             gUnknown_03004828->textWindowBaseTileNum = TextWindow_SetBaseTileNum(2);
             TextWindow_LoadStdFrameGraphics(&gUnknown_03004828->window);
             Menu_EraseScreen();
diff --git a/src/field/berry_tag_screen.c b/src/field/berry_tag_screen.c
index f57face11..75e481f84 100644
--- a/src/field/berry_tag_screen.c
+++ b/src/field/berry_tag_screen.c
@@ -109,11 +109,11 @@ static bool8 sub_8146058(void)
         gMain.state += 1;
         break;
     case 3:
-        SetUpWindowConfig(&gWindowConfig_81E6E18);
+        SetUpWindowConfig(&gWindowTemplate_81E6E18);
         gMain.state += 1;
         break;
     case 4:
-        MultistepInitMenuWindowBegin(&gWindowConfig_81E6E18);
+        MultistepInitMenuWindowBegin(&gWindowTemplate_81E6E18);
         gMain.state += 1;
         break;
     case 5:
diff --git a/src/field/diploma.c b/src/field/diploma.c
index b9cdb65df..8481589cb 100644
--- a/src/field/diploma.c
+++ b/src/field/diploma.c
@@ -68,8 +68,8 @@ void CB2_ShowDiploma(void)
     ResetPaletteFade();
     FreeAllSpritePalettes();
     LoadPalette(gDiplomaPalettes, 0, 64);
-    SetUpWindowConfig(&gWindowConfig_81E6C3C);
-    InitMenuWindow(&gWindowConfig_81E6CE4);
+    SetUpWindowConfig(&gWindowTemplate_81E6C3C);
+    InitMenuWindow(&gWindowTemplate_81E6CE4);
     DisplayDiplomaText();
     BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
 
diff --git a/src/field/field_effect.c b/src/field/field_effect.c
index 1e2aaa4ed..57d9072b1 100644
--- a/src/field/field_effect.c
+++ b/src/field/field_effect.c
@@ -2434,8 +2434,8 @@ void sub_8088380(struct Task *task)
     IntrCallback callback;
     LoadWordFromTwoHalfwords((u16 *)&task->data[13], (u32 *)&callback);
     SetVBlankCallback(callback);
-    SetUpWindowConfig(&gWindowConfig_81E6CE4);
-    InitMenuWindow(&gWindowConfig_81E6CE4);
+    SetUpWindowConfig(&gWindowTemplate_81E6CE4);
+    InitMenuWindow(&gWindowTemplate_81E6CE4);
     FreeResourcesAndDestroySprite(&gSprites[task->data[15]]);
     FieldEffectActiveListRemove(FLDEFF_FIELD_MOVE_SHOW_MON);
     DestroyTask(FindTaskIdByFunc(sub_8088120));
@@ -2557,8 +2557,8 @@ void sub_808862C(struct Task *task)
     CpuFill32(0, (void *)VRAM + bg0cnt, 0x800);
     LoadWordFromTwoHalfwords((u16 *)&task->data[13], (u32 *)&intrCallback);
     SetVBlankCallback(intrCallback);
-    SetUpWindowConfig(&gWindowConfig_81E6CE4);
-    InitMenuWindow(&gWindowConfig_81E6CE4);
+    SetUpWindowConfig(&gWindowTemplate_81E6CE4);
+    InitMenuWindow(&gWindowTemplate_81E6CE4);
     FreeResourcesAndDestroySprite(&gSprites[task->data[15]]);
     FieldEffectActiveListRemove(FLDEFF_FIELD_MOVE_SHOW_MON);
     DestroyTask(FindTaskIdByFunc(sub_808847C));
diff --git a/src/field/field_message_box.c b/src/field/field_message_box.c
index 284fdb3f0..5eec7a14b 100644
--- a/src/field/field_message_box.c
+++ b/src/field/field_message_box.c
@@ -20,7 +20,7 @@ void InitFieldMessageBox(void)
 {
     sMessageBoxMode = FIELD_MESSAGE_BOX_HIDDEN;
     TextWindow_SetDlgFrameBaseTileNum(gMenuTextWindowContentTileOffset);
-    Text_InitWindowWithTemplate(&gFieldMessageBoxWindow, &gWindowConfig_81E6CE4);
+    Text_InitWindowWithTemplate(&gFieldMessageBoxWindow, &gWindowTemplate_81E6CE4);
 }
 
 static void Task_FieldMessageBox(u8 taskId)
diff --git a/src/field/field_region_map.c b/src/field/field_region_map.c
index af8e4ec8a..afbc25226 100644
--- a/src/field/field_region_map.c
+++ b/src/field/field_region_map.c
@@ -50,8 +50,8 @@ void CB2_FieldInitRegionMap(void)
     InitRegionMap((void *)&ewram0_5.unk8, 0);
     CreateRegionMapPlayerIcon(0, 0);
     CreateRegionMapCursor(1, 1);
-    SetUpWindowConfig(&gWindowConfig_81E709C);
-    InitMenuWindow(&gWindowConfig_81E709C);
+    SetUpWindowConfig(&gWindowTemplate_81E709C);
+    InitMenuWindow(&gWindowTemplate_81E709C);
     Menu_EraseScreen();
     REG_BG0CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(31) | BGCNT_16COLOR | BGCNT_TXT256x256;
     Menu_DrawStdWindowFrame(21, 0, 29, 3);
diff --git a/src/field/field_screen_effect.c b/src/field/field_screen_effect.c
index f123768e5..6e818ce68 100644
--- a/src/field/field_screen_effect.c
+++ b/src/field/field_screen_effect.c
@@ -265,7 +265,7 @@ static void sub_80816A8(u8 taskId)
         break;
     case 5:
         Menu_EraseWindowRect(0, 0, 29, 19);
-        LoadFontDefaultPalette(&gWindowConfig_81E6CE4);
+        LoadFontDefaultPalette(&gWindowTemplate_81E6CE4);
         REG_WIN0H = 255;
         REG_DISPCNT = data[6];
         REG_BLDCNT = data[7];
diff --git a/src/field/item_menu.c b/src/field/item_menu.c
index 0db48f55d..f58f42fb9 100644
--- a/src/field/item_menu.c
+++ b/src/field/item_menu.c
@@ -424,11 +424,11 @@ static bool8 SetupBagMultistep(void)
         gMain.state++;
         break;
     case 7:
-        SetUpWindowConfig(&gWindowConfig_81E6DFC);
+        SetUpWindowConfig(&gWindowTemplate_81E6DFC);
         gMain.state++;
         break;
     case 8:
-        MultistepInitMenuWindowBegin(&gWindowConfig_81E6DFC);
+        MultistepInitMenuWindowBegin(&gWindowTemplate_81E6DFC);
         gMain.state++;
         break;
     case 9:
diff --git a/src/field/mauville_man.c b/src/field/mauville_man.c
index 82c6dffe3..c3a73e18b 100644
--- a/src/field/mauville_man.c
+++ b/src/field/mauville_man.c
@@ -858,7 +858,7 @@ static void Task_BardSong(u8 taskId)
     {
     case 0:  // Initialize song
         PrepareSongText();
-        Text_InitWindowWithTemplate(gMenuWindowPtr, &gWindowConfig_81E6CE4);
+        Text_InitWindowWithTemplate(gMenuWindowPtr, &gWindowTemplate_81E6CE4);
         Text_InitWindow8002EB0(gMenuWindowPtr, gStringVar4, 2, 4, 15);
         task->data[1] = 0;
         task->data[2] = 0;
diff --git a/src/field/overworld.c b/src/field/overworld.c
index e239daec7..e91c8ae56 100644
--- a/src/field/overworld.c
+++ b/src/field/overworld.c
@@ -1456,8 +1456,8 @@ bool32 sub_805483C(u8 *a1)
     case 4:
         sub_8054814();
         sub_8054C54();
-        SetUpWindowConfig(&gWindowConfig_81E6C3C);
-        InitMenuWindow(&gWindowConfig_81E6CE4);
+        SetUpWindowConfig(&gWindowTemplate_81E6C3C);
+        InitMenuWindow(&gWindowTemplate_81E6CE4);
         (*a1)++;
         break;
     case 5:
@@ -1522,8 +1522,8 @@ bool32 sub_805493C(u8 *a1, u32 a2)
     case 4:
         sub_8054814();
         sub_8054C54();
-        SetUpWindowConfig(&gWindowConfig_81E6C3C);
-        InitMenuWindow(&gWindowConfig_81E6CE4);
+        SetUpWindowConfig(&gWindowTemplate_81E6C3C);
+        InitMenuWindow(&gWindowTemplate_81E6CE4);
         (*a1)++;
         break;
     case 5:
@@ -1612,8 +1612,8 @@ bool32 sub_8054A9C(u8 *a1)
     case 3:
         sub_8054814();
         sub_8054C54();
-        SetUpWindowConfig(&gWindowConfig_81E6C3C);
-        InitMenuWindow(&gWindowConfig_81E6CE4);
+        SetUpWindowConfig(&gWindowTemplate_81E6C3C);
+        InitMenuWindow(&gWindowTemplate_81E6CE4);
         (*a1)++;
         break;
     case 4:
@@ -1695,8 +1695,8 @@ void sub_8054C2C(void)
 {
     sub_8054814();
     sub_8054C54();
-    SetUpWindowConfig(&gWindowConfig_81E6C3C);
-    InitMenuWindow(&gWindowConfig_81E6CE4);
+    SetUpWindowConfig(&gWindowTemplate_81E6C3C);
+    InitMenuWindow(&gWindowTemplate_81E6CE4);
     mapdata_load_assets_to_gpu_and_full_redraw();
 }
 
diff --git a/src/field/party_menu.c b/src/field/party_menu.c
index f589494f4..73a32d070 100644
--- a/src/field/party_menu.c
+++ b/src/field/party_menu.c
@@ -679,11 +679,11 @@ bool8 InitPartyMenu(void)
         gMain.state++;
         break;
     case 7:
-        SetUpWindowConfig(&gWindowConfig_81E6C90);
+        SetUpWindowConfig(&gWindowTemplate_81E6C90);
         gMain.state++;
         break;
     case 8:
-        Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowConfig_81E6C90);
+        Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6C90);
         MultistepInitWindowTileData(&gUnknown_03004210, 1);
         gMain.state++;
         break;
@@ -716,7 +716,7 @@ bool8 InitPartyMenu(void)
         }
         break;
     case 13:
-        MultistepInitMenuWindowBegin(&gWindowConfig_81E6CC8);
+        MultistepInitMenuWindowBegin(&gWindowTemplate_81E6CC8);
         gMain.state++;
         break;
     case 14:
@@ -3313,7 +3313,7 @@ void PartyMenuDoPrintMonNickname(u8 monIndex, int b, const u8 *nameBuffer)
 {
     u32 var1 = 0;
     CpuFastSet(&var1, gTileBuffer, 0x1000100);
-    sub_8004E3C((struct WindowTemplate *)&gWindowConfig_81E6CAC, gTileBuffer, nameBuffer);
+    sub_8004E3C((struct WindowTemplate *)&gWindowTemplate_81E6CAC, gTileBuffer, nameBuffer);
     CpuFastSet(gTileBuffer, OBJ_VRAM1 + (monIndex * 0x400), 128);
 }
 
@@ -3423,7 +3423,7 @@ void PartyMenuDoPrintLevel(u8 monIndex, u8 menuLayout, u8 level)
 
     var1 = 0;
     CpuFastSet(&var1, gUnknown_02039460, 0x1000020);
-    sub_8004E3C((struct WindowTemplate *)&gWindowConfig_81E6CAC, gUnknown_02039460 - 0x100 /*gTileBuffer*/, gStringVar1);
+    sub_8004E3C((struct WindowTemplate *)&gWindowTemplate_81E6CAC, gUnknown_02039460 - 0x100 /*gTileBuffer*/, gStringVar1);
     CpuFastSet(gUnknown_02039460, OBJ_VRAM1 + 0x200 + (monIndex * 0x400), 32);
 }
 
@@ -3517,7 +3517,7 @@ void PartyMenuDoPrintHP(u8 monIndex, u8 b, u16 currentHP, u16 maxHP)
     var = 0;
 
     CpuFastSet(&var, gUnknown_02039460, 0x1000040);
-    sub_8004E3C((struct WindowTemplate *)&gWindowConfig_81E6CAC, gUnknown_02039460 - 0x100 /*gTileBuffer*/, gStringVar1);
+    sub_8004E3C((struct WindowTemplate *)&gWindowTemplate_81E6CAC, gUnknown_02039460 - 0x100 /*gTileBuffer*/, gStringVar1);
     CpuFastSet(gUnknown_02039460, OBJ_VRAM1 + 0x300 + (monIndex * 0x400), 64);
 }
 
diff --git a/src/field/pokeblock.c b/src/field/pokeblock.c
index 3ca359ef7..b238857fa 100644
--- a/src/field/pokeblock.c
+++ b/src/field/pokeblock.c
@@ -275,15 +275,15 @@ static bool8 sub_810B6C0(void)
             gMain.state++;
             break;
         case  5:
-            SetUpWindowConfig(&gWindowConfig_81E6E34);
+            SetUpWindowConfig(&gWindowTemplate_81E6E34);
             gMain.state++;
             break;
         case  6:
-            SetUpWindowConfig(&gWindowConfig_81E6E50);
+            SetUpWindowConfig(&gWindowTemplate_81E6E50);
             gMain.state++;
             break;
         case  7:
-            MultistepInitMenuWindowBegin(&gWindowConfig_81E6E34);
+            MultistepInitMenuWindowBegin(&gWindowTemplate_81E6E34);
             gMain.state++;
             break;
         case  8:
@@ -293,7 +293,7 @@ static bool8 sub_810B6C0(void)
             }
             break;
         case  9:
-            MultistepInitMenuWindowBegin(&gWindowConfig_81E6E50);
+            MultistepInitMenuWindowBegin(&gWindowTemplate_81E6E50);
             gMain.state++;
             break;
         case 10:
@@ -445,13 +445,13 @@ void debug_sub_8120F98(void)
 
 static void sub_810BB0C(void)
 {
-    BasicInitMenuWindow(&gWindowConfig_81E6E34);
+    BasicInitMenuWindow(&gWindowTemplate_81E6E34);
     sub_8072BD8(ItemId_GetItem(ITEM_POKEBLOCK_CASE)->name, 2, 1, 0x48);
 }
 
 static void sub_810BB30(void)
 {
-    BasicInitMenuWindow(&gWindowConfig_81E6E34);
+    BasicInitMenuWindow(&gWindowTemplate_81E6E34);
     Menu_PrintText(gContestStatsText_Spicy,   2, 13);
     Menu_PrintText(gContestStatsText_Dry,     2, 15);
     Menu_PrintText(gContestStatsText_Sweet,   2, 17);
@@ -464,7 +464,7 @@ static void sub_810BB88(u8 a0)
     u8 i;
     u8 y;
     u8 *buf;
-    BasicInitMenuWindow(&gWindowConfig_81E6E34);
+    BasicInitMenuWindow(&gWindowTemplate_81E6E34);
     for (i=a0; i<=a0+8; i++)
     {
         y = (i - a0) << 1;
@@ -596,7 +596,7 @@ static void sub_810BDAC(bool8 flag)
             gBGTilemapBuffers[2][v0 + 32] = 15;
         }
     }
-    BasicInitMenuWindow(&gWindowConfig_81E6E34);
+    BasicInitMenuWindow(&gWindowTemplate_81E6E34);
     if (gUnknown_02039248.unk0 + gUnknown_02039248.unk1 != gUnknown_02039248.unk2)
     {
         sub_8072C14(gStringVar1, sub_810C9E8(&gSaveBlock1.pokeblocks[gUnknown_02039248.unk0 + gUnknown_02039248.unk1]), 16, 1);
@@ -812,7 +812,7 @@ static void sub_810C368(u8 taskId)
         v0 = 2;
     sub_80F98A4(0);
     sub_80F98A4(1);
-    BasicInitMenuWindow(&gWindowConfig_81E6E50);
+    BasicInitMenuWindow(&gWindowTemplate_81E6E50);
     Menu_DrawStdWindowFrame(7, v0 + 4, 13, 11);
     PrintMenuItemsReordered(8, v0 + 5, gUnknown_0203924C, gUnknown_083F7EF4, gUnknown_03000758);
     InitMenu(0, 8, v0 + 5, gUnknown_0203924C, 0, 5);
@@ -868,7 +868,7 @@ static void sub_810C508(u8 taskId)
 
 static void sub_810C540(u8 taskId)
 {
-    BasicInitMenuWindow(&gWindowConfig_81E6E50);
+    BasicInitMenuWindow(&gWindowTemplate_81E6E50);
     HandleDestroyMenuCursors();
     Menu_EraseWindowRect(7, 4, 13, 11);
     StringCopy(gStringVar1, gPokeblockNames[gSaveBlock1.pokeblocks[gUnknown_02039248.unk0 + gUnknown_02039248.unk1].color]);
@@ -906,7 +906,7 @@ static void sub_810C668(u8 taskId)
     {
         sub_80F979C(1, 0);
     }
-    BasicInitMenuWindow(&gWindowConfig_81E6E50);
+    BasicInitMenuWindow(&gWindowTemplate_81E6E50);
     Menu_EraseWindowRect(7, 6, 13, 11);
     Menu_EraseWindowRect(0, 14, 29, 19);
     gTasks[taskId].func = sub_810BF7C;
@@ -922,7 +922,7 @@ static void sub_810C6DC(u8 taskId)
 
 static void sub_810C704(u8 taskId)
 {
-    BasicInitMenuWindow(&gWindowConfig_81E6E34);
+    BasicInitMenuWindow(&gWindowTemplate_81E6E34);
     sub_810BC84(gUnknown_02039248.unk1);
     sub_80F979C(1, 1);
     gTasks[taskId].func = sub_810C6DC;
diff --git a/src/field/region_map.c b/src/field/region_map.c
index 1eb57b803..f7db0a61e 100644
--- a/src/field/region_map.c
+++ b/src/field/region_map.c
@@ -1540,10 +1540,10 @@ void CB2_InitFlyRegionMap(void)
         FreeAllSpritePalettes();
         break;
     case 1:
-        SetUpWindowConfig(&gWindowConfig_81E7224);
+        SetUpWindowConfig(&gWindowTemplate_81E7224);
         break;
     case 2:
-        InitMenuWindow(&gWindowConfig_81E7224);
+        InitMenuWindow(&gWindowTemplate_81E7224);
         Menu_EraseScreen();
         break;
     case 3:
diff --git a/src/field/script_menu.c b/src/field/script_menu.c
index bf6e93e41..ee5843049 100644
--- a/src/field/script_menu.c
+++ b/src/field/script_menu.c
@@ -622,7 +622,7 @@ bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 multichoiceId, u8 ig
 static u16 GetStringWidthInTilesForScriptMenu(const u8 *str)
 {
     // each tile on screen is 8x8, so it needs the number of tiles and not pixels, hence the division by 8.
-    return (Text_GetStringWidthFromWindowTemplate((struct WindowTemplate *)&gWindowConfig_81E6CE4, str) + 7) / 8;
+    return (Text_GetStringWidthFromWindowTemplate((struct WindowTemplate *)&gWindowTemplate_81E6CE4, str) + 7) / 8;
 }
 
 static void DrawMultichoiceMenu(u8 left, u8 top, u8 count, const struct MenuAction *list, u8 ignoreBPress, u8 cursorPos)
diff --git a/src/field/shop.c b/src/field/shop.c
index 0d8bc83d1..cfd4818dc 100644
--- a/src/field/shop.c
+++ b/src/field/shop.c
@@ -285,8 +285,8 @@ void BuyMenuDrawGraphics(void)
     ResetPaletteFade();
     ResetSpriteData();
     ResetTasks();
-    SetUpWindowConfig(&gWindowConfig_81E6DFC);
-    InitMenuWindow(&gWindowConfig_81E6DFC);
+    SetUpWindowConfig(&gWindowTemplate_81E6DFC);
+    InitMenuWindow(&gWindowTemplate_81E6DFC);
     BuyMenuDrawMapGraphics();
     gMartInfo.cursor = zero;
     gMartInfo.choicesAbove = zero2;
diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c
index 3c13e004c..abf837daa 100644
--- a/src/field/slot_machine.c
+++ b/src/field/slot_machine.c
@@ -400,8 +400,8 @@ static void SlotMachineSetup_0_1(void)
 
 static void SlotMachineSetup_3_0(void)
 {
-    SetUpWindowConfig(&gWindowConfig_81E7128);
-    InitMenuWindow(&gWindowConfig_81E7128);
+    SetUpWindowConfig(&gWindowTemplate_81E7128);
+    InitMenuWindow(&gWindowTemplate_81E7128);
 }
 
 static void SlotMachineSetup_4_0(void)
@@ -2807,7 +2807,7 @@ static void sub_8104B80(struct Task *task)
 {
     sub_8104DA4();
     sub_81065DC();
-    BasicInitMenuWindow(&gWindowConfig_81E7144);
+    BasicInitMenuWindow(&gWindowTemplate_81E7144);
     MenuPrint_PixelCoords(gOtherText_ReelTime, 10, 32, 1);
     BeginNormalPaletteFade(-1, 0, 16, 0, 0);
     task->data[0]++;
@@ -2825,7 +2825,7 @@ static void sub_8104BC8(struct Task *task)
 static void sub_8104BFC(struct Task *task)
 {
     Menu_EraseScreen();
-    BasicInitMenuWindow(&gWindowConfig_81E7128);
+    BasicInitMenuWindow(&gWindowTemplate_81E7128);
     sub_81064B8();
     sub_8104CAC(task->data[1]);
     sub_810423C(eSlotMachine->pikaPower);
diff --git a/src/field/start_menu.c b/src/field/start_menu.c
index 6c2812039..8131e2511 100644
--- a/src/field/start_menu.c
+++ b/src/field/start_menu.c
@@ -271,7 +271,7 @@ void CreateStartMenuTask(void (*func)(u8))
 {
     u8 taskId;
 
-    InitMenuWindow(&gWindowConfig_81E6CE4);
+    InitMenuWindow(&gWindowTemplate_81E6CE4);
     taskId = CreateTask(Task_StartMenu, 0x50);
     SetTaskFuncWithFollowupFunc(taskId, Task_StartMenu, func);
 }
@@ -774,8 +774,8 @@ static bool32 sub_80719FC(u8 *step)
         dp12_8087EA4();
         break;
     case 2:
-        SetUpWindowConfig(&gWindowConfig_81E6CE4);
-        InitMenuWindow(&gWindowConfig_81E6CE4);
+        SetUpWindowConfig(&gWindowTemplate_81E6CE4);
+        InitMenuWindow(&gWindowTemplate_81E6CE4);
         REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_BG0_ON;
         break;
     case 3:
diff --git a/src/field/starter_choose.c b/src/field/starter_choose.c
index d4994d701..9b644c6cb 100644
--- a/src/field/starter_choose.c
+++ b/src/field/starter_choose.c
@@ -294,8 +294,8 @@ void CB2_ChooseStarter(void)
     LoadCompressedObjectPic(&gUnknown_083F7794[0]);
     LoadCompressedObjectPic(&gUnknown_083F77A4[0]);
     LoadSpritePalettes(gUnknown_083F77B4);
-    SetUpWindowConfig(&gWindowConfig_81E6C3C);
-    InitMenuWindow(&gWindowConfig_81E6CE4);
+    SetUpWindowConfig(&gWindowTemplate_81E6C3C);
+    InitMenuWindow(&gWindowTemplate_81E6CE4);
     BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
 
     savedIme = REG_IME;
diff --git a/src/field/use_pokeblock.c b/src/field/use_pokeblock.c
index 6e71011b9..a4a36e40a 100644
--- a/src/field/use_pokeblock.c
+++ b/src/field/use_pokeblock.c
@@ -228,11 +228,11 @@ static void sub_8136294(void)
             gUnknown_02039304->unk50++;
             break;
         case 3:
-            SetUpWindowConfig(&gWindowConfig_81E7080);
+            SetUpWindowConfig(&gWindowTemplate_81E7080);
             gUnknown_02039304->unk50++;
             break;
         case 4:
-            MultistepInitMenuWindowBegin(&gWindowConfig_81E7080);
+            MultistepInitMenuWindowBegin(&gWindowTemplate_81E7080);
             gUnknown_02039304->unk50++;
             break;
         case 5:
@@ -610,7 +610,7 @@ static void sub_8136BB8(void)
     GetMonData(&gPlayerParty[sub_81370A4(gUnknown_083DFEC4->unk87DC)], MON_DATA_NICKNAME, gUnknown_02039304->stringBuffer);
     StringGetEnd10(gUnknown_02039304->stringBuffer);
     StringAppend(gUnknown_02039304->stringBuffer, gOtherText_GetsAPokeBlock);
-    BasicInitMenuWindow(&gWindowConfig_81E709C);
+    BasicInitMenuWindow(&gWindowTemplate_81E709C);
     Menu_DrawStdWindowFrame(0, 16, 29, 19);
     Menu_PrintText(gUnknown_02039304->stringBuffer, 1, 17);
     DisplayYesNoMenu(23, 10, 1);
@@ -623,14 +623,14 @@ static s8 sub_8136C40(void)
     if ((u8)(retval + 1) < 3)
     {
         Menu_EraseScreen();
-        BasicInitMenuWindow(&gWindowConfig_81E7080);
+        BasicInitMenuWindow(&gWindowTemplate_81E7080);
     }
     return retval;
 }
 
 static void sub_8136C6C(void)
 {
-    BasicInitMenuWindow(&gWindowConfig_81E709C);
+    BasicInitMenuWindow(&gWindowTemplate_81E709C);
     Menu_DrawStdWindowFrame(0, 16, 29, 19);
     for (gUnknown_02039304->unk53 = 0; gUnknown_02039304->unk53 < 5 && gUnknown_02039304->unk61[gUnknown_02039304->unk53] == 0; gUnknown_02039304->unk53++);
     if (gUnknown_02039304->unk53 < 5)
@@ -667,7 +667,7 @@ static bool8 sub_8136D00(void)
 
 static void sub_8136D60(void)
 {
-    BasicInitMenuWindow(&gWindowConfig_81E709C);
+    BasicInitMenuWindow(&gWindowTemplate_81E709C);
     Menu_DrawStdWindowFrame(0, 16, 29, 19);
     Menu_PrintText(gOtherText_WontEat, 1, 17);
 }
@@ -675,7 +675,7 @@ static void sub_8136D60(void)
 static void sub_8136D8C(void)
 {
     Menu_EraseScreen();
-    BasicInitMenuWindow(&gWindowConfig_81E7080);
+    BasicInitMenuWindow(&gWindowTemplate_81E7080);
 }
 
 static void Pokeblock_MenuWindowTextPrint(const u8 *message)
diff --git a/src/field/wallclock.c b/src/field/wallclock.c
index 6d102715a..8620ad9f0 100644
--- a/src/field/wallclock.c
+++ b/src/field/wallclock.c
@@ -236,8 +236,8 @@ static void LoadWallClockGraphics(void)
     FreeAllSpritePalettes();
     LoadCompressedObjectPic(&gUnknown_083F7A90[0]);
     LoadSpritePalettes(gUnknown_083F7AA0);
-    SetUpWindowConfig(&gWindowConfig_81E6C3C);
-    InitMenuWindow(&gWindowConfig_81E6CE4);
+    SetUpWindowConfig(&gWindowTemplate_81E6C3C);
+    InitMenuWindow(&gWindowTemplate_81E6CE4);
 }
 
 static void WallClockInit(void)
diff --git a/src/pokemon/learn_move.c b/src/pokemon/learn_move.c
index 83953186b..eae1c0b4e 100644
--- a/src/pokemon/learn_move.c
+++ b/src/pokemon/learn_move.c
@@ -25,8 +25,8 @@ extern u16 gSpecialVar_0x8004;
 extern u16 gSpecialVar_0x8005;
 extern u8 gTileBuffer[];
 
-extern const struct WindowTemplate gWindowConfig_81E6CE4;
-extern const struct WindowTemplate gWindowConfig_81E7240;
+extern const struct WindowTemplate gWindowTemplate_81E6CE4;
+extern const struct WindowTemplate gWindowTemplate_81E7240;
 extern const u8 *const gContestEffectStrings[];
 extern const u8 *const gMoveDescriptions[];
 extern const u8 gTypeNames[][7];
@@ -268,12 +268,12 @@ void CB2_InitLearnMove(void)
     sub_8133558();
     SetVBlankCallback(VBlankCB_LearnMove);
 
-    SetUpWindowConfig(&gWindowConfig_81E7240);
-    InitMenuWindow(&gWindowConfig_81E7240);
+    SetUpWindowConfig(&gWindowTemplate_81E7240);
+    InitMenuWindow(&gWindowTemplate_81E7240);
     Menu_EraseScreen();
 
-    SetUpWindowConfig(&gWindowConfig_81E6CE4);
-    InitMenuWindow(&gWindowConfig_81E6CE4);
+    SetUpWindowConfig(&gWindowTemplate_81E6CE4);
+    InitMenuWindow(&gWindowTemplate_81E6CE4);
     Menu_EraseScreen();
 
     REG_BG0VOFS = 0;
@@ -302,12 +302,12 @@ void sub_81327A4(void)
     sLearnMoveStruct->unk2C6 = gSpecialVar_0x8005;
     SetVBlankCallback(VBlankCB_LearnMove);
 
-    SetUpWindowConfig(&gWindowConfig_81E7240);
-    InitMenuWindow(&gWindowConfig_81E7240);
+    SetUpWindowConfig(&gWindowTemplate_81E7240);
+    InitMenuWindow(&gWindowTemplate_81E7240);
     Menu_EraseScreen();
 
-    SetUpWindowConfig(&gWindowConfig_81E6CE4);
-    InitMenuWindow(&gWindowConfig_81E6CE4);
+    SetUpWindowConfig(&gWindowTemplate_81E6CE4);
+    InitMenuWindow(&gWindowTemplate_81E6CE4);
     Menu_EraseScreen();
 
     REG_DISPCNT = 0x1340;
@@ -633,7 +633,7 @@ void DrawLearnMoveMenuWindow(void)
 {
     u32 i;
 
-    BasicInitMenuWindow(&gWindowConfig_81E7240);
+    BasicInitMenuWindow(&gWindowTemplate_81E7240);
     for (i = 0; i < 4; i++)
     {
         Menu_DrawStdWindowFrame(
@@ -642,7 +642,7 @@ void DrawLearnMoveMenuWindow(void)
           gUnknown_08402CF8[i][2],
           gUnknown_08402CF8[i][3]);
     }
-    BasicInitMenuWindow(&gWindowConfig_81E6CE4);
+    BasicInitMenuWindow(&gWindowTemplate_81E6CE4);
 }
 
 void sub_8133030(bool8 a)
diff --git a/src/pokemon/mail.c b/src/pokemon/mail.c
index c49c6d350..cd1083790 100644
--- a/src/pokemon/mail.c
+++ b/src/pokemon/mail.c
@@ -354,11 +354,11 @@ static u8 sub_80F8A28(void)
         RETURN_UP_STATE;
 
     case 6:
-        SetUpWindowConfig(&gWindowConfig_81E6DFC);
+        SetUpWindowConfig(&gWindowTemplate_81E6DFC);
         RETURN_UP_STATE;
 
     case 7:
-        MultistepInitMenuWindowBegin(&gWindowConfig_81E6DFC);
+        MultistepInitMenuWindowBegin(&gWindowTemplate_81E6DFC);
         RETURN_UP_STATE;
 
     case 8:
diff --git a/src/pokemon/pokeblock_feed.c b/src/pokemon/pokeblock_feed.c
index 028ae71a0..2ed404327 100644
--- a/src/pokemon/pokeblock_feed.c
+++ b/src/pokemon/pokeblock_feed.c
@@ -530,11 +530,11 @@ static bool8 TransitionToPokeblockFeedScene(void)
         gMain.state++;
         break;
     case 4:
-        SetUpWindowConfig(&gWindowConfig_81E6E50);
+        SetUpWindowConfig(&gWindowTemplate_81E6E50);
         gMain.state++;
         break;
     case 5:
-        MultistepInitMenuWindowBegin(&gWindowConfig_81E6E50);
+        MultistepInitMenuWindowBegin(&gWindowTemplate_81E6E50);
         gMain.state++;
         break;
     case 6:
diff --git a/src/pokemon/pokedex.c b/src/pokemon/pokedex.c
index 83820f4cc..b7081f35d 100644
--- a/src/pokemon/pokedex.c
+++ b/src/pokemon/pokedex.c
@@ -1425,8 +1425,8 @@ void CB2_InitPokedex(void)
         ResetPaletteFade();
         FreeAllSpritePalettes();
         gReservedSpritePaletteCount = 8;
-        SetUpWindowConfig(&gWindowConfig_81E7048);
-        InitMenuWindow(&gWindowConfig_81E7048);
+        SetUpWindowConfig(&gWindowTemplate_81E7048);
+        InitMenuWindow(&gWindowTemplate_81E7048);
         gMain.state++;
         break;
     case 2:
@@ -1937,8 +1937,8 @@ static bool8 sub_808D344(u8 a)
         gMain.state++;
         break;
     case 2:
-        SetUpWindowConfig(&gWindowConfig_81E7048);
-        InitMenuWindow(&gWindowConfig_81E7048);
+        SetUpWindowConfig(&gWindowTemplate_81E7048);
+        InitMenuWindow(&gWindowTemplate_81E7048);
         LZ77UnCompVram(gUnknown_0839FA7C, (void *)(VRAM + 0xFF80));
         gMain.state++;
         break;
@@ -2951,8 +2951,8 @@ static void Task_InitPageScreenMultistep(u8 taskId)
         gMain.state++;
         break;
     case 3:
-        SetUpWindowConfig(&gWindowConfig_81E7064);
-        InitMenuWindow(&gWindowConfig_81E7064);
+        SetUpWindowConfig(&gWindowTemplate_81E7064);
+        InitMenuWindow(&gWindowTemplate_81E7064);
         gMain.state++;
         break;
     case 4:
@@ -3205,8 +3205,8 @@ static void Task_InitCryScreenMultistep(u8 taskId)
         gMain.state++;
         break;
     case 3:
-        SetUpWindowConfig(&gWindowConfig_81E702C);
-        InitMenuWindow(&gWindowConfig_81E702C);
+        SetUpWindowConfig(&gWindowTemplate_81E702C);
+        InitMenuWindow(&gWindowTemplate_81E702C);
         ResetPaletteFade();
         gMain.state++;
         break;
@@ -3394,8 +3394,8 @@ static void Task_InitSizeScreenMultistep(u8 taskId)
         {
             u8 string[40];  //I hope this is the correct size
 
-            SetUpWindowConfig(&gWindowConfig_81E702C);
-            InitMenuWindow(&gWindowConfig_81E702C);
+            SetUpWindowConfig(&gWindowTemplate_81E702C);
+            InitMenuWindow(&gWindowTemplate_81E702C);
             string[0] = EOS;
             StringAppend(string, gDexText_SizeComparedTo);
             StringAppend(string, gSaveBlock2.playerName);
@@ -3841,8 +3841,8 @@ static void sub_8090750(u8 taskId)
         gTasks[taskId].data[0]++;
         break;
     case 2:
-        SetUpWindowConfig(&gWindowConfig_81E7064);
-        InitMenuWindow(&gWindowConfig_81E7064);
+        SetUpWindowConfig(&gWindowTemplate_81E7064);
+        InitMenuWindow(&gWindowTemplate_81E7064);
         DmaClear16(3, (void *)(VRAM + 0xC000), 0x200);
         gTasks[taskId].data[0]++;
         break;
@@ -4770,8 +4770,8 @@ static void sub_8091E54(u8 taskId)
         }
         break;
     case 1:
-        SetUpWindowConfig(&gWindowConfig_81E7064);
-        InitMenuWindow(&gWindowConfig_81E7064);
+        SetUpWindowConfig(&gWindowTemplate_81E7064);
+        InitMenuWindow(&gWindowTemplate_81E7064);
         LoadCompressedObjectPic(&gUnknown_083A05CC[0]);
         LoadSpritePalettes(gUnknown_083A05DC);
         sub_809308C(taskId);
diff --git a/src/pokemon/pokemon_summary_screen.c b/src/pokemon/pokemon_summary_screen.c
index 0887c6648..e448c9ed3 100644
--- a/src/pokemon/pokemon_summary_screen.c
+++ b/src/pokemon/pokemon_summary_screen.c
@@ -718,11 +718,11 @@ bool8 sub_809DA84(void)
         gMain.state++;
         break;
     case 5:
-        SetUpWindowConfig(&gWindowConfig_81E6E6C);
+        SetUpWindowConfig(&gWindowTemplate_81E6E6C);
         gMain.state++;
         break;
     case 6:
-        MultistepInitMenuWindowBegin(&gWindowConfig_81E6E6C);
+        MultistepInitMenuWindowBegin(&gWindowTemplate_81E6E6C);
         gMain.state++;
         break;
     case 7:
diff --git a/src/pokenav_before.c b/src/pokenav_before.c
index 411a20f79..43c9475ca 100644
--- a/src/pokenav_before.c
+++ b/src/pokenav_before.c
@@ -3268,10 +3268,10 @@ bool8 sub_80EF284(u8 a)
         sub_80EEDE8();
         break;
     case 1:
-        SetUpWindowConfig(&gWindowConfig_81E7224);
+        SetUpWindowConfig(&gWindowTemplate_81E7224);
         break;
     case 2:
-        MultistepInitMenuWindowBegin(&gWindowConfig_81E7224);
+        MultistepInitMenuWindowBegin(&gWindowTemplate_81E7224);
         break;
     case 3:
         if (!MultistepInitMenuWindowContinue())
@@ -3660,10 +3660,10 @@ bool8 sub_80EF874(void)
         sub_80EEDE8();
         break;
     case 1:
-        SetUpWindowConfig(&gWindowConfig_81E7224);
+        SetUpWindowConfig(&gWindowTemplate_81E7224);
         break;
     case 2:
-        MultistepInitMenuWindowBegin(&gWindowConfig_81E7224);
+        MultistepInitMenuWindowBegin(&gWindowTemplate_81E7224);
         break;
     case 3:
         if (!MultistepInitMenuWindowContinue())
@@ -3972,10 +3972,10 @@ bool8 sub_80EFF68(void)
         gUnknown_083DFEC4->unkD162[0] = 11;
         break;
     case 1:
-        SetUpWindowConfig(&gWindowConfig_81E7080);
+        SetUpWindowConfig(&gWindowTemplate_81E7080);
         break;
     case 2:
-        MultistepInitMenuWindowBegin(&gWindowConfig_81E7080);
+        MultistepInitMenuWindowBegin(&gWindowTemplate_81E7080);
         break;
     case 3:
         if (!MultistepInitMenuWindowContinue())
@@ -4086,10 +4086,10 @@ bool8 sub_80F02A0(void)
         gUnknown_083DFEC4->unkD162[0] = 11;
         break;
     case 1:
-        SetUpWindowConfig(&gWindowConfig_81E70D4);
+        SetUpWindowConfig(&gWindowTemplate_81E70D4);
         break;
     case 2:
-        MultistepInitMenuWindowBegin(&gWindowConfig_81E70D4);
+        MultistepInitMenuWindowBegin(&gWindowTemplate_81E70D4);
         break;
     case 3:
         if (!MultistepInitMenuWindowContinue())
@@ -4268,17 +4268,17 @@ _080F0338: .4byte 0x000087ca\n\
 _080F033C: .4byte 0x000087c8\n\
 _080F0340: .4byte 0x0000d162\n\
 _080F0344:\n\
-    ldr r0, _080F034C @ =gWindowConfig_81E70D4\n\
+    ldr r0, _080F034C @ =gWindowTemplate_81E70D4\n\
     bl SetUpWindowConfig\n\
     b _080F0618\n\
     .align 2, 0\n\
-_080F034C: .4byte gWindowConfig_81E70D4\n\
+_080F034C: .4byte gWindowTemplate_81E70D4\n\
 _080F0350:\n\
-    ldr r0, _080F0358 @ =gWindowConfig_81E70D4\n\
+    ldr r0, _080F0358 @ =gWindowTemplate_81E70D4\n\
     bl MultistepInitMenuWindowBegin\n\
     b _080F0618\n\
     .align 2, 0\n\
-_080F0358: .4byte gWindowConfig_81E70D4\n\
+_080F0358: .4byte gWindowTemplate_81E70D4\n\
 _080F035C:\n\
     bl MultistepInitMenuWindowContinue\n\
     cmp r0, 0\n\
diff --git a/src/roulette.c b/src/roulette.c
index 0253a6bb8..950cbdbb1 100644
--- a/src/roulette.c
+++ b/src/roulette.c
@@ -596,8 +596,8 @@ void sub_8115384(void)
         gMain.state++;
         break;
     case 0x2:
-        SetUpWindowConfig(&gWindowConfig_81E6C3C);
-        InitMenuWindow(&gWindowConfig_81E6CE4);
+        SetUpWindowConfig(&gWindowTemplate_81E6C3C);
+        InitMenuWindow(&gWindowTemplate_81E6CE4);
         LoadPalette(&gUnknown_083F86BC, 0x0, 0x1C0);
         gMain.state++;
         break;
diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c
index d1ab2d512..32a48fd36 100644
--- a/src/scene/berry_blender.c
+++ b/src/scene/berry_blender.c
@@ -215,7 +215,7 @@ extern u8 byte_3002A68;
 extern const u8 gUnknown_08E6C100[];
 extern const u8 gUnknown_08E6C920[];
 extern const u8 gUnknown_08E6D354[];
-extern const struct WindowTemplate gWindowConfig_81E6F68;
+extern const struct WindowTemplate gWindowTemplate_81E6F68;
 extern const u8 *const gPokeblockNames[];
 extern const struct Berry gBerries[];
 
@@ -957,8 +957,8 @@ static void sub_804E56C(void)
         ResetSpriteData();
         FreeAllSpritePalettes();
         SetVBlankCallback(NULL);
-        SetUpWindowConfig(&gWindowConfig_81E6F68);
-        InitMenuWindow(&gWindowConfig_81E6F68);
+        SetUpWindowConfig(&gWindowTemplate_81E6F68);
+        InitMenuWindow(&gWindowTemplate_81E6F68);
         gBerryBlenderData->field_0++;
         gBerryBlenderData->field_140 = 0;
         gBerryBlenderData->field_13E = 0;
@@ -1135,8 +1135,8 @@ static void sub_804E9F8(void)
         FreeAllSpritePalettes();
         ResetTasks();
         SetVBlankCallback(VBlankCB0_BerryBlender);
-        SetUpWindowConfig(&gWindowConfig_81E6F68);
-        InitMenuWindow(&gWindowConfig_81E6F68);
+        SetUpWindowConfig(&gWindowTemplate_81E6F68);
+        InitMenuWindow(&gWindowTemplate_81E6F68);
         gLinkType = 0x4422;
         gBerryBlenderData->field_0++;
         gBerryBlenderData->field_4E = 0;
@@ -1338,8 +1338,8 @@ static void sub_804F0F4(void)
 
     SetVBlankCallback(VBlankCB0_BerryBlender);
 
-    SetUpWindowConfig(&gWindowConfig_81E6F68);
-    InitMenuWindow(&gWindowConfig_81E6F68);
+    SetUpWindowConfig(&gWindowTemplate_81E6F68);
+    InitMenuWindow(&gWindowTemplate_81E6F68);
 
     gLinkType = 0x4422;
 
@@ -3606,8 +3606,8 @@ void unref_sub_80524BC(void)
     FreeAllSpritePalettes();
     ResetTasks();
     SetVBlankCallback(VBlankCB1_BerryBlender);
-    SetUpWindowConfig(&gWindowConfig_81E6CE4);
-    InitMenuWindow(&gWindowConfig_81E6CE4);
+    SetUpWindowConfig(&gWindowTemplate_81E6CE4);
+    InitMenuWindow(&gWindowTemplate_81E6CE4);
     SeedRng(gMain.vblankCounter1);
     REG_DISPCNT = 0x1540;
     RunTasks();
diff --git a/src/scene/contest_painting.c b/src/scene/contest_painting.c
index 442d8ec26..de9063823 100644
--- a/src/scene/contest_painting.c
+++ b/src/scene/contest_painting.c
@@ -243,8 +243,8 @@ static void HoldContestPainting(void)
 
 static void ContestPaintingInitWindow(u8 arg0)
 {
-    InitMenuWindow(&gWindowConfig_81E7160);
-    SetUpWindowConfig(&gWindowConfig_81E7160);
+    InitMenuWindow(&gWindowTemplate_81E7160);
+    SetUpWindowConfig(&gWindowTemplate_81E7160);
 }
 
 static void ContestPaintingPrintCaption(u8 contestType, u8 arg1)
diff --git a/src/scene/credits.c b/src/scene/credits.c
index 54b517a91..f113fe965 100644
--- a/src/scene/credits.c
+++ b/src/scene/credits.c
@@ -474,8 +474,8 @@ void sub_81439D0(void)
     taskIdC = gTasks[taskIdA].data[TDA_TASK_C_ID];
     gTasks[taskIdC].data[TDC_0] = 40;
 
-    SetUpWindowConfig(&gWindowConfig_81E7208);
-    InitMenuWindow(&gWindowConfig_81E7208);
+    SetUpWindowConfig(&gWindowTemplate_81E7208);
+    InitMenuWindow(&gWindowTemplate_81E7208);
     LoadPalette(&gUnknown_0840B7BC, 0x80, sizeof(gUnknown_0840B7BC));
 
     CpuCopy16(&gUnknown_0840B7FC, (void *)(VRAM + 0xBEE0), sizeof(gUnknown_0840B7FC));
diff --git a/src/scene/egg_hatch.c b/src/scene/egg_hatch.c
index 8d961ad1f..e76f5b47c 100644
--- a/src/scene/egg_hatch.c
+++ b/src/scene/egg_hatch.c
@@ -471,8 +471,8 @@ static void CB2_EggHatch_0(void)
         gSpecialVar_0x8005 = GetCurrentMapMusic();
         break;
     case 1:
-        SetUpWindowConfig(&gWindowConfig_81E6F84);
-        Text_InitWindowWithTemplate(&gEggHatchData->window, &gWindowConfig_81E6F84);
+        SetUpWindowConfig(&gWindowTemplate_81E6F84);
+        Text_InitWindowWithTemplate(&gEggHatchData->window, &gWindowTemplate_81E6F84);
         gEggHatchData->tileDataStartOffset = TextWindow_SetBaseTileNum(20);
         TextWindow_LoadStdFrameGraphics(&gEggHatchData->window);
         gMain.state++;
diff --git a/src/scene/evolution_scene.c b/src/scene/evolution_scene.c
index 323313fc2..571b8ab8d 100644
--- a/src/scene/evolution_scene.c
+++ b/src/scene/evolution_scene.c
@@ -197,7 +197,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo,
     REG_WININ = 0;
     REG_WINOUT = 0;
 
-    SetUpWindowConfig(&gWindowConfig_81E6C58);
+    SetUpWindowConfig(&gWindowTemplate_81E6C58);
     ResetPaletteFade();
 
     gBattle_BG0_X = 0;
@@ -209,7 +209,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo,
     gUnknown_030041B0 = 256;
     gUnknown_030041B8 = 0;
 
-    Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowConfig_81E6C58);
+    Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6C58);
     gBattleTerrain = BATTLE_TERRAIN_PLAIN;
 
     sub_800D6D4();
@@ -306,7 +306,7 @@ static void CB2_EvolutionSceneLoadGraphics(void)
     REG_WIN1V = 0;
     REG_WININ = 0;
     REG_WINOUT = 0;
-    SetUpWindowConfig(&gWindowConfig_81E6C58);
+    SetUpWindowConfig(&gWindowTemplate_81E6C58);
     ResetPaletteFade();
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
@@ -317,7 +317,7 @@ static void CB2_EvolutionSceneLoadGraphics(void)
     gUnknown_030041B0 = 256;
     gUnknown_030041B8 = 0;
 
-    Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowConfig_81E6C58);
+    Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6C58);
     gBattleTerrain = BATTLE_TERRAIN_PLAIN;
 
     sub_800D6D4();
@@ -373,8 +373,8 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void)
         gMain.state++;
         break;
     case 1:
-        SetUpWindowConfig(&gWindowConfig_81E6F84);
-        Text_InitWindowWithTemplate(&gUnknown_03004828->window, &gWindowConfig_81E6F84);
+        SetUpWindowConfig(&gWindowTemplate_81E6F84);
+        Text_InitWindowWithTemplate(&gUnknown_03004828->window, &gWindowTemplate_81E6F84);
         gMain.state++;
         break;
     case 2:
diff --git a/src/scene/hall_of_fame.c b/src/scene/hall_of_fame.c
index ae2ff5f87..4f8124ace 100644
--- a/src/scene/hall_of_fame.c
+++ b/src/scene/hall_of_fame.c
@@ -582,8 +582,8 @@ static void sub_81422B8(u8 taskID)
 
 static void sub_81422E8(u8 taskID)
 {
-    SetUpWindowConfig(&gWindowConfig_81E7198);
-    InitMenuWindow(&gWindowConfig_81E7198);
+    SetUpWindowConfig(&gWindowTemplate_81E7198);
+    InitMenuWindow(&gWindowTemplate_81E7198);
     gTasks[taskID].func = sub_8142320;
 }
 
@@ -714,8 +714,8 @@ static void sub_81426F8(u8 taskID)
 static void sub_8142738(u8 taskID)
 {
     REG_DISPCNT = 0x1940;
-    SetUpWindowConfig(&gWindowConfig_81E71B4);
-    InitMenuWindow(&gWindowConfig_81E71B4);
+    SetUpWindowConfig(&gWindowTemplate_81E71B4);
+    InitMenuWindow(&gWindowTemplate_81E71B4);
 
     gTasks[taskID].tPlayerSpriteID = HallOfFame_LoadTrainerPic(gSaveBlock2.playerGender, 120, 72, 6);
     gTasks[taskID].tFrameCount = 120;
@@ -864,8 +864,8 @@ static void sub_8142A28(u8 taskID)
             *(vram1 + i) = i + 3;
             *(vram2 + i) = i + 20;
         }
-        SetUpWindowConfig(&gWindowConfig_81E7198);
-        InitMenuWindow(&gWindowConfig_81E7198);
+        SetUpWindowConfig(&gWindowTemplate_81E7198);
+        InitMenuWindow(&gWindowTemplate_81E7198);
         gTasks[taskID].func = sub_8142B04;
     }
 }
@@ -1285,8 +1285,8 @@ static void sub_8143570(void)
     gReservedSpritePaletteCount = 8;
     LoadCompressedObjectPic(&sHallOfFame_ConfettiSpriteSheet);
     LoadCompressedObjectPalette(&sHallOfFame_ConfettiSpritePalette);
-    SetUpWindowConfig(&gWindowConfig_81E71B4);
-    InitMenuWindow(&gWindowConfig_81E71B4);
+    SetUpWindowConfig(&gWindowTemplate_81E71B4);
+    InitMenuWindow(&gWindowTemplate_81E71B4);
 }
 
 static void sub_81435B8(void)