1 files changed, 18 insertions, 18 deletions

diff --git a/src/engine/naming_screen.c b/src/engine/naming_screen.c
index 6f34fd678..6aa706893 100644
--- a/src/engine/naming_screen.c
+++ b/src/engine/naming_screen.c
@@ -323,8 +323,8 @@ static void NamingScreen_Init(void)
 
 static void NamingScreen_SetUpWindow(void)
 {
-    SetUpWindowConfig(&gWindowConfig_81E6E88);
-    InitMenuWindow(&gWindowConfig_81E6E88);
+    Text_LoadWindowTemplate(&gWindowTemplate_81E6E88);
+    InitMenuWindow(&gWindowTemplate_81E6E88);
 }
 
 static void NamingScreen_ResetObjects(void)
@@ -501,7 +501,7 @@ static bool8 MainState_6(struct Task *task)
 
 static bool8 MainState_UpdateSentToPCMessage(struct Task *task)
 {
-    if (MenuUpdateWindowText())
+    if (Menu_UpdateWindowText())
         namingScreenDataPtr->state++;
     return FALSE;
 }
@@ -1608,8 +1608,8 @@ static void DisplaySentToPCMessage(void)
 {
     StringCopy(gStringVar1, namingScreenDataPtr->destBuffer);
     StringExpandPlaceholders(gStringVar4, gOtherText_SentToPC);
-    BasicInitMenuWindow(&gWindowConfig_81E6E88);
-    MenuDisplayMessageBox();
+    BasicInitMenuWindow(&gWindowTemplate_81E6E88);
+    Menu_DisplayDialogueFrame();
     MenuPrintMessageDefaultCoords(gStringVar4);
 }
 
@@ -1755,19 +1755,19 @@ static void (*const gUnknown_083CE310[][2])(void) =
     sub_80B7844,
 };
 
-static const struct WindowConfig *const gUnknown_083CE328[][2][2] =
+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},
     },
 };
 
@@ -1836,15 +1836,15 @@ static void PrintKeyboardCharacters(u8 page)  //print letters on page
     s16 r5;
 
     for (i = 0, r5 = 9; i < 4; i++, r5 += 2)
-        MenuPrint(sKeyboardCharacters[page][i], 3, r5);
+        Menu_PrintText(sKeyboardCharacters[page][i], 3, r5);
 }
 
 static void sub_80B78A8(void)
 {
-    BasicInitMenuWindow(&gWindowConfig_81E6F4C);
+    BasicInitMenuWindow(&gWindowTemplate_81E6F4C);
     gUnknown_083CE358[namingScreenDataPtr->templateNum]();
     gUnknown_083CE368[namingScreenDataPtr->template->unk3]();
-    MenuPrint(namingScreenDataPtr->template->title, 9, 2);
+    Menu_PrintText(namingScreenDataPtr->template->title, 9, 2);
 }
 
 static void nullsub_61(void)
@@ -1868,7 +1868,7 @@ static void sub_80B7924(void)
     {
         if ((s16)namingScreenDataPtr->unk40 == MON_FEMALE)
             genderSymbol[0] = 0xB6;  //female symbol
-        MenuPrint(genderSymbol, 0x14, 4);
+        Menu_PrintText(genderSymbol, 0x14, 4);
     }
 }
 
@@ -1884,8 +1884,8 @@ static void sub_80B7960(void)
     string[5] = 1;
     string += 6;
     StringCopy(string, namingScreenDataPtr->textBuffer);
-    BasicInitMenuWindow(&gWindowConfig_81E6F4C);
-    MenuPrint(gStringVar1, namingScreenDataPtr->unk2, 4);
+    BasicInitMenuWindow(&gWindowTemplate_81E6F4C);
+    Menu_PrintText(gStringVar1, namingScreenDataPtr->unk2, 4);
 }
 
 //--------------------------------------------------