diff --git a/include/battle/ov16_0223DF00.h b/include/battle/ov16_0223DF00.h
index 4ba0acd19c..3a960cedec 100644
--- a/include/battle/ov16_0223DF00.h
+++ b/include/battle/ov16_0223DF00.h
@@ -142,7 +142,7 @@ int BattleSystem_BattlerOfType(BattleSystem *battleSys, int type);
 u8 BattleSystem_BattlerSlot(BattleSystem *battleSys, int param1);
 u8 Battler_Side(BattleSystem *battleSys, int param1);
 void *ov16_0223E220(BattleSystem *battleSys);
-PCBoxes *ov16_0223E228(BattleSystem *battleSys);
+PCBoxes *BattleSystem_PCBoxes(BattleSystem *battleSys);
 
 /**
  * @brief Get the terrain type for the battle.
diff --git a/include/overlay061/ov61_0222AE60.h b/include/overlay061/ov61_0222AE60.h
index 889eec0ce7..13647226ed 100644
--- a/include/overlay061/ov61_0222AE60.h
+++ b/include/overlay061/ov61_0222AE60.h
@@ -14,7 +14,7 @@
 
 void ov61_0222AE60(SaveData *saveData, const UnkStruct_02029C68 *param1, UnkStruct_ov61_0222AE80 *param2);
 void ov61_0222AE80(const UnkStruct_ov61_0222AE80 *param0, UnkStruct_02029C68 *param1);
-void ov61_0222AE88(SaveData *saveData, const PCBoxes *param1, int param2, UnkStruct_ov62_02239DA4 *param3, int heapID);
+void ov61_0222AE88(SaveData *saveData, const PCBoxes *pcBoxes, int boxID, UnkStruct_ov62_02239DA4 *param3, int heapID);
 void ov61_0222AF88(SaveData *saveData, UnkStruct_ov62_02239DA4 *param1, int param2);
 void ov61_0222AFA4(SaveData *saveData, const UnkStruct_02030A80 *param1, UnkStruct_ov61_0222AFC0 *param2);
 void ov61_0222AFC0(const UnkStruct_ov61_0222AFC0 *param0, UnkStruct_02030A80 *param1);
diff --git a/include/overlay061/ov61_0222B008.h b/include/overlay061/ov61_0222B008.h
index 0de77a259a..e9dcd8fe56 100644
--- a/include/overlay061/ov61_0222B008.h
+++ b/include/overlay061/ov61_0222B008.h
@@ -14,7 +14,7 @@ int ov61_0222B008(UnkStruct_ov62_022349A8 *param0, const UnkStruct_ov62_02241130
 void ov61_0222B0F0(UnkStruct_ov62_022349A8 *param0);
 int ov61_0222B1B4(UnkStruct_ov62_022349A8 *param0, UnkStruct_02030A80 *param1, UnkStruct_02029C68 *param2);
 int ov61_0222B1FC(UnkStruct_ov62_022349A8 *param0, int param1);
-int ov61_0222B224(UnkStruct_ov62_022349A8 *param0, int param1, UnkStruct_02030A80 *param2, const PCBoxes *param3, int param4);
+int ov61_0222B224(UnkStruct_ov62_022349A8 *param0, int param1, UnkStruct_02030A80 *param2, const PCBoxes *pcBoxes, int param4);
 int ov61_0222B290(UnkStruct_ov62_022349A8 *param0, int param1);
 int ov61_0222B2B8(UnkStruct_ov62_022349A8 *param0);
 int ov61_0222B2D8(UnkStruct_ov62_022349A8 *param0, UnkStruct_02030A80 *param1, UnkStruct_ov61_0222B2D8 param2[]);
diff --git a/include/overlay094/ov94_0223FB48.h b/include/overlay094/ov94_0223FB48.h
index 310edc8fbd..347167926c 100644
--- a/include/overlay094/ov94_0223FB48.h
+++ b/include/overlay094/ov94_0223FB48.h
@@ -12,7 +12,7 @@ int ov94_0223FB48(UnkStruct_ov94_0223FD4C *param0, int param1);
 int ov94_0223FBBC(UnkStruct_ov94_0223FD4C *param0, int param1);
 int ov94_0223FBDC(UnkStruct_ov94_0223FD4C *param0, int param1);
 int ov94_022411D0(int param0);
-BoxPokemon *ov94_022411DC(Party *param0, PCBoxes *param1, int param2, int param3);
+BoxPokemon *ov94_022411DC(Party *param0, PCBoxes *pcBoxes, int param2, int param3);
 BOOL ov94_02241498(Pokemon *param0);
 
 #endif // POKEPLATINUM_OV94_0223FB48_H
diff --git a/include/string_template.h b/include/string_template.h
index acb532bfc1..72d9cbb2be 100644
--- a/include/string_template.h
+++ b/include/string_template.h
@@ -80,7 +80,7 @@ void StringTemplate_SetUndergroundAnswer(StringTemplate *template, u32 idx, u32
 void StringTemplate_SetUndergroundGoodsName(StringTemplate *template, u32 idx, u32 goods);
 void StringTemplate_SetUndergroundGoodsNameWithArticle(StringTemplate *template, u32 idx, u32 goods);
 void StringTemplate_SetGenderMarker(StringTemplate *template, u32 idx, enum Gender gender);
-void StringTemplate_SetPCBoxName(StringTemplate *template, u32 idx, const PCBoxes *boxes, u32 boxIdx);
+void StringTemplate_SetPCBoxName(StringTemplate *template, u32 idx, const PCBoxes *pcBoxes, u32 boxIdx);
 void StringTemplate_SetGymName(StringTemplate *template, u32 idx, u32 gym);
 void StringTemplate_SetTimeOfDay(StringTemplate *template, u32 idx, u32 timeOfDay);
 void StringTemplate_SetCountryName(StringTemplate *template, u32 idx, u32 country);
diff --git a/include/struct_defs/struct_0203E0FC.h b/include/struct_defs/struct_0203E0FC.h
index a1d6488b7a..4b14d55aca 100644
--- a/include/struct_defs/struct_0203E0FC.h
+++ b/include/struct_defs/struct_0203E0FC.h
@@ -20,7 +20,7 @@ typedef struct {
     GlobalTrade *unk_00;
     SystemData *unk_04;
     Party *unk_08;
-    PCBoxes *unk_0C;
+    PCBoxes *pcBoxes;
     Pokedex *unk_10;
     WiFiList *unk_14;
     WiFiHistory *wiFiHistory;
diff --git a/include/struct_defs/struct_0208737C.h b/include/struct_defs/struct_0208737C.h
index 0b3d1a55a6..4f3dfd6290 100644
--- a/include/struct_defs/struct_0208737C.h
+++ b/include/struct_defs/struct_0208737C.h
@@ -16,7 +16,7 @@ typedef struct {
     Strbuf *textInputStr;
     u16 unk_1C[20];
     int unk_44;
-    PCBoxes *unk_48;
+    PCBoxes *pcBoxes;
     Options *options;
 } UnkStruct_0208737C;
 
diff --git a/src/battle/battle_script.c b/src/battle/battle_script.c
index b35865fd38..f47407a975 100644
--- a/src/battle/battle_script.c
+++ b/src/battle/battle_script.c
@@ -10871,7 +10871,7 @@ static void BattleScript_CatchMonTask(SysTask *param0, void *param1)
                 }
 
                 v16->unk_08 = Pokemon_GetValue(v3, MON_DATA_FORM, NULL);
-                v16->unk_48 = ov16_0223E228(v2->battleSys);
+                v16->pcBoxes = BattleSystem_PCBoxes(v2->battleSys);
                 v16->unk_10 = Pokemon_GetValue(v3, MON_DATA_GENDER, NULL);
                 v2->tmpPtr[0] = ApplicationManager_New(&Unk_020F2DAC, v16, 5);
                 v2->seqNum = 21;
@@ -10946,18 +10946,18 @@ static void BattleScript_CatchMonTask(SysTask *param0, void *param1)
                     v2->seqNum = 32;
                 } else {
                     {
-                        PCBoxes *v24;
+                        PCBoxes *pcBoxes;
                         u32 v25;
                         u32 v26;
                         int v27;
                         int v28;
                         int v29;
 
-                        v24 = ov16_0223E228(v2->battleSys);
-                        v25 = PCBoxes_GetCurrentBoxID(v24);
-                        v26 = PCBoxes_FirstEmptyBox(v24);
+                        pcBoxes = BattleSystem_PCBoxes(v2->battleSys);
+                        v25 = PCBoxes_GetCurrentBoxID(pcBoxes);
+                        v26 = PCBoxes_FirstEmptyBox(pcBoxes);
 
-                        PCBoxes_SetCurrentBox(v24, v26);
+                        PCBoxes_SetCurrentBox(pcBoxes, v26);
 
                         for (v27 = 0; v27 < LEARNED_MOVES_MAX; v27++) {
                             v28 = Pokemon_GetValue(v3, MON_DATA_MOVE1_MAX_PP + v27, NULL);
@@ -10968,7 +10968,7 @@ static void BattleScript_CatchMonTask(SysTask *param0, void *param1)
                             ov16_0223F9A0(v2->battleSys, v1);
                         }
 
-                        PCBoxes_TryStoreBoxMonInBox(v24, v26, Pokemon_GetBoxPokemon(v3));
+                        PCBoxes_TryStoreBoxMonInBox(pcBoxes, v26, Pokemon_GetBoxPokemon(v3));
 
                         if (v2->seqNum == 22) {
                             if (v25 == v26) {
diff --git a/src/battle/ov16_0223DF00.c b/src/battle/ov16_0223DF00.c
index 9e53257bfe..722324fe0e 100644
--- a/src/battle/ov16_0223DF00.c
+++ b/src/battle/ov16_0223DF00.c
@@ -112,7 +112,6 @@ int BattleSystem_BattlerOfType(BattleSystem *battleSys, int type);
 u8 BattleSystem_BattlerSlot(BattleSystem *battleSys, int battler);
 u8 Battler_Side(BattleSystem *battleSystem, int param1);
 void *ov16_0223E220(BattleSystem *battleSystem);
-PCBoxes *ov16_0223E228(BattleSystem *battleSystem);
 enum BattleTerrain BattleSystem_Terrain(BattleSystem *battleSys);
 int BattleSystem_MapHeader(BattleSystem *battleSystem);
 int BattleSystem_Partner(BattleSystem *battleSys, int battler);
@@ -496,7 +495,7 @@ void *ov16_0223E220(BattleSystem *battleSystem)
     return battleSystem->unk_1AC;
 }
 
-PCBoxes *ov16_0223E228(BattleSystem *battleSystem)
+PCBoxes *BattleSystem_PCBoxes(BattleSystem *battleSystem)
 {
     return battleSystem->pcBoxes;
 }
diff --git a/src/encounter.c b/src/encounter.c
index 871b9be3ce..98861bcf57 100644
--- a/src/encounter.c
+++ b/src/encounter.c
@@ -512,10 +512,10 @@ static BOOL FieldTask_SafariEncounter(FieldTask *task)
                 ScriptManager_Start(task, 8809, NULL, NULL);
             }
         } else {
-            PCBoxes *boxes = SaveData_GetPCBoxes(fieldSystem->saveData);
+            PCBoxes *pcBoxes = SaveData_GetPCBoxes(fieldSystem->saveData);
             Party *party = SaveData_GetParty(fieldSystem->saveData);
 
-            if (PCBoxes_FirstEmptyBox(boxes) == MAX_PC_BOXES && Party_GetCurrentCount(party) == MAX_PARTY_SIZE) {
+            if (PCBoxes_FirstEmptyBox(pcBoxes) == MAX_PC_BOXES && Party_GetCurrentCount(party) == MAX_PARTY_SIZE) {
                 ScriptManager_Start(task, 8822, NULL, NULL);
             }
         }
diff --git a/src/overlay013/battle_bag.c b/src/overlay013/battle_bag.c
index 412d13fe50..bd0674e8e8 100644
--- a/src/overlay013/battle_bag.c
+++ b/src/overlay013/battle_bag.c
@@ -468,9 +468,9 @@ static u8 TryUseItem(BattleBag *battleBag)
         }
 
         Party *party = BattleSystem_Party(context->battleSystem, context->battler);
-        PCBoxes *boxes = ov16_0223E228(context->battleSystem);
+        PCBoxes *pcBoxes = BattleSystem_PCBoxes(context->battleSystem);
 
-        if (Party_GetCurrentCount(party) == MAX_PARTY_SIZE && PCBoxes_FirstEmptyBox(boxes) == MAX_PC_BOXES) {
+        if (Party_GetCurrentCount(party) == MAX_PARTY_SIZE && PCBoxes_FirstEmptyBox(pcBoxes) == MAX_PC_BOXES) {
             MessageLoader_GetStrbuf(battleBag->messageLoader, BattleBag_Text_CantUseBallNoRoomLeft, battleBag->strbuf);
             BattleBagText_DisplayMessage(battleBag);
             battleBag->queuedState = TASK_STATE_CLEAR_ERROR_MESSAGE;
diff --git a/src/overlay019/box_menu.c b/src/overlay019/box_menu.c
index dedfc382c3..ab180446cd 100644
--- a/src/overlay019/box_menu.c
+++ b/src/overlay019/box_menu.c
@@ -120,7 +120,7 @@ void BoxMenu_FillItemsMenu(UnkStruct_ov19_021D4DF0 *param0)
 void BoxMenu_FillHeaderMenu(UnkStruct_ov19_021D4DF0 *param0)
 {
     BoxMenu *menu = &(param0->boxMenu);
-    const PCBoxes *unused = ov19_GetPCBoxes(param0);
+    const PCBoxes *pcBoxes = ov19_GetPCBoxes(param0);
 
     BoxMenu_ClearMenuItems(menu);
     BoxMenu_AddMenuItem(menu, BOX_MENU_JUMP);
diff --git a/src/overlay019/ov19_021D79F8.c b/src/overlay019/ov19_021D79F8.c
index bc1f348b38..a25bc86a01 100644
--- a/src/overlay019/ov19_021D79F8.c
+++ b/src/overlay019/ov19_021D79F8.c
@@ -372,19 +372,19 @@ static void ov19_021D7F9C(UnkStruct_ov19_021D8318 *param0, fx32 param1)
 
 static void ov19_021D803C(UnkStruct_ov19_021D8318 *param0, UnkStruct_ov19_021DCD18 *param1, int param2, int param3)
 {
-    const PCBoxes *v0;
+    const PCBoxes *pcBoxes;
     BoxPokemon *v1;
     int v2, v3;
     u32 v4;
 
-    v0 = ov19_GetPCBoxes(param0->unk_58F8);
+    pcBoxes = ov19_GetPCBoxes(param0->unk_58F8);
     v4 = (88 + (param0->unk_34 * 480)) + param3 * (4 * 4);
     param1 += param3;
     v3 = param3;
 
     for (v2 = 0; v2 < 5; v2++) {
         if (param1->unk_00 == NULL) {
-            v1 = PCBoxes_GetBoxMonAt(v0, param0->unk_30, v3);
+            v1 = PCBoxes_GetBoxMonAt(pcBoxes, param0->unk_30, v3);
 
             if (BoxPokemon_GetValue(v1, MON_DATA_SPECIES_EXISTS, NULL)) {
                 ov19_021DA548(param0->unk_58F0, v1, param0->unk_5814[v3], param0->unk_57D8[v3], param0->unk_CD8[v3], param2, 40 + 24 * v2, 2, ov19_021D85B4(v3), v4, param1);
@@ -415,14 +415,14 @@ static void ov19_021D8114(UnkStruct_ov19_021D8318 *param0, UnkStruct_ov19_021DCD
 
 static void ov19_021D813C(UnkStruct_ov19_021D8318 *param0, u32 param1)
 {
-    const PCBoxes *v0;
+    const PCBoxes *pcBoxes;
     BoxPokemon *v1;
     u32 v2, v3;
 
-    v0 = ov19_GetPCBoxes(param0->unk_58F8);
+    pcBoxes = ov19_GetPCBoxes(param0->unk_58F8);
 
     for (v2 = 0; v2 < (5 * 6); v2++) {
-        v1 = PCBoxes_GetBoxMonAt(v0, param1, v2);
+        v1 = PCBoxes_GetBoxMonAt(pcBoxes, param1, v2);
         v3 = BoxPokemon_GetValue(v1, MON_DATA_SPECIES, NULL);
 
         if (v3) {
diff --git a/src/overlay019/ov19_021DB8E4.c b/src/overlay019/ov19_021DB8E4.c
index e3df17f668..1eb285eaa8 100644
--- a/src/overlay019/ov19_021DB8E4.c
+++ b/src/overlay019/ov19_021DB8E4.c
@@ -422,14 +422,14 @@ static void ov19_021DBF18(UnkStruct_ov19_021DBA9C *param0)
 
 static void ov19_021DBF4C(UnkStruct_ov19_021DBA9C *param0)
 {
-    const PCBoxes *v0;
+    const PCBoxes *pcBoxes;
     Window *v1;
     u32 v2, v3;
 
-    v0 = ov19_GetPCBoxes(param0->unk_0C);
+    pcBoxes = ov19_GetPCBoxes(param0->unk_0C);
     v1 = &param0->unk_10[0];
 
-    PCBoxes_BufferBoxName(v0, param0->unk_E0, param0->unk_4BFC);
+    PCBoxes_BufferBoxName(pcBoxes, param0->unk_E0, param0->unk_4BFC);
 
     v2 = Font_CalcStrbufWidth(FONT_SYSTEM, param0->unk_4BFC, 0);
     v3 = 48 - (v2 / 2);
diff --git a/src/overlay061/ov61_0222AE60.c b/src/overlay061/ov61_0222AE60.c
index 38d82dd6bd..2aa0bc7a9c 100644
--- a/src/overlay061/ov61_0222AE60.c
+++ b/src/overlay061/ov61_0222AE60.c
@@ -31,7 +31,7 @@ void ov61_0222AE80(const UnkStruct_ov61_0222AE80 *param0, UnkStruct_02029C68 *pa
     sub_0202A824(param0, param1);
 }
 
-void ov61_0222AE88(SaveData *saveData, const PCBoxes *param1, int param2, UnkStruct_ov62_02239DA4 *param3, int heapID)
+void ov61_0222AE88(SaveData *saveData, const PCBoxes *pcBoxes, int boxID, UnkStruct_ov62_02239DA4 *param3, int heapID)
 {
     Strbuf *v0;
     int v1;
@@ -39,23 +39,23 @@ void ov61_0222AE88(SaveData *saveData, const PCBoxes *param1, int param2, UnkStr
     MI_CpuClear8(param3, sizeof(UnkStruct_ov62_02239DA4));
 
     v0 = Strbuf_Init(20 * 3, heapID);
-    PCBoxes_BufferBoxName(param1, param2, v0);
+    PCBoxes_BufferBoxName(pcBoxes, boxID, v0);
     Strbuf_ToChars(v0, param3->unk_00, 20);
     Strbuf_Free(v0);
 
     for (v1 = 0; v1 < 30; v1++) {
-        param3->unk_28[v1] = PCBoxes_GetBoxMonData(param1, param2, v1, MON_DATA_SPECIES, NULL);
-        param3->unk_64[v1] = PCBoxes_GetBoxMonData(param1, param2, v1, MON_DATA_PERSONALITY, NULL);
-        param3->unk_DC[v1] = PCBoxes_GetBoxMonData(param1, param2, v1, MON_DATA_OT_ID, NULL);
+        param3->unk_28[v1] = PCBoxes_GetBoxMonData(pcBoxes, boxID, v1, MON_DATA_SPECIES, NULL);
+        param3->unk_64[v1] = PCBoxes_GetBoxMonData(pcBoxes, boxID, v1, MON_DATA_PERSONALITY, NULL);
+        param3->unk_DC[v1] = PCBoxes_GetBoxMonData(pcBoxes, boxID, v1, MON_DATA_OT_ID, NULL);
 
-        if (PCBoxes_GetBoxMonData(param1, param2, v1, MON_DATA_SPECIES_EGG, NULL) == SPECIES_EGG) {
+        if (PCBoxes_GetBoxMonData(pcBoxes, boxID, v1, MON_DATA_SPECIES_EGG, NULL) == SPECIES_EGG) {
             param3->unk_154 |= 1 << v1;
         }
 
-        param3->unk_158[v1] = PCBoxes_GetBoxMonData(param1, param2, v1, MON_DATA_FORM, NULL);
+        param3->unk_158[v1] = PCBoxes_GetBoxMonData(pcBoxes, boxID, v1, MON_DATA_FORM, NULL);
     }
 
-    param3->unk_176 = PCBoxes_GetWallpaper(param1, param2);
+    param3->unk_176 = PCBoxes_GetWallpaper(pcBoxes, boxID);
     param3->unk_177 = 0;
     param3->unk_198.unk_00 = SaveData_CalculateChecksum(saveData, param3, sizeof(UnkStruct_ov62_02239DA4) - (sizeof(UnkStruct_ov62_02239DA4_sub1)));
 }
diff --git a/src/overlay061/ov61_0222B008.c b/src/overlay061/ov61_0222B008.c
index 4c70222343..0edea0cc8a 100644
--- a/src/overlay061/ov61_0222B008.c
+++ b/src/overlay061/ov61_0222B008.c
@@ -190,7 +190,7 @@ int ov61_0222B1FC(UnkStruct_ov62_022349A8 *param0, int param1)
     return 1;
 }
 
-int ov61_0222B224(UnkStruct_ov62_022349A8 *param0, int param1, UnkStruct_02030A80 *param2, const PCBoxes *param3, int param4)
+int ov61_0222B224(UnkStruct_ov62_022349A8 *param0, int param1, UnkStruct_02030A80 *param2, const PCBoxes *pcBoxes, int param4)
 {
     if (ov61_0222BBBC(param0) == 0) {
         return 0;
@@ -200,7 +200,7 @@ int ov61_0222B224(UnkStruct_ov62_022349A8 *param0, int param1, UnkStruct_02030A8
     param0->unk_190.unk_21C.val1.unk_01 = param4;
 
     ov61_0222AFA4(param0->saveData, param2, &param0->unk_190.unk_00_val2.unk_00);
-    ov61_0222AE88(param0->saveData, param3, param4, &param0->unk_190.unk_00_val2.unk_80, param0->heapID);
+    ov61_0222AE88(param0->saveData, pcBoxes, param4, &param0->unk_190.unk_00_val2.unk_80, param0->heapID);
     ov61_0222AF88(param0->saveData, &param0->unk_190.unk_00_val2.unk_80, param1);
 
     param0->unk_40E = 60;
diff --git a/src/overlay062/ov62_02239D60.c b/src/overlay062/ov62_02239D60.c
index ab102c4307..283a781d05 100644
--- a/src/overlay062/ov62_02239D60.c
+++ b/src/overlay062/ov62_02239D60.c
@@ -57,7 +57,7 @@ typedef struct {
 } UnkStruct_ov62_02239DBC_sub1;
 
 typedef struct {
-    PCBoxes *unk_00;
+    PCBoxes *pcBoxes;
     UnkStruct_ov62_02239DA4 unk_04;
     int unk_1A0;
     int unk_1A4;
@@ -94,7 +94,6 @@ static void ov62_02239F98(u32 param0, enum TouchScreenButtonState param1, void *
 static void ov62_0223A0AC(UnkStruct_0208C06C *param0);
 static void ov62_0223A110(UnkStruct_0208C06C *param0);
 static void ov62_0223A138(UnkStruct_ov62_02239DBC *param0);
-static void ov62_0223A154(SaveData *saveData, const PCBoxes *param1, int param2, UnkStruct_ov62_02239DA4 *param3);
 static BOOL ov62_0223A17C(UnkStruct_0208C06C *param0);
 static BOOL ov62_0223A2A8(UnkStruct_0208C06C *param0);
 static BOOL ov62_0223A394(UnkStruct_0208C06C *param0);
@@ -438,10 +437,10 @@ static void ov62_0223A138(UnkStruct_ov62_02239DBC *param0)
     }
 }
 
-static void ov62_0223A154(SaveData *saveData, const PCBoxes *param1, int param2, UnkStruct_ov62_02239DA4 *param3)
+static void ov62_0223A154(SaveData *saveData, const PCBoxes *pcBoxes, int boxID, UnkStruct_ov62_02239DA4 *param3)
 {
     memset(param3, 0, sizeof(UnkStruct_ov62_02239DA4));
-    ov61_0222AE88(saveData, param1, param2, param3, HEAP_ID_102);
+    ov61_0222AE88(saveData, pcBoxes, boxID, param3, HEAP_ID_102);
 }
 
 static BOOL ov62_0223A17C(UnkStruct_0208C06C *param0)
@@ -457,8 +456,8 @@ static BOOL ov62_0223A17C(UnkStruct_0208C06C *param0)
     Bg_ClearTilemap(param0->unk_14.unk_10, 6);
     Bg_ClearTilemap(param0->unk_14.unk_10, 7);
 
-    v0->unk_00 = SaveData_GetPCBoxes(param0->saveData);
-    ov62_0223A154(param0->saveData, v0->unk_00, v0->unk_1A0, &v0->unk_04);
+    v0->pcBoxes = SaveData_GetPCBoxes(param0->saveData);
+    ov62_0223A154(param0->saveData, v0->pcBoxes, v0->unk_1A0, &v0->unk_04);
     ov62_0223A138(v0);
     ov62_022315C8(&v0->unk_1A4, &v0->unk_1A8, 0);
 
@@ -532,7 +531,7 @@ static BOOL ov62_0223A394(UnkStruct_0208C06C *param0)
 
     case 1:
         if (ov62_022315E0(&v0->unk_1A4, &v0->unk_1A8, 1, 1)) {
-            ov62_0223A154(param0->saveData, v0->unk_00, v0->unk_1A0, &v0->unk_04);
+            ov62_0223A154(param0->saveData, v0->pcBoxes, v0->unk_1A0, &v0->unk_04);
             ov62_0223A138(v0);
             param0->unk_08++;
         }
@@ -673,7 +672,7 @@ static BOOL ov62_0223A64C(UnkStruct_0208C06C *param0)
         param0->unk_08++;
         break;
     case 5:
-        if (ov61_0222B224(ov62_0224112C(param0), v0->unk_380.unk_00, v0->unk_380.unk_04, v0->unk_00, v0->unk_1A0) == 1) {
+        if (ov61_0222B224(ov62_0224112C(param0), v0->unk_380.unk_00, v0->unk_380.unk_04, v0->pcBoxes, v0->unk_1A0) == 1) {
             param0->unk_08++;
         }
         break;
@@ -1227,13 +1226,13 @@ static void ov62_0223B158(UnkStruct_0208C06C *param0)
     UnkStruct_ov62_02239DBC *v0 = param0->unk_860;
 
     {
-        PCBoxes *v1 = SaveData_GetPCBoxes(param0->saveData);
+        PCBoxes *pcBoxes = SaveData_GetPCBoxes(param0->saveData);
 
         if ((v0->unk_04.unk_176 >= 16) && (v0->unk_04.unk_176 < (16 + 8))) {
             v0->unk_04.unk_176 = 0;
         }
         if ((v0->unk_04.unk_176 >= (16 + 8)) && (v0->unk_04.unk_176 < (16 + 8 + 8))) {
-            if (PCBoxes_CheckHasUnlockedWallpaper(v1, v0->unk_04.unk_176 - (16 + 8)) == 0) {
+            if (PCBoxes_CheckHasUnlockedWallpaper(pcBoxes, v0->unk_04.unk_176 - (16 + 8)) == 0) {
                 (void)0;
             }
         }
@@ -1259,14 +1258,14 @@ static void ov62_0223B230(UnkStruct_0208C06C *param0)
     UnkStruct_ov62_02239DBC *v0 = param0->unk_860;
 
     {
-        PCBoxes *v1 = SaveData_GetPCBoxes(param0->saveData);
+        PCBoxes *pcBoxes = SaveData_GetPCBoxes(param0->saveData);
 
         if ((v0->unk_04.unk_176 >= 16) && (v0->unk_04.unk_176 < (16 + 8))) {
             v0->unk_04.unk_176 = 0;
         }
 
         if ((v0->unk_04.unk_176 >= (16 + 8)) && (v0->unk_04.unk_176 < (16 + 8 + 8))) {
-            if (PCBoxes_CheckHasUnlockedWallpaper(v1, v0->unk_04.unk_176 - (16 + 8)) == 0) {
+            if (PCBoxes_CheckHasUnlockedWallpaper(pcBoxes, v0->unk_04.unk_176 - (16 + 8)) == 0) {
                 v0->unk_04.unk_176 = 0;
             }
         }
diff --git a/src/overlay094/ov94_0223BCB0.c b/src/overlay094/ov94_0223BCB0.c
index 9d8bbbee69..152f7b4e04 100644
--- a/src/overlay094/ov94_0223BCB0.c
+++ b/src/overlay094/ov94_0223BCB0.c
@@ -537,7 +537,7 @@ void ov94_0223C584(UnkStruct_ov94_0223FD4C *param0)
 static void ov94_0223C598(UnkStruct_ov94_0223FD4C *param0)
 {
     if (param0->unk_110E) {
-        param0->unk_110C += PCBoxes_CountMonsInBox(param0->unk_00->unk_0C, param0->unk_110E - 1);
+        param0->unk_110C += PCBoxes_CountMonsInBox(param0->unk_00->pcBoxes, param0->unk_110E - 1);
         param0->unk_110E++;
 
         if (param0->unk_110E == 19) {
diff --git a/src/overlay094/ov94_0223FB48.c b/src/overlay094/ov94_0223FB48.c
index bbcecb686c..e2cb9e266d 100644
--- a/src/overlay094/ov94_0223FB48.c
+++ b/src/overlay094/ov94_0223FB48.c
@@ -87,8 +87,8 @@ static void ov94_02240EAC(BoxPokemon *boxMon, Sprite *param1, Sprite *param2, u1
 void *ov94_02240DD0(NARC *param0, u32 param1, NNSG2dCharacterData **param2, u32 param3);
 static int ov94_02241328(UnkStruct_ov94_0223BA88_sub2 *param0, UnkStruct_ov94_0223BA88_sub3 *param1);
 static void ov94_02241464(UnkStruct_ov94_0223BA88_sub2 *param0, Sprite **param1, UnkStruct_ov94_0223BA88_sub3 *param2, UnkStruct_ov94_02240FA0 *param3);
-static int ov94_0224121C(Party *param0, PCBoxes *param1, int param2, int param3);
-static int ov94_022412F4(Party *param0, PCBoxes *param1, int param2, int param3);
+static int ov94_0224121C(Party *param0, PCBoxes *pcBoxes, int param2, int param3);
+static int ov94_022412F4(Party *param0, PCBoxes *pcBoxes, int param2, int param3);
 static int ov94_02240BB0(UnkStruct_ov94_0223FD4C *param0);
 static int BoxPokemon_HasUnusedRibbons(BoxPokemon *boxMon);
 static BOOL BoxPokemon_FormNotInDP(BoxPokemon *boxMon);
@@ -556,10 +556,10 @@ static int ov94_022402BC(UnkStruct_ov94_0223FD4C *param0)
                 if (param0->unk_112 != 31) {
                     Sound_PlayEffect(SEQ_SE_CONFIRM);
 
-                    switch (ov94_022412F4(param0->unk_00->unk_08, param0->unk_00->unk_0C, param0->unk_110, param0->unk_112)) {
+                    switch (ov94_022412F4(param0->unk_00->unk_08, param0->unk_00->pcBoxes, param0->unk_110, param0->unk_112)) {
                     case 1:
-                        if (ov94_0224121C(param0->unk_00->unk_08, param0->unk_00->unk_0C, param0->unk_110, param0->unk_112)) {
-                            StringTemplate_SetNickname(param0->unk_B8C, 0, ov94_022411DC(param0->unk_00->unk_08, param0->unk_00->unk_0C, param0->unk_110, param0->unk_112));
+                        if (ov94_0224121C(param0->unk_00->unk_08, param0->unk_00->pcBoxes, param0->unk_110, param0->unk_112)) {
+                            StringTemplate_SetNickname(param0->unk_B8C, 0, ov94_022411DC(param0->unk_00->unk_08, param0->unk_00->pcBoxes, param0->unk_110, param0->unk_112));
                             ov94_02240D58(param0, 22, TEXT_SPEED_FAST, 0, 0xf0f, 0);
                             ov94_0223C3F4(param0, 3, 7);
                         } else {
@@ -587,12 +587,12 @@ static int ov94_022402BC(UnkStruct_ov94_0223FD4C *param0)
                 Sound_PlayEffect(SEQ_SE_CONFIRM);
             } else {
                 if (param0->unk_112 != 31) {
-                    switch (ov94_022412F4(param0->unk_00->unk_08, param0->unk_00->unk_0C, param0->unk_110, param0->unk_112)) {
+                    switch (ov94_022412F4(param0->unk_00->unk_08, param0->unk_00->pcBoxes, param0->unk_110, param0->unk_112)) {
                     case 1: {
-                        BoxPokemon *v0 = ov94_022411DC(param0->unk_00->unk_08, param0->unk_00->unk_0C, param0->unk_110, param0->unk_112);
+                        BoxPokemon *v0 = ov94_022411DC(param0->unk_00->unk_08, param0->unk_00->pcBoxes, param0->unk_110, param0->unk_112);
 
                         if (ov94_02241384(v0, &param0->unk_250[param0->unk_11C].unk_F0)) {
-                            if (ov94_0224121C(param0->unk_00->unk_08, param0->unk_00->unk_0C, param0->unk_110, param0->unk_112)) {
+                            if (ov94_0224121C(param0->unk_00->unk_08, param0->unk_00->pcBoxes, param0->unk_110, param0->unk_112)) {
                                 StringTemplate_SetNickname(param0->unk_B8C, 0, v0);
                                 ov94_02240D58(param0, 18, TEXT_SPEED_FAST, 0, 0xf0f, 0);
                                 ov94_0223C3F4(param0, 3, 9);
@@ -719,7 +719,7 @@ static int ov94_02240688(UnkStruct_ov94_0223FD4C *param0)
         StringList_Free(param0->unk_10CC);
         Window_EraseStandardFrame(&param0->unk_F9C[0], 0);
 
-        v0 = ov94_022411DC(param0->unk_00->unk_08, param0->unk_00->unk_0C, param0->unk_110, param0->unk_112);
+        v0 = ov94_022411DC(param0->unk_00->unk_08, param0->unk_00->pcBoxes, param0->unk_110, param0->unk_112);
 
         if (BoxPokemon_HasUnusedRibbons(v0)) {
             ov94_02240D58(param0, 37, TEXT_SPEED_FAST, 0, 0xf0f, 1);
@@ -745,7 +745,7 @@ static int ov94_02240688(UnkStruct_ov94_0223FD4C *param0)
             }
 
             if (v1 == 0) {
-                param0->unk_114 = ov94_022411DC(param0->unk_00->unk_08, param0->unk_00->unk_0C, param0->unk_110, param0->unk_112);
+                param0->unk_114 = ov94_022411DC(param0->unk_00->unk_08, param0->unk_00->pcBoxes, param0->unk_110, param0->unk_112);
                 param0->unk_2C = 2;
 
                 ov94_0223C4C0(param0, 6, 0);
@@ -811,7 +811,7 @@ static int ov94_022408E8(UnkStruct_ov94_0223FD4C *param0)
         StringList_Free(param0->unk_10CC);
         Window_EraseStandardFrame(&param0->unk_F9C[0], 0);
 
-        boxMon = ov94_022411DC(param0->unk_00->unk_08, param0->unk_00->unk_0C, param0->unk_110, param0->unk_112);
+        boxMon = ov94_022411DC(param0->unk_00->unk_08, param0->unk_00->pcBoxes, param0->unk_110, param0->unk_112);
 
         if (BoxPokemon_HasUnusedRibbons(boxMon)) {
             ov94_02240D58(param0, 37, TEXT_SPEED_FAST, 0, 0xf0f, 1);
@@ -936,7 +936,7 @@ static int ov94_02240BB0(UnkStruct_ov94_0223FD4C *param0)
         }
     }
 
-    param0->unk_114 = ov94_022411DC(param0->unk_00->unk_08, param0->unk_00->unk_0C, param0->unk_110, param0->unk_112);
+    param0->unk_114 = ov94_022411DC(param0->unk_00->unk_08, param0->unk_00->pcBoxes, param0->unk_110, param0->unk_112);
     param0->unk_2C = 2;
     param0->unk_1110 = 1;
 
@@ -973,7 +973,7 @@ static int ov94_02240CA8(UnkStruct_ov94_0223FD4C *param0)
             Window_EraseMessageBox(&param0->unk_109C, 0);
             param0->unk_2C = 1;
         } else {
-            param0->unk_114 = ov94_022411DC(param0->unk_00->unk_08, param0->unk_00->unk_0C, param0->unk_110, param0->unk_112);
+            param0->unk_114 = ov94_022411DC(param0->unk_00->unk_08, param0->unk_00->pcBoxes, param0->unk_110, param0->unk_112);
             param0->unk_2C = 2;
             ov94_0223C4C0(param0, 6, 0);
         }
@@ -1125,7 +1125,7 @@ static void ov94_02240FA0(UnkStruct_ov94_0223FD4C *param0, int param1)
     u16 v0[30], v1, v2;
     Pokemon *v3;
     BoxPokemon *v4;
-    PCBoxes *v5 = param0->unk_00->unk_0C;
+    PCBoxes *pcBoxes = param0->unk_00->pcBoxes;
     NARC *v6;
     UnkStruct_ov94_02240FA0 *v7;
 
@@ -1134,19 +1134,19 @@ static void ov94_02240FA0(UnkStruct_ov94_0223FD4C *param0, int param1)
 
     if ((param1 >= 0) && (param1 < 18)) {
         for (v1 = 0; v1 < 30; v1++) {
-            ov94_02240E50(PCBoxes_GetBoxMonAt(v5, param1, v1), &param0->unk_1108->unk_00[v1]);
+            ov94_02240E50(PCBoxes_GetBoxMonAt(pcBoxes, param1, v1), &param0->unk_1108->unk_00[v1]);
         }
 
         for (v1 = 0; v1 < 30; v1++) {
             param0->unk_1108->unk_00[v1].species = SPECIES_NONE;
-            ov94_02240EAC(PCBoxes_GetBoxMonAt(v5, param1, v1), param0->unk_E28[v1], param0->unk_EA0[v1], &v0[v1], v1, v6, &param0->unk_1108->unk_00[v1], &v7[v1]);
+            ov94_02240EAC(PCBoxes_GetBoxMonAt(pcBoxes, param1, v1), param0->unk_E28[v1], param0->unk_EA0[v1], &v0[v1], v1, v6, &param0->unk_1108->unk_00[v1], &v7[v1]);
 
             if (v1 < 6) {
                 Sprite_SetDrawFlag(param0->unk_F18[v1], 0);
             }
         }
 
-        PCBoxes_BufferBoxName(v5, param1, param0->unk_BA4);
+        PCBoxes_BufferBoxName(pcBoxes, param1, param0->unk_BA4);
     } else {
         int v8 = Party_GetCurrentCount(param0->unk_00->unk_08);
 
@@ -1199,7 +1199,7 @@ int ov94_022411D0(int param0)
     }
 }
 
-BoxPokemon *ov94_022411DC(Party *param0, PCBoxes *param1, int param2, int param3)
+BoxPokemon *ov94_022411DC(Party *param0, PCBoxes *pcBoxes, int param2, int param3)
 {
     if (ov94_022411D0(param2)) {
         if (param3 > (Party_GetCurrentCount(param0) - 1)) {
@@ -1209,10 +1209,10 @@ BoxPokemon *ov94_022411DC(Party *param0, PCBoxes *param1, int param2, int param3
         return Pokemon_GetBoxPokemon(Party_GetPokemonBySlotIndex(param0, param3));
     }
 
-    return PCBoxes_GetBoxMonAt(param1, param2, param3);
+    return PCBoxes_GetBoxMonAt(pcBoxes, param2, param3);
 }
 
-static int ov94_0224121C(Party *param0, PCBoxes *param1, int param2, int param3)
+static int ov94_0224121C(Party *param0, PCBoxes *pcBoxes, int param2, int param3)
 {
     if (ov94_022411D0(param2)) {
         if (Party_GetCurrentCount(param0) < 2) {
@@ -1291,9 +1291,9 @@ static BOOL BoxPokemon_HeldItemNotInDP(BoxPokemon *boxMon)
     return FALSE;
 }
 
-static int ov94_022412F4(Party *param0, PCBoxes *param1, int param2, int param3)
+static int ov94_022412F4(Party *param0, PCBoxes *pcBoxes, int param2, int param3)
 {
-    BoxPokemon *v0 = ov94_022411DC(param0, param1, param2, param3);
+    BoxPokemon *v0 = ov94_022411DC(param0, pcBoxes, param2, param3);
 
     if (v0 == NULL) {
         return 0;
diff --git a/src/overlay094/ov94_02242AD0.c b/src/overlay094/ov94_02242AD0.c
index 8ca2f230b1..189850a770 100644
--- a/src/overlay094/ov94_02242AD0.c
+++ b/src/overlay094/ov94_02242AD0.c
@@ -1240,9 +1240,9 @@ static void ov94_02243B08(UnkStruct_ov94_0223FD4C *param0, int param1)
     if (param0->unk_110 != 18) {
         Pokemon *v0 = Pokemon_New(HEAP_ID_62);
 
-        Pokemon_FromBoxPokemon(PCBoxes_GetBoxMonAt(param0->unk_00->unk_0C, param0->unk_110, param0->unk_112), v0);
+        Pokemon_FromBoxPokemon(PCBoxes_GetBoxMonAt(param0->unk_00->pcBoxes, param0->unk_110, param0->unk_112), v0);
         sub_0202DA7C(param0->unk_00->unk_00, v0, param0->unk_110);
-        PCBoxes_InitBoxMonAt(param0->unk_00->unk_0C, param0->unk_110, param0->unk_112);
+        PCBoxes_InitBoxMonAt(param0->unk_00->pcBoxes, param0->unk_110, param0->unk_112);
         Heap_FreeToHeap(v0);
     } else {
         Pokemon *v1 = Party_GetPokemonBySlotIndex(param0->unk_00->unk_08, param0->unk_112);
@@ -1303,8 +1303,8 @@ static void ov94_02243BC4(UnkStruct_ov94_0223FD4C *param0, Pokemon *param1, int
     } else {
         int v4 = 0;
 
-        PCBoxes_TryGetNextAvailableSpace(param0->unk_00->unk_0C, &param2, &v4);
-        PCBoxes_TryStoreBoxMonInBox(param0->unk_00->unk_0C, param2, Pokemon_GetBoxPokemon(param1));
+        PCBoxes_TryGetNextAvailableSpace(param0->unk_00->pcBoxes, &param2, &v4);
+        PCBoxes_TryStoreBoxMonInBox(param0->unk_00->pcBoxes, param2, Pokemon_GetBoxPokemon(param1));
 
         param0->unk_124.unk_00 = param2;
         param0->unk_124.unk_04 = v4;
@@ -1351,8 +1351,8 @@ static void ov94_02243CE4(UnkStruct_ov94_0223FD4C *param0, Pokemon *param1, int
     } else {
         int v3 = 0;
 
-        PCBoxes_TryGetNextAvailableSpace(param0->unk_00->unk_0C, &param2, &v3);
-        PCBoxes_TryStoreBoxMonInBox(param0->unk_00->unk_0C, param2, Pokemon_GetBoxPokemon(param1));
+        PCBoxes_TryGetNextAvailableSpace(param0->unk_00->pcBoxes, &param2, &v3);
+        PCBoxes_TryStoreBoxMonInBox(param0->unk_00->pcBoxes, param2, Pokemon_GetBoxPokemon(param1));
 
         param0->unk_124.unk_00 = param2;
         param0->unk_124.unk_04 = v3;
diff --git a/src/overlay094/ov94_022443E0.c b/src/overlay094/ov94_022443E0.c
index c4313758ab..d8b144f3da 100644
--- a/src/overlay094/ov94_022443E0.c
+++ b/src/overlay094/ov94_022443E0.c
@@ -28,7 +28,7 @@ static const u8 Unk_ov94_02246360[] = {
 
 int ov94_022443E0(UnkStruct_ov94_0223FD4C *param0, int param1)
 {
-    param0->unk_B8.monData = ov94_022411DC(param0->unk_00->unk_08, param0->unk_00->unk_0C, param0->unk_110, param0->unk_112);
+    param0->unk_B8.monData = ov94_022411DC(param0->unk_00->unk_08, param0->unk_00->pcBoxes, param0->unk_110, param0->unk_112);
     param0->unk_B8.dataType = SUMMARY_DATA_BOX_MON;
     param0->unk_B8.monMax = 1;
     param0->unk_B8.monIndex = 0;
diff --git a/src/overlay094/ov94_022444C8.c b/src/overlay094/ov94_022444C8.c
index ffeb30b0c3..a6624a1c98 100644
--- a/src/overlay094/ov94_022444C8.c
+++ b/src/overlay094/ov94_022444C8.c
@@ -194,8 +194,8 @@ static void ov94_022448E8(UnkStruct_ov94_0223FD4C *param0)
     } else {
         int v1 = 0, v2 = 0;
 
-        PCBoxes_InitBoxMonAt(param0->unk_00->unk_0C, param0->unk_124.unk_00, param0->unk_124.unk_04);
-        PCBoxes_TryGetNextAvailableSpace(param0->unk_00->unk_0C, &v1, &v2);
-        PCBoxes_TryStoreBoxMonInBox(param0->unk_00->unk_0C, v1, Pokemon_GetBoxPokemon(v0));
+        PCBoxes_InitBoxMonAt(param0->unk_00->pcBoxes, param0->unk_124.unk_00, param0->unk_124.unk_04);
+        PCBoxes_TryGetNextAvailableSpace(param0->unk_00->pcBoxes, &v1, &v2);
+        PCBoxes_TryStoreBoxMonInBox(param0->unk_00->pcBoxes, v1, Pokemon_GetBoxPokemon(v0));
     }
 }
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 9ddad7d0f9..c5011f4c20 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -6431,7 +6431,7 @@ static BOOL ScrCmd_249(ScriptContext *ctx)
     FieldSystem *fieldSystem = ctx->fieldSystem;
     TrainerInfo *v1 = SaveData_GetTrainerInfo(FieldSystem_GetSaveData(ctx->fieldSystem));
     u16 *v2 = ScriptContext_GetVarPointer(ctx);
-    PCBoxes *v3 = SaveData_GetPCBoxes(fieldSystem->saveData);
+    PCBoxes *pcBoxes = SaveData_GetPCBoxes(fieldSystem->saveData);
     u16 v4 = ScriptContext_GetVar(ctx);
     u16 v5 = ScriptContext_GetVar(ctx);
     u16 v6 = ScriptContext_GetVar(ctx);
@@ -6443,10 +6443,10 @@ static BOOL ScrCmd_249(ScriptContext *ctx)
         return FALSE;
     }
 
-    if (PCBoxes_CheckHasUnlockedWallpaper(v3, v8)) {
+    if (PCBoxes_CheckHasUnlockedWallpaper(pcBoxes, v8)) {
         *v2 = 0;
     } else {
-        PCBoxes_UnlockWallpaper(v3, v8);
+        PCBoxes_UnlockWallpaper(pcBoxes, v8);
         *v2 = v8 + 1;
     }
 
diff --git a/src/scrcmd_catching_show.c b/src/scrcmd_catching_show.c
index fc9bf5348d..903cf52d3c 100644
--- a/src/scrcmd_catching_show.c
+++ b/src/scrcmd_catching_show.c
@@ -63,7 +63,7 @@ BOOL ScrCmd_CheckHasEnoughMonForCatchingShow(ScriptContext *ctx)
 BOOL ScrCmd_MoveCatchingShowMonsToPCBoxes(ScriptContext *ctx)
 {
     PalParkTransfer *transferData = SaveData_GetPalParkTransfer(ctx->fieldSystem->saveData);
-    PCBoxes *boxes = SaveData_GetPCBoxes(ctx->fieldSystem->saveData);
+    PCBoxes *pcBoxes = SaveData_GetPCBoxes(ctx->fieldSystem->saveData);
     Pokemon *mon = Pokemon_New(HEAP_ID_FIELD_TASK);
     TrainerInfo *trainerInfo = SaveData_GetTrainerInfo(ctx->fieldSystem->saveData);
     Pokedex *pokedex = SaveData_GetPokedex(ctx->fieldSystem->saveData);
@@ -72,7 +72,7 @@ BOOL ScrCmd_MoveCatchingShowMonsToPCBoxes(ScriptContext *ctx)
     for (int i = 0; i < CATCHING_SHOW_MONS; i++) {
         TransferDataToMon(transferData, i, mon);
         UpdateMonStatusAndTrainerInfo(mon, trainerInfo, 2, 0, HEAP_ID_FIELD_TASK);
-        success = PCBoxes_TryStoreBoxMon(boxes, Pokemon_GetBoxPokemon(mon));
+        success = PCBoxes_TryStoreBoxMon(pcBoxes, Pokemon_GetBoxPokemon(mon));
         GF_ASSERT(success);
         SaveData_UpdateCatchRecords(ctx->fieldSystem->saveData, mon);
     }
diff --git a/src/string_template.c b/src/string_template.c
index c3958462d6..30c47828be 100644
--- a/src/string_template.c
+++ b/src/string_template.c
@@ -420,9 +420,9 @@ void StringTemplate_SetGenderMarker(StringTemplate *template, u32 idx, enum Gend
     MessageLoader_Free(loader);
 }
 
-void StringTemplate_SetPCBoxName(StringTemplate *template, u32 idx, const PCBoxes *boxes, u32 boxIdx)
+void StringTemplate_SetPCBoxName(StringTemplate *template, u32 idx, const PCBoxes *pcBoxes, u32 boxIdx)
 {
-    PCBoxes_BufferBoxName(boxes, boxIdx, template->templateBuf);
+    PCBoxes_BufferBoxName(pcBoxes, boxIdx, template->templateBuf);
     SetStringTemplateArg(template, idx, template->templateBuf, NULL);
 }
 
diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c
index d5805d1424..15c1491f65 100644
--- a/src/unk_0203D1B8.c
+++ b/src/unk_0203D1B8.c
@@ -1351,7 +1351,7 @@ void sub_0203E0FC(FieldSystem *fieldSystem, int param1)
     v0->unk_00 = SaveData_GetGlobalTrade(fieldSystem->saveData);
     v0->unk_04 = SaveData_GetSystemData(fieldSystem->saveData);
     v0->unk_08 = SaveData_SaveTable(fieldSystem->saveData, SAVE_TABLE_ENTRY_PARTY);
-    v0->unk_0C = SaveData_GetPCBoxes(fieldSystem->saveData);
+    v0->pcBoxes = SaveData_GetPCBoxes(fieldSystem->saveData);
     v0->unk_10 = SaveData_GetPokedex(fieldSystem->saveData);
     v0->unk_14 = SaveData_GetWiFiList(fieldSystem->saveData);
     v0->wiFiHistory = SaveData_WiFiHistory(fieldSystem->saveData);
diff --git a/src/unk_020474B8.c b/src/unk_020474B8.c
index 4e90a7a83d..5c55a72801 100644
--- a/src/unk_020474B8.c
+++ b/src/unk_020474B8.c
@@ -206,13 +206,13 @@ BOOL ScrCmd_251(ScriptContext *param0)
 {
     BoxPokemon *v0;
     FieldSystem *fieldSystem = param0->fieldSystem;
-    PCBoxes *v2 = SaveData_GetPCBoxes(fieldSystem->saveData);
+    PCBoxes *pcBoxes = SaveData_GetPCBoxes(fieldSystem->saveData);
     StringTemplate **v3 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE);
     u8 v4 = ScriptContext_ReadByte(param0);
     u16 v5 = ScriptContext_GetVar(param0);
     u32 v6 = v5 % (5 * 6);
     u32 v7 = v5 / (5 * 6);
-    v0 = PCBoxes_GetBoxMonAt(v2, v7, v6);
+    v0 = PCBoxes_GetBoxMonAt(pcBoxes, v7, v6);
 
     StringTemplate_SetNickname(*v3, v4, v0);
     return 0;
diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c
index 88c9017791..aee44e0f9c 100644
--- a/src/unk_0208694C.c
+++ b/src/unk_0208694C.c
@@ -1200,7 +1200,7 @@ UnkStruct_0208737C *sub_0208712C(int heapID, int param1, int param2, int param3,
     v0->unk_1C[0] = 0xffff;
     v0->textInputStr = Strbuf_Init(32, heapID);
     v0->unk_44 = 0;
-    v0->unk_48 = NULL;
+    v0->pcBoxes = NULL;
     v0->unk_10 = 0;
     v0->options = options;
     v0->unk_08 = 0;
@@ -1449,16 +1449,16 @@ static void sub_02087544(UnkStruct_02087A10 *param0, ApplicationManager *appMan)
 
         v0 = Strbuf_Init(200, HEAP_ID_18);
         param0->unk_180 = NULL;
-        v2 = PCBoxes_GetCurrentBoxID(v1->unk_48);
-        v3 = PCBoxes_FirstEmptyBox(v1->unk_48);
+        v2 = PCBoxes_GetCurrentBoxID(v1->pcBoxes);
+        v3 = PCBoxes_FirstEmptyBox(v1->pcBoxes);
 
-        StringTemplate_SetPCBoxName(param0->unk_168, 1, v1->unk_48, v2);
+        StringTemplate_SetPCBoxName(param0->unk_168, 1, v1->pcBoxes, v2);
 
         if (v2 != v3) {
-            StringTemplate_SetPCBoxName(param0->unk_168, 2, v1->unk_48, v3);
+            StringTemplate_SetPCBoxName(param0->unk_168, 2, v1->pcBoxes, v3);
             v1->unk_44 += 2;
         } else {
-            StringTemplate_SetPCBoxName(param0->unk_168, 2, v1->unk_48, v2);
+            StringTemplate_SetPCBoxName(param0->unk_168, 2, v1->pcBoxes, v2);
         }
 
         if ((param0->unk_158 == 0) || sub_02086F14(param0->unk_D8)) {