diff --git a/platinumus.xMAP b/platinumus.xMAP
index 337bf24756..4e9220f04a 100644
--- a/platinumus.xMAP
+++ b/platinumus.xMAP
@@ -31314,23 +31314,23 @@
                                         39](Pokedex_TurnOnFormDetection,func) found in global src_pokedex.c.o
                                        38](ScrCmd_22B,func) found in local src_scrcmd.c.o
                                         39](Pokedex_TurnOnLanguageDetection,func) found in global src_pokedex.c.o
-                                       38](ScrCmd_FinishNpcTrade,func) found in local src_scrcmd.c.o
-                                        39](NpcTrade_Free,func) found in global src_overlay006_npc_trade.c.o
+                                       38](ScrCmd_FinishNPCTrade,func) found in local src_scrcmd.c.o
+                                        39](NPCTrade_Free,func) found in global src_overlay006_npc_trade.c.o
                                        38](ScrCmd_StartNPCTrade,func) found in local src_scrcmd.c.o
                                         39](FieldTask_StartNPCTrade,func) found in global src_npc_trade_task.c.o
                                          40](FieldTask_ProcessNPCTrade,func) found in local src_npc_trade_task.c.o
                                           41](NPCTrade_FillAnimationTemplate,func) found in global src_overlay006_npc_trade.c.o
-                                           42](NpcTrade_CreateMon,func) found in local src_overlay006_npc_trade.c.o
-                                            43](NpcTrade_GetNickname,func) found in local src_overlay006_npc_trade.c.o
-                                          41](NpcTrade_ReceiveMon,func) found in global src_overlay006_npc_trade.c.o
+                                           42](NPCTrade_CreateMon,func) found in local src_overlay006_npc_trade.c.o
+                                            43](NPCTrade_GetNickname,func) found in local src_overlay006_npc_trade.c.o
+                                          41](NPCTrade_ReceiveMon,func) found in global src_overlay006_npc_trade.c.o
                                           41](StartTradeApplication,func) found in local src_npc_trade_task.c.o
                                            42](tradeSequenceAppMan,object) found in local src_npc_trade_task.c.o
-                                       38](ScrCmd_GetNpcTradeRequestedSpecies,func) found in local src_scrcmd.c.o
-                                        39](NpcTrade_GetRequestedSpecies,func) found in global src_overlay006_npc_trade.c.o
-                                       38](ScrCmd_GetNpcTradeSpecies,func) found in local src_scrcmd.c.o
-                                        39](NpcTrade_GetSpecies,func) found in global src_overlay006_npc_trade.c.o
+                                       38](ScrCmd_GetNPCTradeRequestedSpecies,func) found in local src_scrcmd.c.o
+                                        39](NPCTrade_GetRequestedSpecies,func) found in global src_overlay006_npc_trade.c.o
+                                       38](ScrCmd_GetNPCTradeSpecies,func) found in local src_scrcmd.c.o
+                                        39](NPCTrade_GetSpecies,func) found in global src_overlay006_npc_trade.c.o
                                        38](ScrCmd_InitNPCTrade,func) found in local src_scrcmd.c.o
-                                        39](NpcTrade_Init,func) found in global src_overlay006_npc_trade.c.o
+                                        39](NPCTrade_Init,func) found in global src_overlay006_npc_trade.c.o
                                        38](ScrCmd_CheckLearnedTutorMove,func) found in global src_scrcmd_party_mon_moves.c.o
                                         39](MoveReminderData_Free,func) found in global src_move_reminder_data.c.o
                                        38](ScrCmd_OpenMoveTutorMenu,func) found in global src_scrcmd_party_mon_moves.c.o
@@ -31521,9 +31521,9 @@
                                        38](ScrCmd_20A,func) found in local src_scrcmd.c.o
                                         39](VsSeeker_Start,func) found in global src_overlay005_vs_seeker.c.o
                                          40](VsSeeker_ExecuteTask,func) found in local src_overlay005_vs_seeker.c.o
-                                          41](VsSeeker_WaitForNpcsToPause,func) found in local src_overlay005_vs_seeker.c.o
+                                          41](VsSeeker_WaitForNPCsToPause,func) found in local src_overlay005_vs_seeker.c.o
                                           41](VsSeekerSystem_SetState,func) found in local src_overlay005_vs_seeker.c.o
-                                          41](VsSeekerSystem_CollectViableNpcs,func) found in local src_overlay005_vs_seeker.c.o
+                                          41](VsSeekerSystem_CollectViableNPCs,func) found in local src_overlay005_vs_seeker.c.o
                                            42](VsSeeker_IsMoveCodeHidden,func) found in local src_overlay005_vs_seeker.c.o
                                           41](VsSeekerSystem_CheckUsability,func) found in local src_overlay005_vs_seeker.c.o
                                            42](SystemVars_GetVsSeekerBattery,func) found in global src_system_vars.c.o
@@ -49802,13 +49802,13 @@
   02044CCC 00000000 .text   $t	(src_scrcmd.c.o)
   02044CE4 00000024 .text   ScrCmd_InitNPCTrade	(src_scrcmd.c.o)
   02044CE4 00000000 .text   $t	(src_scrcmd.c.o)
-  02044D08 0000002E .text   ScrCmd_GetNpcTradeSpecies	(src_scrcmd.c.o)
+  02044D08 0000002E .text   ScrCmd_GetNPCTradeSpecies	(src_scrcmd.c.o)
   02044D08 00000000 .text   $t	(src_scrcmd.c.o)
