diff --git a/include/d/actor/d_a_tag_attention.h b/include/d/actor/d_a_tag_attention.h
index a049d7add..8e0163190 100644
--- a/include/d/actor/d_a_tag_attention.h
+++ b/include/d/actor/d_a_tag_attention.h
@@ -16,7 +16,7 @@ namespace daTagAttention {
 
             fopAc_ac_c* player = dComIfGp_getPlayer(0);
             cXyz plyrToObjVec = player->current.pos-current.pos;
-            if (subtype == 0){
+            if (argument == 0){
                 // spherical collision check
                 f32 distance = plyrToObjVec.abs();
                 
diff --git a/include/d/d_stage.h b/include/d/d_stage.h
index 599f0131f..3ec7639b7 100644
--- a/include/d/d_stage.h
+++ b/include/d/d_stage.h
@@ -987,10 +987,10 @@ public:
 
 // unknown name
 struct dStage_objectNameInf {
-    char mName[8];
-    s16 mProcName;
-    s8 mSubtype;
-    s8 mGbaName;
+    char name[8];
+    s16 procname;
+    s8 argument;
+    s8 gbaName;
 };  // Size: 0xC
 
 typedef int (*dStage_Func)(dStage_dt_c*, void*, int, void*);
@@ -1008,7 +1008,8 @@ void dStage_dt_c_roomLoader(void* i_data, dStage_dt_c* i_stage);
 void dStage_dt_c_roomReLoader(void* i_data, dStage_dt_c* i_stage, int i_roomNo);
 
 dStage_objectNameInf* dStage_searchName(const char*);
-const char* dStage_getName2(s16 i_procName, s8 i_subtype);
+const char* dStage_getName(s16 i_procName, s8 i_argument);
+const char* dStage_getName2(s16 i_procName, s8 i_argument);
 
 
 inline u8 dStage_stagInfo_DefaultCameraType(stage_stag_info_class* p_info) {
diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h
index 88fbaf639..0603d3e44 100644
--- a/include/f_op/f_op_actor.h
+++ b/include/f_op/f_op_actor.h
@@ -278,7 +278,7 @@ public:
     /* 0x1BE */ u8 group;
     /* 0x1BF */ u8 cullType;
     /* 0x1C0 */ u8 demoActorID;
-    /* 0x1C1 */ s8 subtype;
+    /* 0x1C1 */ s8 argument;
     /* 0x1C2 */ u8 gbaName;
     /* 0x1C4 */ u32 actor_status;
     /* 0x1C8 */ u32 actor_condition;
diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h
index 1cdb177ea..384ffe292 100644
--- a/include/f_op/f_op_actor_mng.h
+++ b/include/f_op/f_op_actor_mng.h
@@ -38,25 +38,10 @@ struct fopAcM_prm_class {
     /* 0x18 */ fopAcM_prmScale_class scale;
     /* 0x1B */ u8 gbaName;
     /* 0x1C */ fpc_ProcID parent_id;
-    /* 0x20 */ s8 subtype;
+    /* 0x20 */ s8 argument;
     /* 0x21 */ s8 room_no;
 }; // size = 0x24
 
-struct fopAcM_search4ev_prm {
-    fopAcM_search4ev_prm() { clear(); }
-    void clear() {
-        mName[0] = 0;
-        mEventID = -1;
-        mProcName = 11;
-        mSubType = 0;
-    }
-
-    /* 0x00 */ char mName[30];
-    /* 0x1E */ s16 mEventID;
-    /* 0x20 */ s16 mProcName;
-    /* 0x22 */ s8 mSubType;
-};
-
 struct fopAcM_search_prm {
     /* 0x00 */ const char * procname;
     /* 0x04 */ u32 prm_mask;
@@ -459,17 +444,13 @@ BOOL fopAcM_SearchByName(s16 procName, fopAc_ac_c** p_actor);
 
 fopAcM_prm_class* fopAcM_CreateAppend();
 
-fopAcM_prm_class* createAppend(u16 enemyNo, u32 parameters, cXyz* p_pos, int roomNo,
-                               csXyz* p_angle, cXyz* p_scale, s8 subType,
-                               fpc_ProcID parentPId);
-
 void fopAcM_Log(fopAc_ac_c* p_actor, char* str);
 
 BOOL fopAcM_delete(fopAc_ac_c* p_actor);
 BOOL fopAcM_delete(fpc_ProcID actorID);
 
 fpc_ProcID fopAcM_create(s16 i_procName, u32 i_parameter, cXyz* i_pos = NULL, int i_roomNo = -1,
-                   csXyz* i_angle = NULL, cXyz* i_scale = NULL, s8 i_subType = -1,
+                   csXyz* i_angle = NULL, cXyz* i_scale = NULL, s8 i_argument = -1,
                    createFunc i_createFunc = NULL);
 
 fpc_ProcID fopAcM_create(char*, u32 i_parameter, cXyz* i_pos = NULL, int i_roomNo = -1,
@@ -485,7 +466,7 @@ inline fpc_ProcID fopAcM_Create(s16 i_procName, createFunc i_createFunc, void* p
 }
 
 void* fopAcM_fastCreate(s16 procName, u32 parameter, cXyz* p_pos = NULL, int roomNo = -1,
-                        csXyz* p_angle = NULL, cXyz* p_scale = NULL, s8 subType = -1,
+                        csXyz* p_angle = NULL, cXyz* p_scale = NULL, s8 i_argument = -1,
                         createFunc p_createFunc = NULL, void* p_createFuncData = NULL);
 
 void* fopAcM_fastCreate(char* p_actorName, u32 parameter, cXyz* pActorPos = NULL, int roomNo = -1,
@@ -493,7 +474,7 @@ void* fopAcM_fastCreate(char* p_actorName, u32 parameter, cXyz* pActorPos = NULL
                         createFunc p_createFunc = NULL, void* p_createFuncData = NULL);
 
 fpc_ProcID fopAcM_createChild(s16 procName, fpc_ProcID parentPId, u32 parameters, cXyz* p_pos,
-                        int roomNo, csXyz* p_angle, cXyz* p_scale = NULL, s8 subType = -1,
+                        int roomNo, csXyz* p_angle, cXyz* p_scale = NULL, s8 i_argument = -1,
                         createFunc p_createFunc = NULL);
 
 fpc_ProcID fopAcM_createChild(char* pProcNameString, fpc_ProcID parentPcId, u32 parameter, cXyz* pPos,
@@ -501,7 +482,7 @@ fpc_ProcID fopAcM_createChild(char* pProcNameString, fpc_ProcID parentPcId, u32
 
 fpc_ProcID fopAcM_createChildFromOffset(s16 procName, fpc_ProcID parentProcID, u32 actorParams,
                                   cXyz* p_pos, int roomNo, csXyz* p_angle,
-                                  cXyz* p_scale, s8 subType, createFunc p_createFunc);
+                                  cXyz* p_scale, s8 i_argument, createFunc p_createFunc);
 fpc_ProcID fopAcM_createChildFromOffset(char* pProcNameString, fpc_ProcID parentPcId, u32 parameter,
                                   cXyz* pPosOffs, int roomNo, csXyz* pAngleOffs, cXyz* pScale,
                                   createFunc createFunc);
diff --git a/src/d/actor/d_a_npc_os.cpp b/src/d/actor/d_a_npc_os.cpp
index c82a619c4..6816d955c 100644
--- a/src/d/actor/d_a_npc_os.cpp
+++ b/src/d/actor/d_a_npc_os.cpp
@@ -219,8 +219,8 @@ cPhs_State daNpc_Os_c::create() {
             checkRestart(getRestartNumber());
         }
         else {
-            if(subtype < 3) {
-                home.pos = l_finish_home_pos[subtype];
+            if(argument < 3) {
+                home.pos = l_finish_home_pos[argument];
                 current.pos = home.pos;
             }
         }
@@ -360,17 +360,17 @@ BOOL daNpc_Os_c::createHeap() {
 
 /* 00000C94-00000D10       .text jointCheck__10daNpc_Os_cFSc */
 BOOL daNpc_Os_c::jointCheck(s8 param_1) {
-    if(subtype == 0) {
+    if(argument == 0) {
         if(param_1 == mTuno3JointIdx) {
             return true;
         }
     }
-    else if(subtype == 1) {
+    else if(argument == 1) {
         if(param_1 == mTuno2JointIdx) {
             return true;
         }
     }
-    else if(subtype == 2) {
+    else if(argument == 2) {
         if(param_1 == mTuno1JointIdx) {
             return true;
         }
@@ -381,17 +381,17 @@ BOOL daNpc_Os_c::jointCheck(s8 param_1) {
 
 /* 00000D10-00000DBC       .text wakeupCheck__10daNpc_Os_cFv */
 BOOL daNpc_Os_c::wakeupCheck() {
-    if(subtype == 0) {
+    if(argument == 0) {
         if(dComIfGs_isEventBit(0x1780)) {
             return true;
         }
     }
-    else if(subtype == 1) {
+    else if(argument == 1) {
         if(dComIfGs_isEventBit(0x1740)) {
             return true;
         }
     }
-    else if(subtype == 2) {
+    else if(argument == 2) {
         if(dComIfGs_isEventBit(0x1720)) {
             return true;
         }
@@ -402,30 +402,30 @@ BOOL daNpc_Os_c::wakeupCheck() {
 
 /* 00000DBC-00000E3C       .text setWakeup__10daNpc_Os_cFv */
 void daNpc_Os_c::setWakeup() {
-    if(subtype == 0) {
+    if(argument == 0) {
         dComIfGs_onEventBit(0x1780);
     }
-    else if(subtype == 1) {
+    else if(argument == 1) {
         dComIfGs_onEventBit(0x1740);
     }
-    else if(subtype == 2) {
+    else if(argument == 2) {
         dComIfGs_onEventBit(0x1720);
     }
 }
 
 /* 00000E3C-00000EE8       .text finishCheck__10daNpc_Os_cFv */
 BOOL daNpc_Os_c::finishCheck() {
-    if(subtype == 0) {
+    if(argument == 0) {
         if(dComIfGs_isEventBit(0x1710)) {
             return true;
         }
     }
-    else if(subtype == 1) {
+    else if(argument == 1) {
         if(dComIfGs_isEventBit(0x1704)) {
             return true;
         }
     }
-    else if(subtype == 2) {
+    else if(argument == 2) {
         if(dComIfGs_isEventBit(0x1B01)) {
             return true;
         }
@@ -436,26 +436,26 @@ BOOL daNpc_Os_c::finishCheck() {
 
 /* 00000EE8-00000F68       .text setFinish__10daNpc_Os_cFv */
 void daNpc_Os_c::setFinish() {
-    if(subtype == 0) {
+    if(argument == 0) {
         dComIfGs_onEventBit(0x1710);
     }
-    else if(subtype == 1) {
+    else if(argument == 1) {
         dComIfGs_onEventBit(0x1704);
     }
-    else if(subtype == 2) {
+    else if(argument == 2) {
         dComIfGs_onEventBit(0x1B01);
     }
 }
 
 /* 00000F68-00000FA4       .text getWakeupOrderEventNum__10daNpc_Os_cFv */
 s8 daNpc_Os_c::getWakeupOrderEventNum() {
-    if(subtype == 0) {
+    if(argument == 0) {
         return 1;
     }
-    else if(subtype == 1) {
+    else if(argument == 1) {
         return 3;
     }
-    else if(subtype == 2) {
+    else if(argument == 2) {
         return 5;
     }
     
@@ -465,24 +465,24 @@ s8 daNpc_Os_c::getWakeupOrderEventNum() {
 /* 00000FA4-00001028       .text getFinishOrderEventNum__10daNpc_Os_cFv */
 s8 daNpc_Os_c::getFinishOrderEventNum() {
     if(fopAcM_checkCarryNow(this)) {
-        if(subtype == 0) {
+        if(argument == 0) {
             return 0xB;
         }
-        else if(subtype == 1) {
+        else if(argument == 1) {
             return 0xD;
         }
-        else if(subtype == 2) {
+        else if(argument == 2) {
             return 0xF;
         }
     }
     else {
-        if(subtype == 0) {
+        if(argument == 0) {
             return 0xA;
         }
-        else if(subtype == 1) {
+        else if(argument == 1) {
             return 0xC;
         }
-        else if(subtype == 2) {
+        else if(argument == 2) {
             return 0xE;
         }
     }
@@ -492,8 +492,8 @@ s8 daNpc_Os_c::getFinishOrderEventNum() {
 
 /* 00001028-00001084       .text getMyStaffId__10daNpc_Os_cFv */
 int daNpc_Os_c::getMyStaffId() {
-    if(subtype < 3) {
-        return dComIfGp_evmng_getMyStaffId(l_staff_name[subtype]);
+    if(argument < 3) {
+        return dComIfGp_evmng_getMyStaffId(l_staff_name[argument]);
     }
 
     return -1;
@@ -501,13 +501,13 @@ int daNpc_Os_c::getMyStaffId() {
 
 /* 00001084-000010C4       .text getRestartNumber__10daNpc_Os_cFv */
 s8 daNpc_Os_c::getRestartNumber() {
-    if(subtype == 0) {
+    if(argument == 0) {
         return 3;
     }
-    else if(subtype == 1) {
+    else if(argument == 1) {
         return 4;
     }
-    else if(subtype == 2) {
+    else if(argument == 2) {
         return 5;
     }
 
@@ -527,12 +527,12 @@ BOOL daNpc_Os_c::checkGoalRoom() {
 
 /* 0000112C-000011C4       .text checkPlayerRoom__10daNpc_Os_cFv */
 void daNpc_Os_c::checkPlayerRoom() {
-    offPlayerRoom(subtype);
+    offPlayerRoom(argument);
     
     if(wakeupCheck() && !finishCheck()) {
         fopAc_ac_c* link = dComIfGp_getLinkPlayer();
         if (fopAcM_GetRoomNo(this) == fopAcM_GetRoomNo(link)) {
-            onPlayerRoom(subtype);
+            onPlayerRoom(argument);
         }
     }
 }
@@ -541,17 +541,17 @@ void daNpc_Os_c::checkPlayerRoom() {
 void daNpc_Os_c::eventOrderCheck() {
     if(field_0x7A5 == -1) {
         s8 roomNo = fopAcM_GetRoomNo(this);
-        if(subtype == 0) {
+        if(argument == 0) {
             if(roomNo == 7 && dComIfGs_isSwitch(field_0x794, roomNo) && !dComIfGs_isEventBit(0x2510)) {
                 field_0x7A5 = 7;
             } 
         }
-        else if(subtype == 1) {
+        else if(argument == 1) {
             if(roomNo == 7 && dComIfGs_isSwitch(field_0x794, roomNo) && !dComIfGs_isEventBit(0x2608)) {
                 field_0x7A5 = 8;
             } 
         }
-        else if(subtype == 2) {
+        else if(argument == 2) {
             if(roomNo == 7 && dComIfGs_isSwitch(field_0x794, roomNo) && !dComIfGs_isEventBit(0x2604)) {
                 field_0x7A5 = 9;
             } 
@@ -1600,13 +1600,13 @@ void daNpc_Os_c::initialNextEvent(int staffIdx) {
         fopAcM_seStartCurrent(this, JA_SE_OBJ_OSTATUE_PUT, 0);
     }
 
-    if(subtype == 0) {
+    if(argument == 0) {
         field_0x7A5 = 2;
     }
-    else if(subtype == 1) {
+    else if(argument == 1) {
         field_0x7A5 = 4;
     }
-    else if(subtype == 2) {
+    else if(argument == 2) {
         field_0x7A5 = 6;
     }
 }
@@ -2024,7 +2024,7 @@ BOOL daNpc_Os_c::init() {
     speedF = speedF;
     m_smoke_tevstr = tevStr;
     m_smoke.setTevStr(&m_smoke_tevstr);
-    m_playerRoom[subtype] = false;
+    m_playerRoom[argument] = false;
     clearStatus();
     gravity = l_HIO.field_0x8C;
     field_0x7A0 = 3;
@@ -2166,7 +2166,7 @@ BOOL daNpc_Os_c::execute() {
         mAcchCir[1].SetWallR(40.0f);
     }
 
-    mpPedestal = (daPedestal::daPds_c*)searchFromName(l_daiza_name[subtype], 0xFF, 1);
+    mpPedestal = (daPedestal::daPds_c*)searchFromName(l_daiza_name[argument], 0xFF, 1);
     if(mpPedestal) {
         if(!isFinish()) {
             if(finishCheck()) {
@@ -2233,7 +2233,7 @@ BOOL daNpc_Os_c::execute() {
     mJntCtrl.setParam(l_HIO.mNpc.mMaxBackboneX, l_HIO.mNpc.mMaxBackboneY, l_HIO.mNpc.mMinBackboneX, l_HIO.mNpc.mMinBackboneY,l_HIO.mNpc.mMaxHeadX, l_HIO.mNpc.mMaxHeadY, l_HIO.mNpc.mMinHeadX, l_HIO.mNpc.mMinHeadY, l_HIO.mNpc.mMaxTurnStep);
 
     if(!isFinish()) {
-        if(!fopAcM_checkCarryNow(this) && isGravity() && checkNowPosMove(l_staff_name[subtype])) {
+        if(!fopAcM_checkCarryNow(this) && isGravity() && checkNowPosMove(l_staff_name[argument])) {
             if (maxFallSpeed < speed.y) {
                 speed.y -= gravity;
                 if (speed.y < maxFallSpeed) {
@@ -2340,7 +2340,7 @@ BOOL daNpc_Os_c::execute() {
         setCollision();
     }
 
-    if(checkNowPosMove(l_staff_name[subtype])) {
+    if(checkNowPosMove(l_staff_name[argument])) {
         animationPlay();
     }
 
@@ -2416,7 +2416,7 @@ daNpc_Os_c::~daNpc_Os_c() {
         l_HIO.mNo = -1;
     }
 
-    m_playerRoom[subtype] = false;
+    m_playerRoom[argument] = false;
     m_cattleRoomNo = -1;
 }
 
@@ -2435,7 +2435,7 @@ static BOOL daNpc_Os_Delete(daNpc_Os_c* i_this) {
 static BOOL daNpc_Os_Execute(daNpc_Os_c* i_this) {
     BOOL ret = i_this->execute();
 
-    if(i_this->subtype == 2) {
+    if(i_this->argument == 2) {
         i_this->setCattleRoomNo(fopAcM_GetRoomNo(i_this));
     }
 
diff --git a/src/d/actor/d_a_npc_people.cpp b/src/d/actor/d_a_npc_people.cpp
index 7b6e19ba8..ee73db840 100644
--- a/src/d/actor/d_a_npc_people.cpp
+++ b/src/d/actor/d_a_npc_people.cpp
@@ -7514,8 +7514,8 @@ void daNpcPeople_c::setAnmFromMsgTagUg(int param_1) {
 
 /* 00007B28-00007B48       .text getPrmNpcNo__13daNpcPeople_cFv */
 u8 daNpcPeople_c::getPrmNpcNo() {
-    if(0 <= subtype && subtype < 0x13) {
-        return subtype;
+    if(0 <= argument && argument < 0x13) {
+        return argument;
     }
 
     return 0;
diff --git a/src/d/actor/d_a_obj_doguu.cpp b/src/d/actor/d_a_obj_doguu.cpp
index 2f2af99ba..0284d04e0 100644
--- a/src/d/actor/d_a_obj_doguu.cpp
+++ b/src/d/actor/d_a_obj_doguu.cpp
@@ -213,7 +213,7 @@ void daObjDoguu_c::CreateInit() {
     }
     mCyl.SetStts(&mStts);
     dKy_plight_set(&mLightInfluence);
-    if (subtype >= 1) {
+    if (argument >= 1) {
         mBckHead.setFrame(mBckHead.getStartFrame());
         mBckBody.setFrame(mBckBody.getStartFrame());
         mBckCrystal.setFrame(mBckCrystal.getStartFrame());
@@ -525,8 +525,8 @@ static cPhs_State daObjDoguu_Create(void* i_this) {
 /* 000016C4-0000178C       .text _create__12daObjDoguu_cFv */
 cPhs_State daObjDoguu_c::_create() {
     fopAcM_SetupActor(this, daObjDoguu_c);
-    if(subtype >= 1) {
-        field_0x894 = subtype - 1;
+    if(argument >= 1) {
+        field_0x894 = argument - 1;
     } else {
         field_0x894 = fopAcM_GetParam(this) & 0xFF;
     }
diff --git a/src/d/actor/d_a_pedestal.cpp b/src/d/actor/d_a_pedestal.cpp
index 669ebcf6f..b1c2d7eb2 100644
--- a/src/d/actor/d_a_pedestal.cpp
+++ b/src/d/actor/d_a_pedestal.cpp
@@ -74,8 +74,8 @@ void daPds_c::CreateInit() {
     if (mType == 0) {
         // Type 0: A pedestal that a npc_os starts on in its original room.
         if (wakeupCheck()) {
-            if (subtype <= 2) {
-                fopAc_ac_c* pActor = fopAcM_searchFromName(l_os_name[subtype], 0, 0);
+            if (argument <= 2) {
+                fopAc_ac_c* pActor = fopAcM_searchFromName(l_os_name[argument], 0, 0);
 
                 if (pActor != NULL && fopAcM_searchActorDistanceXZ(this, pActor) < 100.0f) {
                     pActor->current.pos.y = current.pos.y;
@@ -114,11 +114,11 @@ cPhs_State daPds_c::_create() {
 
 /* 00000474-0000052C       .text getMyStaffId__Q210daPedestal7daPds_cFv */
 int daPds_c::getMyStaffId() {
-    if (subtype == 0) {
+    if (argument == 0) {
         return dComIfGp_evmng_getMyStaffId("Hdai1");
-    } else if (subtype == 1) {
+    } else if (argument == 1) {
         return dComIfGp_evmng_getMyStaffId("Hdai2");
-    } else if (subtype == 2) {
+    } else if (argument == 2) {
         return dComIfGp_evmng_getMyStaffId("Hdai3");
     }
 
@@ -127,15 +127,15 @@ int daPds_c::getMyStaffId() {
 
 /* 0000052C-000005D8       .text wakeupCheck__Q210daPedestal7daPds_cFv */
 BOOL daPds_c::wakeupCheck() {
-    if (subtype == 0) {
+    if (argument == 0) {
         if (dComIfGs_isEventBit(0x1780)) {
             return TRUE;
         }
-    } else if (subtype == 1) {
+    } else if (argument == 1) {
         if (dComIfGs_isEventBit(0x1740)) {
             return TRUE;
         }
-    } else if (subtype == 2) {
+    } else if (argument == 2) {
         if (dComIfGs_isEventBit(0x1720)) {
             return TRUE;
         }
@@ -146,15 +146,15 @@ BOOL daPds_c::wakeupCheck() {
 
 /* 000005D8-00000684       .text finishCheck__Q210daPedestal7daPds_cFv */
 BOOL daPds_c::finishCheck() {
-    if (subtype == 0) {
+    if (argument == 0) {
         if (dComIfGs_isEventBit(0x1710)) {
             return TRUE;
         }
-    } else if (subtype == 1) {
+    } else if (argument == 1) {
         if (dComIfGs_isEventBit(0x1704)) {
             return TRUE;
         }
-    } else if (subtype == 2) {
+    } else if (argument == 2) {
         if (dComIfGs_isEventBit(0x1B01)) {
             return TRUE;
         }
diff --git a/src/d/d_event_data.cpp b/src/d/d_event_data.cpp
index 855a068de..6278a7292 100644
--- a/src/d/d_event_data.cpp
+++ b/src/d/d_event_data.cpp
@@ -554,7 +554,7 @@ void dEvDtStaff_c::specialProcCreate() {
                     scale = *pScale;
                 }
 
-                fopAcM_create(objectName->mProcName, arg, &pos, dComIfGp_roomControl_getStayNo(), &angle, &scale, objectName->mSubtype);
+                fopAcM_create(objectName->procname, arg, &pos, dComIfGp_roomControl_getStayNo(), &angle, &scale, objectName->argument);
             }
             break;
         }
diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp
index deeb4b8c4..7bf71a678 100644
--- a/src/d/d_event_manager.cpp
+++ b/src/d/d_event_manager.cpp
@@ -185,7 +185,7 @@ static void* findObjectCallBack(fopAc_ac_c* actor, void* work) {
     if (inf == NULL)
         return NULL;
 
-    if (inf->mProcName == fopAcM_GetProfName(actor) && inf->mSubtype == actor->subtype && (prm->mMask == 0 || (prm->mValue == (prm->mMask & fopAcM_GetParam(actor)))))
+    if (inf->procname == fopAcM_GetProfName(actor) && inf->argument == actor->argument && (prm->mMask == 0 || (prm->mValue == (prm->mMask & fopAcM_GetParam(actor)))))
         return actor;
 
     return NULL;
@@ -207,7 +207,7 @@ static void* extraOnObjectCallBack(fopAc_ac_c* actor, void* work) {
         dStage_objectNameInf* inf = dStage_searchName(name);
         if (inf == NULL)
             return NULL;
-        if (inf->mProcName == fopAcM_GetProfName(actor) && inf->mSubtype == actor->subtype && (prm->mMask == 0 || (prm->mValue == (prm->mMask & fopAcM_GetParam(actor))))) {
+        if (inf->procname == fopAcM_GetProfName(actor) && inf->argument == actor->argument && (prm->mMask == 0 || (prm->mValue == (prm->mMask & fopAcM_GetParam(actor))))) {
             fopAcM_OnStatus(actor, fopAcStts_UNK800_e);
             if (prm->mCastInFlag & 1)
                 fopAcM_OnStatus(actor, fopAcStts_FORCEMOVE_e);
@@ -227,7 +227,7 @@ static void* extraOffObjectCallBack(fopAc_ac_c* actor, void* work) {
         dStage_objectNameInf* inf = dStage_searchName(name);
         if (inf == NULL)
             return NULL;
-        if (inf->mProcName == fopAcM_GetProfName(actor) && inf->mSubtype == actor->subtype) {
+        if (inf->procname == fopAcM_GetProfName(actor) && inf->argument == actor->argument) {
             fopAcM_OffStatus(actor, fopAcStts_UNK800_e);
         }
         return NULL;
diff --git a/src/d/d_npc_event_cut.inc b/src/d/d_npc_event_cut.inc
index 3fc312066..70eaca09e 100644
--- a/src/d/d_npc_event_cut.inc
+++ b/src/d/d_npc_event_cut.inc
@@ -366,7 +366,7 @@ fopAc_ac_c* dNpc_EventCut_c::findActorCallBack(fopAc_ac_c* pActor, void* pData)
                 return 0;
             }
             else {
-                if(obj->mProcName == fopAcM_GetProfName(pActor) && obj->mSubtype == pActor->subtype) {
+                if(obj->procname == fopAcM_GetProfName(pActor) && obj->argument == pActor->argument) {
                     if(cut->mTargetActorPos.abs() == 0.0f) {
                         cut->mTargetActorPos = pActor->current.pos;
                         cut->mpTargetActor = pActor;
diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp
index ef1baf211..842e0d9d2 100644
--- a/src/d/d_stage.cpp
+++ b/src/d/d_stage.cpp
@@ -1276,7 +1276,7 @@ dStage_objectNameInf* dStage_searchName(const char* i_name) {
     dStage_objectNameInf* obj = l_objectName;
 
     for (u32 i = 0; i < ARRAY_SIZE(l_objectName); i++) {
-        if (!strcmp(obj->mName, i_name)) {
+        if (!strcmp(obj->name, i_name)) {
             return obj;
         }
         obj++;
@@ -1286,12 +1286,12 @@ dStage_objectNameInf* dStage_searchName(const char* i_name) {
 }
 
 /* 800415B4-80041608       .text dStage_getName__FsSc */
-const char* dStage_getName(s16 i_procName, s8 i_subtype) {
+const char* dStage_getName(s16 i_procName, s8 i_argument) {
     dStage_objectNameInf* obj = l_objectName;
 
     for (int i = 0; i < ARRAY_SIZE(l_objectName); i++) {
-        if (obj->mProcName == i_procName && obj->mSubtype == i_subtype) {
-            return obj->mName;
+        if (obj->procname == i_procName && obj->argument == i_argument) {
+            return obj->name;
         }
         obj++;
     }
@@ -1301,8 +1301,8 @@ const char* dStage_getName(s16 i_procName, s8 i_subtype) {
 }
 
 /* 80041608-80041628       .text dStage_getName2__FsSc */
-const char* dStage_getName2(s16 i_procName, s8 i_subtype) {
-    return dStage_getName(i_procName, i_subtype);
+const char* dStage_getName2(s16 i_procName, s8 i_argument) {
+    return dStage_getName(i_procName, i_argument);
 }
 
 /* 80041628-8004169C       .text dStage_actorCreate__FP22stage_actor_data_classP16fopAcM_prm_class */
@@ -1312,9 +1312,9 @@ void dStage_actorCreate(stage_actor_data_class* i_actorData, fopAcM_prm_class* i
     if (nameinf_p == NULL) {
         JKRHeap::free(i_actorPrm, NULL);
     } else {
-        i_actorPrm->subtype = nameinf_p->mSubtype;
-        i_actorPrm->gbaName = nameinf_p->mGbaName;
-        fopAcM_create(nameinf_p->mProcName, NULL, i_actorPrm);
+        i_actorPrm->argument = nameinf_p->argument;
+        i_actorPrm->gbaName = nameinf_p->gbaName;
+        fopAcM_create(nameinf_p->procname, NULL, i_actorPrm);
     }
 }
 
diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp
index 30f4c1d40..5d14d8d3f 100644
--- a/src/f_op/f_op_actor.cpp
+++ b/src/f_op/f_op_actor.cpp
@@ -274,7 +274,7 @@ cPhs_State fopAc_Create(void* pProc) {
             actor->home.angle = prm->base.angle;
             actor->shape_angle = prm->base.angle;
             actor->parentActorID = prm->parent_id;
-            actor->subtype = prm->subtype;
+            actor->argument = prm->argument;
             actor->gbaName = prm->gbaName;
             actor->scale.set(prm->scale.x * 0.1f, prm->scale.y * 0.1f, prm->scale.z * 0.1f);
             actor->setID = prm->base.setID;
diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp
index d0747787b..f45a659e3 100644
--- a/src/f_op/f_op_actor_mng.cpp
+++ b/src/f_op/f_op_actor_mng.cpp
@@ -86,13 +86,13 @@ fopAcM_prm_class* fopAcM_CreateAppend() {
         params->scale.y = 10;
         params->scale.z = 10;
         params->parent_id = fpcM_ERROR_PROCESS_ID_e;
-        params->subtype = -1;
+        params->argument = -1;
     }
     return params;
 }
 
 /* 80024320-80024474       .text createAppend__FUlP4cXyziP5csXyzP4cXyzScUi */
-fopAcM_prm_class * createAppend(u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, s8 subtype, fpc_ProcID parentPcId) {
+fopAcM_prm_class * createAppend(u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, s8 i_argument, fpc_ProcID parentPcId) {
     fopAcM_prm_class * params = fopAcM_CreateAppend();
     if (params == NULL)
         return NULL;
@@ -121,7 +121,7 @@ fopAcM_prm_class * createAppend(u32 parameter, cXyz* pPos, int roomNo, csXyz* pA
 
     params->base.parameters = parameter;
     params->parent_id = parentPcId;
-    params->subtype = subtype;
+    params->argument = i_argument;
 
     return params;
 }
@@ -152,8 +152,8 @@ BOOL fopAcM_delete(fpc_ProcID actorID) {
 }
 
 /* 8002451C-80024598       .text fopAcM_create__FsUlP4cXyziP5csXyzP4cXyzScPFPv_i */
-fpc_ProcID fopAcM_create(s16 procName, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, s8 subtype, createFunc createFunc) {
-    fopAcM_prm_class* params = createAppend(parameter, pPos, roomNo, pAngle, pScale, subtype, fpcM_ERROR_PROCESS_ID_e);
+fpc_ProcID fopAcM_create(s16 procName, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, s8 i_argument, createFunc createFunc) {
+    fopAcM_prm_class* params = createAppend(parameter, pPos, roomNo, pAngle, pScale, i_argument, fpcM_ERROR_PROCESS_ID_e);
     if (params == NULL)
         return fpcM_ERROR_PROCESS_ID_e;
 
@@ -166,12 +166,12 @@ fpc_ProcID fopAcM_create(char* pProcNameString, u32 parameter, cXyz* pPos, int r
     if (nameInf == NULL)
         return fpcM_ERROR_PROCESS_ID_e;
 
-    return fopAcM_create(nameInf->mProcName, parameter, pPos, roomNo, pAngle, pScale, nameInf->mSubtype, createFunc);
+    return fopAcM_create(nameInf->procname, parameter, pPos, roomNo, pAngle, pScale, nameInf->argument, createFunc);
 }
 
 /* 80024614-8002468C       .text fopAcM_fastCreate__FsUlP4cXyziP5csXyzP4cXyzScPFPv_iPv */
-void* fopAcM_fastCreate(s16 procName, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, s8 subtype, createFunc createFunc, void* pUserData) {
-    fopAcM_prm_class* params = createAppend(parameter, pPos, roomNo, pAngle, pScale, subtype, fpcM_ERROR_PROCESS_ID_e);
+void* fopAcM_fastCreate(s16 procName, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, s8 i_argument, createFunc createFunc, void* pUserData) {
+    fopAcM_prm_class* params = createAppend(parameter, pPos, roomNo, pAngle, pScale, i_argument, fpcM_ERROR_PROCESS_ID_e);
     if (params == NULL)
         return NULL;
 
@@ -184,12 +184,12 @@ void* fopAcM_fastCreate(char* pProcNameString, u32 parameter, cXyz* pPos, int ro
     if (nameInf == NULL)
         return NULL;
 
-    return fopAcM_fastCreate(nameInf->mProcName, parameter, pPos, roomNo, pAngle, pScale, nameInf->mSubtype, createFunc, pUserData);
+    return fopAcM_fastCreate(nameInf->procname, parameter, pPos, roomNo, pAngle, pScale, nameInf->argument, createFunc, pUserData);
 }
 
 /* 80024710-80024790       .text fopAcM_createChild__FsUiUlP4cXyziP5csXyzP4cXyzScPFPv_i */
-fpc_ProcID fopAcM_createChild(s16 procName, fpc_ProcID parentPcId, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, s8 subtype, createFunc createFunc) {
-    fopAcM_prm_class* params = createAppend(parameter, pPos, roomNo, pAngle, pScale, subtype, parentPcId);
+fpc_ProcID fopAcM_createChild(s16 procName, fpc_ProcID parentPcId, u32 parameter, cXyz* pPos, int roomNo, csXyz* pAngle, cXyz* pScale, s8 i_argument, createFunc createFunc) {
+    fopAcM_prm_class* params = createAppend(parameter, pPos, roomNo, pAngle, pScale, i_argument, parentPcId);
     if (params == NULL)
         return fpcM_ERROR_PROCESS_ID_e;
 
@@ -202,11 +202,11 @@ fpc_ProcID fopAcM_createChild(char* pProcNameString, fpc_ProcID parentPcId, u32
     if (nameInf == NULL)
         return fpcM_ERROR_PROCESS_ID_e;
 
-    return fopAcM_createChild(nameInf->mProcName, parentPcId, parameter, pPos, roomNo, pAngle, pScale, nameInf->mSubtype, createFunc);
+    return fopAcM_createChild(nameInf->procname, parentPcId, parameter, pPos, roomNo, pAngle, pScale, nameInf->argument, createFunc);
 }
 
 /* 80024814-800249D4       .text fopAcM_createChildFromOffset__FsUiUlP4cXyziP5csXyzP4cXyzScPFPv_i */
-fpc_ProcID fopAcM_createChildFromOffset(s16 procName, fpc_ProcID parentPcId, u32 parameter, cXyz* pPosOffs, int roomNo, csXyz* pAngleOffs, cXyz* pScale, s8 subtype, createFunc createFunc) {
+fpc_ProcID fopAcM_createChildFromOffset(s16 procName, fpc_ProcID parentPcId, u32 parameter, cXyz* pPosOffs, int roomNo, csXyz* pAngleOffs, cXyz* pScale, s8 i_argument, createFunc createFunc) {
     fopAc_ac_c * pParent = fopAcM_SearchByID(parentPcId);
     s16 parentAngleY = pParent->current.angle.y;
 
@@ -231,7 +231,7 @@ fpc_ProcID fopAcM_createChildFromOffset(s16 procName, fpc_ProcID parentPcId, u32
     pos.y += posOffs.y;
     pos.z += posOffs.z * cM_scos(parentAngleY) - posOffs.x * cM_ssin(parentAngleY);
 
-    fopAcM_prm_class* params = createAppend(parameter, &pos, roomNo, &angle, pScale, subtype, parentPcId);
+    fopAcM_prm_class* params = createAppend(parameter, &pos, roomNo, &angle, pScale, i_argument, parentPcId);
     if (params == NULL)
         return fpcM_ERROR_PROCESS_ID_e;
 
@@ -1400,7 +1400,7 @@ s32 fopAcM_otoCheck(fopAc_ac_c* actor, f32 param_2) {
 
 /* 800282F8-8002833C       .text fopAcM_getProcNameString__FP10fopAc_ac_c */
 const char * fopAcM_getProcNameString(fopAc_ac_c* i_this) {
-    const char * pProcNameString = dStage_getName2(fopAcM_GetProfName(i_this), i_this->subtype);
+    const char * pProcNameString = dStage_getName2(fopAcM_GetProfName(i_this), i_this->argument);
     if (pProcNameString != NULL)
         return pProcNameString;
     return "UNKOWN";
@@ -1415,7 +1415,7 @@ fopAc_ac_c* fopAcM_findObjectCB(fopAc_ac_c* it, void* i_prm) {
     if (inf == NULL)
         return NULL;
 
-    if (inf->mProcName == fopAcM_GetProfName(it) && inf->mSubtype == it->subtype && (Prm->prm_mask == 0 || Prm->parameter == (fopAcM_GetParam(it) & Prm->prm_mask)))
+    if (inf->procname == fopAcM_GetProfName(it) && inf->argument == it->argument && (Prm->prm_mask == 0 || Prm->parameter == (fopAcM_GetParam(it) & Prm->prm_mask)))
         return it;
 
     return NULL;