diff --git a/include/applications/pokemon_summary_screen/main.h b/include/applications/pokemon_summary_screen/main.h
index 647e4db26..f0db8f3ff 100644
--- a/include/applications/pokemon_summary_screen/main.h
+++ b/include/applications/pokemon_summary_screen/main.h
@@ -286,7 +286,7 @@ typedef struct PokemonSummaryScreen {
 
     u8 buttonCount;
     u8 buttonState;
-    u8 buttonPos;
+    u8 buttonCurrent;
 
     u8 ribbonCol;
     u8 ribbonRow;
@@ -294,17 +294,17 @@ typedef struct PokemonSummaryScreen {
     u8 ribbonNum;
 } PokemonSummaryScreen;
 
-BOOL PokemonSummary_ShowContestData(SaveData *saveData);
-void PokemonSummary_FlagVisiblePages(PokemonSummary *summary, const u8 *pages);
-u8 PokemonSummary_PageIsVisble(PokemonSummaryScreen *summaryScreen, u32 page);
-u8 PokemonSummary_CountVisiblePages(PokemonSummaryScreen *summaryScreen);
-void *PokemonSummary_MonData(PokemonSummaryScreen *summaryScreen);
+BOOL PokemonSummaryScreen_ShowContestData(SaveData *saveData);
+void PokemonSummaryScreen_FlagVisiblePages(PokemonSummary *summary, const u8 *pages);
+u8 PokemonSummaryScreen_PageIsVisble(PokemonSummaryScreen *summaryScreen, u32 page);
+u8 PokemonSummaryScreen_CountVisiblePages(PokemonSummaryScreen *summaryScreen);
+void *PokemonSummaryScreen_MonData(PokemonSummaryScreen *summaryScreen);
 u8 PokemonSummaryScreen_RibbonNumAt(PokemonSummaryScreen *summaryScreen, u8 col);
-void PokemonSummary_SetPlayerProfile(PokemonSummary *summary, const TrainerInfo *trainerInfo);
-u32 PokemonSummary_StatusIconChar(void);
-u32 PokemonSummary_StatusIconPltt(void);
-u32 PokemonSummary_StatusIconCell(void);
-u32 PokemonSummary_StatusIconAnim(void);
-u32 PokemonSummary_StatusIconAnimIdx(Pokemon *mon);
+void PokemonSummaryScreen_SetPlayerProfile(PokemonSummary *summary, const TrainerInfo *trainerInfo);
+u32 PokemonSummaryScreen_StatusIconChar(void);
+u32 PokemonSummaryScreen_StatusIconPltt(void);
+u32 PokemonSummaryScreen_StatusIconCell(void);
+u32 PokemonSummaryScreen_StatusIconAnim(void);
+u32 PokemonSummaryScreen_StatusIconAnimIdx(Pokemon *mon);
 
 #endif // POKEPLATINUM_POKEMON_SUMMARY_SCREEN_MAIN_H
diff --git a/src/applications/pokemon_summary_screen/main.c b/src/applications/pokemon_summary_screen/main.c
index de13cd72e..52fc20506 100644
--- a/src/applications/pokemon_summary_screen/main.c
+++ b/src/applications/pokemon_summary_screen/main.c
@@ -137,7 +137,7 @@ const OverlayManagerTemplate Unk_020F410C = {
     FS_OVERLAY_ID_NONE
 };
 
-BOOL PokemonSummary_ShowContestData(SaveData *saveData)
+BOOL PokemonSummaryScreen_ShowContestData(SaveData *saveData)
 {
     return SystemFlag_CheckContestHallVisited(SaveData_GetVarsFlags(saveData));
 }
@@ -846,7 +846,7 @@ static int HandleInput_Subscreen(PokemonSummaryScreen *summaryScreen)
     }
 
     if (summaryScreen->buttonState == 1) {
-        u8 page = PokemonSummaryScreen_GetSubscreenButtonPage(summaryScreen, summaryScreen->buttonPos);
+        u8 page = PokemonSummaryScreen_GetSubscreenButtonPage(summaryScreen, summaryScreen->buttonCurrent);
 
         if (page == PSS_PAGE_EXIT) {
             summaryScreen->subscreenExit = TRUE;
@@ -871,11 +871,11 @@ static int SetupPoffinFeedConditionPage(PokemonSummaryScreen *summaryScreen)
         Pokemon *mon;
 
         if (summaryScreen->data->dataType == PSS_DATA_BOX_MON) {
-            boxMon = PokemonSummary_MonData(summaryScreen);
+            boxMon = PokemonSummaryScreen_MonData(summaryScreen);
             mon = Pokemon_New(HEAP_ID_POKEMON_SUMMARY_SCREEN);
             Pokemon_FromBoxPokemon(boxMon, mon);
         } else {
-            mon = PokemonSummary_MonData(summaryScreen);
+            mon = PokemonSummaryScreen_MonData(summaryScreen);
         }
 
         sub_02098EF8(summaryScreen->data->poffin, mon);
@@ -981,7 +981,7 @@ static u8 ScreenTransitionIsDone(PokemonSummaryScreen *dummy)
 
 static void SetMonData(PokemonSummaryScreen *summaryScreen)
 {
-    void *monData = PokemonSummary_MonData(summaryScreen);
+    void *monData = PokemonSummaryScreen_MonData(summaryScreen);
 
     if (summaryScreen->data->dataType == PSS_DATA_BOX_MON) {
         SetMonDataFromBoxMon(summaryScreen, monData, &summaryScreen->monData);
@@ -1078,7 +1078,7 @@ static void SetMonDataFromMon(PokemonSummaryScreen *summaryScreen, Pokemon *mon,
 
     monData->markings = Pokemon_GetValue(mon, MON_DATA_MARKS, NULL);
     monData->form = Pokemon_GetValue(mon, MON_DATA_FORM, NULL);
-    monData->status = PokemonSummary_StatusIconAnimIdx(mon);
+    monData->status = PokemonSummaryScreen_StatusIconAnimIdx(mon);
 
     if (Pokemon_CanSpreadPokerus(mon) == TRUE) {
         monData->pokerus = 2;
@@ -1167,7 +1167,7 @@ static void SetupInitialPageGfx(PokemonSummaryScreen *summaryScreen)
     }
 }
 
-void PokemonSummary_FlagVisiblePages(PokemonSummary *summary, const u8 *pages)
+void PokemonSummaryScreen_FlagVisiblePages(PokemonSummary *summary, const u8 *pages)
 {
     summary->pageFlag = 0;
 
@@ -1199,7 +1199,7 @@ static void TryHideContestPages(PokemonSummaryScreen *summaryScreen)
     }
 }
 
-u8 PokemonSummary_PageIsVisble(PokemonSummaryScreen *summaryScreen, u32 page)
+u8 PokemonSummaryScreen_PageIsVisble(PokemonSummaryScreen *summaryScreen, u32 page)
 {
     if (summaryScreen->monData.isEgg != FALSE && page != PSS_PAGE_MEMO && page != PSS_PAGE_EXIT) {
         return FALSE;
@@ -1208,7 +1208,7 @@ u8 PokemonSummary_PageIsVisble(PokemonSummaryScreen *summaryScreen, u32 page)
     return summaryScreen->data->pageFlag & (1 << page);
 }
 
-u8 PokemonSummary_CountVisiblePages(PokemonSummaryScreen *summaryScreen)
+u8 PokemonSummaryScreen_CountVisiblePages(PokemonSummaryScreen *summaryScreen)
 {
     u8 page;
     u8 countVisible = 0;
@@ -1302,7 +1302,7 @@ static u8 CheckSubscreenPressAndSetButton(PokemonSummaryScreen *summaryScreen)
     }
 
     summaryScreen->buttonCount = 0;
-    summaryScreen->buttonPos = button;
+    summaryScreen->buttonCurrent = button;
     summaryScreen->buttonState = 0;
 
     return TRUE;
@@ -1560,7 +1560,7 @@ static s8 TryAdvanceBoxMonIndex(PokemonSummaryScreen *summaryScreen, s8 delta)
     return monIndex;
 }
 
-void *PokemonSummary_MonData(PokemonSummaryScreen *summaryScreen)
+void *PokemonSummaryScreen_MonData(PokemonSummaryScreen *summaryScreen)
 {
     switch (summaryScreen->data->dataType) {
     case PSS_DATA_MON:
@@ -1739,7 +1739,7 @@ static void UpdateContestMoveInfo(PokemonSummaryScreen *summaryScreen, u32 move)
 
 static void SwapSelectedMoves(PokemonSummaryScreen *summaryScreen)
 {
-    void *monData = PokemonSummary_MonData(summaryScreen);
+    void *monData = PokemonSummaryScreen_MonData(summaryScreen);
 
     if (summaryScreen->data->dataType == PSS_DATA_BOX_MON) {
         BoxPokemon_SwapMoveSlots(monData, summaryScreen->cursor, summaryScreen->cursorTmp);
@@ -2125,34 +2125,34 @@ static int TryFeedPoffin(PokemonSummaryScreen *summaryScreen)
     return PSS_STATE_TRANSITION_OUT;
 }
 
-void PokemonSummary_SetPlayerProfile(PokemonSummary *summary, const TrainerInfo *trainerInfo)
+void PokemonSummaryScreen_SetPlayerProfile(PokemonSummary *summary, const TrainerInfo *trainerInfo)
 {
     summary->OTName = TrainerInfo_Name(trainerInfo);
     summary->OTID = TrainerInfo_ID(trainerInfo);
     summary->OTGender = (u8)TrainerInfo_Gender(trainerInfo);
 }
 
-u32 PokemonSummary_StatusIconChar(void)
+u32 PokemonSummaryScreen_StatusIconChar(void)
 {
     return 64;
 }
 
-u32 PokemonSummary_StatusIconPltt(void)
+u32 PokemonSummaryScreen_StatusIconPltt(void)
 {
     return 65;
 }
 
-u32 PokemonSummary_StatusIconCell(void)
+u32 PokemonSummaryScreen_StatusIconCell(void)
 {
     return 63;
 }
 
-u32 PokemonSummary_StatusIconAnim(void)
+u32 PokemonSummaryScreen_StatusIconAnim(void)
 {
     return 62;
 }
 
-u32 PokemonSummary_StatusIconAnimIdx(Pokemon *mon)
+u32 PokemonSummaryScreen_StatusIconAnimIdx(Pokemon *mon)
 {
     u32 statusCondition = Pokemon_GetValue(mon, MON_DATA_STATUS_CONDITION, NULL);
 
diff --git a/src/applications/pokemon_summary_screen/sprite.c b/src/applications/pokemon_summary_screen/sprite.c
index 9a345385b..60d848fac 100644
--- a/src/applications/pokemon_summary_screen/sprite.c
+++ b/src/applications/pokemon_summary_screen/sprite.c
@@ -231,7 +231,7 @@ static u8 sub_0208ECB8(PokemonSummaryScreen *param0)
     u8 v0, v1 = 0;
 
     for (v0 = 0; v0 < 8; v0++) {
-        if (PokemonSummary_PageIsVisble(param0, v0) != 0) {
+        if (PokemonSummaryScreen_PageIsVisble(param0, v0) != 0) {
             v1++;
         }
     }
@@ -253,7 +253,7 @@ void sub_0208ECF4(PokemonSummaryScreen *param0)
     v6 = 0;
 
     for (v5 = 0; v5 < 8; v5++) {
-        if (PokemonSummary_PageIsVisble(param0, v5) == 0) {
+        if (PokemonSummaryScreen_PageIsVisble(param0, v5) == 0) {
             CellActor_SetDrawFlag(v0[v5], 0);
             continue;
         }
@@ -289,7 +289,7 @@ void sub_0208EDC4(PokemonSummaryScreen *param0)
 {
     u8 v0;
 
-    if (PokemonSummary_CountVisiblePages(param0) <= 1) {
+    if (PokemonSummaryScreen_CountVisiblePages(param0) <= 1) {
         PokemonSummaryScreen_UpdatePageArrows(param0, FALSE);
     }
 
@@ -301,7 +301,7 @@ void sub_0208EDC4(PokemonSummaryScreen *param0)
 
 void PokemonSummaryScreen_UpdatePageArrows(PokemonSummaryScreen *summaryScreen, BOOL showArrows)
 {
-    if (PokemonSummary_CountVisiblePages(summaryScreen) <= 1) {
+    if (PokemonSummaryScreen_CountVisiblePages(summaryScreen) <= 1) {
         showArrows = FALSE;
     }
 
@@ -659,7 +659,7 @@ void PokemonSummaryScreen_UpdateAButtonSprite(PokemonSummaryScreen *summaryScree
 
 void sub_0208F71C(PokemonSummaryScreen *param0)
 {
-    void *v0 = PokemonSummary_MonData(param0);
+    void *v0 = PokemonSummaryScreen_MonData(param0);
     u32 v1;
 
     if (param0->data->dataType == 2) {
diff --git a/src/applications/pokemon_summary_screen/subscreen.c b/src/applications/pokemon_summary_screen/subscreen.c
index 006f6ba2f..773568ce3 100644
--- a/src/applications/pokemon_summary_screen/subscreen.c
+++ b/src/applications/pokemon_summary_screen/subscreen.c
@@ -194,7 +194,7 @@ u8 PokemonSummaryScreen_DrawSubscreenButtonAnim(PokemonSummaryScreen *summaryScr
     case 0:
         Sound_PlayEffect(SEQ_SE_DP_BUTTON9);
         PokemonSummaryScreen_UpdateSubscreenButtonGfx(summaryScreen);
-        UpdateSubscreenButtonTilemap(summaryScreen, &buttonList[summaryScreen->buttonPos], 2);
+        UpdateSubscreenButtonTilemap(summaryScreen, &buttonList[summaryScreen->buttonCurrent], 2);
         Bg_ScheduleTilemapTransfer(summaryScreen->bgConfig, 4);
         sub_0208F600(summaryScreen);
         summaryScreen->buttonCount = 0;
@@ -213,13 +213,13 @@ u8 PokemonSummaryScreen_DrawSubscreenButtonAnim(PokemonSummaryScreen *summaryScr
 
         sub_0208F684(summaryScreen);
 
-        if (sub_02092224(summaryScreen) != summaryScreen->buttonPos) {
+        if (sub_02092224(summaryScreen) != summaryScreen->buttonCurrent) {
             if (summaryScreen->monData.isEgg != FALSE
-                && buttonList[summaryScreen->buttonPos].page != PSS_PAGE_MEMO
-                && buttonList[summaryScreen->buttonPos].page != PSS_PAGE_EXIT) {
-                UpdateSubscreenButtonTilemap(summaryScreen, &buttonList[summaryScreen->buttonPos], 0);
+                && buttonList[summaryScreen->buttonCurrent].page != PSS_PAGE_MEMO
+                && buttonList[summaryScreen->buttonCurrent].page != PSS_PAGE_EXIT) {
+                UpdateSubscreenButtonTilemap(summaryScreen, &buttonList[summaryScreen->buttonCurrent], 0);
             } else {
-                UpdateSubscreenButtonTilemap(summaryScreen, &buttonList[summaryScreen->buttonPos], 1);
+                UpdateSubscreenButtonTilemap(summaryScreen, &buttonList[summaryScreen->buttonCurrent], 1);
             }
 
             Bg_ScheduleTilemapTransfer(summaryScreen->bgConfig, 4);
@@ -234,8 +234,8 @@ void PokemonSummaryScreen_CalcSubscreenButtonCirclePos(PokemonSummaryScreen *sum
 {
     const PSSSubscreenButton *buttonList = sSubscreenButtonTypes[summaryScreen->subscreenType];
 
-    *outX = buttonList[summaryScreen->buttonPos].x * 8 + (5 * 8) / 2;
-    *outY = buttonList[summaryScreen->buttonPos].y * 8 + (5 * 8) / 2;
+    *outX = buttonList[summaryScreen->buttonCurrent].x * 8 + (5 * 8) / 2;
+    *outY = buttonList[summaryScreen->buttonCurrent].y * 8 + (5 * 8) / 2;
 }
 
 u8 PokemonSummaryScreen_GetSubscreenButtonPage(PokemonSummaryScreen *summaryScreen, u8 button)
diff --git a/src/applications/pokemon_summary_screen/window.c b/src/applications/pokemon_summary_screen/window.c
index 0715b8ada..143b74228 100644
--- a/src/applications/pokemon_summary_screen/window.c
+++ b/src/applications/pokemon_summary_screen/window.c
@@ -555,7 +555,7 @@ static void sub_020908CC(PokemonSummaryScreen *param0)
     Window_FillTilemap(&param0->extraWindows[0], 0);
 
     {
-        void *v1 = PokemonSummary_MonData(param0);
+        void *v1 = PokemonSummaryScreen_MonData(param0);
         BOOL v2 = sub_02090098(param0);
 
         if (param0->data->dataType == 2) {
diff --git a/src/field_menu.c b/src/field_menu.c
index c64ba42ae..27cd47aad 100644
--- a/src/field_menu.c
+++ b/src/field_menu.c
@@ -1042,11 +1042,11 @@ BOOL sub_0203B7C0(FieldTask *taskMan)
         v3->mode = 0;
         v3->ribbons = sub_0202D79C(fieldSystem->saveData);
         v3->dexMode = sub_0207A274(fieldSystem->saveData);
-        v3->showContest = PokemonSummary_ShowContestData(fieldSystem->saveData);
+        v3->showContest = PokemonSummaryScreen_ShowContestData(fieldSystem->saveData);
         v3->chatotCry = NULL;
 
-        PokemonSummary_FlagVisiblePages(v3, Unk_020EA02C);
-        PokemonSummary_SetPlayerProfile(v3, SaveData_GetTrainerInfo(fieldSystem->saveData));
+        PokemonSummaryScreen_FlagVisiblePages(v3, Unk_020EA02C);
+        PokemonSummaryScreen_SetPlayerProfile(v3, SaveData_GetTrainerInfo(fieldSystem->saveData));
         sub_0203D334(fieldSystem, v3);
 
         menu->unk_25C = v3;
@@ -1063,11 +1063,11 @@ BOOL sub_0203B7C0(FieldTask *taskMan)
         v4->move = partyMan->unk_26;
         v4->mode = 2;
         v4->dexMode = sub_0207A274(fieldSystem->saveData);
-        v4->showContest = PokemonSummary_ShowContestData(fieldSystem->saveData);
+        v4->showContest = PokemonSummaryScreen_ShowContestData(fieldSystem->saveData);
         v4->chatotCry = NULL;
 
-        PokemonSummary_FlagVisiblePages(v4, Unk_020EA01C);
-        PokemonSummary_SetPlayerProfile(v4, SaveData_GetTrainerInfo(fieldSystem->saveData));
+        PokemonSummaryScreen_FlagVisiblePages(v4, Unk_020EA01C);
+        PokemonSummaryScreen_SetPlayerProfile(v4, SaveData_GetTrainerInfo(fieldSystem->saveData));
         sub_0203D334(fieldSystem, v4);
 
         {
@@ -1092,11 +1092,11 @@ BOOL sub_0203B7C0(FieldTask *taskMan)
         v6->move = partyMan->unk_26;
         v6->mode = 2;
         v6->dexMode = sub_0207A274(fieldSystem->saveData);
-        v6->showContest = PokemonSummary_ShowContestData(fieldSystem->saveData);
+        v6->showContest = PokemonSummaryScreen_ShowContestData(fieldSystem->saveData);
         v6->chatotCry = NULL;
 
-        PokemonSummary_FlagVisiblePages(v6, Unk_020EA01C);
-        PokemonSummary_SetPlayerProfile(v6, SaveData_GetTrainerInfo(fieldSystem->saveData));
+        PokemonSummaryScreen_FlagVisiblePages(v6, Unk_020EA01C);
+        PokemonSummaryScreen_SetPlayerProfile(v6, SaveData_GetTrainerInfo(fieldSystem->saveData));
         sub_0203D334(fieldSystem, v6);
 
         {
@@ -1929,9 +1929,9 @@ static void FieldMenu_EvolveInit(FieldTask *taskMan)
     v4 = Party_GetPokemonBySlotIndex(v3, v2->unk_00);
 
     if (v2->unk_01 == 0) {
-        v5 = sub_0207AE68(v3, v4, v2->unk_04, SaveData_Options(fieldSystem->saveData), PokemonSummary_ShowContestData(fieldSystem->saveData), SaveData_Pokedex(fieldSystem->saveData), SaveData_GetBag(fieldSystem->saveData), SaveData_GetGameRecordsPtr(fieldSystem->saveData), SaveData_PoketchData(fieldSystem->saveData), v2->unk_08, 0x1, 73);
+        v5 = sub_0207AE68(v3, v4, v2->unk_04, SaveData_Options(fieldSystem->saveData), PokemonSummaryScreen_ShowContestData(fieldSystem->saveData), SaveData_Pokedex(fieldSystem->saveData), SaveData_GetBag(fieldSystem->saveData), SaveData_GetGameRecordsPtr(fieldSystem->saveData), SaveData_PoketchData(fieldSystem->saveData), v2->unk_08, 0x1, 73);
     } else {
-        v5 = sub_0207AE68(v3, v4, v2->unk_04, SaveData_Options(fieldSystem->saveData), PokemonSummary_ShowContestData(fieldSystem->saveData), SaveData_Pokedex(fieldSystem->saveData), SaveData_GetBag(fieldSystem->saveData), SaveData_GetGameRecordsPtr(fieldSystem->saveData), SaveData_PoketchData(fieldSystem->saveData), v2->unk_08, NULL, 73);
+        v5 = sub_0207AE68(v3, v4, v2->unk_04, SaveData_Options(fieldSystem->saveData), PokemonSummaryScreen_ShowContestData(fieldSystem->saveData), SaveData_Pokedex(fieldSystem->saveData), SaveData_GetBag(fieldSystem->saveData), SaveData_GetGameRecordsPtr(fieldSystem->saveData), SaveData_PoketchData(fieldSystem->saveData), v2->unk_08, NULL, 73);
     }
 
     {
diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c
index b6bdc1435..939c29575 100644
--- a/src/overlay010/ov10_0221F800.c
+++ b/src/overlay010/ov10_0221F800.c
@@ -1534,7 +1534,7 @@ static void ov10_022211F0(UnkStruct_ov10_0221FB28 *param0, Party *param1, u16 pa
                 continue;
             }
 
-            v2 = PokemonSummary_StatusIconAnimIdx(v0);
+            v2 = PokemonSummaryScreen_StatusIconAnimIdx(v0);
 
             if (v2 == 6) {
                 sub_0200D364(param0->unk_198[v4 + param3], 3);
@@ -2054,7 +2054,7 @@ static void ov10_02221D14(UnkStruct_ov10_0221FB28 *param0, Party *param1, u8 par
         }
 
         param0->unk_214[v1 + param2].unk_0D = Pokemon_GetGender(v0);
-        param0->unk_214[v1 + param2].unk_14 = (u8)PokemonSummary_StatusIconAnimIdx(v0);
+        param0->unk_214[v1 + param2].unk_14 = (u8)PokemonSummaryScreen_StatusIconAnimIdx(v0);
     }
 }
 
diff --git a/src/overlay013/ov13_0221FC20.c b/src/overlay013/ov13_0221FC20.c
index 538082137..b9200d50e 100644
--- a/src/overlay013/ov13_0221FC20.c
+++ b/src/overlay013/ov13_0221FC20.c
@@ -880,7 +880,7 @@ static u8 ov13_022208A4(UnkStruct_ov13_022213F0 *param0)
             param0->unk_207C[0] = (u16)Pokemon_GetValue(param0->unk_04[v0->unk_11].unk_00, MON_DATA_MOVE1_CUR_PP + v0->unk_34, NULL);
             param0->unk_2078 = 2;
         } else {
-            param0->unk_04[v0->unk_11].unk_17_3 = PokemonSummary_StatusIconAnimIdx(param0->unk_04[v0->unk_11].unk_00);
+            param0->unk_04[v0->unk_11].unk_17_3 = PokemonSummaryScreen_StatusIconAnimIdx(param0->unk_04[v0->unk_11].unk_00);
 
             if (param0->unk_04[v0->unk_11].unk_17_3 == 7) {
                 SpriteActor_EnableObject(param0->unk_1FB4[13 + v0->unk_11], 0);
@@ -1220,7 +1220,7 @@ static void ov13_02220F98(UnkStruct_ov13_022213F0 *param0)
         }
 
         param0->unk_04[v0].unk_17_0 = Pokemon_GetGender(param0->unk_04[v0].unk_00);
-        param0->unk_04[v0].unk_17_3 = PokemonSummary_StatusIconAnimIdx(param0->unk_04[v0].unk_00);
+        param0->unk_04[v0].unk_17_3 = PokemonSummaryScreen_StatusIconAnimIdx(param0->unk_04[v0].unk_00);
         param0->unk_04[v0].unk_17_7 = (u8)Pokemon_GetValue(param0->unk_04[v0].unk_00, MON_DATA_IS_EGG, NULL);
         param0->unk_04[v0].unk_18 = (u16)Pokemon_GetValue(param0->unk_04[v0].unk_00, MON_DATA_ABILITY, NULL);
         param0->unk_04[v0].unk_1A = (u16)Pokemon_GetValue(param0->unk_04[v0].unk_00, MON_DATA_HELD_ITEM, NULL);
diff --git a/src/overlay013/ov13_02221A88.c b/src/overlay013/ov13_02221A88.c
index 79e721973..565c79082 100644
--- a/src/overlay013/ov13_02221A88.c
+++ b/src/overlay013/ov13_02221A88.c
@@ -1136,7 +1136,7 @@ static void ov13_0222339C(UnkStruct_ov13_022213F0 *param0)
             ov13_02223448(param0, v0);
         }
 
-        if (PokemonSummary_StatusIconAnimIdx(param0->unk_04[v0].unk_00) != 7) {
+        if (PokemonSummaryScreen_StatusIconAnimIdx(param0->unk_04[v0].unk_00) != 7) {
             continue;
         }
 
diff --git a/src/overlay013/ov13_02224500.c b/src/overlay013/ov13_02224500.c
index 7cffe923e..6023dd1cf 100644
--- a/src/overlay013/ov13_02224500.c
+++ b/src/overlay013/ov13_02224500.c
@@ -277,10 +277,10 @@ static void ov13_02224670(UnkStruct_ov13_022213F0 *param0)
 
     v1 = NARC_ctor(NARC_INDEX_GRAPHIC__PL_PST_GRA, param0->unk_00->unk_0C);
 
-    SpriteRenderer_LoadPalette(param0->unk_1E4, 3, v0, param0->unk_1FB0, v1, PokemonSummary_StatusIconPltt(), 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, 45064);
-    SpriteRenderer_LoadCellResObjFromOpenNarc(v0, param0->unk_1FB0, v1, PokemonSummary_StatusIconCell(), 0, 45064);
-    SpriteRenderer_LoadAnimResObjFromOpenNarc(v0, param0->unk_1FB0, v1, PokemonSummary_StatusIconAnim(), 0, 45064);
-    SpriteRenderer_LoadCharResObjFromOpenNarc(v0, param0->unk_1FB0, v1, PokemonSummary_StatusIconChar(), 0, NNS_G2D_VRAM_TYPE_2DSUB, 45069);
+    SpriteRenderer_LoadPalette(param0->unk_1E4, 3, v0, param0->unk_1FB0, v1, PokemonSummaryScreen_StatusIconPltt(), 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, 45064);
+    SpriteRenderer_LoadCellResObjFromOpenNarc(v0, param0->unk_1FB0, v1, PokemonSummaryScreen_StatusIconCell(), 0, 45064);
+    SpriteRenderer_LoadAnimResObjFromOpenNarc(v0, param0->unk_1FB0, v1, PokemonSummaryScreen_StatusIconAnim(), 0, 45064);
+    SpriteRenderer_LoadCharResObjFromOpenNarc(v0, param0->unk_1FB0, v1, PokemonSummaryScreen_StatusIconChar(), 0, NNS_G2D_VRAM_TYPE_2DSUB, 45069);
     NARC_dtor(v1);
 }
 
diff --git a/src/overlay019/ov19_021D0D80.c b/src/overlay019/ov19_021D0D80.c
index 3afe4f503..3bbb92f98 100644
--- a/src/overlay019/ov19_021D0D80.c
+++ b/src/overlay019/ov19_021D0D80.c
@@ -878,11 +878,11 @@ static void ov19_021D1C84(UnkStruct_ov19_021D5DF8 *param0)
 
     param0->unk_12C.chatotCry = NULL;
     param0->unk_12C.dexMode = sub_0207A274(param0->unk_11C);
-    param0->unk_12C.showContest = PokemonSummary_ShowContestData(param0->unk_11C);
+    param0->unk_12C.showContest = PokemonSummaryScreen_ShowContestData(param0->unk_11C);
     param0->unk_12C.ribbons = sub_0202D79C(param0->unk_11C);
 
-    PokemonSummary_FlagVisiblePages(&(param0->unk_12C), v0);
-    PokemonSummary_SetPlayerProfile(&(param0->unk_12C), SaveData_GetTrainerInfo(param0->unk_11C));
+    PokemonSummaryScreen_FlagVisiblePages(&(param0->unk_12C), v0);
+    PokemonSummaryScreen_SetPlayerProfile(&(param0->unk_12C), SaveData_GetTrainerInfo(param0->unk_11C));
 }
 
 static int ov19_021D1DAC(UnkStruct_ov19_021D5DF8 *param0)
diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c
index 1cbbbedb5..97bb829a7 100644
--- a/src/overlay088/ov88_0223B140.c
+++ b/src/overlay088/ov88_0223B140.c
@@ -1732,24 +1732,24 @@ static void ov88_0223D1EC(UnkStruct_02095E80 *param0, int param1)
         param0->unk_0C.max = Party_GetCurrentCount(param0->unk_08->unk_08);
 
         param0->unk_0C.chatotCry = NULL;
-        PokemonSummary_SetPlayerProfile(&param0->unk_0C, CommInfo_TrainerInfo(CommSys_CurNetId()));
+        PokemonSummaryScreen_SetPlayerProfile(&param0->unk_0C, CommInfo_TrainerInfo(CommSys_CurNetId()));
     } else {
         param0->unk_0C.monData = param0->unk_2274;
         param0->unk_0C.max = Party_GetCurrentCount(param0->unk_2274);
         param0->unk_0C.chatotCry = (ChatotCry *)param0->unk_2E6C[CommSys_CurNetId() ^ 1];
-        PokemonSummary_SetPlayerProfile(&param0->unk_0C, CommInfo_TrainerInfo(CommSys_CurNetId() ^ 1));
+        PokemonSummaryScreen_SetPlayerProfile(&param0->unk_0C, CommInfo_TrainerInfo(CommSys_CurNetId() ^ 1));
     }
 
     param0->unk_0C.dataType = 1;
     param0->unk_0C.pos = param0->unk_88[0] % 6;
     param0->unk_0C.mode = 1;
     param0->unk_0C.move = 0;
-    param0->unk_0C.showContest = PokemonSummary_ShowContestData(param0->unk_08->unk_10);
+    param0->unk_0C.showContest = PokemonSummaryScreen_ShowContestData(param0->unk_08->unk_10);
     param0->unk_0C.dexMode = param0->unk_08->unk_30;
     param0->unk_0C.options = param0->unk_08->unk_18;
     param0->unk_0C.ribbons = sub_0202D79C(param0->unk_08->unk_10);
 
-    PokemonSummary_FlagVisiblePages(&param0->unk_0C, Unk_ov88_0223F13C);
+    PokemonSummaryScreen_FlagVisiblePages(&param0->unk_0C, Unk_ov88_0223F13C);
 
     param0->unk_40 = OverlayManager_New(&Unk_020F410C, &param0->unk_0C, 26);
     param0->unk_3C = param1;
diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c
index 11c02451d..617cd9d14 100644
--- a/src/overlay091/ov91_021D0D80.c
+++ b/src/overlay091/ov91_021D0D80.c
@@ -1517,7 +1517,7 @@ static int ov91_021D261C(UnkStruct_ov91_021D0ED8 *param0)
     param0->unk_14C.showContest = 1;
     param0->unk_14C.chatotCry = NULL;
 
-    PokemonSummary_FlagVisiblePages(&param0->unk_14C, v0);
+    PokemonSummaryScreen_FlagVisiblePages(&param0->unk_14C, v0);
 
     param0->unk_17C = OverlayManager_New(&Unk_020F410C, &param0->unk_14C, 67);
     return 12;
diff --git a/src/overlay094/ov94_022443E0.c b/src/overlay094/ov94_022443E0.c
index 56a0d560b..c4fd90af1 100644
--- a/src/overlay094/ov94_022443E0.c
+++ b/src/overlay094/ov94_022443E0.c
@@ -34,13 +34,13 @@ int ov94_022443E0(UnkStruct_ov94_0223FD4C *param0, int param1)
     param0->unk_B8.pos = 0;
     param0->unk_B8.mode = 1;
     param0->unk_B8.move = 0;
-    param0->unk_B8.showContest = PokemonSummary_ShowContestData(param0->unk_00->unk_20);
+    param0->unk_B8.showContest = PokemonSummaryScreen_ShowContestData(param0->unk_00->unk_20);
     param0->unk_B8.dexMode = param0->unk_00->unk_34;
     param0->unk_B8.options = param0->unk_00->unk_24;
     param0->unk_B8.ribbons = sub_0202D79C(param0->unk_00->unk_20);
 
-    PokemonSummary_FlagVisiblePages(&param0->unk_B8, Unk_ov94_02246360);
-    PokemonSummary_SetPlayerProfile(&param0->unk_B8, param0->unk_00->unk_1C);
+    PokemonSummaryScreen_FlagVisiblePages(&param0->unk_B8, Unk_ov94_02246360);
+    PokemonSummaryScreen_SetPlayerProfile(&param0->unk_B8, param0->unk_00->unk_1C);
 
     param0->unk_B4 = OverlayManager_New(&Unk_020F410C, &param0->unk_B8, 62);
     param0->unk_104 = 1;
diff --git a/src/overlay104/ov104_02239C58.c b/src/overlay104/ov104_02239C58.c
index b19c2321f..0495f5ab0 100644
--- a/src/overlay104/ov104_02239C58.c
+++ b/src/overlay104/ov104_02239C58.c
@@ -201,7 +201,7 @@ static void ov104_02239FB0(UnkStruct_0209B75C *param0, UnkStruct_0209BBA4 *param
     param1->unk_AC->options = SaveData_Options(param1->unk_00);
     param1->unk_AC->monData = Party_GetFromSavedata(param1->unk_00);
     param1->unk_AC->dexMode = sub_0207A274(param1->unk_00);
-    param1->unk_AC->showContest = PokemonSummary_ShowContestData(param1->unk_00);
+    param1->unk_AC->showContest = PokemonSummaryScreen_ShowContestData(param1->unk_00);
     param1->unk_AC->dataType = 1;
     param1->unk_AC->pos = param1->unk_9F;
     param1->unk_AC->max = (u8)Party_GetCurrentCount(param1->unk_AC->monData);
@@ -209,8 +209,8 @@ static void ov104_02239FB0(UnkStruct_0209B75C *param0, UnkStruct_0209BBA4 *param
     param1->unk_AC->mode = 0;
     param1->unk_AC->ribbons = sub_0202D79C(param1->unk_00);
 
-    PokemonSummary_FlagVisiblePages(param1->unk_AC, v0);
-    PokemonSummary_SetPlayerProfile(param1->unk_AC, SaveData_GetTrainerInfo(param1->unk_00));
+    PokemonSummaryScreen_FlagVisiblePages(param1->unk_AC, v0);
+    PokemonSummaryScreen_SetPlayerProfile(param1->unk_AC, SaveData_GetTrainerInfo(param1->unk_00));
     sub_0209B988(param0, &Unk_020F410C, param1->unk_AC, 0, NULL);
 
     return;
diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c
index 01e559b43..0fabcac21 100644
--- a/src/overlay105/ov105_02241AE0.c
+++ b/src/overlay105/ov105_02241AE0.c
@@ -2903,8 +2903,8 @@ static void ov105_02245464(UnkStruct_ov105_02241FF4 *param0)
     param0->unk_140->dexMode = sub_0207A274(param0->unk_13C);
     param0->unk_140->showContest = FALSE;
 
-    PokemonSummary_FlagVisiblePages(param0->unk_140, Unk_ov105_022462DC);
-    PokemonSummary_SetPlayerProfile(param0->unk_140, SaveData_GetTrainerInfo(param0->unk_13C));
+    PokemonSummaryScreen_FlagVisiblePages(param0->unk_140, Unk_ov105_022462DC);
+    PokemonSummaryScreen_SetPlayerProfile(param0->unk_140, SaveData_GetTrainerInfo(param0->unk_13C));
 
     return;
 }
diff --git a/src/overlay106/ov106_02241AE0.c b/src/overlay106/ov106_02241AE0.c
index 09f490a6c..73222914e 100644
--- a/src/overlay106/ov106_02241AE0.c
+++ b/src/overlay106/ov106_02241AE0.c
@@ -1219,10 +1219,10 @@ static void ov106_02242CA4(UnkStruct_ov106_02243118 *param0)
     param0->unk_BC->pos = 0;
     param0->unk_BC->move = 0;
     param0->unk_BC->dexMode = sub_0207A274(param0->unk_B8);
-    param0->unk_BC->showContest = PokemonSummary_ShowContestData(param0->unk_B8);
+    param0->unk_BC->showContest = PokemonSummaryScreen_ShowContestData(param0->unk_B8);
 
-    PokemonSummary_FlagVisiblePages(param0->unk_BC, Unk_ov106_02243798);
-    PokemonSummary_SetPlayerProfile(param0->unk_BC, SaveData_GetTrainerInfo(param0->unk_B8));
+    PokemonSummaryScreen_FlagVisiblePages(param0->unk_BC, Unk_ov106_02243798);
+    PokemonSummaryScreen_SetPlayerProfile(param0->unk_BC, SaveData_GetTrainerInfo(param0->unk_B8));
 
     return;
 }
diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c
index 366f3c7d0..8045d35bc 100644
--- a/src/unk_0203D1B8.c
+++ b/src/unk_0203D1B8.c
@@ -555,11 +555,11 @@ void *sub_0203D5C8(int param0, FieldSystem *fieldSystem, int param2)
     v0->mode = 0;
     v0->ribbons = sub_0202D79C(fieldSystem->saveData);
     v0->dexMode = sub_0207A274(fieldSystem->saveData);
-    v0->showContest = PokemonSummary_ShowContestData(fieldSystem->saveData);
+    v0->showContest = PokemonSummaryScreen_ShowContestData(fieldSystem->saveData);
     v0->chatotCry = NULL;
 
-    PokemonSummary_FlagVisiblePages(v0, Unk_020EA02C);
-    PokemonSummary_SetPlayerProfile(v0, SaveData_GetTrainerInfo(fieldSystem->saveData));
+    PokemonSummaryScreen_FlagVisiblePages(v0, Unk_020EA02C);
+    PokemonSummaryScreen_SetPlayerProfile(v0, SaveData_GetTrainerInfo(fieldSystem->saveData));
     FieldSystem_StartChildProcess(fieldSystem, &Unk_020F410C, v0);
 
     return v0;
@@ -596,11 +596,11 @@ PokemonSummary *sub_0203D670(FieldSystem *fieldSystem, int param1, int param2)
     v0->move = 0;
     v0->mode = param2;
     v0->dexMode = sub_0207A274(v1);
-    v0->showContest = PokemonSummary_ShowContestData(v1);
+    v0->showContest = PokemonSummaryScreen_ShowContestData(v1);
     v0->ribbons = sub_0202D79C(v1);
 
-    PokemonSummary_FlagVisiblePages(v0, v2);
-    PokemonSummary_SetPlayerProfile(v0, SaveData_GetTrainerInfo(v1));
+    PokemonSummaryScreen_FlagVisiblePages(v0, v2);
+    PokemonSummaryScreen_SetPlayerProfile(v0, SaveData_GetTrainerInfo(v1));
 
     return v0;
 }
@@ -625,10 +625,10 @@ void *sub_0203D6E4(int param0, FieldSystem *fieldSystem, u8 param2)
     v0->move = 0;
     v0->mode = 2;
     v0->dexMode = sub_0207A274(fieldSystem->saveData);
-    v0->showContest = PokemonSummary_ShowContestData(fieldSystem->saveData);
+    v0->showContest = PokemonSummaryScreen_ShowContestData(fieldSystem->saveData);
 
-    PokemonSummary_FlagVisiblePages(v0, Unk_020EA160);
-    PokemonSummary_SetPlayerProfile(v0, SaveData_GetTrainerInfo(fieldSystem->saveData));
+    PokemonSummaryScreen_FlagVisiblePages(v0, Unk_020EA160);
+    PokemonSummaryScreen_SetPlayerProfile(v0, SaveData_GetTrainerInfo(fieldSystem->saveData));
     sub_0203D334(fieldSystem, v0);
 
     return v0;
@@ -1075,7 +1075,7 @@ BOOL sub_0203DBF0(FieldTask *param0)
 
         if ((v4 = sub_02076B94(NULL, v2->unk_04.unk_40, 1, v3, &v5)) != 0) {
             Heap_Create(3, 26, 0x30000);
-            v2->unk_60 = sub_0207AE68(NULL, v2->unk_04.unk_40, v4, SaveData_Options(fieldSystem->saveData), PokemonSummary_ShowContestData(fieldSystem->saveData), SaveData_Pokedex(fieldSystem->saveData), SaveData_GetBag(fieldSystem->saveData), SaveData_GetGameRecordsPtr(fieldSystem->saveData), SaveData_PoketchData(fieldSystem->saveData), v5, 0x4, 26);
+            v2->unk_60 = sub_0207AE68(NULL, v2->unk_04.unk_40, v4, SaveData_Options(fieldSystem->saveData), PokemonSummaryScreen_ShowContestData(fieldSystem->saveData), SaveData_Pokedex(fieldSystem->saveData), SaveData_GetBag(fieldSystem->saveData), SaveData_GetGameRecordsPtr(fieldSystem->saveData), SaveData_PoketchData(fieldSystem->saveData), v5, 0x4, 26);
             v2->unk_00 = 6;
         } else {
             v2->unk_00 = 7;
@@ -1373,7 +1373,7 @@ void sub_0203E0FC(FieldSystem *fieldSystem, int param1)
     v0->unk_24 = SaveData_Options(fieldSystem->saveData);
     v0->records = SaveData_GetGameRecordsPtr(fieldSystem->saveData);
     v0->unk_2C = fieldSystem->journal;
-    v0->unk_3C = PokemonSummary_ShowContestData(fieldSystem->saveData);
+    v0->unk_3C = PokemonSummaryScreen_ShowContestData(fieldSystem->saveData);
     v0->unk_20 = fieldSystem->saveData;
     v0->unk_34 = sub_0207A274(fieldSystem->saveData);
     v0->unk_38 = sub_02039058(v0->unk_14);
@@ -1777,8 +1777,8 @@ void *sub_0203E63C(int param0, FieldSystem *fieldSystem, u16 param2, u16 param3)
     v0->showContest = SystemFlag_CheckContestHallVisited(SaveData_GetVarsFlags(fieldSystem->saveData));
     v0->chatotCry = NULL;
 
-    PokemonSummary_FlagVisiblePages(v0, Unk_020EA15C);
-    PokemonSummary_SetPlayerProfile(v0, SaveData_GetTrainerInfo(fieldSystem->saveData));
+    PokemonSummaryScreen_FlagVisiblePages(v0, Unk_020EA15C);
+    PokemonSummaryScreen_SetPlayerProfile(v0, SaveData_GetTrainerInfo(fieldSystem->saveData));
     FieldSystem_StartChildProcess(fieldSystem, &Unk_020F410C, v0);
 
     return v0;
diff --git a/src/unk_0204F13C.c b/src/unk_0204F13C.c
index f294ea499..caff5a1a3 100644
--- a/src/unk_0204F13C.c
+++ b/src/unk_0204F13C.c
@@ -424,7 +424,7 @@ static int sub_0204F628(UnkStruct_0204F470 *param0, FieldSystem *fieldSystem, in
     v0->options = SaveData_Options(v1);
     v0->monData = Party_GetFromSavedata(v1);
     v0->dexMode = sub_0207A274(v1);
-    v0->showContest = PokemonSummary_ShowContestData(v1);
+    v0->showContest = PokemonSummaryScreen_ShowContestData(v1);
     v0->dataType = 1;
     v0->pos = param0->unk_05;
     v0->max = (u8)Party_GetCurrentCount(v0->monData);
@@ -432,8 +432,8 @@ static int sub_0204F628(UnkStruct_0204F470 *param0, FieldSystem *fieldSystem, in
     v0->mode = 0;
     v0->ribbons = sub_0202D79C(v1);
 
-    PokemonSummary_FlagVisiblePages(v0, v2);
-    PokemonSummary_SetPlayerProfile(v0, SaveData_GetTrainerInfo(v1));
+    PokemonSummaryScreen_FlagVisiblePages(v0, v2);
+    PokemonSummaryScreen_SetPlayerProfile(v0, SaveData_GetTrainerInfo(v1));
 
     FieldSystem_StartChildProcess(fieldSystem, &Unk_020F410C, v0);
 
diff --git a/src/unk_0204FAB4.c b/src/unk_0204FAB4.c
index 52637cc4c..936de0e52 100644
--- a/src/unk_0204FAB4.c
+++ b/src/unk_0204FAB4.c
@@ -330,7 +330,7 @@ static int sub_0204FF6C(UnkStruct_0204FE50 *param0, FieldSystem *fieldSystem, in
     v0->options = SaveData_Options(v1);
     v0->monData = Party_GetFromSavedata(v1);
     v0->dexMode = sub_0207A274(v1);
-    v0->showContest = PokemonSummary_ShowContestData(v1);
+    v0->showContest = PokemonSummaryScreen_ShowContestData(v1);
     v0->dataType = 1;
     v0->pos = param0->unk_05;
     v0->max = (u8)Party_GetCurrentCount(v0->monData);
@@ -338,8 +338,8 @@ static int sub_0204FF6C(UnkStruct_0204FE50 *param0, FieldSystem *fieldSystem, in
     v0->mode = 0;
     v0->ribbons = sub_0202D79C(v1);
 
-    PokemonSummary_FlagVisiblePages(v0, v2);
-    PokemonSummary_SetPlayerProfile(v0, SaveData_GetTrainerInfo(v1));
+    PokemonSummaryScreen_FlagVisiblePages(v0, v2);
+    PokemonSummaryScreen_SetPlayerProfile(v0, SaveData_GetTrainerInfo(v1));
     FieldSystem_StartChildProcess(fieldSystem, &Unk_020F410C, v0);
 
     *(param0->unk_0C) = v0;
diff --git a/src/unk_0205003C.c b/src/unk_0205003C.c
index 2fd199567..718fa0553 100644
--- a/src/unk_0205003C.c
+++ b/src/unk_0205003C.c
@@ -318,7 +318,7 @@ static int sub_02050498(UnkStruct_0205037C *param0, FieldSystem *fieldSystem, in
     v0->options = SaveData_Options(v1);
     v0->monData = Party_GetFromSavedata(v1);
     v0->dexMode = sub_0207A274(v1);
-    v0->showContest = PokemonSummary_ShowContestData(v1);
+    v0->showContest = PokemonSummaryScreen_ShowContestData(v1);
     v0->dataType = 1;
     v0->pos = param0->unk_05;
     v0->max = (u8)Party_GetCurrentCount(v0->monData);
@@ -326,8 +326,8 @@ static int sub_02050498(UnkStruct_0205037C *param0, FieldSystem *fieldSystem, in
     v0->mode = 0;
     v0->ribbons = sub_0202D79C(v1);
 
-    PokemonSummary_FlagVisiblePages(v0, v2);
-    PokemonSummary_SetPlayerProfile(v0, SaveData_GetTrainerInfo(v1));
+    PokemonSummaryScreen_FlagVisiblePages(v0, v2);
+    PokemonSummaryScreen_SetPlayerProfile(v0, SaveData_GetTrainerInfo(v1));
     FieldSystem_StartChildProcess(fieldSystem, &Unk_020F410C, v0);
 
     *(param0->unk_0C) = v0;
diff --git a/src/unk_02051D8C.c b/src/unk_02051D8C.c
index b3e096f20..e548b7fed 100644
--- a/src/unk_02051D8C.c
+++ b/src/unk_02051D8C.c
@@ -279,7 +279,7 @@ void sub_020521B8(BattleParams *param0, const FieldSystem *fieldSystem, SaveData
     param0->unk_EC = SaveData_PCBoxes(param2);
     param0->unk_130 = MapHeader_GetMapLabelTextID(param3);
     param0->unk_13C = MapHeader_GetMapEvolutionMethod(param3);
-    param0->unk_140 = PokemonSummary_ShowContestData(param2);
+    param0->unk_140 = PokemonSummaryScreen_ShowContestData(param2);
     param0->unk_144 = SystemFlag_CheckMetBebe(SaveData_GetVarsFlags(param2));
     param0->unk_14C = FieldOverworldState_GetWeather(v6);
     param0->unk_E4 = param5;
diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c
index 9fbd25f01..0bdda60a7 100644
--- a/src/unk_0205A0D8.c
+++ b/src/unk_0205A0D8.c
@@ -128,10 +128,10 @@ static void sub_0205A0D8(UnkStruct_0205A0D8 *param0, FieldSystem *fieldSystem, P
     v0 = Heap_AllocFromHeapAtEnd(param5, sizeof(PokemonSummary));
 
     MI_CpuClear8(v0, sizeof(PokemonSummary));
-    PokemonSummary_SetPlayerProfile(v0, SaveData_GetTrainerInfo(fieldSystem->saveData));
+    PokemonSummaryScreen_SetPlayerProfile(v0, SaveData_GetTrainerInfo(fieldSystem->saveData));
 
     v0->dexMode = sub_0207A274(v1);
-    v0->showContest = PokemonSummary_ShowContestData(v1);
+    v0->showContest = PokemonSummaryScreen_ShowContestData(v1);
     v0->options = SaveData_Options(v1);
     v0->monData = param2;
     v0->dataType = 1;
@@ -141,7 +141,7 @@ static void sub_0205A0D8(UnkStruct_0205A0D8 *param0, FieldSystem *fieldSystem, P
     v0->mode = param4;
     v0->ribbons = sub_0202D79C(v1);
 
-    PokemonSummary_FlagVisiblePages(v0, v2);
+    PokemonSummaryScreen_FlagVisiblePages(v0, v2);
     FieldSystem_StartChildProcess(fieldSystem, &Unk_020F410C, v0);
 
     param0->unk_00 = v0;
diff --git a/src/unk_0206B9D8.c b/src/unk_0206B9D8.c
index cdbec1ede..8728430d5 100644
--- a/src/unk_0206B9D8.c
+++ b/src/unk_0206B9D8.c
@@ -140,7 +140,7 @@ static int sub_0206BAE0(UnkStruct_0206B9D8 *param0, FieldSystem *fieldSystem, in
     v0->options = SaveData_Options(v1);
     v0->monData = Party_GetFromSavedata(v1);
     v0->dexMode = sub_0207A274(v1);
-    v0->showContest = PokemonSummary_ShowContestData(v1);
+    v0->showContest = PokemonSummaryScreen_ShowContestData(v1);
     v0->dataType = 1;
     v0->pos = param0->unk_0D;
     v0->max = (u8)Party_GetCurrentCount(v0->monData);
@@ -148,8 +148,8 @@ static int sub_0206BAE0(UnkStruct_0206B9D8 *param0, FieldSystem *fieldSystem, in
     v0->mode = param0->unk_09;
     v0->ribbons = sub_0202D79C(v1);
 
-    PokemonSummary_FlagVisiblePages(v0, v2);
-    PokemonSummary_SetPlayerProfile(v0, SaveData_GetTrainerInfo(v1));
+    PokemonSummaryScreen_FlagVisiblePages(v0, v2);
+    PokemonSummaryScreen_SetPlayerProfile(v0, SaveData_GetTrainerInfo(v1));
     FieldSystem_StartChildProcess(fieldSystem, &Unk_020F410C, v0);
     *(param0->unk_14) = v0;
 
diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c
index b8ab8861e..4bf6dd90a 100644
--- a/src/unk_0207AE68.c
+++ b/src/unk_0207AE68.c
@@ -506,7 +506,7 @@ static void sub_0207B180(UnkStruct_0207AE68 *param0)
             param0->unk_3C->move = param0->unk_6C;
             param0->unk_3C->mode = 2;
             param0->unk_3C->chatotCry = NULL;
-            PokemonSummary_FlagVisiblePages(param0->unk_3C, Unk_020F0A2C);
+            PokemonSummaryScreen_FlagVisiblePages(param0->unk_3C, Unk_020F0A2C);
             sub_0207C624(param0);
             param0->unk_64++;
         }
diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c
index 0ebb2bc63..562ac0b64 100644
--- a/src/unk_0207E0B8.c
+++ b/src/unk_0207E0B8.c
@@ -1069,7 +1069,7 @@ u8 sub_0207EF14(GameWindowLayout *param0, u8 param1)
 
     param0->unk_704[param1].unk_0E_13 = Pokemon_GetGender(v0);
     param0->unk_704[param1].unk_29 = 1;
-    param0->unk_704[param1].unk_0E_0 = (u8)PokemonSummary_StatusIconAnimIdx(v0);
+    param0->unk_704[param1].unk_0E_0 = (u8)PokemonSummaryScreen_StatusIconAnimIdx(v0);
 
     sub_0207F094(param0, v0, param1);
 
diff --git a/src/unk_02084B70.c b/src/unk_02084B70.c
index 9069cc37b..d09512c15 100644
--- a/src/unk_02084B70.c
+++ b/src/unk_02084B70.c
@@ -498,7 +498,7 @@ static int sub_020855C4(void *param0)
     StringTemplate_Format(v0->unk_6A0, v0->unk_6A4, v2);
     Strbuf_Free(v2);
 
-    v4 = PokemonSummary_StatusIconAnimIdx(v1);
+    v4 = PokemonSummaryScreen_StatusIconAnimIdx(v1);
     sub_02083014(v0, v0->unk_B11, v4);
 
     if (v4 == 7) {
@@ -685,7 +685,7 @@ static int sub_02085A70(void *param0)
     StringTemplate_Format(v0->unk_6A0, v0->unk_6A4, v2);
     Strbuf_Free(v2);
 
-    v4 = PokemonSummary_StatusIconAnimIdx(v1);
+    v4 = PokemonSummaryScreen_StatusIconAnimIdx(v1);
     sub_02083014(v0, v0->unk_B11, v4);
 
     if (v4 == 7) {
diff --git a/src/unk_020916B4.c b/src/unk_020916B4.c
index c21c11da3..59e97debe 100644
--- a/src/unk_020916B4.c
+++ b/src/unk_020916B4.c
@@ -342,7 +342,7 @@ void sub_02091F8C(PokemonSummaryScreen *param0)
 
     param0->monSprite.spriteManager = sub_0200762C(19);
 
-    v1 = PokemonSummary_MonData(param0);
+    v1 = PokemonSummaryScreen_MonData(param0);
 
     if (param0->data->dataType == 2) {
         BoxPokemon_BuildArchivedSprite(&v0, v1, 2, 0);
diff --git a/src/unk_020989DC.c b/src/unk_020989DC.c
index f39d008af..d931e1994 100644
--- a/src/unk_020989DC.c
+++ b/src/unk_020989DC.c
@@ -332,8 +332,8 @@ static int sub_02098CB0(UnkStruct_02098BE4 *param0)
     v2->showContest = TRUE;
     v2->chatotCry = NULL;
 
-    PokemonSummary_FlagVisiblePages(v2, v3);
-    PokemonSummary_SetPlayerProfile(v2, param0->unk_0C->unk_0C);
+    PokemonSummaryScreen_FlagVisiblePages(v2, v3);
+    PokemonSummaryScreen_SetPlayerProfile(v2, param0->unk_0C->unk_0C);
 
     param0->unk_14 = OverlayManager_New(&Unk_020F410C, v1, param0->unk_00);
     param0->unk_10 = (void *)v2;
@@ -433,8 +433,8 @@ static int sub_02098E0C(UnkStruct_02098BE4 *param0)
     v1->showContest = TRUE;
     v1->chatotCry = NULL;
 
-    PokemonSummary_FlagVisiblePages(v1, v3);
-    PokemonSummary_SetPlayerProfile(v1, param0->unk_0C->unk_0C);
+    PokemonSummaryScreen_FlagVisiblePages(v1, v3);
+    PokemonSummaryScreen_SetPlayerProfile(v1, param0->unk_0C->unk_0C);
 
     param0->unk_14 = OverlayManager_New(&Unk_020F410C, v1, param0->unk_00);
     param0->unk_10 = (void *)v1;