-  02044D38 0000002E .text   ScrCmd_GetNpcTradeRequestedSpecies	(src_scrcmd.c.o)
+  02044D38 0000002E .text   ScrCmd_GetNPCTradeRequestedSpecies	(src_scrcmd.c.o)
   02044D38 00000000 .text   $t	(src_scrcmd.c.o)
   02044D68 00000032 .text   ScrCmd_StartNPCTrade	(src_scrcmd.c.o)
   02044D68 00000000 .text   $t	(src_scrcmd.c.o)
-  02044D9C 00000016 .text   ScrCmd_FinishNpcTrade	(src_scrcmd.c.o)
+  02044D9C 00000016 .text   ScrCmd_FinishNPCTrade	(src_scrcmd.c.o)
   02044D9C 00000000 .text   $t	(src_scrcmd.c.o)
   02044DB4 00000014 .text   ScrCmd_22B	(src_scrcmd.c.o)
   02044DB4 00000000 .text   $t	(src_scrcmd.c.o)
@@ -74659,7 +74659,7 @@
   021DBA54 00000000 .text   $t	(src_overlay005_vs_seeker.c.o)
   021DBA58 00000024 .text   VsSeekerSystem_CheckUsability	(src_overlay005_vs_seeker.c.o)
   021DBA58 00000000 .text   $t	(src_overlay005_vs_seeker.c.o)
-  021DBA7C 000000F4 .text   VsSeekerSystem_CollectViableNpcs	(src_overlay005_vs_seeker.c.o)
+  021DBA7C 000000F4 .text   VsSeekerSystem_CollectViableNPCs	(src_overlay005_vs_seeker.c.o)
   021DBA7C 00000000 .text   $t	(src_overlay005_vs_seeker.c.o)
   021DBB70 00000022 .text   VsSeeker_IsMoveCodeHidden	(src_overlay005_vs_seeker.c.o)
   021DBB70 00000000 .text   $t	(src_overlay005_vs_seeker.c.o)
@@ -74710,7 +74710,7 @@
   021DBED4 0000004A .text   VsSeeker_SetMoveCodeForFacingDirection	(src_overlay005_vs_seeker.c.o)
   021DBED4 00000000 .text   $t	(src_overlay005_vs_seeker.c.o)
   021DBF20 00000000 .text   $t	(src_overlay005_vs_seeker.c.o)
-  021DBF20 00000050 .text   VsSeeker_WaitForNpcsToPause	(src_overlay005_vs_seeker.c.o)
+  021DBF20 00000050 .text   VsSeeker_WaitForNPCsToPause	(src_overlay005_vs_seeker.c.o)
   021DBF6C 00000000 .text   $d	(src_overlay005_vs_seeker.c.o)
   021DBF70 000000A8 .text   VsSeeker_GetSecondDoubleBattleTrainer	(src_overlay005_vs_seeker.c.o)
   021DBF70 00000000 .text   $t	(src_overlay005_vs_seeker.c.o)
@@ -79501,22 +79501,22 @@
   02246110 00000000 .text   $t	(src_overlay006_roamer_after_battle.c.o)
   02246148 0000003A .text   GetBattledRoamer	(src_overlay006_roamer_after_battle.c.o)
   02246148 00000000 .text   $t	(src_overlay006_roamer_after_battle.c.o)
-  02246184 00000080 .text   NpcTrade_Init	(src_overlay006_npc_trade.c.o)
+  02246184 00000080 .text   NPCTrade_Init	(src_overlay006_npc_trade.c.o)
   02246184 00000000 .text   $t	(src_overlay006_npc_trade.c.o)
-  02246204 0000001E .text   NpcTrade_Free	(src_overlay006_npc_trade.c.o)
+  02246204 0000001E .text   NPCTrade_Free	(src_overlay006_npc_trade.c.o)
   02246204 00000000 .text   $t	(src_overlay006_npc_trade.c.o)
-  02246224 00000006 .text   NpcTrade_GetSpecies	(src_overlay006_npc_trade.c.o)
+  02246224 00000006 .text   NPCTrade_GetSpecies	(src_overlay006_npc_trade.c.o)
   02246224 00000000 .text   $t	(src_overlay006_npc_trade.c.o)
-  0224622C 00000006 .text   NpcTrade_GetRequestedSpecies	(src_overlay006_npc_trade.c.o)
+  0224622C 00000006 .text   NPCTrade_GetRequestedSpecies	(src_overlay006_npc_trade.c.o)
   0224622C 00000000 .text   $t	(src_overlay006_npc_trade.c.o)
-  02246234 00000020 .text   NpcTrade_ReceiveMon	(src_overlay006_npc_trade.c.o)
+  02246234 00000020 .text   NPCTrade_ReceiveMon	(src_overlay006_npc_trade.c.o)
   02246234 00000000 .text   $t	(src_overlay006_npc_trade.c.o)
   02246254 0000008E .text   NPCTrade_FillAnimationTemplate	(src_overlay006_npc_trade.c.o)
   02246254 00000000 .text   $t	(src_overlay006_npc_trade.c.o)
   022462E4 00000000 .text   $t	(src_overlay006_npc_trade.c.o)
-  022462E4 00000028 .text   NpcTrade_GetNickname	(src_overlay006_npc_trade.c.o)
+  022462E4 00000028 .text   NPCTrade_GetNickname	(src_overlay006_npc_trade.c.o)
   02246308 00000000 .text   $d	(src_overlay006_npc_trade.c.o)
-  0224630C 00000138 .text   NpcTrade_CreateMon	(src_overlay006_npc_trade.c.o)
+  0224630C 00000138 .text   NPCTrade_CreateMon	(src_overlay006_npc_trade.c.o)
   0224630C 00000000 .text   $t	(src_overlay006_npc_trade.c.o)
   02246444 00000000 .text   $t	(src_overlay006_ov6_02246444.c.o)
   02246444 0000000C .text   ov6_02246444	(src_overlay006_ov6_02246444.c.o)