diff --git a/include/d/actor/d_a_kaji.h b/include/d/actor/d_a_kaji.h
index 7d84a3b0f..012b7a75d 100644
--- a/include/d/actor/d_a_kaji.h
+++ b/include/d/actor/d_a_kaji.h
@@ -13,7 +13,7 @@ public:
     static const char M_arcname[];
 
     void set_mtx() {
-        mpMorf->getModel()->setBaseScale(mScale);
+        mpMorf->getModel()->setBaseScale(scale);
         mDoMtx_stack_c::transS(current.pos);
         mDoMtx_stack_c::ZXYrotM(shape_angle);
         mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get());
diff --git a/include/d/actor/d_a_npc_kamome.h b/include/d/actor/d_a_npc_kamome.h
index 6ba016f21..7de23905d 100644
--- a/include/d/actor/d_a_npc_kamome.h
+++ b/include/d/actor/d_a_npc_kamome.h
@@ -140,8 +140,8 @@ public:
     BOOL execute();
     BOOL draw();
     f32 getGroundY() { return mAcch.GetGroundH(); }
-    MtxP getLeftHandMatrix() { return mCullMtx; }
-    MtxP getRightHandMatrix() { return mCullMtx; }
+    MtxP getLeftHandMatrix() { return cullMtx; }
+    MtxP getRightHandMatrix() { return cullMtx; }
     f32 getBaseAnimeFrameRate() { return 1.0f; }
     f32 getBaseAnimeFrame() { return 0.0f; }
     void restartPoint(s16) {}
diff --git a/include/d/actor/d_a_npc_md.h b/include/d/actor/d_a_npc_md.h
index 56f80d09b..d7e96b689 100644
--- a/include/d/actor/d_a_npc_md.h
+++ b/include/d/actor/d_a_npc_md.h
@@ -459,8 +459,8 @@ public:
     
     virtual BOOL isTagCheckOK();
     virtual f32 getGroundY() { return mAcch.GetGroundH(); }
-    virtual MtxP getLeftHandMatrix() { return mCullMtx; }
-    virtual MtxP getRightHandMatrix() { return mCullMtx; }
+    virtual MtxP getLeftHandMatrix() { return cullMtx; }
+    virtual MtxP getRightHandMatrix() { return cullMtx; }
     virtual f32 getBaseAnimeFrameRate() { return 1.0f; }
     virtual f32 getBaseAnimeFrame() { return 0.0f; }
     
diff --git a/include/d/actor/d_a_swtact.h b/include/d/actor/d_a_swtact.h
index 0ed6af360..087c300e5 100644
--- a/include/d/actor/d_a_swtact.h
+++ b/include/d/actor/d_a_swtact.h
@@ -7,7 +7,7 @@
 
 class daSwTact_c : public fopAc_ac_c {
 public:
-    f32 getR() { return mRadius * mScale.x; }
+    f32 getR() { return mRadius * scale.x; }
 
     bool _delete();
     BOOL CreateHeap();
diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h
index df0ea36ae..a7a3f08d0 100644
--- a/include/f_op/f_op_actor.h
+++ b/include/f_op/f_op_actor.h
@@ -103,11 +103,11 @@ enum fopAc_Cull_e {
 };
 
 struct actor_process_profile_definition {
-    /* 0x00 */ leaf_process_profile_definition mBase;
-    /* 0x24 */ actor_method_class* mSubMtd;
-    /* 0x28 */ u32 mStatus;
-    /* 0x2C */ u8 mGroup;
-    /* 0x2D */ u8 mCullType;
+    /* 0x00 */ leaf_process_profile_definition base;
+    /* 0x24 */ actor_method_class* sub_method;
+    /* 0x28 */ u32 status;
+    /* 0x2C */ u8 group;
+    /* 0x2D */ u8 cullType;
 };  // Size: 0x30
 
 // Unclear what this is. Only appears in 2 profiles (PLAYER,BG)
@@ -204,9 +204,9 @@ struct actor_place {
 };
 
 struct actor_attention_types {
-    /* 0x00 */ u8 mDistances[8];
-    /* 0x08 */ cXyz mPosition;
-    /* 0x14 */ u32 mFlags;
+    /* 0x00 */ u8 distances[8];
+    /* 0x08 */ cXyz position;
+    /* 0x14 */ u32 flags;
 };  // Size = 0x18
 
 class JntHit_c;
@@ -214,16 +214,16 @@ class JntHit_c;
 struct fopAc_cullSizeSphere {
 public:
 #ifdef __INTELLISENSE__
-    /* 0x0 */ Vec mCenter;
-    /* 0xC */ f32 mRadius;
+    /* 0x0 */ Vec center;
+    /* 0xC */ f32 radius;
 #else
-    /* 0x0 */ cXyz mCenter;
-    /* 0xC */ f32 mRadius;
+    /* 0x0 */ cXyz center;
+    /* 0xC */ f32 radius;
 
     fopAc_cullSizeSphere() {}
     fopAc_cullSizeSphere(cXyz p, f32 r) {
-        mCenter = p;
-        mRadius = r;
+        center = p;
+        radius = r;
     }
     ~fopAc_cullSizeSphere() {}
 #endif
@@ -232,67 +232,67 @@ public:
 struct fopAc_cullSizeBox {
 public:
 #ifdef __INTELLISENSE__
-    /* 0x0 */ Vec mMin;
-    /* 0xC */ Vec mMax;
+    /* 0x0 */ Vec min;
+    /* 0xC */ Vec max;
 #else
     fopAc_cullSizeBox() {}
     fopAc_cullSizeBox(const fopAc_cullSizeBox& box) {
-        mMin = box.mMin;
-        mMax = box.mMax;
+        min = box.min;
+        max = box.max;
     }
     fopAc_cullSizeBox(cXyz min, cXyz max) {
-        mMin = min;
-        mMax = max;
+        this->min = min;
+        this->max = max;
     }
     ~fopAc_cullSizeBox() {}
 
-    /* 0x0 */ cXyz mMin;
-    /* 0xC */ cXyz mMax;
+    /* 0x0 */ cXyz min;
+    /* 0xC */ cXyz max;
 #endif
 };
 
 class fopAc_ac_c : public leafdraw_class {
 public:
-    /* 0x0C0 */ int mAcType;
-    /* 0x0C4 */ create_tag_class mAcTg;
-    /* 0x0D8 */ create_tag_class mDwTg;
-    /* 0x0EC */ actor_method_class* mSubMtd;
+    /* 0x0C0 */ int actor_type;
+    /* 0x0C4 */ create_tag_class actor_tag;
+    /* 0x0D8 */ create_tag_class draw_tag;
+    /* 0x0EC */ actor_method_class* sub_method;
     /* 0x0F0 */ JKRSolidHeap* heap;
-    /* 0x0F4 */ dEvt_info_c mEvtInfo;
-    /* 0x10C */ dKy_tevstr_c mTevStr;
-    /* 0x1BC */ u16 mSetId;
-    /* 0x1BE */ u8 mGroup;
-    /* 0x1BF */ u8 mCullType;
-    /* 0x1C0 */ u8 mDemoActorId;
-    /* 0x1C1 */ s8 mSubtype;
-    /* 0x1C2 */ u8 mGbaName;
-    /* 0x1C4 */ u32 mStatus;
-    /* 0x1C8 */ u32 mCondition;
-    /* 0x1CC */ u32 mParentPcId;
+    /* 0x0F4 */ dEvt_info_c eventInfo;
+    /* 0x10C */ dKy_tevstr_c tevStr;
+    /* 0x1BC */ u16 setID;
+    /* 0x1BE */ u8 group;
+    /* 0x1BF */ u8 cullType;
+    /* 0x1C0 */ u8 demoActorID;
+    /* 0x1C1 */ s8 subtype;
+    /* 0x1C2 */ u8 gbaName;
+    /* 0x1C4 */ u32 actor_status;
+    /* 0x1C8 */ u32 actor_condition;
+    /* 0x1CC */ u32 parentActorID;
     /* 0x1D0 */ actor_place home;
     /* 0x1E4 */ actor_place old;
     /* 0x1F8 */ actor_place current;
     /* 0x20C */ csXyz shape_angle;
-    /* 0x214 */ cXyz mScale;
+    /* 0x214 */ cXyz scale;
     /* 0x220 */ cXyz speed;
-    /* 0x22C */ MtxP mCullMtx;
+    /* 0x22C */ MtxP cullMtx;
     union {
-        /* 0x230 */ fopAc_cullSizeBox mBox;
-        /* 0x230 */ fopAc_cullSizeSphere mSphere;
-    } mCull;
-    /* 0x248 */ f32 mCullSizeFar;
+        /* 0x230 */ fopAc_cullSizeBox box;
+        /* 0x230 */ fopAc_cullSizeSphere sphere;
+    } cull;
+    /* 0x248 */ f32 cullSizeFar;
     /* 0x24C */ J3DModel* model;
-    /* 0x250 */ JntHit_c* mJntHit;
+    /* 0x250 */ JntHit_c* jntHit;
     /* 0x254 */ f32 speedF;
-    /* 0x258 */ f32 mGravity;
-    /* 0x25C */ f32 mMaxFallSpeed;
-    /* 0x260 */ cXyz mEyePos;
-    /* 0x26C */ actor_attention_types mAttentionInfo;
-    /* 0x284 */ s8 mMaxHealth;
-    /* 0x285 */ s8 mHealth;
-    /* 0x288 */ s32 mItemTableIdx;
-    /* 0x28C */ u8 mStealItemBitNo; // For limited items (Blue Chu Jelly), this is the first itemBitNo to set.
-    /* 0x28D */ s8 mStealItemLeft;
+    /* 0x258 */ f32 gravity;
+    /* 0x25C */ f32 maxFallSpeed;
+    /* 0x260 */ cXyz eyePos;
+    /* 0x26C */ actor_attention_types attention_info;
+    /* 0x284 */ s8 max_health;
+    /* 0x285 */ s8 health;
+    /* 0x288 */ s32 itemTableIdx;
+    /* 0x28C */ u8 stealItemBitNo; // For limited items (Blue Chu Jelly), this is the first itemBitNo to set.
+    /* 0x28D */ s8 stealItemLeft;
 
     fopAc_ac_c();
     ~fopAc_ac_c();
diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h
index 49dae1fef..aa9d38b8e 100644
--- a/include/f_op/f_op_actor_mng.h
+++ b/include/f_op/f_op_actor_mng.h
@@ -96,15 +96,15 @@ inline s16 fopAcM_GetName(void* pActor) {
 }
 
 inline MtxP fopAcM_GetMtx(fopAc_ac_c* pActor) {
-    return pActor->mCullMtx;
+    return pActor->cullMtx;
 }
 
 inline bool fopAcM_checkStatus(fopAc_ac_c* pActor, u32 status) {
-    return pActor->mStatus & status;
+    return pActor->actor_status & status;
 }
 
 inline u32 fopAcM_checkCarryNow(fopAc_ac_c* pActor) {
-    return pActor->mStatus & fopAcStts_CARRY_e;
+    return pActor->actor_status & fopAcStts_CARRY_e;
 }
 
 inline u32 fopAcM_checkHookCarryNow(fopAc_ac_c* pActor) {
@@ -124,7 +124,7 @@ inline void fopAcM_SetParam(void* p_actor, u32 param) {
 }
 
 inline void fopAcM_SetJntHit(fopAc_ac_c* i_actorP, JntHit_c* i_jntHitP) {
-    i_actorP->mJntHit = i_jntHitP;
+    i_actorP->jntHit = i_jntHitP;
 }
 
 inline s16 fopAcM_GetProfName(void* pActor) {
@@ -140,28 +140,28 @@ inline void fopAcM_SetPriority(void* pActor, int priority) {
 }
 
 inline u8 fopAcM_GetGroup(fopAc_ac_c* p_actor) {
-    return p_actor->mGroup;
+    return p_actor->group;
 }
 
 inline void fopAcM_SetGroup(fopAc_ac_c* pActor, u8 group) {
-    pActor->mGroup = group;
+    pActor->group = group;
 }
 
 inline void fopAcM_OnStatus(fopAc_ac_c* pActor, u32 flag) {
-    pActor->mStatus |= flag;
+    pActor->actor_status |= flag;
 }
 
 inline void fopAcM_OffStatus(fopAc_ac_c* pActor, u32 flag) {
-    pActor->mStatus &= ~flag;
+    pActor->actor_status &= ~flag;
 }
 
 inline BOOL fopAcM_CheckStatusMap(fopAc_ac_c* pActor, u32) {
     // TODO: This implementation probably isn't right, the u32 argument is likely used for something
-    return (pActor->mStatus & fopAcStts_SHOWMAP_e) && (pActor->mStatus & 0x1F) == 0;
+    return (pActor->actor_status & fopAcStts_SHOWMAP_e) && (pActor->actor_status & 0x1F) == 0;
 }
 
 inline void fopAcM_SetStatusMap(fopAc_ac_c* pActor, u32 flag) {
-    pActor->mStatus = (pActor->mStatus & ~0x3F) | fopAcStts_SHOWMAP_e | flag;
+    pActor->actor_status = (pActor->actor_status & ~0x3F) | fopAcStts_SHOWMAP_e | flag;
 }
 
 inline fopAc_ac_c* fopAcM_Search(fopAcIt_JudgeFunc func, void* param) {
@@ -197,15 +197,15 @@ inline csXyz* fopAcM_GetShapeAngle_p(fopAc_ac_c* pActor) {
 }
 
 inline bool fopAcM_CheckCondition(fopAc_ac_c* p_actor, u32 flag) {
-    return p_actor->mCondition & flag;
+    return p_actor->actor_condition & flag;
 }
 
 inline void fopAcM_OnCondition(fopAc_ac_c* p_actor, u32 flag) {
-    p_actor->mCondition |= flag;
+    p_actor->actor_condition |= flag;
 }
 
 inline void fopAcM_OffCondition(fopAc_ac_c* p_actor, u32 flag) {
-    p_actor->mCondition &= ~flag;
+    p_actor->actor_condition &= ~flag;
 }
 
 inline BOOL fopAcM_IsActor(void* actor) {
@@ -233,15 +233,15 @@ inline void fopAcM_SetHomeRoomNo(fopAc_ac_c* pActor, s8 roomNo) {
 }
 
 inline void fopAcM_SetGravity(fopAc_ac_c* actor, f32 gravity) {
-    actor->mGravity = gravity;
+    actor->gravity = gravity;
 }
 
 inline void fopAcM_SetMaxFallSpeed(fopAc_ac_c* actor, f32 speed) {
-    actor->mMaxFallSpeed = speed;
+    actor->maxFallSpeed = speed;
 }
 
 inline void fopAcM_SetMtx(fopAc_ac_c* actor, MtxP m) {
-    actor->mCullMtx = m;
+    actor->cullMtx = m;
 }
 
 inline void fopAcM_SetSpeed(fopAc_ac_c* actor, f32 x, f32 y, f32 z) {
@@ -253,7 +253,7 @@ inline void fopAcM_SetSpeedF(fopAc_ac_c* actor, f32 f) {
 }
 
 inline void fopAcM_SetStatus(fopAc_ac_c* actor, u32 status) {
-    actor->mStatus = status;
+    actor->actor_status = status;
 }
 
 inline void fopAcM_SetModel(fopAc_ac_c* actor, J3DModel* model) {
@@ -277,31 +277,31 @@ inline f32 fopAcM_GetSpeedF(fopAc_ac_c* p_actor) {
 }
 
 inline f32 fopAcM_GetGravity(fopAc_ac_c* p_actor) {
-    return p_actor->mGravity;
+    return p_actor->gravity;
 }
 
 inline f32 fopAcM_GetMaxFallSpeed(fopAc_ac_c* p_actor) {
-    return p_actor->mMaxFallSpeed;
+    return p_actor->maxFallSpeed;
 }
 
 inline JntHit_c* fopAcM_GetJntHit(fopAc_ac_c* i_actor) {
-    return i_actor->mJntHit;
+    return i_actor->jntHit;
 }
 
 inline void fopAcM_setCullSizeFar(fopAc_ac_c* i_actor, f32 i_far) {
-    i_actor->mCullSizeFar = i_far;
+    i_actor->cullSizeFar = i_far;
 }
 
 inline f32 fopAcM_getCullSizeFar(fopAc_ac_c* i_actor) {
-    return i_actor->mCullSizeFar;
+    return i_actor->cullSizeFar;
 }
 
 inline void fopAcM_SetCullSize(fopAc_ac_c* i_actor, int i_culltype) {
-    i_actor->mCullType = i_culltype;
+    i_actor->cullType = i_culltype;
 }
 
 inline int fopAcM_GetCullSize(fopAc_ac_c* i_actor) {
-    return i_actor->mCullType;
+    return i_actor->cullType;
 }
 
 inline BOOL fopAcM_CULLSIZE_IS_BOX(int i_culltype) {
@@ -317,19 +317,19 @@ inline int fopAcM_CULLSIZE_Q_IDX(int i_culltype) {
 }
 
 inline cXyz* fopAcM_getCullSizeSphereCenter(fopAc_ac_c* i_actor) {
-    return (cXyz*)&i_actor->mCull.mSphere.mCenter;
+    return (cXyz*)&i_actor->cull.sphere.center;
 }
 
 inline f32 fopAcM_getCullSizeSphereR(fopAc_ac_c* i_actor) {
-    return i_actor->mCull.mSphere.mRadius;
+    return i_actor->cull.sphere.radius;
 }
 
 inline cXyz* fopAcM_getCullSizeBoxMax(fopAc_ac_c* actor) {
-    return (cXyz*)&actor->mCull.mBox.mMax;
+    return (cXyz*)&actor->cull.box.max;
 }
 
 inline cXyz* fopAcM_getCullSizeBoxMin(fopAc_ac_c* actor) {
-    return (cXyz*)&actor->mCull.mBox.mMin;
+    return (cXyz*)&actor->cull.box.min;
 }
 
 inline void dComIfGs_onSwitch(int i_no, int i_roomNo);
@@ -392,7 +392,7 @@ inline f32 fopAcM_searchActorDistanceY(fopAc_ac_c* actorA, fopAc_ac_c* actorB) {
 }
 
 inline u16 fopAcM_GetSetId(fopAc_ac_c* p_actor) {
-    return p_actor->mSetId;
+    return p_actor->setID;
 }
 
 inline void dComIfGs_onActor(int bitNo, int roomNo);
@@ -459,13 +459,13 @@ bool fopAcM_entrySolidHeap(fopAc_ac_c* p_actor, heapCallbackFunc p_heapCallback,
 
 inline void fopAcM_SetMin(fopAc_ac_c* p_actor, f32 minX, f32 minY, f32 minZ) {
 #ifndef __INTELLISENSE__
-    p_actor->mCull.mBox.mMin.set(minX, minY, minZ);
+    p_actor->cull.box.min.set(minX, minY, minZ);
 #endif
 }
 
 inline void fopAcM_SetMax(fopAc_ac_c* p_actor, f32 maxX, f32 maxY, f32 maxZ) {
 #ifndef __INTELLISENSE__
-    p_actor->mCull.mBox.mMax.set(maxX, maxY, maxZ);
+    p_actor->cull.box.max.set(maxX, maxY, maxZ);
 #endif
 }
 
@@ -617,11 +617,11 @@ inline void fopAcM_seStartCurrent(fopAc_ac_c* actor, u32 i_seNum, u32 param_2) {
 }
 
 inline void fopAcM_seStart(fopAc_ac_c* actor, u32 i_seNum, u32 param_2) {
-    mDoAud_seStart(i_seNum, &actor->mEyePos, param_2, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
+    mDoAud_seStart(i_seNum, &actor->eyePos, param_2, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
 }
 
 inline void fopAcM_monsSeStart(fopAc_ac_c* actor, u32 i_seNum, u32 param_2) {
-    mDoAud_monsSeStart(i_seNum, &actor->mEyePos, fopAcM_GetID(actor), 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
+    mDoAud_monsSeStart(i_seNum, &actor->eyePos, fopAcM_GetID(actor), 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
 }
 
 inline void fopAcM_monsSeStart(fopAc_ac_c* actor, u32 i_seNum, Vec* i_sePos, u32 param_2) {
@@ -632,11 +632,11 @@ void fopDwTg_ToDrawQ(create_tag_class*, int);
 void fopDwTg_DrawQTo(create_tag_class*);
 
 inline void fopAcM_onDraw(fopAc_ac_c* actor) {
-    fopDwTg_ToDrawQ(&actor->mDwTg, fpcLf_GetPriority(actor));
+    fopDwTg_ToDrawQ(&actor->draw_tag, fpcLf_GetPriority(actor));
 }
 
 inline void fopAcM_offDraw(fopAc_ac_c* actor) {
-    fopDwTg_DrawQTo(&actor->mDwTg);
+    fopDwTg_DrawQTo(&actor->draw_tag);
 }
 
 inline void fopAcM_orderOtherEvent(fopAc_ac_c* ac, char* event, u16 flag) {
diff --git a/include/f_op/f_op_camera.h b/include/f_op/f_op_camera.h
index 33445fa3f..6d108f4ef 100644
--- a/include/f_op/f_op_camera.h
+++ b/include/f_op/f_op_camera.h
@@ -10,7 +10,7 @@ typedef struct leafdraw_method_class leafdraw_method_class;
 
 class camera_process_class : public view_class {
 public:
-    /* 0x210 */ create_tag_class mDwTg;
+    /* 0x210 */ create_tag_class draw_tag;
     /* 0x224 */ leafdraw_method_class* mpMtd;
     /* 0x228 */ u8 field_0x228[4];
     /* 0x22C */ s8 mPrm1;
@@ -29,8 +29,8 @@ public:
 };
 
 struct camera_process_profile_definition {
-    /* 0x00 */ view_process_profile_definition mBase;
-    /* 0x3C */ leafdraw_method_class* mSubMtd; // Subclass methods
+    /* 0x00 */ view_process_profile_definition base;
+    /* 0x3C */ leafdraw_method_class* sub_method; // Subclass methods
 };
 
 #endif
diff --git a/include/f_op/f_op_kankyo.h b/include/f_op/f_op_kankyo.h
index fcf62b5bf..f1fefe171 100644
--- a/include/f_op/f_op_kankyo.h
+++ b/include/f_op/f_op_kankyo.h
@@ -11,8 +11,8 @@ struct kankyo_method_class {
 class kankyo_class : public leafdraw_class {
 public:
     /* 0xC0 */ int mBsType;
-    /* 0xC4 */ create_tag_class mDwTg;
-    /* 0xD8 */ kankyo_method_class* mSubMtd;
+    /* 0xC4 */ create_tag_class draw_tag;
+    /* 0xD8 */ kankyo_method_class* sub_method;
     /* 0xDC */ cXyz mPos;
     /* 0xE8 */ cXyz mScale;
     /* 0xF4 */ u32 mParam;
@@ -20,7 +20,7 @@ public:
 
 struct kankyo_process_profile_definition {
     /* 0x00 */ leaf_process_profile_definition base;
-    /* 0x24 */ kankyo_method_class* mSubMtd;
+    /* 0x24 */ kankyo_method_class* sub_method;
 };  // Size: 0x28
 
 extern leafdraw_method_class g_fopKy_Method;
diff --git a/include/f_op/f_op_msg.h b/include/f_op/f_op_msg.h
index d6041ba85..2f9d19554 100644
--- a/include/f_op/f_op_msg.h
+++ b/include/f_op/f_op_msg.h
@@ -26,8 +26,8 @@ struct msg_method_class {
 class msg_class : public leafdraw_class {
 public:
     /* 0xC0 */ int mMsgType;
-    /* 0xC4 */ create_tag_class mDwTg;
-    /* 0xD8 */ msg_method_class* mSubMtd;
+    /* 0xC4 */ create_tag_class draw_tag;
+    /* 0xD8 */ msg_method_class* sub_method;
     /* 0xDC */ fopAc_ac_c* mpActor;
     /* 0xE0 */ cXyz mPos;
     /* 0xEC */ u32 mMsgID;
diff --git a/include/f_op/f_op_msg_mng.h b/include/f_op/f_op_msg_mng.h
index 5bb98e922..6c4dbb160 100644
--- a/include/f_op/f_op_msg_mng.h
+++ b/include/f_op/f_op_msg_mng.h
@@ -13,8 +13,8 @@ class J2DPane;
 class J2DScreen;
 
 struct msg_process_profile_definition {
-    /* 0x00 */ leaf_process_profile_definition mBase;
-    /* 0x24 */ msg_method_class* mSubMtd;  // Subclass methods
+    /* 0x00 */ leaf_process_profile_definition base;
+    /* 0x24 */ msg_method_class* sub_method;  // Subclass methods
 };
 
 struct fopMsg_prm_class {
diff --git a/include/f_op/f_op_overlap_mng.h b/include/f_op/f_op_overlap_mng.h
index 0fd3682f5..78d16291e 100644
--- a/include/f_op/f_op_overlap_mng.h
+++ b/include/f_op/f_op_overlap_mng.h
@@ -12,14 +12,14 @@ struct overlap_method_class {
 
 class overlap_task_class : public leafdraw_class {
 public:
-    /* 0xC0 */ overlap_method_class* mSubMtd;
+    /* 0xC0 */ overlap_method_class* sub_method;
     /* 0xC4 */ request_base_class mRq;
     /* 0xC8 */ int mScenePId;
 };  // Size: 0xCC
 
 struct overlap_process_profile_definition {
     /* 0x00 */ leaf_process_profile_definition base;
-    /* 0x24 */ overlap_method_class* mSubMtd;
+    /* 0x24 */ overlap_method_class* sub_method;
 };  // Size: 0x28
 
 int fopOvlpM_SceneIsStop();
diff --git a/include/f_op/f_op_scene.h b/include/f_op/f_op_scene.h
index ec3f4291a..343f76d92 100644
--- a/include/f_op/f_op_scene.h
+++ b/include/f_op/f_op_scene.h
@@ -13,14 +13,14 @@ struct scene_method_class {
 };
 
 typedef struct scene_process_profile_definition {
-    /* 0x00 */ node_process_profile_definition mBase;
-    /* 0x20 */ scene_method_class* mpMtd; // Subclass methods
-    /* 0x24 */ u32 field_0x24;            // padding?
+    /* 0x00 */ node_process_profile_definition base;
+    /* 0x20 */ scene_method_class* sub_method; // Subclass methods
+    /* 0x24 */ u32 field_0x24; // padding?
 } scene_process_profile_definition;
 
 class scene_class {
 public:
-    /* 0x000 */ process_node_class mBase;
+    /* 0x000 */ process_node_class base;
     /* 0x1AC */ scene_method_class* mpMtd;
     /* 0x1B0 */ scene_tag_class mScnTg;
 };
diff --git a/include/f_op/f_op_scene_mng.h b/include/f_op/f_op_scene_mng.h
index 07fff1cb8..d2877d94c 100644
--- a/include/f_op/f_op_scene_mng.h
+++ b/include/f_op/f_op_scene_mng.h
@@ -16,7 +16,7 @@ void fopScnM_Init(void);
 
 inline u32 fpcM_LayerID(const void* pProc) {
     return fpcBs_Is_JustOfType(g_fpcNd_type, ((base_process_class*)pProc)->mSubType) != FALSE ?
-               ((scene_class*)pProc)->mBase.mLayer.mLayerID :
+               ((scene_class*)pProc)->base.mLayer.mLayerID :
                0xFFFFFFFF;
 }
 
diff --git a/include/f_op/f_op_view.h b/include/f_op/f_op_view.h
index c3866db4d..bf04b1dff 100644
--- a/include/f_op/f_op_view.h
+++ b/include/f_op/f_op_view.h
@@ -6,8 +6,8 @@
 #include "f_pc/f_pc_leaf.h"
 
 struct view_process_profile_definition {
-    /* 0x00 */ leaf_process_profile_definition mBase;
-    /* 0x24 */ leafdraw_method_class* mSubMtd; // Subclass methods
+    /* 0x00 */ leaf_process_profile_definition base;
+    /* 0x24 */ leafdraw_method_class* sub_method; // Subclass methods
     /* 0x28 */ u8 unk28;
     /* 0x29 */ u8 unk29[3]; // pad
     /* 0x2C */ u32 unk2C;
@@ -41,7 +41,7 @@ struct view_port_class {
 };
 
 struct view_class : public leafdraw_class {
-    /* 0x0C0 */ leafdraw_method_class* mSubMtd;
+    /* 0x0C0 */ leafdraw_method_class* sub_method;
     /* 0x0C4 */ u8 field_0xc4;
     /* 0x0C8 */ f32 mNear;
     /* 0x0CC */ f32 mFar;
diff --git a/include/f_pc/f_pc_create_req.h b/include/f_pc/f_pc_create_req.h
index 340714fcc..98ef9295c 100644
--- a/include/f_pc/f_pc_create_req.h
+++ b/include/f_pc/f_pc_create_req.h
@@ -17,7 +17,7 @@ typedef struct create_request_method_class {
 } create_request_method_class;
 
 typedef struct create_request {
-    create_tag mBase;
+    create_tag base;
     s8 mbIsCreating;
     s8 mbIsCancelling;
     process_method_tag_class mMtdTg;
diff --git a/include/f_pc/f_pc_create_tag.h b/include/f_pc/f_pc_create_tag.h
index 35365179d..845e37856 100644
--- a/include/f_pc/f_pc_create_tag.h
+++ b/include/f_pc/f_pc_create_tag.h
@@ -6,7 +6,7 @@
 #include "SSystem/SComponent/c_tag.h"
 
 typedef struct create_tag {
-    create_tag_class mBase;
+    create_tag_class base;
 } create_tag;
 
 void fpcCtTg_ToCreateQ(create_tag* pTag);
diff --git a/include/f_pc/f_pc_delete_tag.h b/include/f_pc/f_pc_delete_tag.h
index 1c90e6f1d..da925fa2d 100644
--- a/include/f_pc/f_pc_delete_tag.h
+++ b/include/f_pc/f_pc_delete_tag.h
@@ -9,7 +9,7 @@ typedef struct layer_class layer_class;
 typedef int (*delete_tag_func)(void*);
 
 typedef struct delete_tag_class {
-    create_tag_class mBase;
+    create_tag_class base;
     layer_class* mpLayer;
     s16 mTimer;
 } delete_tag_class;
diff --git a/include/f_pc/f_pc_fstcreate_req.h b/include/f_pc/f_pc_fstcreate_req.h
index 2aef06892..16484a78b 100644
--- a/include/f_pc/f_pc_fstcreate_req.h
+++ b/include/f_pc/f_pc_fstcreate_req.h
@@ -9,7 +9,7 @@ typedef struct layer_class layer_class;
 typedef int (*fstCreateFunc)(void*, void*);
 
 typedef struct fast_create_request {
-    /* 0x00 */ create_request mBase;
+    /* 0x00 */ create_request base;
     /* 0x48 */ fstCreateFunc mpFastCreateFunc;
     /* 0x4C */ void* mpFastCreateData;
 } fast_create_request;  // Size: 0x50
diff --git a/include/f_pc/f_pc_leaf.h b/include/f_pc/f_pc_leaf.h
index d2664fd76..3f79104ca 100644
--- a/include/f_pc/f_pc_leaf.h
+++ b/include/f_pc/f_pc_leaf.h
@@ -8,12 +8,12 @@
 #include "f_pc/f_pc_profile.h"
 
 typedef struct leafdraw_method_class {
-    /* 0x00 */ process_method_class mBase;
+    /* 0x00 */ process_method_class base;
     /* 0x10 */ process_method_func mpDrawFunc;
 } leafdraw_method_class;
 
 typedef struct leafdraw_class {
-    /* 0x00 */ base_process_class mBase;
+    /* 0x00 */ base_process_class base;
     /* 0xB8 */ leafdraw_method_class* mpDrawMtd;
     /* 0xBC */ s8 mbUnk0;
     /* 0xBD */ u8 mbUnk1;
@@ -21,8 +21,8 @@ typedef struct leafdraw_class {
 } leafdraw_class;
 
 typedef struct leaf_process_profile_definition {
-    /* 0x00 */ process_profile_definition mBase;
-    /* 0x1C */ leafdraw_method_class* mSubMtd; // Subclass methods
+    /* 0x00 */ process_profile_definition base;
+    /* 0x1C */ leafdraw_method_class* sub_method; // Subclass methods
     /* 0x20 */ s16 mPriority; // mDrawPriority
 } leaf_process_profile_definition;
 
diff --git a/include/f_pc/f_pc_line_tag.h b/include/f_pc/f_pc_line_tag.h
index 299c6145e..0226a2e61 100644
--- a/include/f_pc/f_pc_line_tag.h
+++ b/include/f_pc/f_pc_line_tag.h
@@ -5,7 +5,7 @@
 #include "SSystem/SComponent/c_tag.h"
 
 typedef struct line_tag {
-    create_tag_class mBase;
+    create_tag_class base;
     s32 mLineListID;
 } line_tag;
 
diff --git a/include/f_pc/f_pc_node.h b/include/f_pc/f_pc_node.h
index c3c8a8c89..c055a30b9 100644
--- a/include/f_pc/f_pc_node.h
+++ b/include/f_pc/f_pc_node.h
@@ -8,12 +8,12 @@
 #include "f_pc/f_pc_profile.h"
 
 typedef struct nodedraw_method_class {
-    process_method_class mBase;
+    process_method_class base;
     process_method_func mpDrawFunc;
 } nodedraw_method_class;
 
 typedef struct process_node_class {
-    /* 0x00 */ base_process_class mBase;
+    /* 0x00 */ base_process_class base;
     /* 0xB8 */ nodedraw_method_class* mpNodeMtd;
     /* 0xBC */ layer_class mLayer;
     /* 0xE8 */ node_list_class mLayerNodeLists[16];
@@ -21,8 +21,8 @@ typedef struct process_node_class {
 } process_node_class;
 
 typedef struct node_process_profile_definition {
-    /* 0x00 */ process_profile_definition mBase;
-    /* 0x1C */ process_method_class* mSubMtd; // Subclass methods
+    /* 0x00 */ process_profile_definition base;
+    /* 0x1C */ process_method_class* sub_method; // Subclass methods
 } node_process_profile_definition;
 
 s32 fpcNd_DrawMethod(nodedraw_method_class* pNodeMethod, void* pData);
diff --git a/include/f_pc/f_pc_node_req.h b/include/f_pc/f_pc_node_req.h
index a99c22d02..d8a3c1125 100644
--- a/include/f_pc/f_pc_node_req.h
+++ b/include/f_pc/f_pc_node_req.h
@@ -38,7 +38,7 @@ typedef struct node_create_request {
 } node_create_request;  // Size: 0x64
 
 typedef struct request_node_class {
-    node_class mBase;
+    node_class base;
     node_create_request* mNodeCrReq;
 } request_node_class;
 
diff --git a/include/f_pc/f_pc_priority.h b/include/f_pc/f_pc_priority.h
index d1ed8f300..cc603adcb 100644
--- a/include/f_pc/f_pc_priority.h
+++ b/include/f_pc/f_pc_priority.h
@@ -16,7 +16,7 @@ typedef struct process_priority_queue_info {
 } process_priority_queue_info;
 
 typedef struct process_priority_class {
-    /* 0x00 */ create_tag_class mBase;
+    /* 0x00 */ create_tag_class base;
     /* 0x14 */ process_method_tag_class mMtdTag;
     /* 0x30 */ process_priority_queue_info mInfoQ;
     /* 0x38 */ process_priority_queue_info mInfoCurr;
diff --git a/include/f_pc/f_pc_profile.h b/include/f_pc/f_pc_profile.h
index 7c3dd68b2..9418d9f64 100644
--- a/include/f_pc/f_pc_profile.h
+++ b/include/f_pc/f_pc_profile.h
@@ -13,7 +13,7 @@ typedef struct process_profile_definition {
     /* 0x04 */ u16 mListID;
     /* 0x06 */ u16 mListPrio;
     /* 0x08 */ s16 mProcName;
-    /* 0x0C */ process_method_class* mSubMtd; // Subclass methods
+    /* 0x0C */ process_method_class* sub_method; // Subclass methods
     /* 0x10 */ s32 mSize;
     /* 0x14 */ s32 mSizeOther;
     /* 0x18 */ s32 mParameters;
diff --git a/include/f_pc/f_pc_stdcreate_req.h b/include/f_pc/f_pc_stdcreate_req.h
index d2ec4fa6a..452ce7c84 100644
--- a/include/f_pc/f_pc_stdcreate_req.h
+++ b/include/f_pc/f_pc_stdcreate_req.h
@@ -8,7 +8,7 @@ typedef struct layer_class layer_class;
 typedef int (*stdCreateFunc)(void*, void*);
 
 typedef struct standard_create_request_class {
-    /* 0x00 */ create_request mBase;
+    /* 0x00 */ create_request base;
     /* 0x48 */ request_of_phase_process_class mPhase;
     /* 0x50 */ s16 mProcName;
     /* 0x54 */ void* mpUserData;
diff --git a/src/c/c_damagereaction.cpp b/src/c/c_damagereaction.cpp
index 946f60c6e..9dd4c3e69 100644
--- a/src/c/c_damagereaction.cpp
+++ b/src/c/c_damagereaction.cpp
@@ -32,13 +32,13 @@ BOOL ice_bg_check(enemyice* ei) {
             } else {
                 ei->mSpeed.y = 0.0f;
             }
-            if (ac->mHealth <= 0) {
+            if (ac->health <= 0) {
                 ret = TRUE;
             }
         }
     } else if (ei->mBgAcch.ChkGroundHit()) {
         ei->mSpeedF *= 0.5f;
-        if (ac->mHealth <= 0 || speedY < -40.0f + g_regHIO.mChild[0].mFloatRegs[14]) {
+        if (ac->health <= 0 || speedY < -40.0f + g_regHIO.mChild[0].mFloatRegs[14]) {
             ret = TRUE;
         }
         if (speedY < -20.0f) {
@@ -55,7 +55,7 @@ BOOL ice_bg_check(enemyice* ei) {
             } else {
                 ei->mSpeed.y = 0.0f;
             }
-            if (ac->mHealth <= 0) {
+            if (ac->health <= 0) {
                 ret = TRUE;
             }
         }
@@ -120,17 +120,17 @@ BOOL enemy_ice(enemyice* ei) {
         if (ei->mLightShrinkTimer == 1) { // Just started dying to light arrows.
             ei->mLightShrinkTimer++;
             dComIfGp_particle_set(dPa_name::ID_COMMON_LIGHT_EXPLOSION, &pos, NULL, &particleScale);
-            ac->mTevStr.mFogColor.b = 0xFF;
-            ac->mTevStr.mFogColor.g = 0xFF;
-            ac->mTevStr.mFogColor.r = 0xFF;
-            ac->mTevStr.mFogStartZ = 0.0f;
-            ac->mTevStr.mFogEndZ = 2000.0f;
+            ac->tevStr.mFogColor.b = 0xFF;
+            ac->tevStr.mFogColor.g = 0xFF;
+            ac->tevStr.mFogColor.r = 0xFF;
+            ac->tevStr.mFogStartZ = 0.0f;
+            ac->tevStr.mFogEndZ = 2000.0f;
             fopAcM_seStart(ac, JA_SE_CM_L_ARROW_SHRINK, 0);
-            ac->mAttentionInfo.mFlags &= ~fopAc_Attn_LOCKON_ENEMY_e;
+            ac->attention_info.flags &= ~fopAc_Attn_LOCKON_ENEMY_e;
         } else {
             ei->mLightShrinkTimer++;
             
-            cLib_addCalc2(&ac->mTevStr.mFogEndZ, 10.0f, 1.0f, 80.0f);
+            cLib_addCalc2(&ac->tevStr.mFogEndZ, 10.0f, 1.0f, 80.0f);
             
             mDoMtx_stack_c::transS(ac->current.pos);
             mDoMtx_stack_c::transM(0, ei->mYOffset, 0);
@@ -139,7 +139,7 @@ BOOL enemy_ice(enemyice* ei) {
             mDoMtx_stack_c::YrotM(ac->shape_angle.y);
             mDoMtx_stack_c::XrotM(ac->shape_angle.x);
             mDoMtx_stack_c::ZrotM(ac->shape_angle.z);
-            mDoMtx_stack_c::scaleM(ac->mScale);
+            mDoMtx_stack_c::scaleM(ac->scale);
             
             if (ei->mLightShrinkTimer < (s8)(70 + g_regHIO.mChild[14].mShortRegs[1])) {
                 cLib_addCalc0(&ei->mScaleXZ, 0.1f, 0.01f + g_regHIO.mChild[14].mFloatRegs[0]);
@@ -158,12 +158,12 @@ BOOL enemy_ice(enemyice* ei) {
                     if (fopAcM_GetName(ac) != PROC_PZ) {
                         // If the actor is not Princess Zelda, drop an item ball.
                         // TODO: Why the Zelda check? Is she coded to be able to die to Light Arrows?
-                        fopAcM_createIball(&pos, ac->mItemTableIdx, fopAcM_GetRoomNo(ac), &ac->current.angle, ac->mStealItemBitNo);
+                        fopAcM_createIball(&pos, ac->itemTableIdx, fopAcM_GetRoomNo(ac), &ac->current.angle, ac->stealItemBitNo);
                     }
                     if (ei->mDeathSwitch != 0) {
                         dComIfGs_onSwitch(ei->mDeathSwitch, fopAcM_GetRoomNo(ac));
                     }
-                    ac->mHealth = -0x80;
+                    ac->health = -0x80;
                 }
             }
         }
@@ -205,8 +205,8 @@ BOOL enemy_ice(enemyice* ei) {
                 ei->mSpeed.y = 30.0f;
                 ei->mAngularVelY = (s16)cM_rndFX(3000.0f);
             }
-            ac->mHealth -= 4;
-            if (ac->mHealth <= 0) {
+            ac->health -= 4;
+            if (ac->health <= 0) {
                 // If the enemy died instantly upon being frozen, don't let it fall and shatter instantly.
                 // Instead add a short delay where it will simply stay frozen in the air to emphasize that it froze.
                 ei->mMoveDelayTimer = 40;
@@ -226,10 +226,10 @@ BOOL enemy_ice(enemyice* ei) {
         frozen = TRUE;
         moveAndCollide = TRUE;
         if (ei->m00C != 1) {
-            ac->mAttentionInfo.mFlags |= fopAc_Attn_ACTION_CARRY_e;
-            ac->mAttentionInfo.mDistances[4] = 0x12;
+            ac->attention_info.flags |= fopAc_Attn_ACTION_CARRY_e;
+            ac->attention_info.distances[4] = 0x12;
             if (fopAcM_checkStatus(ac, fopAcStts_CARRY_e)) {
-                ac->mAttentionInfo.mFlags &= ~fopAc_Attn_ACTION_CARRY_e;
+                ac->attention_info.flags &= ~fopAc_Attn_ACTION_CARRY_e;
                 ei->mState = 3;
                 if (ei->m00C == 2) {
                     ei->m00C = 0;
@@ -336,7 +336,7 @@ BOOL enemy_ice(enemyice* ei) {
                 }
                 
                 fopAcM_seStart(ac, JA_SE_CM_ICE_BREAK, 0);
-                fopAcM_createIball(&pos, ac->mItemTableIdx, fopAcM_GetRoomNo(ac), &ac->current.angle, ac->mStealItemBitNo);
+                fopAcM_createIball(&pos, ac->itemTableIdx, fopAcM_GetRoomNo(ac), &ac->current.angle, ac->stealItemBitNo);
                 ei->mFreezeTimer = 0;
                 if (ei->mDeathSwitch != 0) {
                     dComIfGs_onSwitch(ei->mDeathSwitch, fopAcM_GetRoomNo(ac));
@@ -360,7 +360,7 @@ BOOL enemy_ice(enemyice* ei) {
                 } else {
                     fopAcM_delete(ac);
                     fopAcM_onActor(ac);
-                    ac->mHealth = -0x80;
+                    ac->health = -0x80;
                 }
             }
             
@@ -392,7 +392,7 @@ BOOL enemy_ice(enemyice* ei) {
         mDoMtx_stack_c::YrotM(ac->shape_angle.y);
         mDoMtx_stack_c::XrotM(ac->shape_angle.x);
         mDoMtx_stack_c::ZrotM(ac->shape_angle.z);
-        mDoMtx_stack_c::scaleM(ac->mScale);
+        mDoMtx_stack_c::scaleM(ac->scale);
         fopAcM_OnStatus(ac, fopAcStts_FREEZE_e);
     } else {
         fopAcM_OffStatus(ac, fopAcStts_FREEZE_e);
@@ -591,7 +591,7 @@ void enemy_fire_remove(enemyfire* ef) {
 /* 8001D428-8001D48C       .text enemy_piyo_set__FP10fopAc_ac_c */
 void enemy_piyo_set(fopAc_ac_c* enemy) {
     // Creates the rotating stars particle for when an enemy is stunned.
-    dComIfGp_particle_set(dPa_name::ID_COMMON_STARS_SPIN, &enemy->mAttentionInfo.mPosition);
+    dComIfGp_particle_set(dPa_name::ID_COMMON_STARS_SPIN, &enemy->attention_info.position);
 }
 
 /* 8001D48C-8001D890       .text wall_angle_get__FP10fopAc_ac_cs */
diff --git a/src/d/actor/d_a_agb.cpp b/src/d/actor/d_a_agb.cpp
index c1497b43a..f49ccab8d 100644
--- a/src/d/actor/d_a_agb.cpp
+++ b/src/d/actor/d_a_agb.cpp
@@ -594,12 +594,12 @@ daAgb_c::uploadFunc daAgb_c::uploadFuncTable[] = {
 
 /* 800D02E8-800D0364       .text modeLoad__7daAgb_cFv */
 void daAgb_c::modeLoad() {
-    if (mEvtInfo.checkCommandTalk()) {
+    if (eventInfo.checkCommandTalk()) {
         uploadFunc func = uploadFuncTable[mUploadAction];
         (this->*func)();
     } else {
         mUploadAction  = UpAct_UNK0;
-        mEvtInfo.onCondition(dEvtCnd_CANTALK_e);
+        eventInfo.onCondition(dEvtCnd_CANTALK_e);
         mMode = 0;
     }
 }
@@ -608,7 +608,7 @@ void daAgb_c::modeLoad() {
 void daAgb_c::modeLookAttention() {
     static bool se_flag = false;
 
-    if (mEvtInfo.checkCommandDemoAccrpt()) {
+    if (eventInfo.checkCommandDemoAccrpt()) {
         if (!se_flag) {
             fopAcM_seStart(this, JA_SE_CV_CHI_MEGAHORN, 0);
             se_flag = true;
@@ -1305,7 +1305,7 @@ void daAgb_c::CursorMove(fopAc_ac_c* actor, u32 stage_type) {
     }
     
     int roomNo = dComIfG_Bgsp()->GetRoomId(mCrrPos.mGndChk);
-    actor->current.roomNo = actor->mTevStr.mRoomNo = roomNo;
+    actor->current.roomNo = actor->tevStr.mRoomNo = roomNo;
     if (roomNo != player->current.roomNo) {
         return;
     }
@@ -1356,7 +1356,7 @@ void daAgb_c::modeMove() {
     stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo();
     u16 stage_type = dStage_stagInfo_GetSTType(stag_info);
     
-    if (mEvtInfo.checkCommandTalk()) {
+    if (eventInfo.checkCommandTalk()) {
         mUploadAction  = UpAct_UNK0;
         mMode = 2;
         return;
@@ -1420,14 +1420,14 @@ void daAgb_c::modeMove() {
         ) {
             mMode = 1;
             offActive();
-            mEyePos = current.pos;
+            eyePos = current.pos;
             
-            cXyz sp3c = mEyePos - player->current.pos;
+            cXyz sp3c = eyePos - player->current.pos;
             if (sp3c.absXZ() < 10.0f) {
-                mEyePos.x += 10.0f * cM_ssin(player->shape_angle.y);
-                mEyePos.z += 10.0f * cM_scos(player->shape_angle.y);
+                eyePos.x += 10.0f * cM_ssin(player->shape_angle.y);
+                eyePos.z += 10.0f * cM_scos(player->shape_angle.y);
             }
-            mAttentionInfo.mPosition = mEyePos;
+            attention_info.position = eyePos;
             
             if (isHold()) {
                 s16 angle = fopAcM_searchPlayerAngleY(this);
@@ -1437,7 +1437,7 @@ void daAgb_c::modeMove() {
                 shape_angle.z = angle;
             } else {
                 shape_angle.y = fopAcM_searchPlayerAngleY(this);
-                shape_angle.x = cM_atan2s((player->mEyePos - mEyePos).absXZ(), player->mEyePos.y - mEyePos.y);
+                shape_angle.x = cM_atan2s((player->eyePos - eyePos).absXZ(), player->eyePos.y - eyePos.y);
                 field_0x628 = 50.0f;
             }
             
@@ -1514,7 +1514,7 @@ void daAgb_c::modeMove() {
     }
     
     if (mMode == 0) {
-        mEvtInfo.onCondition(dEvtCnd_CANTALK_e);
+        eventInfo.onCondition(dEvtCnd_CANTALK_e);
     }
 }
 
@@ -1788,7 +1788,7 @@ static int daAgb_Create(fopAc_ac_c* i_this) {
         a_this->field_0x680 = true;
 
         fopAcM_setStageLayer(a_this);
-        a_this->mEvtInfo.setEventName("DEFAULT_AGB_USE");
+        a_this->eventInfo.setEventName("DEFAULT_AGB_USE");
     }
 
     return phase;
@@ -1807,7 +1807,7 @@ actor_process_profile_definition g_profile_AGB = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcLy_CURRENT_e,
     /* ProcName     */ PROC_AGB,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daAgb_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_agbsw0.cpp b/src/d/actor/d_a_agbsw0.cpp
index 74fd9bc6e..ae1866dc2 100644
--- a/src/d/actor/d_a_agbsw0.cpp
+++ b/src/d/actor/d_a_agbsw0.cpp
@@ -228,7 +228,7 @@ int daAgbsw0_c::create() {
                 return cPhs_ERROR_e;
         }
         else {
-            if(mScale.x == mScale.z) {
+            if(scale.x == scale.z) {
                 mNonCircular = false;
             }
             else {
@@ -236,18 +236,18 @@ int daAgbsw0_c::create() {
             }
 
             if(behavior == 8) {
-                mScale.x *= 8000.0f;
-                mScale.y *= 8000.0f;
-                mScale.z *= 8000.0f;
+                scale.x *= 8000.0f;
+                scale.y *= 8000.0f;
+                scale.z *= 8000.0f;
             }
             else {
-                mScale.x *= 200.0f;
-                mScale.y *= 200.0f;
-                mScale.z *= 200.0f;
+                scale.x *= 200.0f;
+                scale.y *= 200.0f;
+                scale.z *= 200.0f;
             }
 
-            mOrigScaleX = mScale.x;
-            mOrigScaleZ = mScale.z;
+            mOrigScaleX = scale.x;
+            mOrigScaleZ = scale.z;
             shape_angle.x = 0;
             shape_angle.y = current.angle.y;
             shape_angle.z = 0;
@@ -255,8 +255,8 @@ int daAgbsw0_c::create() {
             field_0x299 = 0;
             mTimer = 0;
 
-            l_cyl_src.mCylAttr.mCyl.mRadius = mScale.x;
-            l_cyl_src.mCylAttr.mCyl.mHeight = mScale.y;
+            l_cyl_src.mCylAttr.mCyl.mRadius = scale.x;
+            l_cyl_src.mCylAttr.mCyl.mHeight = scale.y;
             mStts.Init(0, 0xFF, this);
             mCyl.Set(l_cyl_src);
             mCyl.SetC(current.pos);
@@ -656,10 +656,10 @@ BOOL daAgbsw0_c::ExeSubF2() {
                 agb->home.pos.z = z;
                 agb->shape_angle.x = 0x3FFF;
                 agb->field_0x67f = true;
-                mOrigScaleX = mScale.x;
-                mOrigScaleZ = mScale.z;
-                mScale.z = 50.0f;
-                mScale.x = 50.0f;
+                mOrigScaleX = scale.x;
+                mOrigScaleZ = scale.z;
+                scale.z = 50.0f;
+                scale.x = 50.0f;
                 field_0x299 += 1;
             }
         }
@@ -1045,9 +1045,9 @@ BOOL daAgbsw0_c::ExeSubMW() {
 #endif
         static bool se_flag = 0;
 
-        mEyePos = current.pos;
-        mAttentionInfo.mPosition = current.pos;
-        if(mEvtInfo.checkCommandDemoAccrpt()) {
+        eyePos = current.pos;
+        attention_info.position = current.pos;
+        if(eventInfo.checkCommandDemoAccrpt()) {
             if(!se_flag) {
                 fopAcM_seStart(this, JA_SE_CV_CHI_MEGAHORN, 0);
                 se_flag = 1;
@@ -1055,11 +1055,11 @@ BOOL daAgbsw0_c::ExeSubMW() {
 
             dComIfGp_evmng_getMyStaffId("AGB_SW0");
             fopAc_ac_c* player = dComIfGp_getPlayer(0);
-            cXyz diff = mEyePos - player->current.pos;
+            cXyz diff = eyePos - player->current.pos;
             f32 dist = diff.absXZ();
             if(dist < 0.001f) {
-                mEyePos.x += cM_ssin(player->shape_angle.y) * 10.0f;
-                mEyePos.z += cM_scos(player->shape_angle.y) * 10.0f;
+                eyePos.x += cM_ssin(player->shape_angle.y) * 10.0f;
+                eyePos.z += cM_scos(player->shape_angle.y) * 10.0f;
             }
 
             if(dComIfGp_evmng_endCheck("DEFAULT_AGB_LOOK_ATTENTION")) {
@@ -1208,7 +1208,7 @@ BOOL daAgbsw0_c::ExeSubR() {
             }
 
             if(itemNo != RECOVER_FAIRY) {
-                current.pos.y += mScale.y / 2.0f;
+                current.pos.y += scale.y / 2.0f;
             }
 
             fopAcM_fastCreateItem(&current.pos, itemNo, fopAcM_GetHomeRoomNo(this), NULL, NULL, 0.0f, cM_rndF(10.0f) + 40.0f, -7.0f);
@@ -1317,33 +1317,33 @@ BOOL daAgbsw0_c::ExeSubB() {
                 cXyz posDiff = current.pos - agb->current.pos;
 
                 if(!mNonCircular) {
-                    f32 rad = mScale.x;
+                    f32 rad = scale.x;
                     if(xzDiff < rad - 100.0f) {
-                        if(agb->current.pos.y < current.pos.y + mScale.y / 2.0f) {
+                        if(agb->current.pos.y < current.pos.y + scale.y / 2.0f) {
                             agb->home.pos.y = current.pos.y - 6.0f;
                         }
                         else {
-                            agb->home.pos.y = current.pos.y + mScale.y + 6.0f;
+                            agb->home.pos.y = current.pos.y + scale.y + 6.0f;
                         }
                     }
                     else {
                         agb->home.pos.x = current.pos.x - (posDiff.x * (rad + 1.0f) / xzDiff);
-                        agb->home.pos.z = current.pos.z - (posDiff.z * (mScale.z + 1.0f) / xzDiff);
+                        agb->home.pos.z = current.pos.z - (posDiff.z * (scale.z + 1.0f) / xzDiff);
                     }
                 }
                 else {
                     cXyz rel;
                     fpoAcM_relativePos(this, &agb->current.pos, &rel);
-                    rel.y = rel.y - mScale.y / 2.0f + 5.0f;
-                    f32 x_diff = mScale.x - fabsf(rel.x);
-                    f32 y_diff = (mScale.y / 2.0f) - fabsf(rel.y) + 50.0f; //some register oddity here
-                    f32 z_diff = mScale.z - fabsf(rel.z);
+                    rel.y = rel.y - scale.y / 2.0f + 5.0f;
+                    f32 x_diff = scale.x - fabsf(rel.x);
+                    f32 y_diff = (scale.y / 2.0f) - fabsf(rel.y) + 50.0f; //some register oddity here
+                    f32 z_diff = scale.z - fabsf(rel.z);
                     if(y_diff < x_diff && y_diff < z_diff) {
-                        if(agb->current.pos.y < current.pos.y + mScale.y / 2.0f) {
+                        if(agb->current.pos.y < current.pos.y + scale.y / 2.0f) {
                             agb->home.pos.y = current.pos.y - 6.0f;
                         }
                         else {
-                            agb->home.pos.y = current.pos.y + mScale.y + 6.0f;
+                            agb->home.pos.y = current.pos.y + scale.y + 6.0f;
                         }
                     }
                     else {
@@ -1451,10 +1451,10 @@ BOOL daAgbsw0_c::ExeSubD() {
                         agb->home.pos.z = z;
                         agb->shape_angle.x = -0x3FFF;
                         agb->field_0x67f = true;
-                        mOrigScaleX = mScale.x;
-                        mOrigScaleZ = mScale.z;
-                        mScale.z = 50.0f;
-                        mScale.x = 50.0f;
+                        mOrigScaleX = scale.x;
+                        mOrigScaleZ = scale.z;
+                        scale.z = 50.0f;
+                        scale.x = 50.0f;
                         field_0x299 += 1;
                     }
                 }
@@ -1473,7 +1473,7 @@ BOOL daAgbsw0_c::ExeSubD() {
                 else if(field_0x299 == 2 && fopAcM_isSwitch(this, getSw1())) {
                     s32 itemNo = getParamNo();
                     if(itemNo != RECOVER_FAIRY) {
-                        current.pos.y += mScale.y / 2;
+                        current.pos.y += scale.y / 2;
                     }
                     if(0 <= itemNo && itemNo < 0x1F && itemNo != KAKERA_HEART && itemNo != UTUWA_HEART && itemNo != dItem_SMALL_KEY_e) {
                         s8 roomNo = fopAcM_GetHomeRoomNo(this);
@@ -1493,8 +1493,8 @@ BOOL daAgbsw0_c::ExeSubD() {
         }
         else {
             if(field_0x299 != 0 && field_0x299 < 3) {
-                mScale.x = mOrigScaleX;
-                mScale.z = mOrigScaleZ;
+                scale.x = mOrigScaleX;
+                scale.z = mOrigScaleZ;
                 field_0x299 = 0;
             }
         }
@@ -1609,11 +1609,11 @@ BOOL daAgbsw0_c::ExeSubFA() {
 BOOL daAgbsw0_c::HitCheck(fopAc_ac_c* param_1) {
     if(mNonCircular == false) {
         f32 y_diff = param_1->current.pos.y - current.pos.y;
-        if(-10.0f <= y_diff && y_diff <= mScale.y) {
+        if(-10.0f <= y_diff && y_diff <= scale.y) {
             f32 x_diff = fabsf(param_1->current.pos.x - current.pos.x);
-            if(x_diff < mScale.x) {
+            if(x_diff < scale.x) {
                 f32 z_diff = fabs(param_1->current.pos.z - current.pos.z);
-                if(z_diff < mScale.x && x_diff * x_diff + z_diff * z_diff < mScale.x * mScale.x) {
+                if(z_diff < scale.x && x_diff * x_diff + z_diff * z_diff < scale.x * scale.x) {
                     return true;
                 }
             }
@@ -1622,7 +1622,7 @@ BOOL daAgbsw0_c::HitCheck(fopAc_ac_c* param_1) {
     else {
         cXyz pos;
         fpoAcM_relativePos(this, &param_1->current.pos, &pos);
-        if(-10.0f <= pos.y && pos.y <= mScale.y && fabsf(pos.x) < mScale.x && fabsf(pos.z) < mScale.z) {
+        if(-10.0f <= pos.y && pos.y <= scale.y && fabsf(pos.x) < scale.x && fabsf(pos.z) < scale.z) {
             return true;
         }
     }
@@ -1634,11 +1634,11 @@ BOOL daAgbsw0_c::HitCheck(fopAc_ac_c* param_1) {
 BOOL daAgbsw0_c::HitCheck(cXyz param_1, f32 param_2) {
     if(mNonCircular == false) {
         f32 y_diff = param_1.y - current.pos.y;
-        if(-param_2 <= y_diff && y_diff <= mScale.y) {
+        if(-param_2 <= y_diff && y_diff <= scale.y) {
             f32 x_diff = fabs(param_1.x - current.pos.x);
-            if(x_diff < mScale.x) {
+            if(x_diff < scale.x) {
                 f32 z_diff = fabs(param_1.z - current.pos.z);
-                if(z_diff < mScale.x && x_diff * x_diff + z_diff * z_diff < mScale.x * mScale.x) {
+                if(z_diff < scale.x && x_diff * x_diff + z_diff * z_diff < scale.x * scale.x) {
                     return true;
                 }
             }
@@ -1647,7 +1647,7 @@ BOOL daAgbsw0_c::HitCheck(cXyz param_1, f32 param_2) {
     else {
         cXyz pos;
         fpoAcM_relativePos(this, &param_1, &pos);
-        if(-param_2 <= pos.y && pos.y <= mScale.y && (f32)fabs(pos.x) < mScale.x && (f32)fabs(pos.z) < mScale.z) {
+        if(-param_2 <= pos.y && pos.y <= scale.y && (f32)fabs(pos.x) < scale.x && (f32)fabs(pos.z) < scale.z) {
             return true;
         }
     }
@@ -2560,7 +2560,7 @@ actor_process_profile_definition g_profile_AGBSW0 = {
     7,
     fpcPi_CURRENT_e,
     PROC_AGBSW0,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(daAgbsw0_c),
     0,
     0,
diff --git a/src/d/actor/d_a_alldie.cpp b/src/d/actor/d_a_alldie.cpp
index 3a341e67c..6cfddc2c6 100644
--- a/src/d/actor/d_a_alldie.cpp
+++ b/src/d/actor/d_a_alldie.cpp
@@ -121,7 +121,7 @@ actor_process_profile_definition g_profile_ALLDIE = {
     2,
     fpcPi_CURRENT_e,
     PROC_ALLDIE,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(daAlldie_c),
     0,
     0,
diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp
index fde36b5d2..1936cfd54 100644
--- a/src/d/actor/d_a_am.cpp
+++ b/src/d/actor/d_a_am.cpp
@@ -122,7 +122,7 @@ static BOOL nodeCallBack(J3DNode* node, int param_1) {
 /* 0000021C-000002E4       .text draw_SUB__FP8am_class */
 static void draw_SUB(am_class* i_this) {
     J3DModel* model = i_this->mpMorf->getModel();
-    model->setBaseScale(i_this->mScale);
+    model->setBaseScale(i_this->scale);
     mDoMtx_stack_c::transS(i_this->current.pos);
     cMtx_YrotM(mDoMtx_stack_c::get(), i_this->shape_angle.y);
     cMtx_XrotM(mDoMtx_stack_c::get(), i_this->shape_angle.x);
@@ -131,12 +131,12 @@ static void draw_SUB(am_class* i_this) {
 
     i_this->mpMorf->calc();
 
-    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &i_this->current.pos, &i_this->mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &i_this->current.pos, &i_this->tevStr);
 }
 
 /* 000002E4-00000378       .text daAM_Draw__FP8am_class */
 static BOOL daAM_Draw(am_class* i_this) {
-    g_env_light.setLightTevColorType(i_this->mpMorf->getModel(), &i_this->mTevStr);
+    g_env_light.setLightTevColorType(i_this->mpMorf->getModel(), &i_this->tevStr);
 
     dSnap_RegistFig(DSNAP_TYPE_AM, i_this, 1.0f, 1.0f, 1.0f);
 
@@ -260,15 +260,15 @@ static BOOL medama_atari_check(am_class* i_this) {
     switch (hitObj->GetAtType()) {
     case AT_TYPE_GRAPPLING_HOOK:
         if (i_this->mCurrBckIdx != AM_BCK_SLEEP && i_this->mCurrBckIdx != AM_BCK_SLEEP_LOOP) {
-            if (i_this->mStealItemLeft > 0) {
-                i_this->mMaxHealth = 10;
-                i_this->mHealth = 10;
+            if (i_this->stealItemLeft > 0) {
+                i_this->max_health = 10;
+                i_this->health = 10;
                 atInfo.mpObj = i_this->mEyeSph.GetTgHitObj();
                 atInfo.pParticlePos = NULL;
                 cc_at_check(i_this, &atInfo);
-                i_this->mMaxHealth = 10;
-                i_this->mHealth = 10;
-                dComIfGp_particle_set(dPa_name::ID_COMMON_STARS_BLOW, &i_this->mAttentionInfo.mPosition);
+                i_this->max_health = 10;
+                i_this->health = 10;
+                dComIfGp_particle_set(dPa_name::ID_COMMON_STARS_BLOW, &i_this->attention_info.position);
             } else {
                 dComIfGp_particle_set(dPa_name::ID_COMMON_PURPLE_HIT, &hitPos);
             }
@@ -293,18 +293,18 @@ static BOOL medama_atari_check(am_class* i_this) {
         i_this->mEnemyIce.mLightShrinkTimer = 1;
         i_this->mEnemyIce.mParticleScale = 1.0f;
         i_this->mEnemyIce.mYOffset = 80.0f;
-        i_this->mAttentionInfo.mFlags = 0;
+        i_this->attention_info.flags = 0;
         break;
     case AT_TYPE_NORMAL_ARROW:
     case AT_TYPE_FIRE_ARROW:
     case AT_TYPE_ICE_ARROW:
         // Using the fopAcM_seStart inline multiple times in a single case makes the codegen not match.
         // fopAcM_seStart(i_this, JA_SE_LK_MS_WEP_HIT, 0x42);
-        mDoAud_seStart(JA_SE_LK_MS_WEP_HIT, &i_this->mEyePos, 0x42, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
+        mDoAud_seStart(JA_SE_LK_MS_WEP_HIT, &i_this->eyePos, 0x42, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
         ret = true;
         if (i_this->mCurrBckIdx == AM_BCK_SLEEP || i_this->mCurrBckIdx == AM_BCK_SLEEP_LOOP) {
             anm_init(i_this, AM_BCK_OKIRU, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1);
-            i_this->mAttentionInfo.mFlags = fopAc_Attn_LOCKON_ENEMY_e;
+            i_this->attention_info.flags = fopAc_Attn_LOCKON_ENEMY_e;
             i_this->mNeedleCyl.OnAtSPrmBit(AT_SPRM_SET);
             i_this->mNeedleCyl.OnAtHitBit();
             i_this->mAction = ACTION_DOUSA;
@@ -312,7 +312,7 @@ static BOOL medama_atari_check(am_class* i_this) {
         } else {
             dComIfGp_particle_set(0x10, &i_this->mEyeballPos, &player->shape_angle);
             // fopAcM_seStart(i_this, JA_SE_CM_AM_EYE_DAMAGE, 0);
-            mDoAud_seStart(JA_SE_CM_AM_EYE_DAMAGE, &i_this->mEyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
+            mDoAud_seStart(JA_SE_CM_AM_EYE_DAMAGE, &i_this->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
             fopAcM_monsSeStart(i_this, JA_SE_CV_AM_EYE_DAMAGE, 0x42);
             i_this->mAction = ACTION_ITAI_MOVE;
             i_this->mState = 0x28;
@@ -355,7 +355,7 @@ static void bomb_move_set(am_class* i_this, u8 alwaysMoveY) {
     }
     cLib_addCalc2(&swallowedActor->current.pos.z, mouthPos.z, 1.0f, 50.0f);
 
-    swallowedActor->mGravity = 0.0f;
+    swallowedActor->gravity = 0.0f;
     swallowedActor->speedF = 0.0f;
     swallowedActor->speed.setall(0.0f);
     swallowedActor->current.angle.setall(0);
@@ -366,19 +366,19 @@ static void bomb_move_set(am_class* i_this, u8 alwaysMoveY) {
     if (fpcM_GetName(swallowedActor) == PROC_BOMB) {
         daBomb_c* bomb = (daBomb_c*)swallowedActor;
         if (i_this->mCountDownTimers[1] == 1) {
-            bomb->mScale.setall(0.0f);
+            bomb->scale.setall(0.0f);
             bomb->setBombNoEff();
         } else if (i_this->mCountDownTimers[1] > 1) {
-            bomb->mScale.setall(1.0f);
+            bomb->scale.setall(1.0f);
         }
         bomb->setBombRestTime(100);
     } else if (fpcM_GetName(swallowedActor) == PROC_Bomb2) {
         daBomb2::Act_c* bomb2 = (daBomb2::Act_c*)swallowedActor;
         if (i_this->mCountDownTimers[1] == 1) {
-            bomb2->mScale.setall(0.0f);
+            bomb2->scale.setall(0.0f);
             bomb2->remove_fuse_effect();
         } else if (i_this->mCountDownTimers[1] > 1) {
-            bomb2->mScale.setall(1.0f);
+            bomb2->scale.setall(1.0f);
         }
         bomb2->set_time(100);
     }
@@ -481,7 +481,7 @@ static void medama_move(am_class* i_this) {
     }
 
     f32 diffX = i_this->current.pos.x - player->current.pos.x;
-    f32 diffY = i_this->mEyePos.y - player->current.pos.y;
+    f32 diffY = i_this->eyePos.y - player->current.pos.y;
     f32 diffZ = i_this->current.pos.z - player->current.pos.z;
 
     i_this->mTargetEyeRot.y = cM_atan2s(diffX, diffZ);
@@ -527,7 +527,7 @@ static void action_dousa(am_class* i_this) {
             if (Line_check(i_this, player->current.pos)) {
                 anm_init(i_this, AM_BCK_OKIRU, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1);
                 fopAcM_monsSeStart(i_this, JA_SE_CV_AM_AWAKE, 0);
-                i_this->mAttentionInfo.mFlags = fopAc_Attn_LOCKON_ENEMY_e;
+                i_this->attention_info.flags = fopAc_Attn_LOCKON_ENEMY_e;
                 i_this->mNeedleCyl.OnAtSetBit();
                 i_this->mNeedleCyl.OnAtHitBit();
                 i_this->mState += 1;
@@ -546,7 +546,7 @@ static void action_dousa(am_class* i_this) {
                 fopAcM_seStart(i_this, JA_SE_CM_AM_NEEDLE_OUT, 0);
                 // Using the fopAcM_seStart inline multiple times in a single case makes the codegen not match.
                 // fopAcM_seStart(i_this, JA_SE_CM_AM_MOUTH_CLOSE, 0);
-                mDoAud_seStart(JA_SE_CM_AM_MOUTH_CLOSE, &i_this->mEyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
+                mDoAud_seStart(JA_SE_CM_AM_MOUTH_CLOSE, &i_this->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
             }
             anm_init(i_this, AM_BCK_CLOSE, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1);
             i_this->mCountDownTimers[2] = 6;
@@ -590,7 +590,7 @@ static void action_dousa(am_class* i_this) {
         break;
     case 5:
         i_this->speedF = 30.0f;
-        i_this->mGravity = -11.0f;
+        i_this->gravity = -11.0f;
         i_this->speed.y = 40.0f;
         fopAcM_monsSeStart(i_this, JA_SE_CV_AM_JUMP, 0);
         if (!Line_check(i_this, player->current.pos) || player->getDamageWaitTimer() != 0) {
@@ -632,9 +632,9 @@ static void action_dousa(am_class* i_this) {
             anm_init(i_this, AM_BCK_DAMAGE, 0.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1);
             // Using the fopAcM_seStart inline multiple times in a single case makes the codegen not match.
             // fopAcM_seStart(i_this, JA_SE_CM_AM_NEEDLE_IN, 0);
-            mDoAud_seStart(JA_SE_CM_AM_NEEDLE_IN, &i_this->mEyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
+            mDoAud_seStart(JA_SE_CM_AM_NEEDLE_IN, &i_this->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
             // fopAcM_seStart(i_this, JA_SE_CM_AM_MOUTH_OPEN, 0);
-            mDoAud_seStart(JA_SE_CM_AM_MOUTH_OPEN, &i_this->mEyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
+            mDoAud_seStart(JA_SE_CM_AM_MOUTH_OPEN, &i_this->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
             fopAcM_monsSeStart(i_this, JA_SE_CV_AM_OPEN_MOUTH, 0);
             i_this->mNeedleCyl.OffAtSetBit();
             i_this->mNeedleCyl.OffAtSetBit();
@@ -651,7 +651,7 @@ static void action_dousa(am_class* i_this) {
         break;
     case 8:
         if (i_this->mAcch.ChkGroundHit()) {
-            i_this->mGravity = -6.0f;
+            i_this->gravity = -6.0f;
             i_this->speed.y = 15.0f;
             fopAcM_seStart(i_this, JA_SE_CM_AM_JUMP_S, 0);
             i_this->mTargetAngleY = fopAcM_searchPlayerAngleY(i_this);
@@ -666,7 +666,7 @@ static void action_dousa(am_class* i_this) {
         fopAcM_seStart(i_this, JA_SE_CM_AM_NEEDLE_IN, 0);
         i_this->mNeedleCyl.OffAtSetBit();
         i_this->mNeedleCyl.OffAtSetBit();
-        i_this->mAttentionInfo.mFlags = 0;
+        i_this->attention_info.flags = 0;
         i_this->mState += 1;
         break;
     case 10:
@@ -692,7 +692,7 @@ static void action_modoru_move(am_class* i_this) {
         anm_init(i_this, AM_BCK_CLOSE_LOOP, 1.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1);
         i_this->mNeedleCyl.OnAtSetBit();
         i_this->mNeedleCyl.OnAtHitBit();
-        i_this->mGravity = -11.0f;
+        i_this->gravity = -11.0f;
         i_this->speed.y = 40.0f;
         i_this->speedF = 15.0f;
         fopAcM_monsSeStart(i_this, JA_SE_CV_AM_JUMP, 0x42);
@@ -715,7 +715,7 @@ static void action_modoru_move(am_class* i_this) {
             dComIfGp_getVibration().StartShock(1, -0x21, cXyz(0.0f, 1.0f, 0.0f));
             // The fopAcM_seStart inline makes the codegen not match.
             // fopAcM_seStart(i_this, JA_SE_CM_AM_JUMP, 0);
-            mDoAud_seStart(JA_SE_CM_AM_JUMP, &i_this->mEyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
+            mDoAud_seStart(JA_SE_CM_AM_JUMP, &i_this->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
             fopAcM_monsSeStart(i_this, JA_SE_CV_AM_JUMP, 0x42);
 
             i_this->speed.y = 40.0f;
@@ -735,7 +735,7 @@ static void action_modoru_move(am_class* i_this) {
         if (angleDiff < 0x100) {
             i_this->mNeedleCyl.OffAtSetBit();
             i_this->mNeedleCyl.OffAtSetBit();
-            i_this->mAttentionInfo.mFlags = 0;
+            i_this->attention_info.flags = 0;
             i_this->mAction = ACTION_DOUSA;
             i_this->mState = 0;
         }
@@ -760,7 +760,7 @@ static void action_handou_move(am_class* i_this) {
             fopAcM_seStart(i_this, JA_SE_CM_AM_NEEDLE_OUT, 0);
             // Using the fopAcM_seStart inline multiple times makes the codegen not match.
             // fopAcM_seStart(i_this, JA_SE_CM_AM_MOUTH_CLOSE, 0);
-            mDoAud_seStart(JA_SE_CM_AM_MOUTH_CLOSE, &i_this->mEyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
+            mDoAud_seStart(JA_SE_CM_AM_MOUTH_CLOSE, &i_this->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
             anm_init(i_this, AM_BCK_CLOSE, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1);
         }
         i_this->mState += 1;
@@ -808,7 +808,7 @@ static void action_itai_move(am_class* i_this) {
         fopAcM_seStart(i_this, JA_SE_CM_AM_NEEDLE_OUT, 0);
         // Using the fopAcM_seStart inline multiple times in a single case makes the codegen not match.
         // fopAcM_seStart(i_this, JA_SE_CM_AM_MOUTH_CLOSE, 0);
-        mDoAud_seStart(JA_SE_CM_AM_MOUTH_CLOSE, &i_this->mEyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
+        mDoAud_seStart(JA_SE_CM_AM_MOUTH_CLOSE, &i_this->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
         i_this->mState += 1;
         break;
     case 0x2B:
@@ -842,7 +842,7 @@ static void action_itai_move(am_class* i_this) {
         if (i_this->mpMorf->checkFrame(3.0f)) {
             // The fopAcM_seStart inline makes the codegen not match.
             // fopAcM_seStart(i_this, JA_SE_CM_AM_EAT_BOMB, 0);
-            mDoAud_seStart(JA_SE_CM_AM_EAT_BOMB, &i_this->mEyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
+            mDoAud_seStart(JA_SE_CM_AM_EAT_BOMB, &i_this->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
             fopAcM_monsSeStart(i_this, JA_SE_CV_AM_EAT_BOMB, 0);
         }
         if (i_this->mpMorf->checkFrame(6.0f)) {
@@ -871,7 +871,7 @@ static void action_itai_move(am_class* i_this) {
             i_this->mSmokeCbs[0].end();
             // The fopAcM_seStart inline makes the codegen not match.
             // fopAcM_seStart(i_this, JA_SE_CM_AM_JUMP, 0);
-            mDoAud_seStart(JA_SE_CM_AM_JUMP, &i_this->mEyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
+            mDoAud_seStart(JA_SE_CM_AM_JUMP, &i_this->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
             dComIfGp_particle_setToon(
                 0xA125, &i_this->mWaistPos, &i_this->shape_angle, NULL,
                 0xB9, &i_this->mSmokeCbs[0], fopAcM_GetRoomNo(i_this)
@@ -879,10 +879,10 @@ static void action_itai_move(am_class* i_this) {
             dComIfGp_getVibration().StartShock(1, -0x21, cXyz(0.0f, 1.0f, 0.0f));
             // The fopAcM_seStart inline makes the codegen not match.
             // fopAcM_seStart(i_this, JA_SE_CM_AM_JUMP_L, 0);
-            mDoAud_seStart(JA_SE_CM_AM_JUMP_L, &i_this->mEyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
+            mDoAud_seStart(JA_SE_CM_AM_JUMP_L, &i_this->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
             fopAcM_monsSeStart(i_this, JA_SE_CV_AM_JITABATA, 0);
             i_this->speed.y = 25.0f;
-            i_this->mGravity = -10.0f;
+            i_this->gravity = -10.0f;
             i_this->speedF = 10.0f;
         }
 
@@ -917,7 +917,7 @@ static void action_itai_move(am_class* i_this) {
         if (i_this->mSwallowedActorPID != fpcM_ERROR_PROCESS_ID_e) {
             fopAc_ac_c* swallowedActor = fopAcM_SearchByID(i_this->mSwallowedActorPID);
             if (swallowedActor) {
-                swallowedActor->mScale.setall(1.0f);
+                swallowedActor->scale.setall(1.0f);
                 if (fpcM_GetName(swallowedActor) == PROC_BOMB) {
                     daBomb_c* bomb = (daBomb_c*)swallowedActor;
                     bomb->setBombRestTime(1);
@@ -931,7 +931,7 @@ static void action_itai_move(am_class* i_this) {
         fopAcM_seStart(i_this, JA_SE_CM_AM_EXPLODE, 0);
         // Using the fopAcM_seStart inline multiple times in a single case makes the codegen not match.
         // fopAcM_seStart(i_this, JA_SE_LK_LAST_HIT, 0);
-        mDoAud_seStart(JA_SE_LK_LAST_HIT, &i_this->mEyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
+        mDoAud_seStart(JA_SE_LK_LAST_HIT, &i_this->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
 
         fopAcM_createDisappear(i_this, &centerPos, 5);
         fopAcM_onActor(i_this);
@@ -1025,17 +1025,17 @@ static BOOL daAM_Execute(am_class* i_this) {
     MtxPosition(&offset, &rotOffset);
     i_this->speed.x = rotOffset.x;
     i_this->speed.z = rotOffset.z;
-    i_this->speed.y += i_this->mGravity;
+    i_this->speed.y += i_this->gravity;
     if (i_this->speed.y < -100.0f) {
         i_this->speed.y = -100.0f;
     }
 
     body_atari_check(i_this);
 
-    i_this->mAttentionInfo.mPosition = i_this->current.pos;
-    i_this->mAttentionInfo.mPosition.y += 330.0f;
-    i_this->mEyePos = i_this->current.pos;
-    i_this->mEyePos.y += 250.0f;
+    i_this->attention_info.position = i_this->current.pos;
+    i_this->attention_info.position.y += 330.0f;
+    i_this->eyePos = i_this->current.pos;
+    i_this->eyePos.y += 250.0f;
 
     cXyz needlePos = i_this->current.pos;
 
@@ -1127,7 +1127,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) {
     };
     i_this->mEyeJntHit = JntHit_create(i_this->mpMorf->getModel(), search_data, ARRAY_SIZE(search_data));
     if (i_this->mEyeJntHit) {
-        i_this->mJntHit = i_this->mEyeJntHit;
+        i_this->jntHit = i_this->mEyeJntHit;
     } else {
         return FALSE;
     }
@@ -1147,7 +1147,7 @@ static s32 daAM_Create(fopAc_ac_c* i_actor) {
             return cPhs_ERROR_e;
         }
 
-        i_this->mStealItemLeft = 3;
+        i_this->stealItemLeft = 3;
 
         i_this->mSmokeCbs[0].setRateOff(0);
         i_this->mSmokeCbs[1].setRateOff(0);
@@ -1186,14 +1186,14 @@ static s32 daAM_Create(fopAc_ac_c* i_actor) {
             fopAcM_OffStatus(i_this, fopAcStts_SHOWMAP_e);
         }
 
-        i_this->mItemTableIdx = dComIfGp_CharTbl()->GetNameIndex("amos", 0);
-        i_this->mMaxHealth = 10;
-        i_this->mHealth = 10;
+        i_this->itemTableIdx = dComIfGp_CharTbl()->GetNameIndex("amos", 0);
+        i_this->max_health = 10;
+        i_this->health = 10;
 
         fopAcM_SetMtx(i_this, i_this->mpMorf->mpModel->getBaseTRMtx());
         fopAcM_setCullSizeBox(i_this, -100.0f, -10.0f, -80.0f, 120.0f, 400.0f, 100.0f);
 
-        i_this->mAttentionInfo.mFlags = 0;
+        i_this->attention_info.flags = 0;
 
         i_this->mAcch.Set(
             fopAcM_GetPosition_p(i_this), fopAcM_GetOldPosition_p(i_this),
@@ -1201,7 +1201,7 @@ static s32 daAM_Create(fopAc_ac_c* i_actor) {
         );
         i_this->mStts.Init(254, 1, i_this);
 
-        i_this->mGravity = -10.0f;
+        i_this->gravity = -10.0f;
 
         i_this->mEnemyIce.mpActor = i_this;
         i_this->mEnemyIce.mWallRadius = 80.0f;
@@ -1359,7 +1359,7 @@ actor_process_profile_definition g_profile_AM = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_AM,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(am_class),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp
index 4aa5b3f45..f2ee1ea9f 100644
--- a/src/d/actor/d_a_am2.cpp
+++ b/src/d/actor/d_a_am2.cpp
@@ -100,7 +100,7 @@ static BOOL nodeCallBack(J3DNode* node, int param_1) {
 /* 000001B0-00000278       .text draw_SUB__FP9am2_class */
 static void draw_SUB(am2_class* i_this) {
     J3DModel* model = i_this->mpMorf->getModel();
-    model->setBaseScale(i_this->mScale);
+    model->setBaseScale(i_this->scale);
     mDoMtx_stack_c::transS(i_this->current.pos);
     cMtx_YrotM(mDoMtx_stack_c::get(), i_this->shape_angle.y);
     cMtx_XrotM(mDoMtx_stack_c::get(), i_this->shape_angle.x);
@@ -109,13 +109,13 @@ static void draw_SUB(am2_class* i_this) {
 
     i_this->mpMorf->calc();
 
-    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &i_this->current.pos, &i_this->mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &i_this->current.pos, &i_this->tevStr);
 }
 
 /* 00000278-00000374       .text daAM2_Draw__FP9am2_class */
 static BOOL daAM2_Draw(am2_class* i_this) {
     J3DModel* model = i_this->mpMorf->getModel();
-    g_env_light.setLightTevColorType(model, &i_this->mTevStr);
+    g_env_light.setLightTevColorType(model, &i_this->tevStr);
 
     dSnap_RegistFig(DSNAP_TYPE_AM2, i_this, 1.0f, 1.0f, 1.0f);
     
@@ -168,14 +168,14 @@ static BOOL medama_atari_check(am2_class* i_this) {
 
             if (hitObj->ChkAtType(AT_TYPE_GRAPPLING_HOOK)) {
                 if (i_this->mCurrBckIdx != AM2_BCK_SLEEP) {
-                    if (i_this->mStealItemLeft > 0) {
-                        s8 origHealth = i_this->mHealth;
-                        i_this->mHealth = 10;
+                    if (i_this->stealItemLeft > 0) {
+                        s8 origHealth = i_this->health;
+                        i_this->health = 10;
                         atInfo.mpObj = i_this->mEyeSph.GetTgHitObj();
                         atInfo.pParticlePos = NULL;
                         cc_at_check(i_this, &atInfo);
-                        i_this->mHealth = origHealth;
-                        dComIfGp_particle_set(dPa_name::ID_COMMON_STARS_BLOW, &i_this->mAttentionInfo.mPosition);
+                        i_this->health = origHealth;
+                        dComIfGp_particle_set(dPa_name::ID_COMMON_STARS_BLOW, &i_this->attention_info.position);
                     } else {
                         dComIfGp_particle_set(dPa_name::ID_COMMON_PURPLE_HIT, &hitPos);
                     }
@@ -189,7 +189,7 @@ static BOOL medama_atari_check(am2_class* i_this) {
                 i_this->mEnemyIce.mLightShrinkTimer = 1;
                 i_this->mEnemyIce.mParticleScale = 1.0f;
                 i_this->mEnemyIce.mYOffset = 80.0f;
-                i_this->mAttentionInfo.mFlags = 0;
+                i_this->attention_info.flags = 0;
                 return TRUE;
             }
             
@@ -197,7 +197,7 @@ static BOOL medama_atari_check(am2_class* i_this) {
                 ret = true;
                 if (i_this->mCurrBckIdx == AM2_BCK_SLEEP) {
                     anm_init(i_this, AM2_BCK_WAIT, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1);
-                    i_this->mAttentionInfo.mFlags = fopAc_Attn_LOCKON_ENEMY_e;
+                    i_this->attention_info.flags = fopAc_Attn_LOCKON_ENEMY_e;
                     fopAcM_OnStatus(i_this, fopAcStts_SHOWMAP_e);
                     i_this->mNeedleCyl.OnAtSetBit();
                     i_this->mNeedleCyl.OnAtHitBit();
@@ -208,7 +208,7 @@ static BOOL medama_atari_check(am2_class* i_this) {
                     dComIfGp_particle_set(0x10, &hitPos, &player->shape_angle);
                     // Using the fopAcM_seStart inline breaks the codegen.
                     // fopAcM_seStart(i_this, JA_SE_CM_AM2_PARALYZED, 0);
-                    mDoAud_seStart(JA_SE_CM_AM2_PARALYZED, &i_this->mEyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
+                    mDoAud_seStart(JA_SE_CM_AM2_PARALYZED, &i_this->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
                     fopAcM_monsSeStart(i_this, JA_SE_CV_AM2_PARALYZED, 0x42);
                     i_this->mAction = ACTION_MAHI;
                     i_this->mState = 10;
@@ -248,7 +248,7 @@ static BOOL week_atari_check(am2_class* i_this) {
                 i_this->mEnemyIce.mLightShrinkTimer = 1;
                 i_this->mEnemyIce.mParticleScale = 1.0f;
                 i_this->mEnemyIce.mYOffset = 80.0f;
-                actor->mAttentionInfo.mFlags = 0;
+                actor->attention_info.flags = 0;
                 return TRUE;
             }
             
@@ -322,7 +322,7 @@ static BOOL week_atari_check(am2_class* i_this) {
                 i_this->mAction = ACTION_ITAI;
                 i_this->mState = 0x14;
                 if (i_this->m2CE == 7 || i_this->m2CE == 8) {
-                    actor->mHealth = 0;
+                    actor->health = 0;
                 }
             }
             return TRUE;
@@ -423,7 +423,7 @@ static BOOL naraku_check(am2_class* i_this) {
         if (i_this->current.pos.y < -500.0f || i_this->mInAbyssTimer > 50) {
             i_this->speedF = 0.0f;
             i_this->speed.setall(0.0f);
-            i_this->mGravity = 0.0f;
+            i_this->gravity = 0.0f;
             return TRUE;
         }
     }
@@ -457,7 +457,7 @@ static BOOL naraku_check(am2_class* i_this) {
         if (i_this->current.pos.y < i_this->mAcch.m_wtr.GetHeight() - waterSinkDepth) {
             i_this->speedF = 0.0f;
             i_this->speed.setall(0.0f);
-            i_this->mGravity = 0.0f;
+            i_this->gravity = 0.0f;
             return TRUE;
         }
     } else if (i_this->mbMadeWaterSplash) {
@@ -499,7 +499,7 @@ static void action_dousa(am2_class* i_this) {
             cXyz centerPos = player->current.pos;
             centerPos.y += 100.0f + g_regHIO.mChild[12].mFloatRegs[19];
             if (Line_check(i_this, centerPos)) {
-                i_this->mAttentionInfo.mFlags = fopAc_Attn_LOCKON_ENEMY_e;
+                i_this->attention_info.flags = fopAc_Attn_LOCKON_ENEMY_e;
                 fopAcM_OnStatus(i_this, fopAcStts_SHOWMAP_e);
                 anm_init(i_this, AM2_BCK_START, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1);
                 fopAcM_monsSeStart(i_this, JA_SE_CV_AM2_AWAKE, 0);
@@ -532,7 +532,7 @@ static void action_dousa(am2_class* i_this) {
             i_this->mNeedleCyl.OnAtHitBit();
             i_this->mNeedleCyl.OnTgSetBit();
             i_this->mTargetAngleY = fopAcM_searchPlayerAngleY(i_this);
-            i_this->mGravity = -3.0f;
+            i_this->gravity = -3.0f;
             i_this->speed.y = 12.0f;
             if (i_this->mCurrBckIdx != AM2_BCK_JUMP) {
                 anm_init(i_this, AM2_BCK_JUMP, 2.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1);
@@ -542,7 +542,7 @@ static void action_dousa(am2_class* i_this) {
         break;
     case 4:
         if (i_this->mAcch.ChkGroundHit()) {
-            i_this->mGravity = -3.0f;
+            i_this->gravity = -3.0f;
             i_this->speed.y = 12.0f;
             fopAcM_seStart(i_this, JA_SE_CM_AM2_LANDING, 0);
             i_this->mState = 3;
@@ -565,7 +565,7 @@ static void action_dousa(am2_class* i_this) {
             i_this->mSmokeCb.end();
             // Using the fopAcM_seStart inline multiple times in a single case makes the codegen not match.
             // fopAcM_seStart(i_this, JA_SE_CM_AM_JUMP_S, 0);
-            mDoAud_seStart(JA_SE_CM_AM_JUMP_S, &i_this->mEyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
+            mDoAud_seStart(JA_SE_CM_AM_JUMP_S, &i_this->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
             
             dComIfGp_particle_setToon(0xA125, &i_this->current.pos, &i_this->shape_angle, NULL, 0xB9, &i_this->mSmokeCb, fopAcM_GetRoomNo(i_this));
             if (i_this->mSmokeCb.getEmitter()) {
@@ -579,7 +579,7 @@ static void action_dousa(am2_class* i_this) {
                 i_this->mState = 3;
             } else {
                 i_this->speedF = 9.0f;
-                i_this->mGravity = -8.0f;
+                i_this->gravity = -8.0f;
                 i_this->speed.y = 20.0f;
                 i_this->mCountUpTimers[1] = 0;
                 if (!Line_check(i_this, rotOffset) || player->getDamageWaitTimer() != 0) {
@@ -670,7 +670,7 @@ static void action_mahi(am2_class* i_this) {
         break;
     case 0xC:
         if (i_this->mCountDownTimers[3] == 0 || i_this->mCountDownTimers[3] > 3) {
-            actor->mAttentionInfo.mFlags |= fopAc_Attn_ACTION_CARRY_e;
+            actor->attention_info.flags |= fopAc_Attn_ACTION_CARRY_e;
         }
         if (naraku_check(i_this)) {
             if (i_this->mbNotInHomeRoom) {
@@ -691,7 +691,7 @@ static void action_mahi(am2_class* i_this) {
                 i_this->mPickedUpYPos = actor->current.pos.y;
                 fopAcM_OffStatus(actor, fopAcStts_SHOWMAP_e);
                 actor->current.angle.y = player->shape_angle.y;
-                actor->mGravity = 0.0f;
+                actor->gravity = 0.0f;
                 actor->speed.setall(0.0f);
                 actor->speedF = 0.0f;
                 i_this->mbNotInHomeRoom = false;
@@ -712,13 +712,13 @@ static void action_mahi(am2_class* i_this) {
             i_this->mAcchRadius = 40.0f + g_regHIO.mChild[8].mFloatRegs[10];
             i_this->mBodyCyl.OnCoSetBit();
             if (actor->speedF > 0.0f) {
-                actor->mGravity = -5.0f;
+                actor->gravity = -5.0f;
                 actor->speed.y = 25.0f;
                 actor->speedF = 35.0f;
                 i_this->mAcch.OnLineCheck();
                 i_this->mState = 0xE;
             } else {
-                actor->mGravity = -3.0f;
+                actor->gravity = -3.0f;
                 i_this->mCountUpTimers[1] = 1;
                 i_this->mState = 0xC;
             }
@@ -759,7 +759,7 @@ static void action_mahi(am2_class* i_this) {
                     
                     actor->speedF = 7.0f;
                     actor->speed.y = 25.0f;
-                    actor->mGravity = -14.0f;
+                    actor->gravity = -14.0f;
                     i_this->mCountUpTimers[0]++;
                 } else {
                     actor->speedF = 0.0f;
@@ -784,8 +784,8 @@ static void action_mahi(am2_class* i_this) {
         
         actor->shape_angle.y += 0x1000;
         if (i_this->mAcch.ChkGroundHit()) {
-            actor->mGravity = -3.0f;
-            actor->mAttentionInfo.mFlags = fopAc_Attn_LOCKON_ENEMY_e;
+            actor->gravity = -3.0f;
+            actor->attention_info.flags = fopAc_Attn_LOCKON_ENEMY_e;
             fopAcM_OnStatus(actor, fopAcStts_SHOWMAP_e);
             i_this->mAction = ACTION_DOUSA;
             i_this->mState = 3;
@@ -809,8 +809,8 @@ static void action_mahi(am2_class* i_this) {
             
             if (fopAcM_checkStatus(actor, fopAcStts_CARRY_e)) {
                 fopAcM_cancelCarryNow(actor);
-                actor->mAttentionInfo.mFlags &= ~fopAc_Attn_ACTION_CARRY_e;
-                actor->mGravity = -4.0f;
+                actor->attention_info.flags &= ~fopAc_Attn_ACTION_CARRY_e;
+                actor->gravity = -4.0f;
                 actor->speed.y = 20.0f;
             }
             
@@ -821,7 +821,7 @@ static void action_mahi(am2_class* i_this) {
             if (i_this->mCurrBckIdx != AM2_BCK_BURUBURU) {
                 anm_init(i_this, AM2_BCK_BURUBURU, 1.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, -1);
                 i_this->mCountDownTimers[3] = 20*30;
-                actor->mAttentionInfo.mFlags &= ~fopAc_Attn_ACTION_CARRY_e;
+                actor->attention_info.flags &= ~fopAc_Attn_ACTION_CARRY_e;
                 fopAcM_seStart(i_this, JA_SE_CM_AM2_RECOVER, 0);
                 fopAcM_monsSeStart(actor, JA_SE_CV_AM2_AWAKE, 0);
             }
@@ -829,10 +829,10 @@ static void action_mahi(am2_class* i_this) {
             if (i_this->mCountDownTimers[3] == 1) {
                 if (fopAcM_checkStatus(actor, fopAcStts_CARRY_e)) {
                     fopAcM_cancelCarryNow(actor);
-                    actor->mAttentionInfo.mFlags &= ~fopAc_Attn_ACTION_CARRY_e;
+                    actor->attention_info.flags &= ~fopAc_Attn_ACTION_CARRY_e;
                 }
                 fopAcM_OnStatus(actor, fopAcStts_SHOWMAP_e);
-                actor->mGravity = -4.0f;
+                actor->gravity = -4.0f;
                 actor->speed.y = 20.0f;
                 i_this->mBodyCyl.OnCoSetBit();
                 i_this->mState = 0xF;
@@ -864,7 +864,7 @@ static void action_itai(am2_class* i_this) {
         fopAcM_monsSeStart(i_this, JA_SE_CV_AM2_DAMAGE, 0x42);
         dComIfGp_particle_set(0x81AE, &i_this->mWeakPos, &i_this->shape_angle);
         
-        if (i_this->mHealth > 0) {
+        if (i_this->health > 0) {
             anm_init(i_this, AM2_BCK_DAMAGE, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1);
             if (i_this->mCountDownTimers[2] > 5) {
                 i_this->speedF = 5.0f;
@@ -878,7 +878,7 @@ static void action_itai(am2_class* i_this) {
         cLib_addCalc0(&i_this->speedF, 0.5f, 1.0f);
         if (i_this->speedF < 0.2f) {
             i_this->speedF = 0.0f;
-            i_this->mGravity = -3.0f;
+            i_this->gravity = -3.0f;
             if (i_this->mCountDownTimers[2] < 5) {
                 i_this->mAction = ACTION_DOUSA;
                 i_this->mState = 3;
@@ -904,7 +904,7 @@ static void action_itai(am2_class* i_this) {
         i_this->mNeedleCyl.OnAtSetBit();
         i_this->mNeedleCyl.OnAtHitBit();
         i_this->speed.y = 25.0f;
-        i_this->mGravity = -10.0f;
+        i_this->gravity = -10.0f;
         i_this->speedF = 10.0f;
         i_this->mCountDownTimers[0] = 100;
         i_this->current.angle.y = fopAcM_searchPlayerAngleY(i_this);
@@ -931,11 +931,11 @@ static void action_itai(am2_class* i_this) {
             
             // Using the fopAcM_seStart inline multiple times in a single case makes the codegen not match.
             // fopAcM_seStart(i_this, JA_SE_CM_AM2_JUMP2, 0);
-            mDoAud_seStart(JA_SE_CM_AM2_JUMP2, &i_this->mEyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
+            mDoAud_seStart(JA_SE_CM_AM2_JUMP2, &i_this->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)));
             fopAcM_monsSeStart(i_this, JA_SE_CV_AM_JITABATA, 0x42);
             
             i_this->speed.y = 25.0f;
-            i_this->mGravity = -10.0f;
+            i_this->gravity = -10.0f;
             i_this->speedF = 10.0f;
         }
         
@@ -965,7 +965,7 @@ static void action_itai(am2_class* i_this) {
     }
     
     if (naraku_check(i_this)) {
-        if (i_this->mbNotInHomeRoom || i_this->mHealth <= 0) {
+        if (i_this->mbNotInHomeRoom || i_this->health <= 0) {
             if (i_this->mState != 0x19) {
                 anm_init(i_this, AM2_BCK_DEAD3, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1);
                 fopAcM_seStart(i_this, JA_SE_CM_AM2_BEF_EXPLODE, 0);
@@ -1006,7 +1006,7 @@ static void action_handou_move(am2_class* i_this) {
             i_this->mAction = ACTION_DOUSA;
             i_this->mState = 3;
             if (i_this->mStartsInactive == 1 && i_this->mSwitch != 0xFF && !dComIfGs_isSwitch(i_this->mSwitch, dComIfGp_roomControl_getStayNo())) {
-                i_this->mAttentionInfo.mFlags = 0;
+                i_this->attention_info.flags = 0;
                 i_this->mCountDownTimers[2] = 20*30;
                 i_this->mAction = ACTION_MAHI;
                 i_this->mState = 0xC;
@@ -1038,19 +1038,19 @@ static void action_modoru_move(am2_class* i_this) {
         i_this->mState++;
         // Fall-through
     case 0x29:
-        cLib_addCalc0(&i_this->mScale.x, 1.0f, 0.1f);
-        i_this->mScale.y = i_this->mScale.z = i_this->mScale.x;
+        cLib_addCalc0(&i_this->scale.x, 1.0f, 0.1f);
+        i_this->scale.y = i_this->scale.z = i_this->scale.x;
         
-        if (i_this->mScale.x < 0.1f) {
+        if (i_this->scale.x < 0.1f) {
             i_this->speedF = 0.0f;
             i_this->speed.setall(0.0f);
-            i_this->mGravity = -3.0f;
+            i_this->gravity = -3.0f;
             i_this->mbMadeWaterSplash = false;
             i_this->mRippleCb.end();
             
             i_this->current.angle.y = i_this->shape_angle.y;
             i_this->current.pos = i_this->mSpawnPos;
-            i_this->mScale.setall(0.0f);
+            i_this->scale.setall(0.0f);
             i_this->shape_angle.y = i_this->mSpawnRotY;
             i_this->current.angle.y = i_this->shape_angle.y;
             i_this->current.pos = i_this->mSpawnPos;
@@ -1065,12 +1065,12 @@ static void action_modoru_move(am2_class* i_this) {
         i_this->current.pos = i_this->mSpawnPos;
         i_this->mTargetAngleY = i_this->current.angle.y;
         
-        cLib_addCalc2(&i_this->mScale.x, 1.0f, 1.0f, 0.1f);
-        i_this->mScale.y = i_this->mScale.z = i_this->mScale.x;
+        cLib_addCalc2(&i_this->scale.x, 1.0f, 1.0f, 0.1f);
+        i_this->scale.y = i_this->scale.z = i_this->scale.x;
         
-        if (i_this->mScale.x > 0.9f) {
+        if (i_this->scale.x > 0.9f) {
             i_this->mCountUpTimers[1] = 0;
-            i_this->mScale.setall(1.0f);
+            i_this->scale.setall(1.0f);
             i_this->mWeakSph.OffTgSetBit();
             i_this->mNeedleCyl.OffAtSetBit();
             i_this->mNeedleCyl.OffCoSetBit();
@@ -1081,7 +1081,7 @@ static void action_modoru_move(am2_class* i_this) {
             i_this->mState = 0;
             
             if (i_this->mStartsInactive == 1 && i_this->mSwitch != 0xFF && !dComIfGs_isSwitch(i_this->mSwitch, dComIfGp_roomControl_getStayNo())) {
-                i_this->mAttentionInfo.mFlags = 0;
+                i_this->attention_info.flags = 0;
                 i_this->mCountDownTimers[2] = 20*30;
                 i_this->mAction = ACTION_MAHI;
                 i_this->mState = 0xC;
@@ -1143,15 +1143,15 @@ static BOOL daAM2_Execute(am2_class* i_this) {
     MtxPosition(&offset, &rotOffset);
     actor->speed.x = rotOffset.x;
     actor->speed.z = rotOffset.z;
-    actor->speed.y += actor->mGravity;
+    actor->speed.y += actor->gravity;
     if (actor->speed.y < -50.0f) {
         actor->speed.y = -50.0f;
     }
 
-    actor->mAttentionInfo.mPosition = actor->current.pos;
-    actor->mAttentionInfo.mPosition.y += 120.0f;
-    actor->mEyePos = i_this->mEyeballPos;
-    actor->mEyePos.y -= 15.0f + g_regHIO.mChild[8].mFloatRegs[2];
+    actor->attention_info.position = actor->current.pos;
+    actor->attention_info.position.y += 120.0f;
+    actor->eyePos = i_this->mEyeballPos;
+    actor->eyePos.y -= 15.0f + g_regHIO.mChild[8].mFloatRegs[2];
 
     i_this->mBodyCyl.SetC(i_this->current.pos);
     i_this->mBodyCyl.SetH(150.0f);
@@ -1261,7 +1261,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) {
     };
     i_this->mEyeJntHit = JntHit_create(i_this->mpMorf->getModel(), search_data, ARRAY_SIZE(search_data));
     if (i_this->mEyeJntHit) {
-        i_this->mJntHit = i_this->mEyeJntHit;
+        i_this->jntHit = i_this->mEyeJntHit;
     } else {
         return FALSE;
     }
@@ -1307,16 +1307,16 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) {
             return cPhs_ERROR_e;
         }
 
-        i_this->mItemTableIdx = dComIfGp_CharTbl()->GetNameIndex("amos2", 0);
-        i_this->mMaxHealth = 2;
-        i_this->mHealth = 2;
-        i_this->mStealItemLeft = 3;
+        i_this->itemTableIdx = dComIfGp_CharTbl()->GetNameIndex("amos2", 0);
+        i_this->max_health = 2;
+        i_this->health = 2;
+        i_this->stealItemLeft = 3;
         i_this->model = i_this->mpMorf->getModel();
         
         fopAcM_SetMtx(i_this, i_this->mpMorf->mpModel->getBaseTRMtx());
         fopAcM_setCullSizeBox(i_this, -50.0f, 0.0f, -20.0f, 60.0f, 180.0f, 60.0f);
 
-        i_this->mAttentionInfo.mFlags = 0;
+        i_this->attention_info.flags = 0;
 
         i_this->mAcch.Set(
             fopAcM_GetPosition_p(i_this), fopAcM_GetOldPosition_p(i_this),
@@ -1324,12 +1324,12 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) {
         );
         i_this->mStts.Init(254, 1, i_this);
 
-        i_this->mGravity = -3.0f;
+        i_this->gravity = -3.0f;
 
         i_this->mEnemyIce.mpActor = i_this;
         i_this->mEnemyIce.mWallRadius = 50.0f;
         i_this->mEnemyIce.mCylHeight = 100.0f;
-        i_this->mAttentionInfo.mDistances[4] = 9;
+        i_this->attention_info.distances[4] = 9;
         
         fopAcM_OnStatus(i_this, fopAcStts_UNK8000000_e);
 
@@ -1475,7 +1475,7 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) {
         draw_SUB(i_this);
         
         if (i_this->mStartsInactive == 1 && i_this->mSwitch != 0xFF && !dComIfGs_isSwitch(i_this->mSwitch, dComIfGp_roomControl_getStayNo())) {
-            i_this->mAttentionInfo.mFlags = 0;
+            i_this->attention_info.flags = 0;
             i_this->mCountDownTimers[2] = 20*30;
             i_this->mAction = ACTION_MAHI;
             i_this->mState = 0xC;
@@ -1500,7 +1500,7 @@ actor_process_profile_definition g_profile_AM2 = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_AM2,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(am2_class),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_andsw0.cpp b/src/d/actor/d_a_andsw0.cpp
index 044132450..e8577e07a 100644
--- a/src/d/actor/d_a_andsw0.cpp
+++ b/src/d/actor/d_a_andsw0.cpp
@@ -274,7 +274,7 @@ static void event_start_check(andsw0_class* i_this) {
     switch (i_this->mEventState) {
     case 0:
         if (i_this->mEventIdx != -1 && fopAcM_isSwitch(actor, i_this->mSwitchToSet)) {
-            if (actor->mEvtInfo.checkCommandDemoAccrpt()) {
+            if (actor->eventInfo.checkCommandDemoAccrpt()) {
                 i_this->mEventState++;
             } else {
                 fopAcM_orderOtherEventId(actor, i_this->mEventIdx, i_this->mEventNo);
@@ -350,7 +350,7 @@ actor_process_profile_definition g_profile_ANDSW0 = {
     7,
     fpcPi_CURRENT_e,
     PROC_ANDSW0,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(andsw0_class),
     0,
     0,
diff --git a/src/d/actor/d_a_andsw2.cpp b/src/d/actor/d_a_andsw2.cpp
index 20ae01773..6c66cf030 100644
--- a/src/d/actor/d_a_andsw2.cpp
+++ b/src/d/actor/d_a_andsw2.cpp
@@ -31,18 +31,18 @@ u8 daAndsw2_c::getEventNo() {
 /* 00000084-00000090       .text getSwbit__10daAndsw2_cFv */
 u8 daAndsw2_c::getSwbit() {
     // Switch to set.
-    return (mBase.mParameters & 0x00FF0000) >> 16;
+    return (base.mParameters & 0x00FF0000) >> 16;
 }
 
 /* 00000090-0000009C       .text getSwbit2__10daAndsw2_cFv */
 u8 daAndsw2_c::getSwbit2() {
     // First switch to check.
-    return (mBase.mParameters & 0xFF000000) >> 24;
+    return (base.mParameters & 0xFF000000) >> 24;
 }
 
 /* 0000009C-000000A8       .text getType__10daAndsw2_cFv */
 u8 daAndsw2_c::getType() {
-    return (mBase.mParameters & 0x0000FF00) >> 8;
+    return (base.mParameters & 0x0000FF00) >> 8;
 }
 
 /* 000000A8-000000B4       .text getTimer__10daAndsw2_cFv */
@@ -53,7 +53,7 @@ u8 daAndsw2_c::getTimer() {
 /* 000000B4-000000C0       .text getNum__10daAndsw2_cFv */
 u8 daAndsw2_c::getNum() {
     // Number of switches to check.
-    return (mBase.mParameters & 0x000000FF) >> 0;
+    return (base.mParameters & 0x000000FF) >> 0;
 }
 
 /* 000000C0-00000130       .text getTopSw__10daAndsw2_cFv */
@@ -129,7 +129,7 @@ static BOOL daAndsw2_actionTimer(daAndsw2_c* i_this) {
 
 /* 00000380-00000438       .text daAndsw2_actionOrder__FP10daAndsw2_c */
 static BOOL daAndsw2_actionOrder(daAndsw2_c* i_this) {
-    if (i_this->mEvtInfo.checkCommandDemoAccrpt()) {
+    if (i_this->eventInfo.checkCommandDemoAccrpt()) {
         i_this->setActio(ACT_EVENT);
         int room = i_this->current.roomNo;
         int sw = i_this->getSwbit();
@@ -267,7 +267,7 @@ actor_process_profile_definition g_profile_ANDSW2 = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_ANDSW2,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daAndsw2_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp
index e95913027..8a17982ce 100644
--- a/src/d/actor/d_a_arrow.cpp
+++ b/src/d/actor/d_a_arrow.cpp
@@ -150,7 +150,7 @@ void daArrow_c::_atHit(dCcD_GObjInf* thisObjInf, fopAc_ac_c* hitActor, dCcD_GObj
 void daArrow_c::checkCreater() {
     // Check if this arrow was fired by Princess Zelda (during the Ganondorf fight).
     fopAc_ac_c* archer;
-    if (fopAcM_SearchByID(mParentPcId, &archer)) {
+    if (fopAcM_SearchByID(parentActorID, &archer)) {
         if (fpcM_GetName(archer) == PROC_PZ) {
             mbSetByZelda = true;
         }
@@ -525,12 +525,12 @@ void daArrow_c::setRoomInfo() {
     f32 groundY = dComIfG_Bgsp()->GroundCross(&mGndChk);
     if (groundY != -1000000000.0f) {
         roomNo = dComIfG_Bgsp()->GetRoomId(mGndChk);
-        mTevStr.mEnvrIdxOverride = dComIfG_Bgsp()->GetPolyColor(mGndChk);
+        tevStr.mEnvrIdxOverride = dComIfG_Bgsp()->GetPolyColor(mGndChk);
     } else {
         roomNo = dComIfGp_roomControl_getStayNo();
     }
     
-    mTevStr.mRoomNo = roomNo;
+    tevStr.mRoomNo = roomNo;
     mStts.SetRoomId(roomNo);
     current.roomNo = roomNo;
 }
@@ -540,7 +540,7 @@ void daArrow_c::setKeepMatrix() {
     // Transform the arrow onto its archer's hand.
     if (mbSetByZelda) {
         fopNpc_npc_c* zelda;
-        fopAcM_SearchByID(mParentPcId, (fopAc_ac_c**)&zelda);
+        fopAcM_SearchByID(parentActorID, (fopAc_ac_c**)&zelda);
         
         mDoMtx_stack_c::transS(0.7f, -0.07f, -0.2f);
         mDoMtx_stack_c::XYZrotM(0x238E, 0x2CDF, 0x29BE);
@@ -1075,12 +1075,12 @@ BOOL daArrow_c::createInit() {
     
     setKeepMatrix();
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
-    mCull.mBox.mMin.x = -6.0f;
-    mCull.mBox.mMin.y = -6.0f;
-    mCull.mBox.mMin.z = 0.0f;
-    mCull.mBox.mMax.x = 6.0f;
-    mCull.mBox.mMax.y = 6.0f;
-    mCull.mBox.mMax.z = 65.0f;
+    cull.box.min.x = -6.0f;
+    cull.box.min.y = -6.0f;
+    cull.box.min.z = 0.0f;
+    cull.box.max.x = 6.0f;
+    cull.box.max.y = 6.0f;
+    cull.box.max.z = 65.0f;
     
     mStts.Init(10, 0xFF, this);
     mAtCps.Set(m_at_cps_src);
@@ -1151,15 +1151,15 @@ BOOL daArrow_c::_execute() {
         
         if (mpSparkleEmitter) {
             if (mSparkleTimer != 0) {
-                f32 scale = mSparkleTimer*2.0f;
-                if (scale > 7.0f) {
-                    scale = 7.0f;
+                f32 scaleMag = mSparkleTimer*2.0f;
+                if (scaleMag > 7.0f) {
+                    scaleMag = 7.0f;
                 }
                 mpSparkleEmitter->setGlobalTranslation(current.pos.x, current.pos.y, current.pos.z);
                 JGeometry::TVec3<f32> scaleVec;
-                scaleVec.x = scale;
-                scaleVec.y = scale;
-                scaleVec.z = scale;
+                scaleVec.x = scaleMag;
+                scaleVec.y = scaleMag;
+                scaleVec.z = scaleMag;
                 mpSparkleEmitter->setGlobalScale(scaleVec);
             } else {
                 mpSparkleEmitter->becomeInvalidEmitter();
@@ -1193,8 +1193,8 @@ BOOL daArrow_c::_execute() {
         (this->*mCurrProcFunc)();
     }
     
-    mAttentionInfo.mPosition = current.pos;
-    mEyePos = current.pos;
+    attention_info.position = current.pos;
+    eyePos = current.pos;
     setRoomInfo();
     
     return TRUE;
@@ -1206,8 +1206,8 @@ BOOL daArrow_c::_draw() {
         return TRUE;
     }
     
-    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(mpModel, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(mpModel, &tevStr);
     
     if (mArrowType != TYPE_LIGHT) {
         mpTipMat->getShape()->show();
@@ -1310,7 +1310,7 @@ actor_process_profile_definition g_profile_ARROW = {
     /* ListID       */ 9,
     /* ListPrio     */ fpcLy_CURRENT_e,
     /* ProcName     */ PROC_ARROW,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daArrow_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_arrow_iceeff.cpp b/src/d/actor/d_a_arrow_iceeff.cpp
index 96ef13d6e..c01677433 100644
--- a/src/d/actor/d_a_arrow_iceeff.cpp
+++ b/src/d/actor/d_a_arrow_iceeff.cpp
@@ -98,8 +98,8 @@ void daArrow_Iceeff_c::set_mtx() {
         }
     }
     else {
-        mScale.setall(1.0f);
-        mpModel->setBaseScale(mScale);
+        scale.setall(1.0f);
+        mpModel->setBaseScale(scale);
         mDoMtx_stack_c::transS(current.pos);
         mDoMtx_stack_c::YrotM(current.angle.y);
         mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
@@ -109,7 +109,7 @@ void daArrow_Iceeff_c::set_mtx() {
 s32 daArrow_Iceeff_c::_create() {
     fopAcM_SetupActor(this, daArrow_Iceeff_c);
 
-    void* arrow = fopAcM_SearchByID(mParentPcId);
+    void* arrow = fopAcM_SearchByID(parentActorID);
     if(arrow == 0) {
         return cPhs_ERROR_e;
     }
@@ -153,10 +153,10 @@ bool daArrow_Iceeff_c::_draw() {
     field_0xA1C->setFrame(field_0xA34);
     dComIfGd_setListP1();
 
-    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &tevStr);
     if(field_0xA38 == 0) {
         for(int i = 0; i < temp; i++) {
-            g_env_light.setLightTevColorType(field_0x298[i], &mTevStr);
+            g_env_light.setLightTevColorType(field_0x298[i], &tevStr);
 
             if(field_0xA3C == 1) {
                 mDoExt_modelUpdateDL(field_0x298[i]);
@@ -164,7 +164,7 @@ bool daArrow_Iceeff_c::_draw() {
         }
     }
     else {
-        g_env_light.setLightTevColorType(mpModel, &mTevStr);
+        g_env_light.setLightTevColorType(mpModel, &tevStr);
         J3DModelData* mdl_data = mpModel->getModelData();
         mBck.entry(mdl_data, mBck.getFrame());
         if(field_0xA3C == 1) {
@@ -193,7 +193,7 @@ static BOOL daArrow_Iceeff_Execute(void* i_this) {
 bool daArrow_Iceeff_c::_execute() {
     static cXyz ripple_scale(1.0f, 1.0f, 1.0f);
 
-    daArrow_c* arrow = static_cast<daArrow_c*>(fopAcM_SearchByID(mParentPcId));
+    daArrow_c* arrow = static_cast<daArrow_c*>(fopAcM_SearchByID(parentActorID));
     if(field_0xA38 == 0) {
         if(arrow == 0) {
             dComIfGp_particle_setP1(0x55, &current.pos, &current.angle);
@@ -306,7 +306,7 @@ actor_process_profile_definition g_profile_ARROW_ICEEFF = {
     9,
     fpcPi_CURRENT_e,
     PROC_ARROW_ICEEFF,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(daArrow_Iceeff_c),
     0,
     0,
diff --git a/src/d/actor/d_a_arrow_lighteff.cpp b/src/d/actor/d_a_arrow_lighteff.cpp
index fe8efb2fb..f54741170 100644
--- a/src/d/actor/d_a_arrow_lighteff.cpp
+++ b/src/d/actor/d_a_arrow_lighteff.cpp
@@ -14,7 +14,7 @@
 
 /* 00000078-00000108       .text setTopPos__18daArrow_Lighteff_cFv */
 void daArrow_Lighteff_c::setTopPos() {
-    daArrow_c* arrow = static_cast<daArrow_c*>(fopAcM_SearchByID(mParentPcId));
+    daArrow_c* arrow = static_cast<daArrow_c*>(fopAcM_SearchByID(parentActorID));
     if(arrow) {
         mDoMtx_stack_c::copy(arrow->field_0x6b4);
         mDoMtx_stack_c::transM(0.0f, 0.0f, 62.0f);
@@ -173,7 +173,7 @@ void daArrow_Lighteff_c::CreateInit() {
 void daArrow_Lighteff_c::set_mtx() {
     field_0x298->setBaseScale(field_0x2A8);
 
-    daArrow_c* arrow = static_cast<daArrow_c*>(fopAcM_SearchByID(mParentPcId));
+    daArrow_c* arrow = static_cast<daArrow_c*>(fopAcM_SearchByID(parentActorID));
     if(arrow) {
         mDoMtx_stack_c::copy(arrow->field_0x6b4);
         mDoMtx_stack_c::transM(0.0f, 0.0f, 62.0f);
@@ -211,7 +211,7 @@ bool daArrow_Lighteff_c::_delete() {
     if(field_0x2EA == 1) {
         daPy_py_c* link = daPy_getPlayerActorClass();
 
-        daArrow_c* arrow = static_cast<daArrow_c*>(fopAcM_SearchByID(mParentPcId));
+        daArrow_c* arrow = static_cast<daArrow_c*>(fopAcM_SearchByID(parentActorID));
         if(arrow) {
             if(!arrow->isSetByZelda()) {
                 link->offUseArrowEffect();
@@ -305,7 +305,7 @@ bool daArrow_Lighteff_c::_execute() {
     brk_play();
 
     daPy_py_c* link = daPy_getPlayerActorClass();
-    daArrow_c* arrow = static_cast<daArrow_c*>(fopAcM_SearchByID(mParentPcId));
+    daArrow_c* arrow = static_cast<daArrow_c*>(fopAcM_SearchByID(parentActorID));
     if(arrow) {
         field_0x2EC = fopAcM_GetParam(arrow);
         if(arrow->field_0x6e4 == 1) {
@@ -412,7 +412,7 @@ actor_process_profile_definition g_profile_ARROW_LIGHTEFF = {
     9,
     fpcPi_CURRENT_e,
     PROC_ARROW_LIGHTEFF,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(daArrow_Lighteff_c),
     0,
     0,
diff --git a/src/d/actor/d_a_bg.cpp b/src/d/actor/d_a_bg.cpp
index a0b896dec..48dcceabe 100644
--- a/src/d/actor/d_a_bg.cpp
+++ b/src/d/actor/d_a_bg.cpp
@@ -408,7 +408,7 @@ actor_process_profile_definition2 g_profile_BG = {
     7,
     fpcPi_CURRENT_e,
     PROC_BG,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(daBg_c),
     0,
     0,
diff --git a/src/d/actor/d_a_bita.cpp b/src/d/actor/d_a_bita.cpp
index 924d3b404..de17695d4 100644
--- a/src/d/actor/d_a_bita.cpp
+++ b/src/d/actor/d_a_bita.cpp
@@ -64,14 +64,14 @@ static void* b_a_sub(void* search, void* user) {
 
 /* 000000C4-0000018C       .text daBita_Draw__FP10bita_class */
 static BOOL daBita_Draw(bita_class* i_this) {
-    dKy_getEnvlight().settingTevStruct(TEV_TYPE_BG0, &i_this->current.pos, &i_this->mTevStr);
+    dKy_getEnvlight().settingTevStruct(TEV_TYPE_BG0, &i_this->current.pos, &i_this->tevStr);
     if (i_this->mMode == 1 && i_this->mSub == 1) {
-        dKy_getEnvlight().setLightTevColorType(i_this->mpModelEf, &i_this->mTevStr);
+        dKy_getEnvlight().setLightTevColorType(i_this->mpModelEf, &i_this->tevStr);
         i_this->mpBrkAnm->entry(i_this->mpModelEf->getModelData());
         mDoExt_modelUpdateDL(i_this->mpModelEf);
         i_this->mpBrkAnm->remove(i_this->mpModelEf->getModelData());
     } else {
-        dKy_getEnvlight().setLightTevColorType(i_this->mpModel, &i_this->mTevStr);
+        dKy_getEnvlight().setLightTevColorType(i_this->mpModel, &i_this->tevStr);
         mDoExt_modelUpdateDL(i_this->mpModel);
     }
     return TRUE;
@@ -172,7 +172,7 @@ static BOOL daBita_Execute(bita_class* i_this) {
         VECAdd(&pos, &i_this->current.pos, &pos);
         i_this->mCyl.SetC(pos);
         i_this->mCyl.SetH(60.0f);
-        i_this->mCyl.SetR(i_this->mScale.x * 400.0f);
+        i_this->mCyl.SetR(i_this->scale.x * 400.0f);
         dComIfG_Ccsp()->Set(&i_this->mCyl);
     }
 
@@ -282,17 +282,17 @@ static s32 daBita_Create(fopAc_ac_c* i_ac) {
             return cPhs_ERROR_e;
 
         switch (i_this->mPrmScale) {
-        case 1: i_this->mScale.setall(1.5f); break;
-        case 2: i_this->mScale.setall(2.0f); break;
-        case 3: i_this->mScale.setall(3.0f); break;
-        default: i_this->mScale.y = i_this->mScale.z = i_this->mScale.x = 1.0f; break;
+        case 1: i_this->scale.setall(1.5f); break;
+        case 2: i_this->scale.setall(2.0f); break;
+        case 3: i_this->scale.setall(3.0f); break;
+        default: i_this->scale.y = i_this->scale.z = i_this->scale.x = 1.0f; break;
         }
 
         fopAcM_SetMtx(i_this, i_this->mpModel->getBaseTRMtx());
-        fopAcM_SetMin(i_this, i_this->mScale.x * -1000.0f, -500.0f, i_this->mScale.z * -1000.0f);
-        fopAcM_SetMax(i_this, i_this->mScale.x * 1000.0f, 500.0f, i_this->mScale.z * 1000.0f);
-        i_this->mpModel->setBaseScale(i_this->mScale);
-        i_this->mpModelEf->setBaseScale(i_this->mScale);
+        fopAcM_SetMin(i_this, i_this->scale.x * -1000.0f, -500.0f, i_this->scale.z * -1000.0f);
+        fopAcM_SetMax(i_this, i_this->scale.x * 1000.0f, 500.0f, i_this->scale.z * 1000.0f);
+        i_this->mpModel->setBaseScale(i_this->scale);
+        i_this->mpModelEf->setBaseScale(i_this->scale);
         i_this->shape_angle = i_this->current.angle;
         base_mtx_set(i_this);
         i_this->mpBgW->Move();
@@ -316,7 +316,7 @@ actor_process_profile_definition g_profile_BITA = {
     /* ListID       */ 3,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_BITA,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(bita_class),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp
index 0a77f202c..7edfe45d7 100644
--- a/src/d/actor/d_a_bk.cpp
+++ b/src/d/actor/d_a_bk.cpp
@@ -181,7 +181,7 @@ static void yari_off_check(bk_class* i_this) {
         boko->current.angle.y = player->shape_angle.y;
         
         dBgS_LinChk linChk;
-        linChk.Set(&i_this->mEyePos, &boko->current.pos, i_this);
+        linChk.Set(&i_this->eyePos, &boko->current.pos, i_this);
         if (dComIfG_Bgsp()->LineCross(&linChk)) {
             MtxP mtx = i_this->mpMorf->getModel()->getAnmMtx(0x10); // mune (chest) joint
             MTXCopy(mtx, *calc_mtx);
@@ -359,7 +359,7 @@ static BOOL daBk_shadowDraw(bk_class* i_this) {
         i_this->mShadowId = dComIfGd_setShadow(
             i_this->mShadowId, 1, model, &shadowPos, temp, shadowSize,
             i_this->current.pos.y, i_this->dr.mAcch.GetGroundH(),
-            i_this->dr.mAcch.m_gnd, &i_this->mTevStr,
+            i_this->dr.mAcch.m_gnd, &i_this->tevStr,
             0, 1.0f, dDlst_shadowControl_c::getSimpleTex()
         );
     }
@@ -874,13 +874,13 @@ static void fight_run(bk_class* i_this) {
         }
         // Fall-through
     case 0x01:
-        f32 scale;
+        f32 scaleMag;
         if (i_this->m0B30 != 0 || i_this->m11F3 != 0) {
-            scale = l_bkHIO.m054;
+            scaleMag = l_bkHIO.m054;
         } else {
-            scale = l_bkHIO.m058;
+            scaleMag = l_bkHIO.m058;
         }
-        cLib_addCalc2(&i_this->speedF, scale, 1.0f, 5.0f);
+        cLib_addCalc2(&i_this->speedF, scaleMag, 1.0f, 5.0f);
         i_this->m1212++;
         if (daBk_player_way_check(i_this) && (i_this->m1212 & 0x30) && !r29) {
             if (i_this->m120C != 0) {
@@ -1067,7 +1067,7 @@ static void fight_run(bk_class* i_this) {
             fopAc_ac_c* r29 = (fopAc_ac_c*)fpcM_Search(shot_s_sub, i_this);
             if (r29) {
                 if (r29->speedF > 10.0f) {
-                    cXyz sp18 = (r29->current.pos - i_this->mEyePos);
+                    cXyz sp18 = (r29->current.pos - i_this->eyePos);
                     if (sp18.abs() < r29->speedF * 10.0f) {
                         r27 = true;
                     }
@@ -1389,7 +1389,7 @@ static BOOL daBk_Execute(bk_class* i_this) {
     if (enemy_ice(&i_this->mEnemyIce)) {
         i_this->mpMorf->setPlayMode(J3DFrameCtrl::LOOP_ONCE_e);
         i_this->mpMorf->setPlaySpeed(3.0f);
-        i_this->mpMorf->play(&i_this->mEyePos, 0, 0);
+        i_this->mpMorf->play(&i_this->eyePos, 0, 0);
         i_this->mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get());
         i_this->mpMorf->calc();
         tate_mtx_set(i_this);
@@ -1397,7 +1397,7 @@ static BOOL daBk_Execute(bk_class* i_this) {
         return TRUE;
     }
     
-    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &i_this->current.pos, &i_this->mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &i_this->current.pos, &i_this->tevStr);
     
     if (i_this->mType == 8) {
         for (int i = 0; i < ARRAY_SIZE(i_this->m0300); i++) {
@@ -1474,7 +1474,7 @@ static BOOL daBk_Execute(bk_class* i_this) {
                         if (fabsf(i_this->speedF) > 10.0f) {
                             another_hit = 1;
                         } else {
-                            i_this->mScale.x = i_this->mScale.y = i_this->mScale.z = 0.5f;
+                            i_this->scale.x = i_this->scale.y = i_this->scale.z = 0.5f;
                         }
                     }
                     i_this->m0B88.SetR(62.5f);
@@ -1509,7 +1509,7 @@ static BOOL daBk_Execute(bk_class* i_this) {
             }
         }
         
-        i_this->mAttentionInfo.mFlags = fopAc_Attn_LOCKON_ENEMY_e;
+        i_this->attention_info.flags = fopAc_Attn_LOCKON_ENEMY_e;
         fopAcM_OnStatus(i_this, fopAcStts_SHOWMAP_e);
         i_this->m02F0 = 0;
         i_this->m02F4 = 0;
@@ -1588,10 +1588,10 @@ static BOOL daBk_Execute(bk_class* i_this) {
     }
     
     J3DModel* model = i_this->mpMorf->getModel();
-    model->setBaseScale(i_this->mScale);
+    model->setBaseScale(i_this->scale);
     model->setBaseTRMtx(*calc_mtx);
     if (i_this->m030C == 0) {
-        i_this->mpMorf->play(&i_this->mEyePos, 0, 0);
+        i_this->mpMorf->play(&i_this->eyePos, 0, 0);
     }
     i_this->mpMorf->calc();
     
@@ -1819,7 +1819,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) {
         // TODO check this case as well.
         return cPhs_ERROR_e;
     }
-    i_this->m02E8->setBaseScale(i_this->mScale);
+    i_this->m02E8->setBaseScale(i_this->scale);
     
     if (i_this->m02D4 != 0) {
         modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", BK_BMD_BK_TATE);
@@ -1958,7 +1958,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) {
     };
     i_this->mpJntHit = JntHit_create(i_this->mpMorf->getModel(), search_data, ARRAY_SIZE(search_data));
     if (i_this->mpJntHit) {
-        i_this->mJntHit = i_this->mpJntHit;
+        i_this->jntHit = i_this->mpJntHit;
     } else {
         return FALSE;
     }
@@ -1974,7 +1974,7 @@ static s32 daBk_Create(fopAc_ac_c* i_actor) {
     
     s32 phase_state = dComIfG_resLoad(&i_this->mPhase, "Bk");
     if (phase_state == cPhs_COMPLEATE_e) {
-        i_this->mGbaName = 1;
+        i_this->gbaName = 1;
         
         if (strcmp(dComIfGp_getStartStageName(), "ITest63") == 0 ||
             strcmp(dComIfGp_getStartStageName(), "GanonJ") == 0)
@@ -2015,7 +2015,7 @@ static s32 daBk_Create(fopAc_ac_c* i_actor) {
             i_this->m02B7 = 0xFF;
         }
         
-        i_this->mItemTableIdx = dComIfGp_CharTbl()->GetNameIndex("Bk", 0);
+        i_this->itemTableIdx = dComIfGp_CharTbl()->GetNameIndex("Bk", 0);
         
         if (!fopAcM_entrySolidHeap(i_this, useHeapInit, 0x17B20)) {
             return cPhs_ERROR_e;
@@ -2124,9 +2124,9 @@ static s32 daBk_Create(fopAc_ac_c* i_actor) {
         i_this->dr.mInvincibleTimer = 5;
         
         if (i_this->m02D4 != 0) {
-            i_this->mMaxHealth = i_this->mHealth = 7;
+            i_this->max_health = i_this->health = 7;
         } else {
-            i_this->mMaxHealth = i_this->mHealth = 5;
+            i_this->max_health = i_this->health = 5;
         }
         
         i_this->dr.mStts.Init(200, 0xFF, i_this);
@@ -2304,7 +2304,7 @@ static s32 daBk_Create(fopAc_ac_c* i_actor) {
             i_this->mEnemyFire.mParticleScale[i] = fire_sc[i];
         }
         
-        i_this->mStealItemLeft = 3;
+        i_this->stealItemLeft = 3;
         
         daBk_Execute(i_this);
     }
@@ -2325,7 +2325,7 @@ actor_process_profile_definition g_profile_BK = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_BK,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(bk_class),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_bomb2.cpp b/src/d/actor/d_a_bomb2.cpp
index 929d67bd2..a4aebf9ad 100644
--- a/src/d/actor/d_a_bomb2.cpp
+++ b/src/d/actor/d_a_bomb2.cpp
@@ -388,8 +388,8 @@ namespace daBomb2 {
             on_carry();
         }
 
-        mGravity = attr().gravity;
-        mMaxFallSpeed = attr().maxFallSpeed;
+        gravity = attr().gravity;
+        maxFallSpeed = attr().maxFallSpeed;
         bgCrrPos();
         speed.y = 0.0f;
         speedF = 0.0f;
@@ -434,7 +434,7 @@ namespace daBomb2 {
     }
 
     void Act_c::set_mtx() {
-        mpModel->setBaseScale(mScale);
+        mpModel->setBaseScale(scale);
         mDoMtx_stack_c::transS(current.pos);
         mDoMtx_stack_c::concat(field_0x754);
         mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -467,10 +467,10 @@ namespace daBomb2 {
         } else if (r4) {
             r31 = false;
         } else if (r31) {
-            radius = mScale.x * 30.0f;
+            radius = scale.x * 30.0f;
             static cXyz local_center(0.0f, 30.0f, 0.0f);
             mDoMtx_stack_c::copy(mpModel->getBaseTRMtx());
-            mDoMtx_stack_c::scaleM(mScale);
+            mDoMtx_stack_c::scaleM(scale);
             mDoMtx_stack_c::multVec(&local_center, &pos);
         }
         
@@ -577,13 +577,13 @@ namespace daBomb2 {
         s32 roomNo;
         if(mAcch.GetGroundH() != -1.0e9f) {
             roomNo = dComIfG_Bgsp()->GetRoomId(mAcch.m_gnd);
-            mTevStr.mEnvrIdxOverride = dComIfG_Bgsp()->GetPolyColor(mAcch.m_gnd);
+            tevStr.mEnvrIdxOverride = dComIfG_Bgsp()->GetPolyColor(mAcch.m_gnd);
         }
         else {
             roomNo = dComIfGp_roomControl_getStayNo();
         }
 
-        mTevStr.mRoomNo = roomNo;
+        tevStr.mRoomNo = roomNo;
         mStts.SetRoomId(roomNo);
         current.roomNo = roomNo;
     }
@@ -702,10 +702,10 @@ namespace daBomb2 {
     }
 
     void Act_c::eff_explode_normal(const csXyz* rotation) {
-        dComIfGp_particle_setP1(dPa_name::ID_COMMON_LIGHT_FLASH, &current.pos, rotation, &mScale);
-        dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CLOUD, &current.pos, NULL, &mScale);
-        dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CIRCLE, &current.pos, NULL, &mScale);
-        dComIfGp_particle_setToonP1(dPa_name::ID_COMMON_SMOKE_DEBRIS, &current.pos, NULL, &mScale);
+        dComIfGp_particle_setP1(dPa_name::ID_COMMON_LIGHT_FLASH, &current.pos, rotation, &scale);
+        dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CLOUD, &current.pos, NULL, &scale);
+        dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CIRCLE, &current.pos, NULL, &scale);
+        dComIfGp_particle_setToonP1(dPa_name::ID_COMMON_SMOKE_DEBRIS, &current.pos, NULL, &scale);
     }
 
     void Act_c::eff_explode_water() {
@@ -734,8 +734,8 @@ namespace daBomb2 {
             field_0x6CC = field_0x6C0;
             field_0x6D8 = field_0x6C0;
 
-            dComIfGp_particle_setP1(dPa_name::ID_COMMON_FUSE_SPARKS, &field_0x6C0, NULL, &mScale, 0xFF, &mSparks);
-            dComIfGp_particle_setToonP1(0x2012, &field_0x6C0, NULL, &mScale, 0xDC, &mSmoke);
+            dComIfGp_particle_setP1(dPa_name::ID_COMMON_FUSE_SPARKS, &field_0x6C0, NULL, &scale, 0xFF, &mSparks);
+            dComIfGp_particle_setToonP1(0x2012, &field_0x6C0, NULL, &scale, 0xDC, &mSmoke);
             mSmoke.setOldPosP(&field_0x6CC, &field_0x6D8);
         }
     }
@@ -958,16 +958,16 @@ namespace daBomb2 {
     }
 
     void Act_c::on_carry() {
-        mAttentionInfo.mFlags |= fopAc_Attn_ACTION_CARRY_e;
+        attention_info.flags |= fopAc_Attn_ACTION_CARRY_e;
     }
 
     void Act_c::off_carry() {
-        mAttentionInfo.mFlags &= ~fopAc_Attn_ACTION_CARRY_e;
+        attention_info.flags &= ~fopAc_Attn_ACTION_CARRY_e;
     }
 
     void Act_c::mode_wait_init() {
         mState = 0;
-        mGravity = attr().gravity;
+        gravity = attr().gravity;
         mSph.OnCoSPrmBit(CO_SPRM_SET);
     }
 
@@ -1060,7 +1060,7 @@ namespace daBomb2 {
         mEnv.set(current.pos);
         speedF = 0.0f;
         speed = cXyz::Zero;
-        mGravity = 0.0f;
+        gravity = 0.0f;
         off_carry();
         mSph.OffTgSPrmBit(TG_SPRM_SET);
         mSph.OffCoSPrmBit(CO_SPRM_SET);
@@ -1245,10 +1245,10 @@ namespace daBomb2 {
             tensor_proc_call();
             anm_play();
 
-            mAttentionInfo.mPosition.x = current.pos.x;
-            mAttentionInfo.mPosition.y = current.pos.y + 50.0f;
-            mAttentionInfo.mPosition.z = current.pos.z;
-            mEyePos = mAttentionInfo.mPosition;
+            attention_info.position.x = current.pos.x;
+            attention_info.position.y = current.pos.y + 50.0f;
+            attention_info.position.z = current.pos.z;
+            eyePos = attention_info.position;
 
             set_mtx();
             cc_set();
@@ -1303,8 +1303,8 @@ namespace daBomb2 {
     /* 800E0A0C-800E0A80       .text _draw__Q27daBomb25Act_cFv */
     bool Act_c::_draw() {
         if(is_draw()) {
-            g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &mTevStr);
-            g_env_light.setLightTevColorType(mpModel, &mTevStr);
+            g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
+            g_env_light.setLightTevColorType(mpModel, &tevStr);
             draw_nut();
             draw_shadow();
         }
@@ -1349,7 +1349,7 @@ actor_process_profile_definition g_profile_Bomb2 = {
     7,
     fpcPi_CURRENT_e,
     PROC_Bomb2,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(daBomb2::Act_c),
     0,
     0,
diff --git a/src/d/actor/d_a_bomb3.inc b/src/d/actor/d_a_bomb3.inc
index 8ae5c4ee7..35ab8e5ed 100644
--- a/src/d/actor/d_a_bomb3.inc
+++ b/src/d/actor/d_a_bomb3.inc
@@ -190,8 +190,8 @@ BOOL daBomb_c::draw() {
         return true;
     }
     
-    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(mpModel, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(mpModel, &tevStr);
 
     if(mType == 1) {
         draw_nut();
@@ -452,10 +452,10 @@ void daBomb_c::water_tention() {
 void daBomb_c::posMoveF() {
     cM3dGPla* tri;
     bool temp = mNoGravityTime > 0;
-    f32 gravity;
+    f32 origGravity;
     if(temp) {
-        gravity = mGravity;
-        mGravity = 0.0f;
+        origGravity = gravity;
+        gravity = 0.0f;
     }
 
     if(mType == 0 && chk_water_in()) {
@@ -490,7 +490,7 @@ void daBomb_c::posMoveF() {
     }
     
     if(temp) {
-        mGravity = gravity;
+        gravity = origGravity;
         mNoGravityTime--;
     }
 }
@@ -634,13 +634,13 @@ void daBomb_c::setRoomInfo() {
     s32 roomNo;
     if(mAcch.GetGroundH() != -1.0e9f) {
         roomNo = dComIfG_Bgsp()->GetRoomId(mAcch.m_gnd);
-        mTevStr.mEnvrIdxOverride = dComIfG_Bgsp()->GetPolyColor(mAcch.m_gnd);
+        tevStr.mEnvrIdxOverride = dComIfG_Bgsp()->GetPolyColor(mAcch.m_gnd);
     }
     else {
         roomNo = dComIfGp_roomControl_getStayNo();
     }
 
-    mTevStr.mRoomNo = roomNo;
+    tevStr.mRoomNo = roomNo;
     mStts.SetRoomId(roomNo);
     current.roomNo = roomNo;
 }
@@ -696,8 +696,8 @@ void daBomb_c::setFuseEffect() {
         mFusePos2 = mFusePos;
         mFusePos3 = mFusePos;
 
-        dComIfGp_particle_setP1(dPa_name::ID_COMMON_FUSE_SPARKS, &mFusePos, NULL, &mScale, 0xFF, &mSparks);
-        dComIfGp_particle_setToonP1(0x2012, &mFusePos, NULL, &mScale, 0xDC, &mSmoke);
+        dComIfGp_particle_setP1(dPa_name::ID_COMMON_FUSE_SPARKS, &mFusePos, NULL, &scale, 0xFF, &mSparks);
+        dComIfGp_particle_setToonP1(0x2012, &mFusePos, NULL, &scale, 0xDC, &mSmoke);
         mSmoke.field_0x0C = &mFusePos2;
         mSmoke.field_0x10 = &mFusePos3;
         mSmoke.field_0x04 = 0x14;
@@ -706,28 +706,28 @@ void daBomb_c::setFuseEffect() {
 
 /* 800DAD6C-800DAE54       .text eff_explode_normal__8daBomb_cFPC5csXyz */
 void daBomb_c::eff_explode_normal(const csXyz* rotation) {
-    dComIfGp_particle_setP1(dPa_name::ID_COMMON_LIGHT_FLASH, &current.pos, rotation, &mScale);
-    dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CLOUD, &current.pos, NULL, &mScale);
-    dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CIRCLE, &current.pos, NULL, &mScale);
-    dComIfGp_particle_setToonP1(dPa_name::ID_COMMON_SMOKE_DEBRIS, &current.pos, NULL, &mScale);
+    dComIfGp_particle_setP1(dPa_name::ID_COMMON_LIGHT_FLASH, &current.pos, rotation, &scale);
+    dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CLOUD, &current.pos, NULL, &scale);
+    dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CIRCLE, &current.pos, NULL, &scale);
+    dComIfGp_particle_setToonP1(dPa_name::ID_COMMON_SMOKE_DEBRIS, &current.pos, NULL, &scale);
 }
 
 /* 800DAE54-800DAF94       .text eff_explode_cheap__8daBomb_cFPC5csXyz */
 void daBomb_c::eff_explode_cheap(const csXyz* rotation) {
-    JPABaseEmitter* emitter = dComIfGp_particle_setP1(dPa_name::ID_COMMON_LIGHT_FLASH, &current.pos, rotation, &mScale);
+    JPABaseEmitter* emitter = dComIfGp_particle_setP1(dPa_name::ID_COMMON_LIGHT_FLASH, &current.pos, rotation, &scale);
     if(emitter) {
         emitter->mLifeTime = 0xC;
         JGeometry::TVec3<f32> vec(0.5f, 0.67f, 1.0f);
         emitter->setGlobalParticleScale(vec);
     }
 
-    dComIfGp_particle_setBombSmoke(0x232A, &current.pos, NULL, &mScale);
-    emitter = dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CIRCLE, &current.pos, NULL, &mScale);
+    dComIfGp_particle_setBombSmoke(0x232A, &current.pos, NULL, &scale);
+    emitter = dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CIRCLE, &current.pos, NULL, &scale);
     if(emitter) {
         emitter->mLifeTime = 0x46;
     }
     
-    emitter = dComIfGp_particle_setToonP1(dPa_name::ID_COMMON_SMOKE_DEBRIS, &current.pos, NULL, &mScale);
+    emitter = dComIfGp_particle_setToonP1(dPa_name::ID_COMMON_SMOKE_DEBRIS, &current.pos, NULL, &scale);
     if(emitter) {
         emitter->mLifeTime = 0x46;
         emitter->mInitialVelAxis = 25.0f;
@@ -817,13 +817,13 @@ int daBomb_c::procExplode_init() {
     mFunc = &daBomb_c::procExplode;
     speedF = 0.0f;
     speed = cXyz::Zero;
-    mGravity = 0.0f;
+    gravity = 0.0f;
 
     if(!chk_state(STATE_8)) {
         change_state(STATE_0);
     }
 
-    mAttentionInfo.mFlags &= ~fopAc_Attn_ACTION_CARRY_e;
+    attention_info.flags &= ~fopAc_Attn_ACTION_CARRY_e;
 
     if(field_0x6F0) {
         daPy_getPlayerLinkActorClass()->decrementBombCnt();
@@ -928,7 +928,7 @@ bool daBomb_c::procCarry_init() {
     change_state(STATE_2);
     speedF = 0.0f;
     speed.set(cXyz::Zero);
-    mAttentionInfo.mFlags &= ~fopAc_Attn_ACTION_CARRY_e;
+    attention_info.flags &= ~fopAc_Attn_ACTION_CARRY_e;
     mSph.OffCoSPrmBit(CO_SPRM_SET);
 
     return true;
@@ -1002,10 +1002,10 @@ bool daBomb_c::procWait() {
             if(!temp && !field_0x781) {
                 bound(y_vel);
                 if((mAcch.ChkGroundHit() || chk_state(STATE_5)) && !mAcch.ChkGroundLanding()) {
-                    mAttentionInfo.mFlags |= fopAc_Attn_ACTION_CARRY_e;
+                    attention_info.flags |= fopAc_Attn_ACTION_CARRY_e;
                 }
                 else {
-                    mAttentionInfo.mFlags &= ~fopAc_Attn_ACTION_CARRY_e;
+                    attention_info.flags &= ~fopAc_Attn_ACTION_CARRY_e;
                 }
             }
 
@@ -1023,9 +1023,9 @@ bool daBomb_c::waitState_cannon() {
 
 /* 800DBBC4-800DBC4C       .text waitState_bomtyu__8daBomb_cFv */
 void daBomb_c::waitState_bomtyu() {
-    cLib_chaseF(&mScale.x, 1.0f, 0.05f);
-    cLib_chaseF(&mScale.y, 1.0f, 0.05f);
-    cLib_chaseF(&mScale.z, 1.0f, 0.05f);
+    cLib_chaseF(&scale.x, 1.0f, 0.05f);
+    cLib_chaseF(&scale.y, 1.0f, 0.05f);
+    cLib_chaseF(&scale.z, 1.0f, 0.05f);
     if(mBombFire) {
         setFuseEffect();
         mBombFire = 0;
@@ -1067,10 +1067,10 @@ BOOL daBomb_c::execute() {
         }
 
         mStts.Move();
-        mAttentionInfo.mPosition.x = current.pos.x;
-        mAttentionInfo.mPosition.y = current.pos.y + 50.0f;
-        mAttentionInfo.mPosition.z = current.pos.z;
-        mEyePos = mAttentionInfo.mPosition;
+        attention_info.position.x = current.pos.x;
+        attention_info.position.y = current.pos.y + 50.0f;
+        attention_info.position.z = current.pos.z;
+        eyePos = attention_info.position;
         if(!chk_attrState(this, ATTR_STATE_20)) {
             set_mtx();
             mFusePos3 = mFusePos2;
@@ -1081,7 +1081,7 @@ BOOL daBomb_c::execute() {
             pos.y = current.pos.y + 30.0f;
             pos.z = current.pos.z;
             mSph.SetC(pos);
-            mSph.SetR(mScale.x * 30.0f);
+            mSph.SetR(scale.x * 30.0f);
             if(mMassCounter != g_Counter.mCounter0) {
                 dComIfG_Ccsp()->Set(&mSph);
                 //using inline breaks match
@@ -1172,7 +1172,7 @@ void daBomb_c::anm_play_nut() {
 
 /* 800DC2D0-800DC384       .text set_mtx__8daBomb_cFv */
 void daBomb_c::set_mtx() {
-    mpModel->setBaseScale(mScale);
+    mpModel->setBaseScale(scale);
     mDoMtx_stack_c::transS(current.pos);
     if(prm_get_angXZero()) {
         mDoMtx_stack_c::ZXYrotM(0, shape_angle.y, shape_angle.z);
@@ -1410,12 +1410,12 @@ void daBomb_c::create_init() {
         mSph.GetObjAt().SetAtp(2);
     }
 
-    mGravity = -2.9f;
-    mMaxFallSpeed = -100.0f;
+    gravity = -2.9f;
+    maxFallSpeed = -100.0f;
     mRestTime = 0x96;
     mInitialState = prm_get_state();
     if(!chk_state(STATE_4)) {
-        mAttentionInfo.mFlags |= fopAc_Attn_ACTION_CARRY_e;
+        attention_info.flags |= fopAc_Attn_ACTION_CARRY_e;
     }
 
     field_0x77C = 0;
@@ -1432,7 +1432,7 @@ void daBomb_c::create_init() {
 
     mMassCounter = g_Counter.mCounter0 - 1;
     if(chk_attrState(this, ATTR_STATE_2)) {
-        mScale.setall(0.0f);
+        scale.setall(0.0f);
     }
     if(chk_attrState(this, ATTR_STATE_4)) {
         setFuseEffect();
@@ -1456,12 +1456,12 @@ void daBomb_c::create_init() {
         procWait_init();
     }
 
-    mCull.mBox.mMin.x = -36.0f;
-    mCull.mBox.mMin.y = 0.0f;
-    mCull.mBox.mMin.z = -36.0f;
-    mCull.mBox.mMax.x = 36.0f;
-    mCull.mBox.mMax.y = 66.0f;
-    mCull.mBox.mMax.z = 36.0f;
+    cull.box.min.x = -36.0f;
+    cull.box.min.y = 0.0f;
+    cull.box.min.z = -36.0f;
+    cull.box.max.x = 36.0f;
+    cull.box.max.y = 66.0f;
+    cull.box.max.z = 36.0f;
     fopAcM_setCullSizeFar(this, 10.0f);
 
     init_mtx();
@@ -1480,7 +1480,7 @@ actor_process_profile_definition g_profile_BOMB = {
     7,
     fpcPi_CURRENT_e,
     PROC_BOMB,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(daBomb_c),
     0,
     0,
diff --git a/src/d/actor/d_a_boss_item.cpp b/src/d/actor/d_a_boss_item.cpp
index a1839882f..1185cc29c 100644
--- a/src/d/actor/d_a_boss_item.cpp
+++ b/src/d/actor/d_a_boss_item.cpp
@@ -26,7 +26,7 @@ static s32 daBossItem_Create(fopAc_ac_c* i_this) {
 
     fopAcM_SetupActor(bItem, bossitem_class);
 
-    int stageNo = bItem->mBase.mParameters & 0xFF;
+    int stageNo = bItem->base.mParameters & 0xFF;
     BOOL isStageBossDead = dComIfGs_isStageBossEnemy(stageNo);
 
     if (isStageBossDead && !dComIfGs_isStageLife(stageNo)) {
@@ -52,7 +52,7 @@ actor_process_profile_definition g_profile_BOSSITEM = {
     7,
     fpcLy_CURRENT_e,
     PROC_BOSSITEM,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(bossitem_class),
     0,
     0,
diff --git a/src/d/actor/d_a_branch.cpp b/src/d/actor/d_a_branch.cpp
index 02726a729..2496053e4 100644
--- a/src/d/actor/d_a_branch.cpp
+++ b/src/d/actor/d_a_branch.cpp
@@ -44,7 +44,7 @@ void daBranch_c::set_mtx() {
         pMdl = mModel[i];
 
         if (pMdl) {
-            pMdl->setBaseScale(mScale);
+            pMdl->setBaseScale(scale);
 
             mDoMtx_stack_c::transS(current.pos);
             mDoMtx_stack_c::XYZrotM(current.angle);
@@ -123,8 +123,8 @@ inline BOOL daBranch_c::draw() {
         activeIdx = 1;
     }
 
-    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(mModel[activeIdx], &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(mModel[activeIdx], &tevStr);
 
     mAnims[activeIdx]->updateDL();
 
@@ -138,7 +138,7 @@ static BOOL daBranch_Draw(daBranch_c* i_this) {
 }
 
 inline BOOL daBranch_c::execute() {
-    u8 demoId = mDemoActorId;
+    u8 demoId = demoActorID;
 
     if (demoId == 0) {
         if (m02B8 == 5) {
@@ -246,7 +246,7 @@ actor_process_profile_definition g_profile_BRANCH = {
     7,
     fpcLy_CURRENT_e,
     PROC_BRANCH,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(daBranch_c),
     0,
     0,
diff --git a/src/d/actor/d_a_demo_item.cpp b/src/d/actor/d_a_demo_item.cpp
index 360299f14..20dd33da4 100644
--- a/src/d/actor/d_a_demo_item.cpp
+++ b/src/d/actor/d_a_demo_item.cpp
@@ -407,7 +407,7 @@ void daDitem_c::anim_control() {
 
 /* 00000760-00000880       .text set_mtx__9daDitem_cFv */
 void daDitem_c::set_mtx() {
-    mpModel->setBaseScale(mScale);
+    mpModel->setBaseScale(scale);
     fopAcM_addAngleY(this, current.angle.y + 0x0111, 0x0111);
     
     if (chkArgFlag(0x02) || chkArgFlag(0x04) || chkArgFlag(0x08)) {
@@ -428,7 +428,7 @@ void daDitem_c::set_mtx() {
 /* 00000880-000008F0       .text settingBeforeDraw__9daDitem_cFv */
 void daDitem_c::settingBeforeDraw() {
     if (isBomb(m_itemNo) || m_itemNo == BOMB_BAG || m_itemNo == dItem_SKULL_HAMMER_e || m_itemNo == dItem_SMALL_KEY_e) {
-        dDlst_texSpecmapST(&mEyePos, &mTevStr, mpModel->getModelData(), 1.0f);
+        dDlst_texSpecmapST(&eyePos, &tevStr, mpModel->getModelData(), 1.0f);
     }
 }
 
@@ -544,7 +544,7 @@ actor_process_profile_definition g_profile_Demo_Item = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_Demo_Item,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daDitem_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_disappear.cpp b/src/d/actor/d_a_disappear.cpp
index 9bb81a01c..84c8755fc 100644
--- a/src/d/actor/d_a_disappear.cpp
+++ b/src/d/actor/d_a_disappear.cpp
@@ -23,7 +23,7 @@ static BOOL daDisappear_Execute(disappear_class* i_this) {
         i_this->mTimer--;
         
         if (i_this->mTimer == 0) {
-            s8 health = i_this->mHealth; // TODO: add enum for disappear types (stored in health)
+            s8 health = i_this->health; // TODO: add enum for disappear types (stored in health)
 
             if (health != 1 && health != 3) {
                 if (health == 2) {
@@ -42,7 +42,7 @@ static BOOL daDisappear_Execute(disappear_class* i_this) {
                     }
                 }
                 else {
-                    fopAcM_createIball(&i_this->current.pos, i_this->mItemTableIdx, i_this->current.roomNo, &i_this->current.angle, i_this->mItemBitNo);
+                    fopAcM_createIball(&i_this->current.pos, i_this->itemTableIdx, i_this->current.roomNo, &i_this->current.angle, i_this->mItemBitNo);
                 }
             }
         }
@@ -71,7 +71,7 @@ void set_disappear(disappear_class* i_this, float scale) {
     cXyz particleScale(scale, scale, scale);
     i_this->mTimer = 58 + g_regHIO.mChild[8].mShortRegs[0];
 
-    switch (i_this->mHealth) {
+    switch (i_this->health) {
         case 0x0:
         case 0x2:
         case 0xA:
@@ -102,15 +102,15 @@ static s32 daDisappear_Create(fopAc_ac_c* i_this) {
 
     fopAcM_SetupActor(dis, disappear_class);
 
-    dis->mHealth = fopAcM_GetParam(dis) & 0xFF;
-    f32 scale = ((fopAcM_GetParam(dis) >> 8) & 0xFF) * 0.1f;
+    dis->health = fopAcM_GetParam(dis) & 0xFF;
+    f32 scaleMag = ((fopAcM_GetParam(dis) >> 8) & 0xFF) * 0.1f;
 
     dis->mItemBitNo = (fopAcM_GetParam(dis) >> 0x10) & 0xFF;
     if (dis->mItemBitNo == 0xFF) {
         dis->mItemBitNo = -1;
     }
 
-    set_disappear(dis, scale);
+    set_disappear(dis, scaleMag);
 
     return cPhs_COMPLEATE_e;
 }
@@ -128,7 +128,7 @@ actor_process_profile_definition g_profile_DISAPPEAR = {
     7,
     fpcLy_CURRENT_e,
     PROC_DISAPPEAR,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(disappear_class),
     0,
     0,
diff --git a/src/d/actor/d_a_dr.cpp b/src/d/actor/d_a_dr.cpp
index 0e0447dbe..709b10ca3 100644
--- a/src/d/actor/d_a_dr.cpp
+++ b/src/d/actor/d_a_dr.cpp
@@ -50,10 +50,10 @@ daDr_HIO_c::daDr_HIO_c() {
 /* 00000148-000001DC       .text daDr_Draw__FP8dr_class */
 static BOOL daDr_Draw(dr_class* i_this) {
     J3DModel* model = i_this->mpMorf->getModel();
-    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &i_this->current.pos, &i_this->mTevStr);
-    g_env_light.setLightTevColorType(model, &i_this->mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &i_this->current.pos, &i_this->tevStr);
+    g_env_light.setLightTevColorType(model, &i_this->tevStr);
     i_this->mpMorf->entryDL();
-    dSnap_RegistFig(DSNAP_TYPE_DR, i_this, i_this->mEyePos, i_this->shape_angle.y, 1.0f, 1.0f, 1.0f);
+    dSnap_RegistFig(DSNAP_TYPE_DR, i_this, i_this->eyePos, i_this->shape_angle.y, 1.0f, 1.0f, 1.0f);
     return TRUE;
 }
 
@@ -183,7 +183,7 @@ static void move(dr_class* i_this) {
 /* 0000091C-000009CC       .text daDr_setMtx__FP8dr_class */
 static void daDr_setMtx(dr_class* i_this) {
     J3DModel* model = i_this->mpMorf->getModel();
-    model->setBaseScale(i_this->mScale);
+    model->setBaseScale(i_this->scale);
     mDoMtx_stack_c::transS(i_this->current.pos);
     cMtx_YrotM(mDoMtx_stack_c::get(), i_this->current.angle.y);
     cMtx_XrotM(mDoMtx_stack_c::get(), i_this->current.angle.x);
@@ -203,14 +203,14 @@ static BOOL daDr_Execute(dr_class* i_this) {
     
     move(i_this);
     
-    i_this->mScale.x = i_this->mScale.y = i_this->mScale.z = l_HIO.mScale;
+    i_this->scale.x = i_this->scale.y = i_this->scale.z = l_HIO.mScale;
     
     daDr_setMtx(i_this);
     
     MtxP tongueJntMtx = i_this->mpMorf->getModel()->getAnmMtx(0x20); // j_dr_sita2 (tongue) joint
     cMtx_copy(tongueJntMtx, *calc_mtx);
     cXyz offset(0.0f, 0.0f, 0.0f);
-    MtxPosition(&offset, &i_this->mEyePos);
+    MtxPosition(&offset, &i_this->eyePos);
     
     return TRUE;
 }
@@ -284,7 +284,7 @@ actor_process_profile_definition g_profile_DR = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_DR,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(dr_class),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_dummy.cpp b/src/d/actor/d_a_dummy.cpp
index 24d2bed33..fa4c1dc8b 100644
--- a/src/d/actor/d_a_dummy.cpp
+++ b/src/d/actor/d_a_dummy.cpp
@@ -89,7 +89,7 @@ actor_process_profile_definition g_profile_Dummy = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcLy_CURRENT_e,
     /* ProcName     */ PROC_Dummy,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daDummy::Act_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_fan.cpp b/src/d/actor/d_a_fan.cpp
index 40fa7a78b..923990be9 100644
--- a/src/d/actor/d_a_fan.cpp
+++ b/src/d/actor/d_a_fan.cpp
@@ -127,7 +127,7 @@ int daFan_c::Create() {
     }
 
     mModel->calc();
-    mWindSePId = fopKyM_create(PROC_LEVEL_SE, JA_SE_OBJ_WIND_TAG, &mEyePos);
+    mWindSePId = fopKyM_create(PROC_LEVEL_SE, JA_SE_OBJ_WIND_TAG, &eyePos);
     return TRUE;
 }
 
@@ -173,7 +173,7 @@ s32 daFan_c::_create() {
 
 /* 00000C28-00000D28       .text set_mtx__7daFan_cFv */
 void daFan_c::set_mtx() {
-    mModel->setBaseScale(mScale);
+    mModel->setBaseScale(scale);
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(current.angle);
     mModel->setBaseTRMtx(mDoMtx_stack_c::get());
@@ -244,9 +244,9 @@ int daFan_c::Execute(Mtx** mtxP) {
 
 /* 00001088-0000118C       .text Draw__7daFan_cFv */
 BOOL daFan_c::Draw() {
-    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(mModel, &mTevStr);
-    g_env_light.setLightTevColorType(mWindModel, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(mModel, &tevStr);
+    g_env_light.setLightTevColorType(mWindModel, &tevStr);
     dComIfGd_setListBG();
     mDoExt_modelUpdateDL(mModel);
     dComIfGd_setList();
@@ -295,7 +295,7 @@ actor_process_profile_definition g_profile_FAN = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_FAN,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daFan_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_floor.cpp b/src/d/actor/d_a_floor.cpp
index 596432da5..a6a5666d1 100644
--- a/src/d/actor/d_a_floor.cpp
+++ b/src/d/actor/d_a_floor.cpp
@@ -69,7 +69,7 @@ s32 daFloor_c::_create() {
 
 /* 00000354-000003D4       .text set_mtx__9daFloor_cFv */
 void daFloor_c::set_mtx() {
-    mpModel->setBaseScale(mScale);
+    mpModel->setBaseScale(scale);
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(current.angle.y);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
@@ -107,8 +107,8 @@ void daFloor_c::set_effect() {
 
 /* 00000640-000006E0       .text Draw__9daFloor_cFv */
 BOOL daFloor_c::Draw() {
-    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(mpModel, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(mpModel, &tevStr);
     dComIfGd_setListBG();
     mDoExt_modelUpdateDL(mpModel);
     dComIfGd_setList();
@@ -153,7 +153,7 @@ actor_process_profile_definition g_profile_FLOOR = {
     /* ListID       */ 3,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_FLOOR,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daFloor_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_ghostship.cpp b/src/d/actor/d_a_ghostship.cpp
index aee058426..f410e311d 100644
--- a/src/d/actor/d_a_ghostship.cpp
+++ b/src/d/actor/d_a_ghostship.cpp
@@ -67,8 +67,8 @@ BOOL daGhostship_c::_createHeap() {
     ResTIMG* res2 = static_cast<ResTIMG*>(dComIfG_getObjectRes(m_arc_name, AYUSH_BTI_B_GSHIP_HO));
     ResTIMG* res3 = static_cast<ResTIMG*>(dComIfG_getObjectRes(m_cloth_arc_name, CLOTH_BTI_CLOTHTOON));
 
-    mpCloth = dCloth_packetXlu_create(res1, res3, 5, 5, 700.0f, 350.0f, &mTevStr, 0);
-    mpCloth2 = dCloth_packetXlu_create(res2, res3, 6, 6, 1800.0f, 1000.0f, &mTevStr, 0);
+    mpCloth = dCloth_packetXlu_create(res1, res3, 5, 5, 700.0f, 350.0f, &tevStr, 0);
+    mpCloth2 = dCloth_packetXlu_create(res2, res3, 6, 6, 1800.0f, 1000.0f, &tevStr, 0);
     if(!mpCloth || !mpCloth2) {
         return false;
     }
@@ -226,7 +226,7 @@ void daGhostship_c::createInit() {
     shape_angle.x = mWave.mRotX;
     shape_angle.z = mWave.mRotZ;
 
-    mpModel->setBaseScale(mScale);
+    mpModel->setBaseScale(scale);
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::XYZrotM(shape_angle.x, 0, shape_angle.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -383,7 +383,7 @@ bool daGhostship_c::_execute() {
     shape_angle.x = mWave.mRotX;
     shape_angle.z = mWave.mRotZ;
 
-    mpModel->setBaseScale(mScale);
+    mpModel->setBaseScale(scale);
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::XYZrotM(shape_angle.x, 0, shape_angle.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -425,8 +425,8 @@ bool daGhostship_c::_draw() {
     }
 
     if(!l_HIO.hideShip) {
-        g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &mTevStr);
-        g_env_light.setLightTevColorType(mpModel, &mTevStr);
+        g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
+        g_env_light.setLightTevColorType(mpModel, &tevStr);
 
         J3DModelData* modelData = mpModel->getModelData();
         u8 i;
@@ -439,9 +439,9 @@ bool daGhostship_c::_draw() {
         mDoExt_modelUpdateDL(mpModel);
         mBtk.remove(modelData);
 
-        mTevStr.mColorC0.a = alpha;
+        tevStr.mColorC0.a = alpha;
         mpCloth->cloth_draw();
-        mTevStr.mColorC0.a = alpha;
+        tevStr.mColorC0.a = alpha;
         mpCloth2->cloth_draw();
     }
 
@@ -466,7 +466,7 @@ actor_process_profile_definition g_profile_AYUSH = {
     7,
     fpcPi_CURRENT_e,
     PROC_AYUSH,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(daGhostship_c),
     0,
     0,
diff --git a/src/d/actor/d_a_grass.cpp b/src/d/actor/d_a_grass.cpp
index b86f242f7..2bf97878f 100644
--- a/src/d/actor/d_a_grass.cpp
+++ b/src/d/actor/d_a_grass.cpp
@@ -208,7 +208,7 @@ actor_process_profile_definition g_profile_GRASS = {
     7,
     fpcPi_CURRENT_e,
     PROC_GRASS,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(grass_class),
     0,
     0,
diff --git a/src/d/actor/d_a_hitobj.cpp b/src/d/actor/d_a_hitobj.cpp
index ad75ef968..94dfb26cb 100644
--- a/src/d/actor/d_a_hitobj.cpp
+++ b/src/d/actor/d_a_hitobj.cpp
@@ -102,7 +102,7 @@ actor_process_profile_definition g_profile_HITOBJ = {
     7,
     fpcPi_CURRENT_e,
     PROC_HITOBJ,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(hitobj_class),
     0,
     0,
diff --git a/src/d/actor/d_a_hookshot.cpp b/src/d/actor/d_a_hookshot.cpp
index ddf1137db..1381e61fd 100644
--- a/src/d/actor/d_a_hookshot.cpp
+++ b/src/d/actor/d_a_hookshot.cpp
@@ -148,8 +148,8 @@ void daHookshot_shape::draw() {
     dKy_GxFog_set();
     // Not sure why the size passed here is smaller than l_matDL's size in the symbol maps.
     GXCallDisplayList(&l_matDL, sizeof(l_matDL) - 0x08);
-    GXSetTevColorS10(GX_TEVREG0, hookshot->mTevStr.mColorC0);
-    GXSetTevColor(GX_TEVREG1, hookshot->mTevStr.mColorK0);
+    GXSetTevColorS10(GX_TEVREG0, hookshot->tevStr.mColorC0);
+    GXSetTevColor(GX_TEVREG1, hookshot->tevStr.mColorK0);
     GXSetCurrentMtx(0);
     
     cXyz chain_pos = daPy_getPlayerLinkActorClass()->getHookshotRootPos();
@@ -176,7 +176,7 @@ void daHookshot_shape::draw() {
 
 /* 800F12C8-800F1324       .text draw__12daHookshot_cFv */
 BOOL daHookshot_c::draw() {
-    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
     dComIfGd_getOpaListP1()->entryImm(&mShape, 0);
     return TRUE;
 }
@@ -370,14 +370,14 @@ s32 daHookshot_c::create() {
     mShape.setUserArea(reinterpret_cast<u32>(this));
     mLinChk.ClrSttsRoofOff();
     procWait_init(FALSE);
-    mGravity = -5.0f;
+    gravity = -5.0f;
     
     mStts.Init(10, 0xFF, this);
     mCps.Set(l_at_cps_src);
     mCps.SetStts(&mStts);
     
     int roomNo = dComIfGp_roomControl_getStayNo();
-    mTevStr.mRoomNo = roomNo;
+    tevStr.mRoomNo = roomNo;
     mStts.SetRoomId(roomNo);
     current.roomNo = roomNo;
     
@@ -402,7 +402,7 @@ actor_process_profile_definition g_profile_HOOKSHOT = {
     /* ListID       */ 6,
     /* ListPrio     */ fpcLy_CURRENT_e,
     /* ProcName     */ PROC_HOOKSHOT,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daHookshot_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_hot_floor.cpp b/src/d/actor/d_a_hot_floor.cpp
index 52d84e322..111cae610 100644
--- a/src/d/actor/d_a_hot_floor.cpp
+++ b/src/d/actor/d_a_hot_floor.cpp
@@ -133,7 +133,7 @@ actor_process_profile_definition g_profile_Hot_Floor = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_Hot_Floor,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daHot_Floor_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_ib.cpp b/src/d/actor/d_a_ib.cpp
index 373e70922..07b5cf0ee 100644
--- a/src/d/actor/d_a_ib.cpp
+++ b/src/d/actor/d_a_ib.cpp
@@ -232,7 +232,7 @@ void daIball_c::mode_wait_init() {
 void daIball_c::mode_wait() {
     if (mAcch.ChkGroundLanding()) {
         mPrevSpeedY *= m_data.mBounceSpeedMult;
-        if (mPrevSpeedY > mGravity - 0.5f) {
+        if (mPrevSpeedY > gravity - 0.5f) {
             speedF = 0.0f;
         } else {
             speed.set(0.0f, -mPrevSpeedY, 0.0f);
@@ -248,7 +248,7 @@ void daIball_c::mode_wait() {
 
 /* 800F3F6C-800F3FE8       .text mode_water_init__9daIball_cFv */
 void daIball_c::mode_water_init() {
-    dComIfGp_particle_setShipTail(0x33, &current.pos, NULL, &mScale, 0xFF, &mRippleCb);
+    dComIfGp_particle_setShipTail(0x33, &current.pos, NULL, &scale, 0xFF, &mRippleCb);
     mRippleCb.setRate(0.0f);
     mMode = MODE_WATER;
 }
@@ -313,7 +313,7 @@ void daIball_c::damage() {
 
 /* 800F4250-800F42E8       .text set_mtx__9daIball_cFv */
 void daIball_c::set_mtx() {
-    mpModel->setBaseScale(mScale);
+    mpModel->setBaseScale(scale);
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y + m_data.mYOffset, current.pos.z);
     mDoMtx_stack_c::XYZrotM(current.angle);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
@@ -331,7 +331,7 @@ void daIball_c::CreateInit() {
     mAcch.OnSeaWaterHeight();
     
     mbPlayedSe = false;
-    mGravity = m_data.mGravity;
+    gravity = m_data.mGravity;
     mMode = MODE_WAIT;
     current.pos.y -= m_data.mYOffset;
     
@@ -349,8 +349,8 @@ void daIball_c::CreateInit() {
 
 /* 800F441C-800F4544       .text _daIball_draw__9daIball_cFv */
 BOOL daIball_c::_daIball_draw() {
-    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(mpModel, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(mpModel, &tevStr);
     
     for (int i = 0; i < (int)ARRAY_SIZE(mBrkAnm); i++) {
         mBrkAnm[i].entry(mpModel->getModelData());
@@ -372,8 +372,8 @@ BOOL daIball_c::_daIball_draw() {
 
 /* 800F4544-800F4634       .text _daIball_execute__9daIball_cFv */
 BOOL daIball_c::_daIball_execute() {
-    mEyePos = current.pos;
-    mEyePos.y = current.pos.y + 45.0f;
+    eyePos = current.pos;
+    eyePos.y = current.pos.y + 45.0f;
     
     mTimer++;
     
@@ -526,7 +526,7 @@ actor_process_profile_definition g_profile_Iball = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcLy_CURRENT_e,
     /* ProcName     */ PROC_Iball,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daIball_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_ikari.cpp b/src/d/actor/d_a_ikari.cpp
index 7ce7bd523..c39a15ae7 100644
--- a/src/d/actor/d_a_ikari.cpp
+++ b/src/d/actor/d_a_ikari.cpp
@@ -20,7 +20,7 @@ static BOOL createHeap_CB(fopAc_ac_c* i_this) {
 
 /* 0000010C-000001C4       .text setMtx__9daIkari_cFv */
 void daIkari_c::setMtx() {
-    mpModel->setBaseScale(mScale);
+    mpModel->setBaseScale(scale);
 
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -58,13 +58,13 @@ void daIkari_c::getArg() {
     }
 
     if (mEnvType == 0xff) {
-        mScale.x = 1.0f;
-        mScale.y = 1.0f;
-        mScale.z = 1.0f;
+        scale.x = 1.0f;
+        scale.y = 1.0f;
+        scale.z = 1.0f;
     } else if (mEnvType == 0x01) {
-        mScale.x = 1.27f;
-        mScale.y = 1.27f;
-        mScale.z = 1.27f;
+        scale.x = 1.27f;
+        scale.y = 1.27f;
+        scale.z = 1.27f;
     }
 }
 
@@ -91,18 +91,18 @@ bool daIkari_c::_execute() {
 /* 000003CC-00000494       .text _draw__9daIkari_cFv */
 bool daIkari_c::_draw() {
     if (mEnvType == 1) {
-        g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &mTevStr);
-        mTevStr.mColorC0.r = g_env_light.mActorC0.r;
-        mTevStr.mColorC0.g = g_env_light.mActorC0.g;
-        mTevStr.mColorC0.b = g_env_light.mActorC0.b;
-        mTevStr.mColorC0.a = g_env_light.mActorC0.a;
-        mTevStr.mColorK0.r = g_env_light.mActorK0.r;
-        mTevStr.mColorK0.g = g_env_light.mActorK0.g;
-        mTevStr.mColorK0.b = g_env_light.mActorK0.b;
+        g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &tevStr);
+        tevStr.mColorC0.r = g_env_light.mActorC0.r;
+        tevStr.mColorC0.g = g_env_light.mActorC0.g;
+        tevStr.mColorC0.b = g_env_light.mActorC0.b;
+        tevStr.mColorC0.a = g_env_light.mActorC0.a;
+        tevStr.mColorK0.r = g_env_light.mActorK0.r;
+        tevStr.mColorK0.g = g_env_light.mActorK0.g;
+        tevStr.mColorK0.b = g_env_light.mActorK0.b;
     } else {
-        g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &mTevStr);
+        g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
     }
-    g_env_light.setLightTevColorType(mpModel, &mTevStr);
+    g_env_light.setLightTevColorType(mpModel, &tevStr);
     mDoExt_modelUpdateDL(mpModel);
     return true;
 }
@@ -121,7 +121,7 @@ int daIkari_c::_create() {
         } else {
             setMtx();
 
-            f32 mScaleX = mScale.x;
+            f32 mScaleX = scale.x;
 
             fopAcM_SetMtx(this, &mpModel->mBaseTransformMtx[0]);
             fopAcM_setCullSizeBox(this,
@@ -178,7 +178,7 @@ actor_process_profile_definition g_profile_IKARI = {
     7,
     fpcPi_CURRENT_e,
     PROC_IKARI,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(daIkari_c),
     0,
     0,
diff --git a/src/d/actor/d_a_item.cpp b/src/d/actor/d_a_item.cpp
index 3c052af39..2435bba7d 100644
--- a/src/d/actor/d_a_item.cpp
+++ b/src/d/actor/d_a_item.cpp
@@ -103,7 +103,7 @@ void daItem_c::set_mtx_base(J3DModel* pModel, cXyz pos, csXyz rot) {
         return;
     }
     
-    pModel->setBaseScale(mScale);
+    pModel->setBaseScale(scale);
     
     mDoMtx_stack_c::transS(pos.x, pos.y + getYOffset(), pos.z);
     
@@ -148,9 +148,9 @@ void daItem_c::CreateInit() {
     // f32 radius = dItem_data::getR(m_itemNo);
     f32 height = dItem_data::item_info[m_itemNo].mCollisionH;
     f32 radius = dItem_data::item_info[m_itemNo].mCollisionR;
-    if (mScale.x > 1.0f) {
-        height *= mScale.x;
-        radius *= mScale.x;
+    if (scale.x > 1.0f) {
+        height *= scale.x;
+        radius *= scale.x;
     }
     mCyl.SetR(radius);
     mCyl.SetH(height);
@@ -259,9 +259,9 @@ BOOL daItem_c::_daItem_execute() {
     
     timeCount();
     
-    mEyePos = current.pos;
-    mEyePos.y += dItem_data::getH(m_itemNo)/2.0f;
-    mAttentionInfo.mPosition = current.pos;
+    eyePos = current.pos;
+    eyePos.y += dItem_data::getH(m_itemNo)/2.0f;
+    attention_info.position = current.pos;
     
     switch (mItemStatus) {
     case STATUS_BRING_NEZUMI:
@@ -348,13 +348,13 @@ void daItem_c::execInitNormalDirection() {
     current.pos = headPos;
     current.angle.z = 0;
     current.angle.x = 0;
-    mScale.set(mScaleTarget.x, mScaleTarget.y, mScaleTarget.z);
+    scale.set(mScaleTarget.x, mScaleTarget.y, mScaleTarget.z);
     mExtraZRot = 0;
     
     field_0x65c = getData()->field_0x40;
     f32 speedY = getData()->mPickedUpInitialSpeedY;
     speed.set(0.0f, speedY, 0.0f);
-    mGravity = getData()->mPickedUpGravity;
+    gravity = getData()->mPickedUpGravity;
     
     show();
     
@@ -400,7 +400,7 @@ void daItem_c::execInitGetDemoDirection() {
     
     if (player == link) {
         fopAcM_orderItemEvent(this);
-        mEvtInfo.onCondition(dEvtCnd_CANGETITEM_e);
+        eventInfo.onCondition(dEvtCnd_CANGETITEM_e);
         mDemoItemBsPcId = fopAcM_createItemForTrBoxDemo(&current.pos, m_itemNo, -1, current.roomNo);
         mItemStatus = STATUS_WAIT_GET_DEMO;
     }
@@ -410,14 +410,14 @@ void daItem_c::execInitGetDemoDirection() {
 void daItem_c::execWaitGetDemoDirection() {
     hide();
     
-    if (mEvtInfo.checkCommandItem()) {
+    if (eventInfo.checkCommandItem()) {
         mItemStatus = STATUS_MAIN_GET_DEMO;
         if (mDemoItemBsPcId != fpcM_ERROR_PROCESS_ID_e) {
             dComIfGp_event_setItemPartnerId(mDemoItemBsPcId);
         }
     } else {
         fopAcM_orderItemEvent(this);
-        mEvtInfo.onCondition(dEvtCnd_CANGETITEM_e);
+        eventInfo.onCondition(dEvtCnd_CANGETITEM_e);
     }
 }
 
@@ -451,9 +451,9 @@ void daItem_c::execWaitMain() {
         f32 scaleStepX = mScaleTarget.x / getData()->mScaleAnimSpeed;
         f32 scaleStepY = mScaleTarget.y / getData()->mScaleAnimSpeed;
         f32 scaleStepZ = mScaleTarget.z / getData()->mScaleAnimSpeed;
-        cLib_chaseF(&mScale.x, mScaleTarget.x, scaleStepX);
-        cLib_chaseF(&mScale.y, mScaleTarget.y, scaleStepY);
-        cLib_chaseF(&mScale.z, mScaleTarget.z, scaleStepZ);
+        cLib_chaseF(&scale.x, mScaleTarget.x, scaleStepX);
+        cLib_chaseF(&scale.y, mScaleTarget.y, scaleStepY);
+        cLib_chaseF(&scale.z, mScaleTarget.z, scaleStepZ);
     }
     
     if (checkItemDisappear() && mDisappearTimer == 0) {
@@ -494,17 +494,17 @@ void daItem_c::execWaitMainFromBoss() {
 /* 800F5FC0-800F60C0       .text scaleAnimFromBossItem__8daItem_cFv */
 void daItem_c::scaleAnimFromBossItem() {
     if (field_0x638 < 30) {
-        mScale.x = cM_ssin(field_0x634*0x2000 - 0x4000)*2.0f / field_0x634+1.0f;
-        if (mScale.x < 0.0f) {
-            mScale.x = 0.0f;
+        scale.x = cM_ssin(field_0x634*0x2000 - 0x4000)*2.0f / field_0x634+1.0f;
+        if (scale.x < 0.0f) {
+            scale.x = 0.0f;
         }
-        mScale.y = mScale.x;
-        mScale.z = mScale.x;
+        scale.y = scale.x;
+        scale.z = scale.x;
     } else {
         if (field_0x638 == 30) {
             fopAcM_seStart(this, JA_SE_CM_BOSS_HEART_APPEAR, 0);
         }
-        mScale.setall(1.0f);
+        scale.setall(1.0f);
     }
 }
 
@@ -518,21 +518,21 @@ BOOL daItem_c::_daItem_draw() {
 
 /* 800F6110-800F61C8       .text setTevStr__8daItem_cFv */
 void daItem_c::setTevStr() {
-    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
     
-    mTevStr.mColorC0.r = 0x96;
-    mTevStr.mColorC0.g = 0x96;
-    mTevStr.mColorC0.b = 0x96;
-    mTevStr.mColorK0.r = 0xFF;
-    mTevStr.mColorK0.g = 0xFF;
-    mTevStr.mColorK0.b = 0xFF;
-    g_env_light.setLightTevColorType(mpModel, &mTevStr);
+    tevStr.mColorC0.r = 0x96;
+    tevStr.mColorC0.g = 0x96;
+    tevStr.mColorC0.b = 0x96;
+    tevStr.mColorK0.r = 0xFF;
+    tevStr.mColorK0.g = 0xFF;
+    tevStr.mColorK0.b = 0xFF;
+    g_env_light.setLightTevColorType(mpModel, &tevStr);
     
     for (int i = 0; i < 2; i++) {
         if (!mpModelArrow[i]) {
             continue;
         }
-        g_env_light.setLightTevColorType(mpModelArrow[i], &mTevStr);
+        g_env_light.setLightTevColorType(mpModelArrow[i], &tevStr);
     }
 }
 
@@ -832,7 +832,7 @@ BOOL daItem_c::itemActionForRupee() {
     
     if (mAcch.ChkGroundLanding()) {
         f32 temp2 = field_0x650 * getData()->field_0x04;
-        if (temp2 > mGravity - 0.5f) {
+        if (temp2 > gravity - 0.5f) {
             speedF = 0.0f;
         } else {
             speed.set(0.0f, -temp2, 0.0f);
@@ -874,7 +874,7 @@ BOOL daItem_c::itemActionForRupee() {
 BOOL daItem_c::itemActionForHeart() {
     f32 origSpeedY = speed.y;
     if (origSpeedY < 0.0f) {
-        mGravity = 0.0f;
+        gravity = 0.0f;
         speed.set(0.0f, getData()->field_0x20, 0.0f);
     }
     
@@ -902,7 +902,7 @@ BOOL daItem_c::itemActionForKey() {
     
     if (mAcch.ChkGroundLanding()) {
         f32 temp2 = field_0x650 * getData()->field_0x04;
-        if (temp2 > mGravity - 0.5f) {
+        if (temp2 > gravity - 0.5f) {
             speedF = 0.0f;
             current.angle.x = 0x4000;
             mTargetAngleX = current.angle.x;
@@ -946,7 +946,7 @@ BOOL daItem_c::itemActionForEmono() {
     
     if (mAcch.ChkGroundLanding()) {
         f32 temp2 = field_0x650 * getData()->field_0x04;
-        if (temp2 > mGravity - 0.5f) {
+        if (temp2 > gravity - 0.5f) {
             speedF = 0.0f;
         } else {
             speed.set(0.0f, -temp2, 0.0f);
@@ -975,7 +975,7 @@ BOOL daItem_c::itemActionForSword() {
     bool isQuake = dComIfGp_getDetect().chk_quake(&current.pos);
     if (isQuake && !checkFlag(FLAG_QUAKE) && mAcch.ChkGroundHit()) {
         speed.set(0.0f, 21.0f, 0.0f);
-        mGravity = -3.5f;
+        gravity = -3.5f;
     }
     
     if (mAcch.ChkGroundLanding()) {
@@ -1048,7 +1048,7 @@ BOOL daItem_c::itemActionForArrow() {
     
     if (mAcch.ChkGroundLanding()) {
         f32 temp_f3 = field_0x650 * getData()->field_0x04;
-        if (temp_f3 > mGravity - 0.5f) {
+        if (temp_f3 > gravity - 0.5f) {
             speedF = 0.0f;
         } else {
             speed.set(0.0f, -temp_f3, 0.0f);
@@ -1206,7 +1206,7 @@ BOOL daItem_c::timeCount() {
 /* 800F7F0C-800F7F50       .text mode_wait_init__8daItem_cFv */
 void daItem_c::mode_wait_init() {
     mMode = 0;
-    mGravity = getData()->mFieldItemGravity;
+    gravity = getData()->mFieldItemGravity;
     mPtclRippleCb.end();
 }
 
@@ -1233,12 +1233,12 @@ void daItem_c::mode_water_init() {
     mExtraZRot = 0;
     field_0x654 = 0;
     clrFlag(FLAG_UNK04);
-    mScale.set(mScaleTarget.x, mScaleTarget.y, mScaleTarget.z);
+    scale.set(mScaleTarget.x, mScaleTarget.y, mScaleTarget.z);
     
     cXyz scale;
     f32 temp = dItem_data::getShadowSize(m_itemNo);
     f32 temp3 = temp / dItem_data::getShadowSize(dItem_GREEN_RUPEE_e);
-    temp3 *= mScale.x;
+    temp3 *= scale.x;
     scale.setall(temp3);
     
     dComIfGp_particle_setShipTail(0x33, &current.pos, NULL, &scale, 0xFF, &mPtclRippleCb);
@@ -1335,7 +1335,7 @@ void daItem_c::mode_water() {
 /* 800F8528-800F8950       .text initAction__8daItem_cFv */
 BOOL daItem_c::initAction() {
     if (checkFlag(FLAG_UNK02)) {
-        mScale.set(mScaleTarget.x, mScaleTarget.y, mScaleTarget.z);
+        scale.set(mScaleTarget.x, mScaleTarget.y, mScaleTarget.z);
         
         switch (mAction) {
         case 4:
@@ -1347,20 +1347,20 @@ BOOL daItem_c::initAction() {
         case 5:
             speed.setall(0.0f);
             speedF = 0.0f;
-            mScale.setall(0.0f);
+            scale.setall(0.0f);
             mItemStatus = STATUS_WAIT_BOSS1;
             fopAcM_OnStatus(this, fopAcStts_UNK4000_e);
             field_0x654 = 0x4A8;
             break;
         case 0xC:
-            mScale.setall(1.0f);
+            scale.setall(1.0f);
             mItemStatus = STATUS_WAIT_BOSS2;
             fopAcM_OnStatus(this, fopAcStts_UNK4000_e);
             field_0x654 = 0x4A8;
             break;
         }
         
-        mGravity = getData()->mFieldItemGravity;
+        gravity = getData()->mFieldItemGravity;
         clrFlag(FLAG_UNK04);
         mMode = 0;
         
@@ -1401,8 +1401,8 @@ BOOL daItem_c::initAction() {
         speedF = getData()->mVelocityScale;
         break;
     case 0xA:
-        mGravity = getData()->mFieldItemGravity;
-        mScale.setall(0.0f);
+        gravity = getData()->mFieldItemGravity;
+        scale.setall(0.0f);
         mMode = 0;
         break;
     case 0xB:
@@ -1425,12 +1425,12 @@ BOOL daItem_c::initAction() {
         mExtraZRot = cM_rndFX(getData()->mHeartMaxRandomZRot);
     }
     
-    mGravity = getData()->mFieldItemGravity;
+    gravity = getData()->mFieldItemGravity;
     speed.set(0.0f, temp_f31, 0.0f);
     // This line setting speedF to itself gets optimized out and produces no code, but affects regalloc.
     // It's not known what the original code that got optimized out here was, it could be speedF or something else.
     speedF = speedF;
-    mScale.setall(0.0f);
+    scale.setall(0.0f);
     
     mMode = 0;
     
@@ -1512,7 +1512,7 @@ actor_process_profile_definition g_profile_ITEM = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_ITEM,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daItem_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_itembase.cpp b/src/d/actor/d_a_itembase.cpp
index 9ff07d42b..12faa0d02 100644
--- a/src/d/actor/d_a_itembase.cpp
+++ b/src/d/actor/d_a_itembase.cpp
@@ -166,26 +166,26 @@ void daItemBase_c::settingBeforeDraw() {
     }
     
     if (m_itemNo == BOMB_BAG || m_itemNo == dItem_SKULL_HAMMER_e || m_itemNo == dItem_SMALL_KEY_e) {
-        dDlst_texSpecmapST(&mEyePos, &mTevStr, mpModel->getModelData(), 1.0f);
+        dDlst_texSpecmapST(&eyePos, &tevStr, mpModel->getModelData(), 1.0f);
     }
 }
 
 /* 800F9244-800F92DC       .text setTevStr__12daItemBase_cFv */
 void daItemBase_c::setTevStr() {
-    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(mpModel, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(mpModel, &tevStr);
     
     for (int i = 0; i < 2; i++) {
         if (!mpModelArrow[i]) {
             continue;
         }
-        g_env_light.setLightTevColorType(mpModelArrow[i], &mTevStr);
+        g_env_light.setLightTevColorType(mpModelArrow[i], &tevStr);
     }
 }
 
 /* 800F92DC-800F93A8       .text setShadow__12daItemBase_cFv */
 void daItemBase_c::setShadow() {
-    f32 shadowSize = mScale.x * dItem_data::getShadowSize(m_itemNo);
+    f32 shadowSize = scale.x * dItem_data::getShadowSize(m_itemNo);
     if (!dItem_data::chkFlag(m_itemNo, 0x10)) {
         dComIfGd_setSimpleShadow2(
             &current.pos, mAcch.GetGroundH(), shadowSize, mAcch.m_gnd,
@@ -194,7 +194,7 @@ void daItemBase_c::setShadow() {
     } else {
         mShadowId = dComIfGd_setShadow(
             mShadowId, 1, mpModel, &current.pos, 80.0f, shadowSize,
-            current.pos.y, mAcch.GetGroundH(), mAcch.m_gnd, &mTevStr,
+            current.pos.y, mAcch.GetGroundH(), mAcch.m_gnd, &tevStr,
             0, 1.0f, dDlst_shadowControl_c::getSimpleTex()
         );
     }
diff --git a/src/d/actor/d_a_kaji.cpp b/src/d/actor/d_a_kaji.cpp
index 5058f4bde..91502b93b 100644
--- a/src/d/actor/d_a_kaji.cpp
+++ b/src/d/actor/d_a_kaji.cpp
@@ -48,10 +48,10 @@ s32 daKaji_c::_create() {
         if (fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x660)) {
             mDoMtx_stack_c::transS(current.pos);
             mDoMtx_stack_c::YrotM(shape_angle.y);
-            mDoMtx_stack_c::scaleM(mScale);
+            mDoMtx_stack_c::scaleM(scale);
             MTXCopy(mDoMtx_stack_c::get(), mMtx);
             
-            l_p_ship = (daObjPirateship::Act_c*)fopAcM_SearchByID(mParentPcId);
+            l_p_ship = (daObjPirateship::Act_c*)fopAcM_SearchByID(parentActorID);
         } else {
             return cPhs_ERROR_e;
         }
@@ -92,8 +92,8 @@ bool daKaji_c::_draw() {
     if (!l_p_ship->m2CC) {
         return true;
     }
-    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(mpMorf->getModel(), &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(mpMorf->getModel(), &tevStr);
     mpMorf->update();
     return true;
 }
@@ -136,7 +136,7 @@ actor_process_profile_definition g_profile_Kaji = {
     3,
     fpcLy_CURRENT_e,
     PROC_Kaji,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(daKaji_c),
     0,
     0,
diff --git a/src/d/actor/d_a_kt.cpp b/src/d/actor/d_a_kt.cpp
index 0668036a4..55763d0f1 100644
--- a/src/d/actor/d_a_kt.cpp
+++ b/src/d/actor/d_a_kt.cpp
@@ -23,8 +23,8 @@ void kotori_draw(kt_class* i_this) {
     cMtx_YrotM(*calc_mtx, i_this->current.angle.y);
     cMtx_XrotM(*calc_mtx, i_this->mAngleRoll);
     cMtx_ZrotM(*calc_mtx, i_this->current.angle.z);
-    f32 scale = kt_scale * 0.2f;
-    MtxScale(scale, scale, scale, true);
+    f32 scaleMag = kt_scale * 0.2f;
+    MtxScale(scaleMag, scaleMag, scaleMag, true);
     J3DModel* model = i_this->mpModel;
     model->setBaseTRMtx(*calc_mtx);
     mDoExt_modelUpdate(model);
@@ -330,8 +330,8 @@ static s32 daKt_Create(fopAc_ac_c* i_ac) {
                 }
             }
 
-            i_this->mpModel->setBaseScale(i_this->mScale);
-            i_this->mpModelWing->setBaseScale(i_this->mScale);
+            i_this->mpModel->setBaseScale(i_this->scale);
+            i_this->mpModelWing->setBaseScale(i_this->scale);
             i_this->current.pos.y += 2500.0f;
             i_this->mTargetPosHome = i_this->mHomePos = i_this->current.pos;
             i_this->mTimer[2] = g_regHIO.mChild[0].mShortRegs[5] + 500;
diff --git a/src/d/actor/d_a_kytag00.cpp b/src/d/actor/d_a_kytag00.cpp
index 151c90693..9addbaa2b 100644
--- a/src/d/actor/d_a_kytag00.cpp
+++ b/src/d/actor/d_a_kytag00.cpp
@@ -50,7 +50,7 @@ void wether_tag_move(kytag00_class* i_this) {
 
     if (dist_xz < i_this->mOuterRadius &&
         (chk_pos.y >= (i_this->current.pos.y - fade_y) &&
-        chk_pos.y < (i_this->current.pos.y + i_this->mScale.y * 5000.0f + fade_y)) &&
+        chk_pos.y < (i_this->current.pos.y + i_this->scale.y * 5000.0f + fade_y)) &&
         i_this->mTarget > 0.0f)
     {
         f32 blend = 1.0f;
@@ -74,7 +74,7 @@ void wether_tag_move(kytag00_class* i_this) {
             }
         } else {
             if (fade_y != 0.0f) {
-                f9 = (chk_pos.y - (i_this->current.pos.y + i_this->mScale.y * 5000.0f)) / fade_y;
+                f9 = (chk_pos.y - (i_this->current.pos.y + i_this->scale.y * 5000.0f)) / fade_y;
                 if (f9 < 0.0f) {
                     f9 = 0.0f;
                 }
@@ -184,7 +184,7 @@ void wether_tag_efect_move(kytag00_class* i_this) {
     
     if (dist_xz < i_this->mOuterRadius &&
         (chk_pos.y >= (i_this->current.pos.y - fade_y) &&
-        chk_pos.y < (i_this->current.pos.y + i_this->mScale.y * 5000.0f + fade_y)) &&
+        chk_pos.y < (i_this->current.pos.y + i_this->scale.y * 5000.0f + fade_y)) &&
         i_this->mTarget > 0.0f)
     {
         f32 blend = 1.0f;
@@ -211,7 +211,7 @@ void wether_tag_efect_move(kytag00_class* i_this) {
             }
         } else {
             if (fade_y != 0.0f) {
-                f9 = (chk_pos.y - (i_this->current.pos.y + i_this->mScale.y * 5000.0f)) / fade_y;
+                f9 = (chk_pos.y - (i_this->current.pos.y + i_this->scale.y * 5000.0f)) / fade_y;
                 if (f9 < 0.0f) {
                     f9 = 0.0f;
                 }
@@ -387,11 +387,11 @@ static s32 daKytag00_Create(fopAc_ac_c* i_ac) {
         i_this->mInnerFadeY = 10;
 
     if (i_this->mMode == 0) {
-        i_this->mInnerRadius = i_this->mScale.x * 5000.0f;
-        i_this->mOuterRadius = i_this->mScale.x * 5000.0f + i_this->mThickness * 100.0f;
+        i_this->mInnerRadius = i_this->scale.x * 5000.0f;
+        i_this->mOuterRadius = i_this->scale.x * 5000.0f + i_this->mThickness * 100.0f;
     } else {
-        i_this->mInnerRadius = i_this->mScale.x * 500.0f;
-        i_this->mOuterRadius = i_this->mScale.x * 500.0f + i_this->mThickness * 10.0f;
+        i_this->mInnerRadius = i_this->scale.x * 500.0f;
+        i_this->mOuterRadius = i_this->scale.x * 500.0f + i_this->mThickness * 10.0f;
     }
 
     i_this->mbEfSet = false;
@@ -414,7 +414,7 @@ actor_process_profile_definition g_profile_KYTAG00 = {
     7,
     fpcPi_CURRENT_e,
     PROC_KYTAG00,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(kytag00_class),
     0,
     0,
diff --git a/src/d/actor/d_a_kytag01.cpp b/src/d/actor/d_a_kytag01.cpp
index 4df1729fc..27a689652 100644
--- a/src/d/actor/d_a_kytag01.cpp
+++ b/src/d/actor/d_a_kytag01.cpp
@@ -77,8 +77,8 @@ static s32 daKytag01_Create(fopAc_ac_c* i_ac) {
     fopAcM_SetupActor(i_this, kytag01_class);
 
     i_this->mWaveInfo.mPos = i_this->current.pos;
-    i_this->mWaveInfo.mInnerRadius = i_this->mScale.x * 5000.0f;
-    i_this->mWaveInfo.mOuterRadius = i_this->mScale.z * 5000.0f;
+    i_this->mWaveInfo.mInnerRadius = i_this->scale.x * 5000.0f;
+    i_this->mWaveInfo.mOuterRadius = i_this->scale.z * 5000.0f;
 
     f32 defaultOuter = i_this->mWaveInfo.mInnerRadius + 500.0f;
     if (defaultOuter >= i_this->mWaveInfo.mOuterRadius)
@@ -108,7 +108,7 @@ actor_process_profile_definition g_profile_KYTAG01 = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_KYTAG01,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(kytag01_class),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_kytag04.cpp b/src/d/actor/d_a_kytag04.cpp
index 5cb876ecf..17b5119d8 100644
--- a/src/d/actor/d_a_kytag04.cpp
+++ b/src/d/actor/d_a_kytag04.cpp
@@ -50,11 +50,11 @@ static int daKytag04_Create(fopAc_ac_c* i_this)  {
     fopAcM_SetupActor(i_this, kytag04_class);
     kytag04_class* a_this = (kytag04_class*)i_this;
     a_this->mState = 0;
-    a_this->mOffColPat = a_this->mBase.mParameters;
-    a_this->mOnColPat = a_this->mBase.mParameters >> 8;
+    a_this->mOffColPat = a_this->base.mParameters;
+    a_this->mOnColPat = a_this->base.mParameters >> 8;
     a_this->mSwitchNo = a_this->current.angle.x;
-    a_this->mScaleX = a_this->mScale.x * 100.0f;
-    a_this->mScaleY = a_this->mScale.y * 100.0f;
+    a_this->mScaleX = a_this->scale.x * 100.0f;
+    a_this->mScaleY = a_this->scale.y * 100.0f;
     a_this->mTimer = 0;
     a_this->mTimerThreshold = 5;
     return cPhs_COMPLEATE_e;
@@ -73,7 +73,7 @@ actor_process_profile_definition g_profile_KYTAG04 = {
     7,
     fpcLy_CURRENT_e,
     PROC_KYTAG04,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(kytag04_class),
     0,
     0,
diff --git a/src/d/actor/d_a_kytag05.cpp b/src/d/actor/d_a_kytag05.cpp
index e60d83568..09b091b37 100644
--- a/src/d/actor/d_a_kytag05.cpp
+++ b/src/d/actor/d_a_kytag05.cpp
@@ -128,7 +128,7 @@ static int daKytag05_Create(fopAc_ac_c* i_this) {
     }
     a_this->mIndex = 0;
     a_this->mTimer = 0;
-    a_this->mUnknownParam = i_this->mBase.mParameters & 0xff;
+    a_this->mUnknownParam = i_this->base.mParameters & 0xff;
     dKyw_evt_wind_set_go();
     dKyw_evt_wind_set(0, 0);
     g_env_light.mSnowCount = 200;
@@ -155,7 +155,7 @@ actor_process_profile_definition g_profile_KYTAG05 = {
     7,
     fpcLy_CURRENT_e,
     PROC_KYTAG05,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(kytag05_class),
     0,
     0,
diff --git a/src/d/actor/d_a_kytag06.cpp b/src/d/actor/d_a_kytag06.cpp
index e043363a5..9dc20bc7b 100644
--- a/src/d/actor/d_a_kytag06.cpp
+++ b/src/d/actor/d_a_kytag06.cpp
@@ -87,7 +87,7 @@ actor_process_profile_definition g_profile_KYTAG06 = {
     7,
     fpcLy_CURRENT_e,
     PROC_KYTAG06,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(kytag06_class),
     0,
     0,
diff --git a/src/d/actor/d_a_lamp.cpp b/src/d/actor/d_a_lamp.cpp
index c935c6806..36c2012d1 100644
--- a/src/d/actor/d_a_lamp.cpp
+++ b/src/d/actor/d_a_lamp.cpp
@@ -45,9 +45,9 @@ static const float partMaxFlickerPerTick = 0.02f;
 
 /* 000000EC-00000158       .text daLamp_Draw__FP10lamp_class */
 static BOOL daLamp_Draw(lamp_class* i_this) {
-    g_env_light.settingTevStruct(TEV_TYPE_BG0, &i_this->current.pos, &i_this->mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_BG0, &i_this->current.pos, &i_this->tevStr);
     J3DModel* pModel = i_this->mModel;
-    g_env_light.setLightTevColorType(pModel, &i_this->mTevStr);
+    g_env_light.setLightTevColorType(pModel, &i_this->tevStr);
     mDoExt_modelUpdateDL(pModel);
     return TRUE;
 }
@@ -219,7 +219,7 @@ actor_process_profile_definition g_profile_LAMP = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcLy_CURRENT_e,
     /* ProcName     */ PROC_LAMP,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(lamp_class),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_magma.cpp b/src/d/actor/d_a_magma.cpp
index af271d56f..6592dbf86 100644
--- a/src/d/actor/d_a_magma.cpp
+++ b/src/d/actor/d_a_magma.cpp
@@ -25,7 +25,7 @@ s32 daMagma_c::create() {
     if (dComIfGp_createMagma()) {
         dComIfGp_getMagma()->newFloor(
             current.pos,
-            mScale,
+            scale,
             current.roomNo,
             getPathNo()
         );
@@ -63,7 +63,7 @@ actor_process_profile_definition g_profile_MAGMA = {
     7,
     fpcPi_CURRENT_e,
     PROC_MAGMA,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(daMagma_c),
     0,
     0,
diff --git a/src/d/actor/d_a_mbdoor.cpp b/src/d/actor/d_a_mbdoor.cpp
index 22ef75011..7611fab17 100644
--- a/src/d/actor/d_a_mbdoor.cpp
+++ b/src/d/actor/d_a_mbdoor.cpp
@@ -232,7 +232,7 @@ BOOL daMbdoor_c::CreateInit() {
         JUT_ASSERT(334, 0);
     }
     field_0x2ac = true;
-    mTevStr.mRoomNo = current.roomNo;
+    tevStr.mRoomNo = current.roomNo;
     
     if (type == 2) {
         setAction(1);
@@ -250,9 +250,9 @@ BOOL daMbdoor_c::CreateInit() {
     }
     
     field_0x2bc = 30;
-    mAttentionInfo.mPosition.y += 250.0f;
-    mEyePos.y += 250.0f;
-    mAttentionInfo.mFlags = fopAc_Attn_ACTION_DOOR_e;
+    attention_info.position.y += 250.0f;
+    eyePos.y += 250.0f;
+    attention_info.flags = fopAc_Attn_ACTION_DOOR_e;
     calcMtx();
     mpBgW->Move();
     fopAcM_SetStatusMap(this, 0xB);
@@ -467,7 +467,7 @@ BOOL daMbdoor_actionLockWait(daMbdoor_c* i_this) {
 
 /* 0000121C-000012AC       .text daMbdoor_actionLockOff__FP10daMbdoor_c */
 BOOL daMbdoor_actionLockOff(daMbdoor_c* i_this) {
-    if (i_this->mEvtInfo.checkCommandDemoAccrpt()) {
+    if (i_this->eventInfo.checkCommandDemoAccrpt()) {
         i_this->mEvtStaffId = dComIfGp_evmng_getMyStaffId("MBDOOR");
         i_this->demoProc();
         i_this->setAction(3);
@@ -490,7 +490,7 @@ BOOL daMbdoor_actionLockDemo(daMbdoor_c* i_this) {
 
 /* 00001324-000013E4       .text daMbdoor_actionCloseWait__FP10daMbdoor_c */
 BOOL daMbdoor_actionCloseWait(daMbdoor_c* i_this) {
-    if (i_this->mEvtInfo.checkCommandDoor()) {
+    if (i_this->eventInfo.checkCommandDoor()) {
         i_this->mEvtStaffId = dComIfGp_evmng_getMyStaffId("MBDOOR");
         i_this->demoProc();
         i_this->setAction(5);
@@ -498,8 +498,8 @@ BOOL daMbdoor_actionCloseWait(daMbdoor_c* i_this) {
         i_this->field_0x2ac = false;
     } else {
         if (i_this->checkArea()) {
-            i_this->mEvtInfo.setEventName("MBDOOR_OPEN");
-            i_this->mEvtInfo.onCondition(dEvtCnd_CANDOOR_e);
+            i_this->eventInfo.setEventName("MBDOOR_OPEN");
+            i_this->eventInfo.onCondition(dEvtCnd_CANDOOR_e);
         }
     }
     return TRUE;
@@ -512,18 +512,18 @@ BOOL daMbdoor_actionOpen(daMbdoor_c* i_this) {
 }
 
 BOOL daMbdoor_c::draw() {
-    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &tevStr);
     
-    g_env_light.setLightTevColorType(mpFuModel, &mTevStr);
+    g_env_light.setLightTevColorType(mpFuModel, &tevStr);
     mDoExt_modelUpdateDL(mpFuModel);
     
-    g_env_light.setLightTevColorType(mpLModel, &mTevStr);
+    g_env_light.setLightTevColorType(mpLModel, &tevStr);
     mDoExt_modelUpdateDL(mpLModel);
     
-    g_env_light.setLightTevColorType(mpRModel, &mTevStr);
+    g_env_light.setLightTevColorType(mpRModel, &tevStr);
     mDoExt_modelUpdateDL(mpRModel);
     
-    g_env_light.setLightTevColorType(mpToModel, &mTevStr);
+    g_env_light.setLightTevColorType(mpToModel, &tevStr);
     mDoExt_modelUpdateDL(mpToModel);
     
     return TRUE;
@@ -544,7 +544,7 @@ BOOL daMbdoor_c::execute() {
         &daMbdoor_actionOpen,
     };
     
-    dDemo_actor_c* demoActor = dComIfGp_demo_getActor(mDemoActorId);
+    dDemo_actor_c* demoActor = dComIfGp_demo_getActor(demoActorID);
     if (demoActor) {
         field_0x2ad = 0;
         if (demoActor->checkEnable(0x8)) {
@@ -596,7 +596,7 @@ actor_process_profile_definition g_profile_MBDOOR = {
     /* ListID       */ 3,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_MBDOOR,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daMbdoor_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_mmusic.cpp b/src/d/actor/d_a_mmusic.cpp
index aa5d3ebd9..4ee65c351 100644
--- a/src/d/actor/d_a_mmusic.cpp
+++ b/src/d/actor/d_a_mmusic.cpp
@@ -186,7 +186,7 @@ actor_process_profile_definition g_profile_Mmusic = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_Mmusic,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daMmusic::Act_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_mozo.cpp b/src/d/actor/d_a_mozo.cpp
index b3183550c..1776ae512 100644
--- a/src/d/actor/d_a_mozo.cpp
+++ b/src/d/actor/d_a_mozo.cpp
@@ -88,7 +88,7 @@ BOOL daMozo_c::CreateHeap() {
 /* 00000A24-00000AAC       .text set_mtx__8daMozo_cFv */
 void daMozo_c::set_mtx() {
     J3DModel* mdl = mAnimMorf->getModel();
-    mdl->setBaseScale(mScale);
+    mdl->setBaseScale(scale);
 
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(current.angle.y);
@@ -156,7 +156,7 @@ s32 daMozo_c::CreateInit() {
     /* Nonmatching */
     J3DModelData* mdlData = mAnimMorf->getModel()->getModelData();
 
-    int param = mBase.mParameters * 0xFF;
+    int param = base.mParameters * 0xFF;
     if (param == 0xFF) {
         param = 0;
     }
@@ -242,8 +242,8 @@ bool daMozo_c::_execute() {
 bool daMozo_c::_draw() {
     /* Nonmatching */
     J3DModelData* mdlData = mAnimMorf->getModel()->getModelData();
-    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(mAnimMorf->getModel(), &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(mAnimMorf->getModel(), &tevStr);
 
     mBrkAnm.entry(mdlData);
     mBtkAnm.entry(mdlData);
@@ -290,7 +290,7 @@ actor_process_profile_definition g_profile_MOZO = {
     7,
     fpcPi_CURRENT_e,
     PROC_MOZO,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(daMozo_c),
     0,
     0,
diff --git a/src/d/actor/d_a_nh.cpp b/src/d/actor/d_a_nh.cpp
index e3d755379..028c4f486 100644
--- a/src/d/actor/d_a_nh.cpp
+++ b/src/d/actor/d_a_nh.cpp
@@ -83,8 +83,8 @@ daNh_c::~daNh_c() {
 /* 800F9874-800F9980       .text setBaseMtx__6daNh_cFv */
 void daNh_c::setBaseMtx() {
     J3DModel* model = mpModel;
-    mScale.setall(l_HIO.prm.mModelScale);
-    model->setBaseScale(mScale);
+    scale.setall(l_HIO.prm.mModelScale);
+    model->setBaseScale(scale);
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
     model->setBaseTRMtx(mDoMtx_stack_c::get());
@@ -149,7 +149,7 @@ s32 daNh_c::create() {
 BOOL daNh_c::init() {
     mType = fopAcM_GetParam(this) & 0xFF;
     speed.y = 1.0f;
-    mGravity = l_HIO.prm.mGravity;
+    gravity = l_HIO.prm.mGravity;
     mGlowAlpha = l_HIO.prm.mDefaultGlowAlpha;
     mPlayerDist = 0.0f;
     mAlpha = 0xFF;
@@ -163,7 +163,7 @@ BOOL daNh_c::init() {
     mCyl.SetStts(&mStts);
     
     setBaseMtx();
-    mEyePos = mAttentionInfo.mPosition = current.pos;
+    eyePos = attention_info.position = current.pos;
     
     return TRUE;
 }
@@ -198,7 +198,7 @@ BOOL daNh_c::setAction(ActionFunc actionFunc, void* arg) {
 
 /* 800F9EB8-800F9F3C       .text checkBinCatch__6daNh_cFv */
 BOOL daNh_c::checkBinCatch() {
-    if (mEvtInfo.checkCommandCatch()) {
+    if (eventInfo.checkCommandCatch()) {
         fopAcM_delete(this);
         return TRUE;
     }
@@ -209,7 +209,7 @@ BOOL daNh_c::checkBinCatch() {
         l_HIO.prm.field_0x10, l_HIO.prm.field_0x3c,
         1
     );
-    mEvtInfo.onCondition(dEvtCnd_CANCATCH_e);
+    eventInfo.onCondition(dEvtCnd_CANCATCH_e);
     
     return FALSE;
 }
@@ -275,8 +275,8 @@ void daNh_c::BGCheck() {
     f32 groundY = dComIfG_Bgsp()->GroundCross(&gndChk);
     if (groundY != -1000000000.0f) {
         mGroundY = groundY;
-        mTevStr.mRoomNo = current.roomNo = dComIfG_Bgsp()->GetRoomId(gndChk);
-        mTevStr.mEnvrIdxOverride = dComIfG_Bgsp()->GetPolyColor(gndChk);
+        tevStr.mRoomNo = current.roomNo = dComIfG_Bgsp()->GetRoomId(gndChk);
+        tevStr.mEnvrIdxOverride = dComIfG_Bgsp()->GetPolyColor(gndChk);
     }
 }
 
@@ -284,9 +284,9 @@ void daNh_c::BGCheck() {
 void daNh_c::airMove() {
     f32 idealY = mGroundY + l_HIO.prm.mHeightAboveGround;
     if (current.pos.y < idealY - 10.0f) {
-        mMaxFallSpeed = l_HIO.prm.mAscentSpeed;
+        maxFallSpeed = l_HIO.prm.mAscentSpeed;
     } else if (current.pos.y > idealY + 10.0f) {
-        mMaxFallSpeed = l_HIO.prm.mDescentSpeed;
+        maxFallSpeed = l_HIO.prm.mDescentSpeed;
     }
 }
 
@@ -383,15 +383,15 @@ BOOL daNh_c::execute() {
     
     mGlowAlpha = l_HIO.prm.mDefaultGlowAlpha;
     
-    if (mMaxFallSpeed < speed.y) {
-        speed.y -= mGravity;
-        if (speed.y < mMaxFallSpeed) {
-            speed.y = mMaxFallSpeed;
+    if (maxFallSpeed < speed.y) {
+        speed.y -= gravity;
+        if (speed.y < maxFallSpeed) {
+            speed.y = maxFallSpeed;
         }
-    } else if (mMaxFallSpeed > speed.y) {
-        speed.y += mGravity;
-        if (speed.y > mMaxFallSpeed) {
-            speed.y = mMaxFallSpeed;
+    } else if (maxFallSpeed > speed.y) {
+        speed.y += gravity;
+        if (speed.y > maxFallSpeed) {
+            speed.y = maxFallSpeed;
         }
     }
     
@@ -416,7 +416,7 @@ BOOL daNh_c::execute() {
     }
     
     setBaseMtx();
-    mEyePos = mAttentionInfo.mPosition = current.pos;
+    eyePos = attention_info.position = current.pos;
     
     return TRUE;
 }
@@ -442,8 +442,8 @@ void daNh_c::playBrkAnm() {
 
 /* 800FACE8-800FAE1C       .text draw__6daNh_cFv */
 BOOL daNh_c::draw() {
-    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(mpModel, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(mpModel, &tevStr);
     
     J3DModelData* modelData = mpModel->getModelData();
     
@@ -511,7 +511,7 @@ actor_process_profile_definition g_profile_NH = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcLy_CURRENT_e,
     /* ProcName     */ PROC_NH,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daNh_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_npc_btsw2.cpp b/src/d/actor/d_a_npc_btsw2.cpp
index 51f3e3eac..2875150ba 100644
--- a/src/d/actor/d_a_npc_btsw2.cpp
+++ b/src/d/actor/d_a_npc_btsw2.cpp
@@ -187,7 +187,7 @@ static BOOL nodeCallBack(J3DNode* node, int param_1) {
                 mDoMtx_stack_c::XrotM(-i_this->m_jnt.getHead_x());
                 mDoMtx_stack_c::YrotM(-i_this->current.angle.y);
                 mDoMtx_stack_c::concat(sp14);
-                mDoMtx_stack_c::multVec(&a_eye_pos_offst, &i_this->mEyePos);
+                mDoMtx_stack_c::multVec(&a_eye_pos_offst, &i_this->eyePos);
             } else if (jointNo == i_this->m_jnt.getBackboneJntNum()) {
                 int backboneY = i_this->m_jnt.getBackbone_y();
                 mDoMtx_stack_c::XrotM(backboneY);
@@ -292,7 +292,7 @@ bool daNpc_Btsw2_c::chkAttention(cXyz pos, s16 facingAngleY) {
 /* 000007D0-00000820       .text eventOrder__13daNpc_Btsw2_cFv */
 void daNpc_Btsw2_c::eventOrder() {
     if (m746 == 1 || m746 == 2) {
-        mEvtInfo.onCondition(dEvtCmd_INTALK_e);
+        eventInfo.onCondition(dEvtCmd_INTALK_e);
         if (m746 == 1) {
             fopAcM_orderSpeakEvent(this);
         }
@@ -301,10 +301,10 @@ void daNpc_Btsw2_c::eventOrder() {
 
 /* 00000820-00000860       .text checkOrder__13daNpc_Btsw2_cFv */
 void daNpc_Btsw2_c::checkOrder() {
-    if (mEvtInfo.checkCommandDemoAccrpt()) {
+    if (eventInfo.checkCommandDemoAccrpt()) {
         return;
     }
-    if (mEvtInfo.checkCommandTalk()) {
+    if (eventInfo.checkCommandTalk()) {
         if (m746 == 1 || m746 == 2) {
             m746 = 0;
             m71E = true;
@@ -368,7 +368,7 @@ u16 daNpc_Btsw2_c::next_msgStatus(u32*) {
 
 /* 000009F4-00000A20       .text setAttention__13daNpc_Btsw2_cFv */
 void daNpc_Btsw2_c::setAttention() {
-    mAttentionInfo.mPosition.set(m704.x, m704.y + l_HIO.mNpc.mAttnYOffset, m704.z);
+    attention_info.position.set(m704.x, m704.y + l_HIO.mNpc.mAttnYOffset, m704.z);
 }
 
 /* 00000A20-00000B94       .text lookBack__13daNpc_Btsw2_cFv */
@@ -396,7 +396,7 @@ void daNpc_Btsw2_c::lookBack() {
             sp38 = dNpc_playerEyePos(l_HIO.mNpc.m04);
             r31 = &sp38;
             sp2c = current.pos;
-            sp2c.y = mEyePos.y;
+            sp2c.y = eyePos.y;
         }
         break;
     }
@@ -459,8 +459,8 @@ BOOL daNpc_Btsw2_c::CreateHeap() {
 /* 00000EFC-000010F8       .text CreateInit__13daNpc_Btsw2_cFv */
 BOOL daNpc_Btsw2_c::CreateInit() {
     m714 = current.angle;
-    mAttentionInfo.mFlags = fopAc_Attn_LOCKON_TALK_e | fopAc_Attn_ACTION_TALK_e;
-    mGravity = -30.0f;
+    attention_info.flags = fopAc_Attn_LOCKON_TALK_e | fopAc_Attn_ACTION_TALK_e;
+    gravity = -30.0f;
     setAction(&daNpc_Btsw2_c::wait_action, NULL);
     m704 = current.pos;
     mStts.Init(0xFF, 0xFF, this);
@@ -477,8 +477,8 @@ BOOL daNpc_Btsw2_c::CreateInit() {
     m736 = 0;
     m740 = 0;
     mEventCut.setActorInfo2("Btsw2", this);
-    mAttentionInfo.mDistances[1] = 0xAB;
-    mAttentionInfo.mDistances[3] = 0xAB;
+    attention_info.distances[1] = 0xAB;
+    attention_info.distances[3] = 0xAB;
     return TRUE;
 }
 
@@ -634,15 +634,15 @@ BOOL daNpc_Btsw2_c::_execute() {
         l_HIO.mNpc.mMaxTurnStep
     );
     playTexPatternAnm();
-    mpMcaMorf->play(&mEyePos, 0, 0);
+    mpMcaMorf->play(&eyePos, 0, 0);
     checkOrder();
     if (!mEventCut.cutProc()) {
         (this->*mCurrActionFunc)(NULL);
     }
     eventOrder();
     mObjAcch.CrrPos(*dComIfG_Bgsp());
-    mTevStr.mRoomNo = dComIfG_Bgsp()->GetRoomId(mObjAcch.m_gnd);
-    mTevStr.mEnvrIdxOverride = dComIfG_Bgsp()->GetPolyColor(mObjAcch.m_gnd);
+    tevStr.mRoomNo = dComIfG_Bgsp()->GetRoomId(mObjAcch.m_gnd);
+    tevStr.mEnvrIdxOverride = dComIfG_Bgsp()->GetPolyColor(mObjAcch.m_gnd);
     
     J3DModel* model = mpMcaMorf->getModel();
     mDoMtx_stack_c::transS(current.pos);
@@ -659,10 +659,10 @@ BOOL daNpc_Btsw2_c::_draw() {
     J3DModel* model = mpMcaMorf->getModel();
     J3DModelData* modelData = model->getModelData();
     
-    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(model, &mTevStr);
-    g_env_light.setLightTevColorType(m6D0, &mTevStr);
-    g_env_light.setLightTevColorType(m6D4, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(model, &tevStr);
+    g_env_light.setLightTevColorType(m6D0, &tevStr);
+    g_env_light.setLightTevColorType(m6D4, &tevStr);
     
     mBtpAnm.entry(modelData, m6F0);
     mpMcaMorf->updateDL();
@@ -675,7 +675,7 @@ BOOL daNpc_Btsw2_c::_draw() {
     cXyz sp8(current.pos.x, current.pos.y + 130.0f, current.pos.z);
     mShadowId = dComIfGd_setShadow(
         mShadowId, 1, mpMcaMorf->getModel(), &sp8, 800.0f, 20.0f,
-        current.pos.y, mObjAcch.GetGroundH(), mObjAcch.m_gnd, &mTevStr,
+        current.pos.y, mObjAcch.GetGroundH(), mObjAcch.m_gnd, &tevStr,
         0, 1.0f, dDlst_shadowControl_c::getSimpleTex()
     );
     
@@ -722,7 +722,7 @@ actor_process_profile_definition g_profile_NPC_BTSW2 = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcLy_CURRENT_e,
     /* ProcName     */ PROC_NPC_BTSW2,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daNpc_Btsw2_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp
index da95bddfd..d4e9ff853 100644
--- a/src/d/actor/d_a_npc_ji1.cpp
+++ b/src/d/actor/d_a_npc_ji1.cpp
@@ -586,9 +586,9 @@ u32 daNpc_Ji1_c::kaitenExpAction(void*) {
 
     if(field_0xC78 == 0) {
         setAnm(0x10, 4.0f, 0);
-        if(!mEvtInfo.checkCommandDemoAccrpt()) {
+        if(!eventInfo.checkCommandDemoAccrpt()) {
             fopAcM_orderOtherEventId(this, field_0xC60);
-            mEvtInfo.onCondition(dEvtCmd_INDEMO_e);
+            eventInfo.onCondition(dEvtCmd_INDEMO_e);
 
             return false;
         }
@@ -706,7 +706,7 @@ u32 daNpc_Ji1_c::getMsg1stType() {
 
     if(!dComIfGs_isEventBit(0x108)) {
         dComIfGs_onEventBit(0x108);
-        mEvtInfo.setEventId(-1);
+        eventInfo.setEventId(-1);
 
         return 0x965;
     }
@@ -1111,7 +1111,7 @@ u32 daNpc_Ji1_c::evn_talk_init(int staffIdx) {
 /* 000049AC-00004B1C       .text evn_talk__11daNpc_Ji1_cFv */
 u32 daNpc_Ji1_c::evn_talk() {
     if(l_msgId == -1) {
-        l_msgId = fopMsgM_messageSet(field_0x2AC, &mEyePos);
+        l_msgId = fopMsgM_messageSet(field_0x2AC, &eyePos);
     }
     else if(!l_msg) {
         l_msg = fopMsgM_SearchByID(l_msgId);
@@ -1171,7 +1171,7 @@ u32 daNpc_Ji1_c::evn_continue_talk_init(int staffIdx) {
 /* 00004B84-00004CF4       .text evn_continue_talk__11daNpc_Ji1_cFv */
 u32 daNpc_Ji1_c::evn_continue_talk() {
     if(l_msgId == -1) {
-        l_msgId = fopMsgM_messageSet(field_0x2AC, &mEyePos);
+        l_msgId = fopMsgM_messageSet(field_0x2AC, &eyePos);
     }
     else if(!l_msg) {
         l_msg = fopMsgM_SearchByID(l_msgId);
@@ -1613,7 +1613,7 @@ u32 daNpc_Ji1_c::teachSPRollCutAction(void*) {
     if(field_0xC78 == 0) {
         dComIfGp_setItemMagicCount(dComIfGs_getMaxMagic());
         setAnm(5, 0.0f, 0);
-        mAttentionInfo.mFlags |= fopAc_Attn_LOCKON_MISC_e;
+        attention_info.flags |= fopAc_Attn_LOCKON_MISC_e;
         field_0xC90 = 0;
         field_0xD34 = 0;
         field_0xC30 = 0;
@@ -1751,7 +1751,7 @@ u32 daNpc_Ji1_c::teachSPRollCutAction(void*) {
                         }
 
                         fopAcM_orderOtherEventId(this, field_0xC5A);
-                        mEvtInfo.onCondition(dEvtCnd_UNK2_e);
+                        eventInfo.onCondition(dEvtCnd_UNK2_e);
                         field_0xC90 = 2;
                     }
                 }
@@ -2209,9 +2209,9 @@ u32 daNpc_Ji1_c::battleAction(void*) {
         dComIfGp_setMiniGameRupee(0);
         field_0xC3C = 0;
         setAnm(5, 0.0f, 0);
-        mAttentionInfo.mFlags |= fopAc_Attn_LOCKON_MISC_e;
-        mAttentionInfo.mFlags |= fopAc_Attn_LOCKON_ENEMY_e;
-        mAttentionInfo.mDistances[2] = 3;
+        attention_info.flags |= fopAc_Attn_LOCKON_MISC_e;
+        attention_info.flags |= fopAc_Attn_LOCKON_ENEMY_e;
+        attention_info.distances[2] = 3;
         field_0xC30 = (s16)cM_rndF(150.0f) + 30;
         field_0xD70 = 0;
         field_0xD6C = 0;
@@ -2220,8 +2220,8 @@ u32 daNpc_Ji1_c::battleAction(void*) {
         field_0xC78++;
     }
     else if(field_0xC78 == -1) {
-        mAttentionInfo.mFlags &= ~fopAc_Attn_LOCKON_ENEMY_e;
-        mAttentionInfo.mDistances[2] = 0xB5;
+        attention_info.flags &= ~fopAc_Attn_LOCKON_ENEMY_e;
+        attention_info.distances[2] = 0xB5;
     }
     else {
         cXyz temp = player->current.pos - current.pos;
@@ -2879,7 +2879,7 @@ BOOL daNpc_Ji1_c::CreateHeap() {
     field_0xC76 = dComIfGp_evmng_getEventIdx("Ji1_EquipTalk", 0xFF);
 
     if(dComIfGs_isEventBit(0x1) && !dComIfGs_isEventBit(0x108)) {
-        mEvtInfo.setEventId(field_0xC76);
+        eventInfo.setEventId(field_0xC76);
     }
 
     return true;
@@ -2895,8 +2895,8 @@ BOOL daNpc_Ji1_c::CreateInit() {
     fopAcM_createChild("Kmon", fopAcM_GetID(this), 0, &temp, fopAcM_GetRoomNo(this), &temp2, 0, (createFunc)0);
     fopAcM_SetMtx(this, field_0x330->getModel()->getBaseTRMtx());
     fopAcM_setCullSizeBox(this, -70.0f, 0.0f, -70.0f, 70.0f, 200.0f, 70.0f);
-    mGravity = -30.0f;
-    mAttentionInfo.mFlags = fopAc_Attn_LOCKON_MISC_e | fopAc_Attn_LOCKON_TALK_e | fopAc_Attn_ACTION_TALK_e;
+    gravity = -30.0f;
+    attention_info.flags = fopAc_Attn_LOCKON_MISC_e | fopAc_Attn_LOCKON_TALK_e | fopAc_Attn_ACTION_TALK_e;
 
     field_0x638.Init(0xFF, 0xFF, this);
     field_0x674.Init(0xFF, 0xFF, this);
@@ -3061,10 +3061,10 @@ BOOL daNpc_Ji1_c::CreateInit() {
     field_0xD7C = 0;
     field_0xD7E = 0;
     
-    mAttentionInfo.mFlags |= fopAc_Attn_LOCKON_MISC_e;
-    mAttentionInfo.mDistances[1] = 0xA9;
-    mAttentionInfo.mDistances[3] = 0xA9;
-    mAttentionInfo.mDistances[2] = 0xB5;
+    attention_info.flags |= fopAc_Attn_LOCKON_MISC_e;
+    attention_info.distances[1] = 0xA9;
+    attention_info.distances[3] = 0xA9;
+    attention_info.distances[2] = 0xB5;
     field_0x414 = 0.0f;
     field_0x42C = 0.0f;
     field_0x430 = 0;
@@ -3178,15 +3178,15 @@ BOOL daNpc_Ji1_c::_execute() {
     lookBack();
     daNpc_Ji1_setHairAngle(this);
 
-    mAttentionInfo.mPosition.set(current.pos.x, current.pos.y + 190.0f, current.pos.z);
+    attention_info.position.set(current.pos.x, current.pos.y + 190.0f, current.pos.z);
     shape_angle = current.angle;
-    mEyePos.set(current.pos.x, current.pos.y + 150.0f, current.pos.z);
+    eyePos.set(current.pos.x, current.pos.y + 150.0f, current.pos.z);
     fopAcM_posMoveF(this, field_0x638.GetCCMoveP());
     cXyz temp(current.pos);
     field_0x434.CrrPos(*dComIfG_Bgsp());
     field_0xC40 = current.pos - temp;
-    mTevStr.mRoomNo = dComIfG_Bgsp()->GetRoomId(field_0x434.m_gnd);
-    mTevStr.mEnvrIdxOverride = dComIfG_Bgsp()->GetPolyColor(field_0x434.m_gnd);
+    tevStr.mRoomNo = dComIfG_Bgsp()->GetRoomId(field_0x434.m_gnd);
+    tevStr.mEnvrIdxOverride = dComIfG_Bgsp()->GetPolyColor(field_0x434.m_gnd);
     set_mtx();
     field_0x6B0.SetC(current.pos);
     dComIfG_Ccsp()->Set(&field_0x6B0);
@@ -3209,9 +3209,9 @@ BOOL daNpc_Ji1_c::_draw() {
         J3DModelData* modelData1 = model1->getModelData();
         J3DModel* model2 = mpMorf->getModel();
 
-        g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &mTevStr);
-        g_env_light.setLightTevColorType(model1, &mTevStr);
-        g_env_light.setLightTevColorType(model2, &mTevStr);
+        g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
+        g_env_light.setLightTevColorType(model1, &tevStr);
+        g_env_light.setLightTevColorType(model2, &tevStr);
         field_0x3D8.entry(modelData1, field_0x3EC);
         field_0x330->entryDL();
         if(field_0xD84 == 1) {
@@ -3225,7 +3225,7 @@ BOOL daNpc_Ji1_c::_draw() {
         field_0x3FC.entry(field_0x3F8->getModelData(), (s16)field_0x414);
         mDoExt_modelUpdateDL(field_0x3F8);
         cXyz temp(current.pos.x, current.pos.y + 150.0f, current.pos.z);
-        field_0x3F0 = dComIfGd_setShadow(field_0x3F0, 1, field_0x330->getModel(), &temp, 800.0f, 20.0f, current.pos.y, field_0x434.GetGroundH(), field_0x434.m_gnd, &mTevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex());
+        field_0x3F0 = dComIfGd_setShadow(field_0x3F0, 1, field_0x330->getModel(), &temp, 800.0f, 20.0f, current.pos.y, field_0x434.GetGroundH(), field_0x434.m_gnd, &tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex());
         if(field_0x3F0 != 0 && field_0xD84 != 0) {
             dComIfGd_addRealShadow(field_0x3F0, mpMorf->getModel());
         }
@@ -3328,7 +3328,7 @@ BOOL daNpc_Ji1_c::lookBack() {
         field_0xC88 = 0;
     }
 
-    m_jnt.lookAtTarget(&current.angle.y, dstPos, mEyePos, current.angle.y, field_0xC88, temp2);
+    m_jnt.lookAtTarget(&current.angle.y, dstPos, eyePos, current.angle.y, field_0xC88, temp2);
 
     return ret;
 }
@@ -3453,7 +3453,7 @@ actor_process_profile_definition g_profile_NPC_JI1 = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcLy_CURRENT_e,
     /* ProcName     */ PROC_NPC_JI1,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daNpc_Ji1_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp
index 226b3f98c..80ea56733 100644
--- a/src/d/actor/d_a_npc_kamome.cpp
+++ b/src/d/actor/d_a_npc_kamome.cpp
@@ -201,11 +201,11 @@ daNpc_kam_c::~daNpc_kam_c() {
 void daNpc_kam_c::setAttention(bool param_1, int param_2) {
     if (param_1) {
         cXyz headTopPos = getHeadTopPos();
-        mEyePos.set(headTopPos.x, headTopPos.y - 20.0f, headTopPos.z);
+        eyePos.set(headTopPos.x, headTopPos.y - 20.0f, headTopPos.z);
         if (param_2) {
-            mAttentionInfo.mPosition.set(current.pos.x, current.pos.y, current.pos.z);
+            attention_info.position.set(current.pos.x, current.pos.y, current.pos.z);
         } else {
-            mAttentionInfo.mPosition.set(home.pos.x, home.pos.y, home.pos.z);
+            attention_info.position.set(home.pos.x, home.pos.y, home.pos.z);
         }
     }
 }
@@ -407,9 +407,9 @@ BOOL daNpc_kam_c::init() {
     mUnusedC06 = 0;
     mEventState = -1;
     mCurrEventIdxIdx = -1;
-    mScale *= 1000.0f;
-    mMaxY = home.pos.y + mScale.y;
-    mMinY = home.pos.y - mScale.y;
+    scale *= 1000.0f;
+    mMaxY = home.pos.y + scale.y;
+    mMinY = home.pos.y - scale.y;
     
     mTargetSpeedF = l_HIO.mHio1.mSpeedF;
     mAngVelY = l_HIO.mHio1.mGlidingAngVelY;
@@ -437,16 +437,16 @@ BOOL daNpc_kam_c::init() {
     
     setBaseMtx();
     
-    mAttentionInfo.mFlags = 0;
-    mAttentionInfo.mDistances[1] = 38;
-    mAttentionInfo.mDistances[3] = 38;
+    attention_info.flags = 0;
+    attention_info.distances[1] = 38;
+    attention_info.distances[3] = 38;
     
     for (int i = 0; i < 3; i++) {
         mEventIdxs[i] = dComIfGp_evmng_getEventIdx(event_name_tbl[i], 0xFF);
     }
     
-    mEvtInfo.setXyCheckCB(daNpc_kam_XyCheckCB);
-    mEvtInfo.setXyEventCB(daNpc_kam_XyEventCB);
+    eventInfo.setXyCheckCB(daNpc_kam_XyCheckCB);
+    eventInfo.setXyEventCB(daNpc_kam_XyEventCB);
     
     return TRUE;
 }
@@ -538,7 +538,7 @@ BOOL daNpc_kam_c::changeAreaCheck() {
     } else {
         // For all other sectors, simple check if Link is within the Hyoi Seagull's moveable range.
         delta = player->current.pos - home.pos;
-        if (delta.absXZ() < mScale.x) {
+        if (delta.absXZ() < scale.x) {
             offNpcNotChange();
             return TRUE;
         }
@@ -550,7 +550,7 @@ BOOL daNpc_kam_c::changeAreaCheck() {
 /* 0000235C-00002450       .text areaOutCheck__11daNpc_kam_cFv */
 BOOL daNpc_kam_c::areaOutCheck() {
     cXyz delta = (current.pos - home.pos);
-    return delta.absXZ() > mScale.x ? TRUE : FALSE;
+    return delta.absXZ() > scale.x ? TRUE : FALSE;
 }
 
 /* 00002450-000025B0       .text getStickAngY__11daNpc_kam_cFPsPs */
@@ -648,10 +648,10 @@ int daNpc_kam_c::waitNpcAction(void*) {
         mC0C = cLib_getRndValue(10, 80);
     } else if (mActionStatus != ACTION_ENDING) {
         if (changeAreaCheck()) {
-            mAttentionInfo.mFlags |= fopAc_Attn_ACTION_TALK_e | fopAc_Attn_TALKFLAG_NOTALK_e;
+            attention_info.flags |= fopAc_Attn_ACTION_TALK_e | fopAc_Attn_TALKFLAG_NOTALK_e;
             mEventState = 6;
         } else {
-            mAttentionInfo.mFlags &= ~(fopAc_Attn_ACTION_TALK_e | fopAc_Attn_TALKFLAG_NOTALK_e);
+            attention_info.flags &= ~(fopAc_Attn_ACTION_TALK_e | fopAc_Attn_TALKFLAG_NOTALK_e);
             mEventState = -1;
         }
         
@@ -863,7 +863,7 @@ void daNpc_kam_c::eventOrder() {
     }
     if (mEventState == 5 || mEventState == 4) {
         if (dComIfGp_getPlayer(0) != this) {
-            mEvtInfo.onCondition(dEvtCnd_CANTALK_e);
+            eventInfo.onCondition(dEvtCnd_CANTALK_e);
             if (mEventState == 5) {
                 fopAcM_orderSpeakEvent(this);
             }
@@ -872,8 +872,8 @@ void daNpc_kam_c::eventOrder() {
         }
     } else if (mEventState == 6) {
         if (dComIfGp_getPlayer(0) != this) {
-            mEvtInfo.onCondition(dEvtCnd_CANTALKITEM_e);
-            mEvtInfo.onCondition(dEvtCnd_CANTALK_e);
+            eventInfo.onCondition(dEvtCnd_CANTALKITEM_e);
+            eventInfo.onCondition(dEvtCnd_CANTALK_e);
         } else {
             mEventState = -1;
         }
@@ -885,7 +885,7 @@ void daNpc_kam_c::eventOrder() {
 
 /* 0000315C-00003194       .text checkOrder__11daNpc_kam_cFv */
 void daNpc_kam_c::checkOrder() {
-    if (!mEvtInfo.checkCommandTalk()) {
+    if (!eventInfo.checkCommandTalk()) {
         return;
     }
     if (mEventState != 5 && mEventState != 4 && mEventState != 6) {
@@ -896,7 +896,7 @@ void daNpc_kam_c::checkOrder() {
 
 /* 00003194-00003200       .text checkCommandTalk__11daNpc_kam_cFv */
 BOOL daNpc_kam_c::checkCommandTalk() {
-    if (mEvtInfo.checkCommandTalk()) {
+    if (eventInfo.checkCommandTalk()) {
         if (dComIfGp_event_chkTalkXY()) {
             if (mEventState == 6) {
                 mEventState = -1;
@@ -938,7 +938,7 @@ static char* cut_name_tbl[] = {
 
 /* 00003248-000034A8       .text eventProc__11daNpc_kam_cFv */
 BOOL daNpc_kam_c::eventProc() {
-    if (mEvtInfo.checkCommandDemoAccrpt()) {
+    if (eventInfo.checkCommandDemoAccrpt()) {
         if (mEventState != -1) {
             if (mEventState == 0) {
                 if (dComIfGp_evmng_startCheck("OPTION_CHAR_END") || dComIfGp_evmng_endCheck("OPTION_CHAR_END")) {
@@ -1253,7 +1253,7 @@ void daNpc_kam_c::animationPlay() {
         mtrlSndId = dComIfG_Bgsp()->GetMtrlSndId(mAcch.m_gnd);
     }
     
-    mReachedAnimEnd = mpMorf->play(&mEyePos, mtrlSndId, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
+    mReachedAnimEnd = mpMorf->play(&eyePos, mtrlSndId, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
     
     f32 frame = mpMorf->getFrame();
     if (mpMorf->getPlaySpeed() < 0.0f) {
@@ -1309,8 +1309,8 @@ BOOL daNpc_kam_c::execute() {
             if (mAcch.GetGroundH() != -1000000000.0f) {
                 s8 roomNo = dComIfG_Bgsp()->GetRoomId(mAcch.m_gnd);
                 fopAcM_SetRoomNo(this, roomNo);
-                mTevStr.mRoomNo = roomNo;
-                mTevStr.mEnvrIdxOverride = dComIfG_Bgsp()->GetPolyColor(mAcch.m_gnd);
+                tevStr.mRoomNo = roomNo;
+                tevStr.mEnvrIdxOverride = dComIfG_Bgsp()->GetPolyColor(mAcch.m_gnd);
                 mStts.SetRoomId(roomNo);
                 mPolyInfo.SetPolyInfo(mAcch.m_gnd);
             }
@@ -1384,18 +1384,18 @@ BOOL daNpc_kam_c::execute() {
 BOOL daNpc_kam_c::draw() {
     J3DModel* model = mpMorf->getModel();
     
-    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
     
     drawDamageFog();
     
-    g_env_light.setLightTevColorType(model, &mTevStr);
+    g_env_light.setLightTevColorType(model, &tevStr);
     
     mpMorf->entryDL();
     
     cXyz shadowPos(current.pos.x, current.pos.y, current.pos.z);
     mShadowId = dComIfGd_setShadow(
         mShadowId, 1, model, &shadowPos, 800.0f, 20.0f,
-        current.pos.y, mAcch.GetGroundH(), mAcch.m_gnd, &mTevStr,
+        current.pos.y, mAcch.GetGroundH(), mAcch.m_gnd, &tevStr,
         0, 1.0f, dDlst_shadowControl_c::getSimpleTex()
     );
     
@@ -1443,7 +1443,7 @@ actor_process_profile_definition g_profile_NPC_KAM = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcLy_CURRENT_e,
     /* ProcName     */ PROC_NPC_KAM,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daNpc_kam_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp
index c94a89ea7..ff5361d48 100644
--- a/src/d/actor/d_a_npc_md.cpp
+++ b/src/d/actor/d_a_npc_md.cpp
@@ -1012,7 +1012,7 @@ int daNpc_Md_c::calcStickPos(s16 param_1, cXyz* param_2) {
         attList = attention.GetActionList(0);
     }
     if (attList) {
-        *param_2 = attList->getActor()->mEyePos;
+        *param_2 = attList->getActor()->eyePos;
         return r31;
     }
     
@@ -1459,7 +1459,7 @@ BOOL daNpc_Md_c::hitNpcAction(void* r29) {
         current.angle.y = angle;
         speedF = 10.0f;
         speed.y = 20.0f;
-        mAttentionInfo.mFlags &= ~fopAc_Attn_ACTION_CARRY_e;
+        attention_info.flags &= ~fopAc_Attn_ACTION_CARRY_e;
         mAcchCir[1].SetWall(60.0f, 20.0f);
         cLib_offBit(m30F0, 0x01UL | 0x04UL);
         cLib_onBit(m30F0, 0x02UL);
@@ -1582,8 +1582,8 @@ BOOL daNpc_Md_c::mkamaePlayerAction(void*) {
         setAnm(0x1F);
         shape_angle.x = 0;
         shape_angle.z = 0;
-        mGravity = l_HIO.m0F4;
-        mMaxFallSpeed = -100.0f;
+        gravity = l_HIO.m0F4;
+        maxFallSpeed = -100.0f;
         speedF = 0.0f;
         speed.y = 0.0f;
         mAcchCir[1].SetWall(60.0f, 20.0f);
@@ -1788,7 +1788,7 @@ static char* cut_name_tbl[] = {
 
 /* 0000A9BC-0000AC80       .text eventProc__10daNpc_Md_cFv */
 BOOL daNpc_Md_c::eventProc() {
-    if (mEvtInfo.checkCommandDemoAccrpt() && mCurEventMode != 0) {
+    if (eventInfo.checkCommandDemoAccrpt() && mCurEventMode != 0) {
         if (mCurEventMode == 0xC) {
             if (dComIfGp_evmng_startCheck("OPTION_CHAR_END") || dComIfGp_evmng_endCheck("OPTION_CHAR_END")) {
                 dComIfGp_event_setTalkPartner(dComIfGp_getLinkPlayer());
@@ -1832,7 +1832,7 @@ BOOL daNpc_Md_c::eventProc() {
         }
         if (staffIdx != -1) {
             return TRUE;
-        } else if (dComIfGp_getLinkPlayer()->mEvtInfo.checkCommandDoor() == FALSE) {
+        } else if (dComIfGp_getLinkPlayer()->eventInfo.checkCommandDoor() == FALSE) {
             return TRUE;
         }
     }
@@ -1904,8 +1904,8 @@ BOOL daNpc_Md_c::actionFlyEvent(int) {
 
 /* 0000B870-0000B890       .text initialGlidingEvent__10daNpc_Md_cFi */
 void daNpc_Md_c::initialGlidingEvent(int) {
-    mGravity = l_HIO.m0F4;
-    mMaxFallSpeed = -100.0f;
+    gravity = l_HIO.m0F4;
+    maxFallSpeed = -100.0f;
 }
 
 /* 0000B890-0000B934       .text actionGlidingEvent__10daNpc_Md_cFi */
@@ -2452,7 +2452,7 @@ BOOL daNpc_Md_c::setAnm(int anmIdx) {
     
     if (m312D == 0x10) {
         if (m0508[1] == NULL) {
-            m0508[1] = dComIfGp_particle_set(0x819D, &current.pos, NULL, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this), &mTevStr.mColorK0, &mTevStr.mColorK0);
+            m0508[1] = dComIfGp_particle_set(0x819D, &current.pos, NULL, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this), &tevStr.mColorK0, &tevStr.mColorK0);
             if (m0508[1]) {
                 m0508[1]->becomeImmortalEmitter();
             }
@@ -2514,7 +2514,7 @@ void daNpc_Md_c::checkOrder() {
 
 /* 0000DC14-0000DCB0       .text checkCommandTalk__10daNpc_Md_cFv */
 BOOL daNpc_Md_c::checkCommandTalk() {
-    if (mEvtInfo.checkCommandTalk()) {
+    if (eventInfo.checkCommandTalk()) {
         if (dComIfGp_event_chkTalkXY()) {
             onXYTalk();
             if (!isDefaultTalkXY()) {
@@ -2920,9 +2920,9 @@ BOOL daNpc_Md_c::draw() {
     J3DModel* model = mpMorf->getModel();
     J3DModelData* modelData = model->getModelData();
     
-    g_env_light.settingTevStruct(0, &current.pos, &mTevStr);
+    g_env_light.settingTevStruct(0, &current.pos, &tevStr);
     drawDamageFog();
-    g_env_light.setLightTevColorType(model, &mTevStr);
+    g_env_light.setLightTevColorType(model, &tevStr);
     m0520.entry(modelData);
     mpMorf->entryDL();
     m0520.remove(modelData);
@@ -2930,20 +2930,20 @@ BOOL daNpc_Md_c::draw() {
     if (!isTypeShipRide()) {
         if (cLib_checkBit(m30F0, 0x1UL)) {
             model = mpWingMorf->getModel();
-            g_env_light.setLightTevColorType(model, &mTevStr);
+            g_env_light.setLightTevColorType(model, &tevStr);
             mpWingMorf->entryDL();
         } else {
             model = mpArmMorf->getModel();
-            g_env_light.setLightTevColorType(model, &mTevStr);
+            g_env_light.setLightTevColorType(model, &tevStr);
             mpArmMorf->entryDL();
         }
     } else {
         model = mpArmMorf->getModel();
-        g_env_light.setLightTevColorType(model, &mTevStr);
+        g_env_light.setLightTevColorType(model, &tevStr);
         mpArmMorf->entryDL();
     }
     
-    g_env_light.setLightTevColorType(mpHarpModel, &mTevStr);
+    g_env_light.setLightTevColorType(mpHarpModel, &tevStr);
     mDoExt_modelUpdateDL(mpHarpModel);
     
     if (isLightHit()) {
@@ -2968,7 +2968,7 @@ BOOL daNpc_Md_c::draw() {
         cXyz shadowPos(current.pos.x, current.pos.y + 150.0f, current.pos.z);
         mShadowId = dComIfGd_setShadow(
             mShadowId, 0, mpMorf->getModel(), &shadowPos, 800.0f, 20.0f,
-            current.pos.y, mAcch.GetGroundH(), mAcch.m_gnd, &mTevStr,
+            current.pos.y, mAcch.GetGroundH(), mAcch.m_gnd, &tevStr,
             0, 1.0f, dDlst_shadowControl_c::getSimpleTex()
         );
         
@@ -3007,7 +3007,7 @@ void daNpc_Md_c::particle_set(JPABaseEmitter** pEmitter, u16 particleID) {
     if (*pEmitter) {
         return;
     }
-    (*pEmitter) = dComIfGp_particle_set(particleID, &current.pos, &current.angle, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this), &mTevStr.mColorK0, &mTevStr.mColorK0);
+    (*pEmitter) = dComIfGp_particle_set(particleID, &current.pos, &current.angle, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this), &tevStr.mColorK0, &tevStr.mColorK0);
     if (*pEmitter) {
         (*pEmitter)->becomeImmortalEmitter();
     }
@@ -3127,7 +3127,7 @@ actor_process_profile_definition g_profile_NPC_MD = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcLy_CURRENT_e,
     /* ProcName     */ PROC_NPC_MD,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daNpc_Md_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_obj_AjavW.cpp b/src/d/actor/d_a_obj_AjavW.cpp
index f438d7f31..f0aa9edc4 100644
--- a/src/d/actor/d_a_obj_AjavW.cpp
+++ b/src/d/actor/d_a_obj_AjavW.cpp
@@ -66,7 +66,7 @@ s32 daObjAjavW_c::_create() {
                 ret = cPhs_ERROR_e;
             } else {
                 fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
-                mpModel->setBaseScale(mScale);
+                mpModel->setBaseScale(scale);
                 mDoMtx_stack_c::transS(current.pos);
                 mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
                 fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
@@ -104,8 +104,8 @@ bool daObjAjavW_c::_execute() {
 
 /* 000004F4-0000056C       .text _draw__12daObjAjavW_cFv */
 bool daObjAjavW_c::_draw() {
-    g_env_light.settingTevStruct(TEV_TYPE_BG1, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(mpModel, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_BG1, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(mpModel, &tevStr);
     mBtkAnm.entry(mpModel->getModelData());
     mDoExt_modelUpdateDL(mpModel);
     return true;
@@ -149,7 +149,7 @@ actor_process_profile_definition g_profile_Obj_AjavW = {
     /* ListID       */ 3,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_Obj_AjavW,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daObjAjavW_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_obj_Vteng.cpp b/src/d/actor/d_a_obj_Vteng.cpp
index 625799e7c..820dd4065 100644
--- a/src/d/actor/d_a_obj_Vteng.cpp
+++ b/src/d/actor/d_a_obj_Vteng.cpp
@@ -18,11 +18,11 @@ namespace {
 
 /* 00000078-00000120       .text init_mtx__12daObjVteng_cFv */
 void daObjVteng_c::init_mtx() {
-    mpModel->setBaseScale(mScale);
+    mpModel->setBaseScale(scale);
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::XYZrotM(shape_angle);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
-    mDoMtx_stack_c::scaleM(mScale);
+    mDoMtx_stack_c::scaleM(scale);
     MTXCopy(mDoMtx_stack_c::get(), mtx);
 }
 
@@ -114,8 +114,8 @@ bool daObjVteng_c::_execute() {
 
 /* 00000510-00000578       .text _draw__12daObjVteng_cFv */
 bool daObjVteng_c::_draw() {
-    g_env_light.settingTevStruct(TEV_TYPE_BG3, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(mpModel, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_BG3, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(mpModel, &tevStr);
     mpMorf->updateDL();
     fopAcM_SetModel(this, mpModel);
     return true;
@@ -159,7 +159,7 @@ actor_process_profile_definition g_profile_Obj_Vteng = {
     /* ListID       */ 3,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_Obj_Vteng,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daObjVteng_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_obj_Yboil.cpp b/src/d/actor/d_a_obj_Yboil.cpp
index e1a325a5b..111ae3cca 100644
--- a/src/d/actor/d_a_obj_Yboil.cpp
+++ b/src/d/actor/d_a_obj_Yboil.cpp
@@ -171,9 +171,9 @@ void daObjYboil_c::set_sea_material(J3DMaterial* material) {
 /* 00000A50-00000C6C       .text _draw__12daObjYboil_cFv */
 bool daObjYboil_c::_draw() {
     dComIfGd_setListBG();
-    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &tevStr);
     for (s32 i = 0; i < 50; i++) {
-        g_env_light.setLightTevColorType(mModel[i], &mTevStr);
+        g_env_light.setLightTevColorType(mModel[i], &tevStr);
         set_sea_material(mModel[i]->getModelData()->getJointNodePointer(0)->getMesh());
         mBckAnm[i].entry(mModel[i]->getModelData());
         mBtkAnm[i].entry(mModel[i]->getModelData());
@@ -207,7 +207,7 @@ actor_process_profile_definition g_profile_Obj_Yboil = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcLy_CURRENT_e,
     /* ProcName     */ PROC_Obj_Yboil,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daObjYboil_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_obj_Ygush00.cpp b/src/d/actor/d_a_obj_Ygush00.cpp
index 3879d1392..9f6f753d5 100644
--- a/src/d/actor/d_a_obj_Ygush00.cpp
+++ b/src/d/actor/d_a_obj_Ygush00.cpp
@@ -71,14 +71,14 @@ s32 daObjYgush00_c::_create() {
 
     if (ret == cPhs_COMPLEATE_e) {
         if (fopAcM_entrySolidHeap(this, solidHeapCB, 0x740) == 1) {
-            mpModel->setBaseScale(mScale);
+            mpModel->setBaseScale(scale);
             mDoMtx_stack_c::transS(current.pos);
             mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
             fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
 
             fopAcM_setCullSizeBox(this,
-                mScale.x * -80.0f, 0.0f, mScale.z * -80.0f,
-                mScale.x * 80.0f, mScale.y * 125.0f, mScale.z * 80.0f);
+                scale.x * -80.0f, 0.0f, scale.z * -80.0f,
+                scale.x * 80.0f, scale.y * 125.0f, scale.z * 80.0f);
         } else {
             ret = cPhs_ERROR_e;
         }
@@ -117,8 +117,8 @@ bool daObjYgush00_c::_execute() {
 
 /* 0000066C-000006FC       .text _draw__14daObjYgush00_cFv */
 bool daObjYgush00_c::_draw() {
-    g_env_light.settingTevStruct(TEV_TYPE_BG1, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(mpModel, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_BG1, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(mpModel, &tevStr);
     mBtkAnm.entry(mpModel->getModelData());
     mBckAnm.entry(mpModel->getModelData());
     mDoExt_modelUpdateDL(mpModel);
@@ -163,7 +163,7 @@ actor_process_profile_definition g_profile_Obj_Ygush00 = {
     /* ListID       */ 3,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_Obj_Ygush00,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daObjYgush00_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_obj_adnno.cpp b/src/d/actor/d_a_obj_adnno.cpp
index 1a460fe7c..758553fae 100644
--- a/src/d/actor/d_a_obj_adnno.cpp
+++ b/src/d/actor/d_a_obj_adnno.cpp
@@ -45,7 +45,7 @@ void daObjAdnno_c::CreateInit() {
 void daObjAdnno_c::set_mtx() {
     for (int i = 0; i < 16; i++) {
         J3DModel * model = mpModel[i];
-        model->setBaseScale(mScale);
+        model->setBaseScale(scale);
 
         mDoMtx_stack_c::transS(current.pos);
         mDoMtx_stack_c::YrotM(current.angle.y);
@@ -144,7 +144,7 @@ actor_process_profile_definition g_profile_Obj_Adnno = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_Obj_Adnno,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daObjAdnno_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_obj_akabe.cpp b/src/d/actor/d_a_obj_akabe.cpp
index 3d63fa4d1..c2d66a13c 100644
--- a/src/d/actor/d_a_obj_akabe.cpp
+++ b/src/d/actor/d_a_obj_akabe.cpp
@@ -105,14 +105,14 @@ namespace daObjAkabe {
     void Act_c::init_scale() {
         s32 scl = prm_get_scl();
         if (scl == 1) {
-            mScale.x *= 10.0f;
-            mScale.y *= 10.0f;
-            mScale.z = 1.0f;
+            scale.x *= 10.0f;
+            scale.y *= 10.0f;
+            scale.z = 1.0f;
         } else if (scl == 2) {
         } else if (scl == 3) {
-            mScale *= 10.0f;
+            scale *= 10.0f;
         } else {
-            mScale.z = 1.0f;
+            scale.z = 1.0f;
         }
     }
 
@@ -120,7 +120,7 @@ namespace daObjAkabe {
     void Act_c::init_mtx() {
         mDoMtx_stack_c::transS(current.pos);
         mDoMtx_stack_c::ZXYrotM(shape_angle);
-        mDoMtx_stack_c::scaleM(mScale);
+        mDoMtx_stack_c::scaleM(scale);
         mDoMtx_copy(mDoMtx_stack_c::get(), mMtx);
     }
 
@@ -189,7 +189,7 @@ actor_process_profile_definition g_profile_Obj_Akabe = {
     /* ListID       */ 3,
     /* ListPrio     */ fpcLy_CURRENT_e,
     /* ProcName     */ PROC_Obj_Akabe,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daObjAkabe::Act_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_obj_barrier.cpp b/src/d/actor/d_a_obj_barrier.cpp
index d2eac1966..2821c6b3d 100644
--- a/src/d/actor/d_a_obj_barrier.cpp
+++ b/src/d/actor/d_a_obj_barrier.cpp
@@ -81,12 +81,12 @@ static cXyz l_ef_scale(1.0f, 1.0f, 1.0f);
 
 /* 000000EC-0000018C       .text init_mtx__14daObjBarrier_cFv */
 void daObjBarrier_c::init_mtx() {
-    mAnm.getMdlP()->setBaseScale(mScale);
+    mAnm.getMdlP()->setBaseScale(scale);
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
     mAnm.getMdlP()->setBaseTRMtx(mDoMtx_stack_c::get());
 
-    mDoMtx_stack_c::scaleM(mScale);
+    mDoMtx_stack_c::scaleM(scale);
     cMtx_copy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
@@ -154,7 +154,7 @@ bool daObjBarrier_c::checkCollision_Tg() {
                 }
             }
 
-            mEffect.birth(hit_actor, mScale.x * 1000.0f, mTgCyl.GetC(), hit_pos, no_set_effect);
+            mEffect.birth(hit_actor, scale.x * 1000.0f, mTgCyl.GetC(), hit_pos, no_set_effect);
         }
 
         mTgCyl.ClrTgHit();
@@ -170,7 +170,7 @@ void daObjBarrier_c::checkCollision_At() {
         fopAc_ac_c* player_p = dComIfGp_getPlayer(0);
 
         if (hit_actor != NULL && hit_actor == player_p) {
-            mEffect.birth(hit_actor, mScale.x * 1000.0f, mAtCyl.GetC(), hit_actor->current.pos, 1);
+            mEffect.birth(hit_actor, scale.x * 1000.0f, mAtCyl.GetC(), hit_actor->current.pos, 1);
         }
 
         mAtCyl.ClrAtHit();
@@ -182,8 +182,8 @@ void daObjBarrier_c::registCollisionTable() {
     cXyz pos = current.pos;
     pos.y -= 300.0f;
 
-    f32 base_radius = mScale.x * 1000.0f;
-    f32 height = mScale.y * 10000.0f + 300.0f;
+    f32 base_radius = scale.x * 1000.0f;
+    f32 height = scale.y * 10000.0f + 300.0f;
 
     mAtCyl.SetC(pos);
     mAtCyl.SetR(base_radius - 60.0f);
@@ -203,7 +203,7 @@ void daObjBarrier_c::registCollisionTable() {
 /* 00000754-00000884       .text brkAnmPlay__14daObjBarrier_cFv */
 void daObjBarrier_c::brkAnmPlay() {
     f32 dist_to_playerXZ = (dComIfGp_getPlayer(0)->current.pos - current.pos).absXZ();
-    f32 radius = mScale.x * 1000.0f - 150.0f;
+    f32 radius = scale.x * 1000.0f - 150.0f;
 
     f32 var_r3;
     if (dist_to_playerXZ > radius) {
@@ -253,11 +253,11 @@ void daObjBarrier_c::break_start_wait_proc() {
 
 /* 000009F0-00000A58       .text break_order_proc__14daObjBarrier_cFv */
 void daObjBarrier_c::break_order_proc() {
-    if (mEvtInfo.checkCommandDemoAccrpt()) {
+    if (eventInfo.checkCommandDemoAccrpt()) {
         mBarrierProc = PROC_BREAK_END_WAIT;
     } else {
         fopAcM_orderOtherEventId(this, mEventID);
-        mEvtInfo.onCondition(dEvtCnd_UNK2_e);
+        eventInfo.onCondition(dEvtCnd_UNK2_e);
     }
 }
 
@@ -501,7 +501,7 @@ int daObjBarrier_c::_create() {
                 phase = cPhs_ERROR_e;
             } else {
                 mpBgW->SetCrrFunc(NULL);
-                mScale.z = mScale.x;
+                scale.z = scale.x;
                 fopAcM_SetMtx(this, mAnm.getMdlP()->getBaseTRMtx());
                 init_mtx();
 
@@ -619,7 +619,7 @@ actor_process_profile_definition g_profile_Obj_Barrier = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_Obj_Barrier,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daObjBarrier_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_obj_bscurtain.cpp b/src/d/actor/d_a_obj_bscurtain.cpp
index 602d66ba9..140e60c55 100644
--- a/src/d/actor/d_a_obj_bscurtain.cpp
+++ b/src/d/actor/d_a_obj_bscurtain.cpp
@@ -89,8 +89,8 @@ bool daObj_Bscurtain_c::_execute() {
 
 bool daObj_Bscurtain_c::_draw() {
     dComIfGd_setListBG();
-    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(mpModel, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(mpModel, &tevStr);
     mDoExt_modelUpdateDL(mpModel);
     dComIfGd_setList();
     return true;
@@ -134,7 +134,7 @@ actor_process_profile_definition g_profile_Obj_Bscurtain = {
     /* ListID       */ 3,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_Obj_Bscurtain,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daObj_Bscurtain_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_obj_cafelmp.cpp b/src/d/actor/d_a_obj_cafelmp.cpp
index a90897483..33888c28b 100644
--- a/src/d/actor/d_a_obj_cafelmp.cpp
+++ b/src/d/actor/d_a_obj_cafelmp.cpp
@@ -38,7 +38,7 @@ void daObjCafelmp_c::CreateInit() {
 
 /* 000001CC-0000024C       .text set_mtx__14daObjCafelmp_cFv */
 void daObjCafelmp_c::set_mtx() {
-    mpModel->setBaseScale(mScale);
+    mpModel->setBaseScale(scale);
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(current.angle.y);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
@@ -72,8 +72,8 @@ BOOL daObjCafelmp_c::_execute() {
 }
 
 BOOL daObjCafelmp_c::_draw() {
-    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(mpModel, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(mpModel, &tevStr);
     dComIfGd_setListBG();
     mDoExt_modelUpdateDL(mpModel);
     dComIfGd_setList();
@@ -118,7 +118,7 @@ actor_process_profile_definition g_profile_Obj_Cafelmp = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_Obj_Cafelmp,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daObjCafelmp_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_obj_dmgroom.cpp b/src/d/actor/d_a_obj_dmgroom.cpp
index 3c8b4f558..70e4c7b6c 100644
--- a/src/d/actor/d_a_obj_dmgroom.cpp
+++ b/src/d/actor/d_a_obj_dmgroom.cpp
@@ -43,7 +43,7 @@ void daObjDmgroom_c::CreateInit() {
 
 /* 0000026C-000002EC       .text set_mtx__14daObjDmgroom_cFv */
 void daObjDmgroom_c::set_mtx() {
-    mpModel->setBaseScale(mScale);
+    mpModel->setBaseScale(scale);
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(current.angle.y);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
@@ -71,8 +71,8 @@ bool daObjDmgroom_c::_delete() {
 }
 
 bool daObjDmgroom_c::_execute() {
-    if (mDemoActorId != 0) {
-        dDemo_actor_c * demoAc = dComIfGp_demo_getActor(mDemoActorId);
+    if (demoActorID != 0) {
+        dDemo_actor_c * demoAc = dComIfGp_demo_getActor(demoActorID);
         if (demoAc != NULL && demoAc->checkEnable(0x40))
             mBrkAnm.setFrame(demoAc->mAnimationFrame);
     }
@@ -81,8 +81,8 @@ bool daObjDmgroom_c::_execute() {
 }
 
 bool daObjDmgroom_c::_draw() {
-    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(mpModel, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(mpModel, &tevStr);
     dComIfGd_setListBG();
     mBrkAnm.entry(mpModel->getModelData());
     mDoExt_modelUpdateDL(mpModel);
@@ -129,7 +129,7 @@ actor_process_profile_definition g_profile_Obj_Dmgroom = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_Obj_Dmgroom,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daObjDmgroom_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_obj_doguu_demo.cpp b/src/d/actor/d_a_obj_doguu_demo.cpp
index 063de4de6..0734256cf 100644
--- a/src/d/actor/d_a_obj_doguu_demo.cpp
+++ b/src/d/actor/d_a_obj_doguu_demo.cpp
@@ -30,7 +30,7 @@ BOOL daObjDoguuD_c::CreateHeap() {
 
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
-    mDoMtx_stack_c::scaleM(mScale);
+    mDoMtx_stack_c::scaleM(scale);
     mDoMtx_copy(mDoMtx_stack_c::get(), mMtx);
 
     mpBgW = new dBgW();
@@ -56,7 +56,7 @@ void daObjDoguuD_c::CreateInit() {
 
 /* 00000294-00000314       .text set_mtx__13daObjDoguuD_cFv */
 void daObjDoguuD_c::set_mtx() {
-    mpModel->setBaseScale(mScale);
+    mpModel->setBaseScale(scale);
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(current.angle.y);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
@@ -97,8 +97,8 @@ static BOOL daObjDoguuD_Delete(void* i_this) {
 }
 
 BOOL daObjDoguuD_c::_draw() {
-    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(mpModel, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(mpModel, &tevStr);
     dComIfGd_setListBG();
     mDoExt_modelUpdateDL(mpModel);
     dComIfGd_setList();
@@ -111,8 +111,8 @@ static BOOL daObjDoguuD_Draw(void* i_this) {
 }
 
 BOOL daObjDoguuD_c::_execute() {
-    if (mDemoActorId != 0) {
-        dDemo_actor_c* demoAc = dComIfGp_demo_getActor(mDemoActorId);
+    if (demoActorID != 0) {
+        dDemo_actor_c* demoAc = dComIfGp_demo_getActor(demoActorID);
         if (demoAc != NULL && demoAc->checkEnable(0x10)) {
             mShape = demoAc->mShapeId;
         }
@@ -142,7 +142,7 @@ actor_process_profile_definition g_profile_Obj_DoguuD = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_Obj_DoguuD,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daObjDoguuD_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_obj_dragonhead.cpp b/src/d/actor/d_a_obj_dragonhead.cpp
index 5fd7789bc..f2110b01e 100644
--- a/src/d/actor/d_a_obj_dragonhead.cpp
+++ b/src/d/actor/d_a_obj_dragonhead.cpp
@@ -63,7 +63,7 @@ BOOL daObjDragonhead_c::CreateHeap() {
 
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
-    mDoMtx_stack_c::scaleM(mScale);
+    mDoMtx_stack_c::scaleM(scale);
     mDoMtx_copy(mDoMtx_stack_c::get(), mtx);
 
     mpBgW = new dBgW();
@@ -103,7 +103,7 @@ void daObjDragonhead_c::CreateInit() {
 
 /* 0000034C-000003CC       .text set_mtx__17daObjDragonhead_cFv */
 void daObjDragonhead_c::set_mtx() {
-    mpModel->setBaseScale(mScale);
+    mpModel->setBaseScale(scale);
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(current.angle.y);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
@@ -154,7 +154,7 @@ BOOL daObjDragonhead_c::_execute() {
             if (!dComIfG_Bgsp()->Release(mpBgW))
                 field_0x40c = 0;
 
-            mDoAud_seStart(JA_SE_OBJ_ICEVERG_MELT, &mEyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
+            mDoAud_seStart(JA_SE_OBJ_ICEVERG_MELT, &eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
         }
 
         if (mAlpha != 0) {
@@ -181,8 +181,8 @@ BOOL daObjDragonhead_c::_execute() {
 }
 
 BOOL daObjDragonhead_c::_draw() {
-    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(mpModel, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(mpModel, &tevStr);
     dComIfGd_setListBG();
     J3DModelData* modelData = mpModel->getModelData();
     u16 materialNum = modelData->getMaterialNum();
@@ -233,7 +233,7 @@ actor_process_profile_definition g_profile_Obj_Dragonhead = {
     /* ListID       */ 3,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_Obj_Dragonhead,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daObjDragonhead_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_obj_eayogn.cpp b/src/d/actor/d_a_obj_eayogn.cpp
index 083f8a9e4..d4dea9936 100644
--- a/src/d/actor/d_a_obj_eayogn.cpp
+++ b/src/d/actor/d_a_obj_eayogn.cpp
@@ -92,7 +92,7 @@ BOOL daObjEayogn_c::check_ev_bit() const {
 
 /* 00000360-000003E8       .text init_mtx__13daObjEayogn_cFv */
 void daObjEayogn_c::init_mtx() {
-    mpModel->setBaseScale(mScale);
+    mpModel->setBaseScale(scale);
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
@@ -105,8 +105,8 @@ bool daObjEayogn_c::_execute() {
 
 /* 000003F0-00000490       .text _draw__13daObjEayogn_cFv */
 bool daObjEayogn_c::_draw() {
-    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(mpModel, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(mpModel, &tevStr);
     dComIfGd_setListBG();
     mDoExt_modelUpdateDL(mpModel);
     dComIfGd_setList();
@@ -153,7 +153,7 @@ actor_process_profile_definition g_profile_Obj_Eayogn = {
     /* ListID       */ 3,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_Obj_Eayogn,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daObjEayogn_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_obj_ferris.cpp b/src/d/actor/d_a_obj_ferris.cpp
index 9d35efc5d..902a570f5 100644
--- a/src/d/actor/d_a_obj_ferris.cpp
+++ b/src/d/actor/d_a_obj_ferris.cpp
@@ -249,7 +249,7 @@ void daObjFerris::Act_c::set_mtx(int idx) {
 /* 000011B8-00001240       .text init_mtx__Q211daObjFerris5Act_cFv */
 void daObjFerris::Act_c::init_mtx() {
     for (s32 i = 0; i < 6; i++) {
-        mpModel[i]->setBaseScale(mScale);
+        mpModel[i]->setBaseScale(scale);
         set_mtx(i);
         mpModel[i]->calc();
     }
@@ -274,11 +274,11 @@ BOOL daObjFerris::Act_c::set_event(s16 p1) {
 void daObjFerris::Act_c::exe_event() {
     switch (mEventState) {
     case 1:
-        if (mEvtInfo.checkCommandDemoAccrpt()) {
+        if (eventInfo.checkCommandDemoAccrpt()) {
             mEventState = 2;
         } else {
             fopAcM_orderOtherEventId(this, mEventIdx);
-            mEvtInfo.onCondition(dEvtCnd_UNK2_e);
+            eventInfo.onCondition(dEvtCnd_UNK2_e);
         }
         break;
     case 2:
@@ -514,10 +514,10 @@ bool daObjFerris::Act_c::_execute() {
 
 /* 00001D58-00001E18       .text _draw__Q211daObjFerris5Act_cFv */
 bool daObjFerris::Act_c::_draw() {
-    dKy_getEnvlight().settingTevStruct(TEV_TYPE_BG0, &current.pos, &mTevStr);
+    dKy_getEnvlight().settingTevStruct(TEV_TYPE_BG0, &current.pos, &tevStr);
     dComIfGd_setListBG();
     for (s32 i = 0; i < 6; i++) {
-        dKy_getEnvlight().setLightTevColorType(mpModel[i], &mTevStr);
+        dKy_getEnvlight().setLightTevColorType(mpModel[i], &tevStr);
         mDoExt_modelUpdateDL(mpModel[i]);
     }
     dComIfGd_setList();
@@ -561,7 +561,7 @@ actor_process_profile_definition g_profile_Obj_Ferris = {
     /* ListID       */ 3,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_Obj_Ferris,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daObjFerris::Act_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_obj_ganonbed.cpp b/src/d/actor/d_a_obj_ganonbed.cpp
index e726a8454..9ee9876c7 100644
--- a/src/d/actor/d_a_obj_ganonbed.cpp
+++ b/src/d/actor/d_a_obj_ganonbed.cpp
@@ -27,7 +27,7 @@ namespace {
 
 /* 00000078-00000100       .text init_mtx__11daObjGbed_cFv */
 void daObjGbed_c::init_mtx() {
-    mpModel->setBaseScale(mScale);
+    mpModel->setBaseScale(scale);
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::XYZrotM(shape_angle);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
@@ -104,8 +104,8 @@ bool daObjGbed_c::_execute() {
 
 /* 000003E4-00000444       .text _draw__11daObjGbed_cFv */
 bool daObjGbed_c::_draw() {
-    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(mpModel, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(mpModel, &tevStr);
     mDoExt_modelUpdateDL(mpModel);
     return true;
 }
@@ -148,7 +148,7 @@ actor_process_profile_definition g_profile_Obj_Gbed = {
     /* ListID       */ 3,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_Obj_Gbed,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daObjGbed_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_obj_gaship2.cpp b/src/d/actor/d_a_obj_gaship2.cpp
index fa03a87ec..12204413a 100644
--- a/src/d/actor/d_a_obj_gaship2.cpp
+++ b/src/d/actor/d_a_obj_gaship2.cpp
@@ -70,7 +70,7 @@ bool daObjGaship2::Act_c::_delete() {
 
 /* 00000384-00000430       .text set_mtx__Q212daObjGaship25Act_cFv */
 void daObjGaship2::Act_c::set_mtx() {
-    mpModel->setBaseScale(mScale);
+    mpModel->setBaseScale(scale);
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
 
@@ -88,9 +88,9 @@ bool daObjGaship2::Act_c::_execute() {
 
 /* 00000468-00000508       .text _draw__Q212daObjGaship25Act_cFv */
 bool daObjGaship2::Act_c::_draw() {
-    dKy_getEnvlight().settingTevStruct(TEV_TYPE_BG0, &current.pos, &mTevStr);
+    dKy_getEnvlight().settingTevStruct(TEV_TYPE_BG0, &current.pos, &tevStr);
     dComIfGd_setListBG();
-    dKy_getEnvlight().setLightTevColorType(mpModel, &mTevStr);
+    dKy_getEnvlight().setLightTevColorType(mpModel, &tevStr);
     mDoExt_modelUpdateDL(mpModel);
     dComIfGd_setList();
     return TRUE;
@@ -133,7 +133,7 @@ actor_process_profile_definition g_profile_Obj_Gaship2 = {
     /* ListID       */ 3,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_Obj_Gaship2,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daObjGaship2::Act_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_obj_gong.cpp b/src/d/actor/d_a_obj_gong.cpp
index bce62d3d6..702ce99f4 100644
--- a/src/d/actor/d_a_obj_gong.cpp
+++ b/src/d/actor/d_a_obj_gong.cpp
@@ -70,7 +70,7 @@ s32 daObjGong::Act_c::_create() {
             fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx());
             init_mtx();
             fopAcM_setCullSizeBox(this, -100.0f, -1.0f, -50.0f, 100.0f, 230.0f, 50.0f);
-            mEyePos.y += attr().offsetY;
+            eyePos.y += attr().offsetY;
         } else {
             ret = cPhs_ERROR_e;
         }
@@ -94,7 +94,7 @@ void daObjGong::Act_c::set_mtx() {
 
 /* 00000414-00000454       .text init_mtx__Q29daObjGong5Act_cFv */
 void daObjGong::Act_c::init_mtx() {
-    mpMorf->getModel()->setBaseScale(mScale);
+    mpMorf->getModel()->setBaseScale(scale);
     set_mtx();
 }
 
@@ -115,9 +115,9 @@ bool daObjGong::Act_c::_execute() {
 bool daObjGong::Act_c::_draw() {
     J3DModel* model = (J3DModel*)mpMorf->getModel();
     J3DModelData* modelData = (J3DModelData*)model->getModelData();
-    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(model, &mTevStr);
-    dDlst_texSpecmapST(&mEyePos, &mTevStr, modelData, attr().spec);
+    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(model, &tevStr);
+    dDlst_texSpecmapST(&eyePos, &tevStr, modelData, attr().spec);
     mpMorf->updateDL();
     return true;
 }
@@ -164,7 +164,7 @@ actor_process_profile_definition g_profile_Obj_Gong = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_Obj_Gong,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daObjGong::Act_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_obj_hfuck1.cpp b/src/d/actor/d_a_obj_hfuck1.cpp
index 40a66cb0b..76fb3a542 100644
--- a/src/d/actor/d_a_obj_hfuck1.cpp
+++ b/src/d/actor/d_a_obj_hfuck1.cpp
@@ -58,7 +58,7 @@ namespace {
 
 /* 00000078-00000100       .text init_mtx__13daObjHfuck1_cFv */
 void daObjHfuck1_c::init_mtx() {
-    mpModel->setBaseScale(mScale);
+    mpModel->setBaseScale(scale);
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::XYZrotM(shape_angle);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
@@ -172,8 +172,8 @@ bool daObjHfuck1_c::_execute() {
 
 /* 000007CC-0000082C       .text _draw__13daObjHfuck1_cFv */
 bool daObjHfuck1_c::_draw() {
-    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(mpModel, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(mpModel, &tevStr);
     mDoExt_modelUpdateDL(mpModel);
     return true;
 }
@@ -216,7 +216,7 @@ actor_process_profile_definition g_profile_Obj_Hfuck1 = {
     /* ListID       */ 3,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_Obj_Hfuck1,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daObjHfuck1_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_obj_hole.cpp b/src/d/actor/d_a_obj_hole.cpp
index ff1c0c3f7..a3d1afa81 100644
--- a/src/d/actor/d_a_obj_hole.cpp
+++ b/src/d/actor/d_a_obj_hole.cpp
@@ -54,19 +54,19 @@ void daObj_Hole_c::setMtx() {
     }
 
     if (mHasModel == 0xFF) {
-        float scale = l_HIO.m08 * mScale.x;
+        f32 scaleMag = l_HIO.m08 * scale.x;
 
         if (l_HIO.m0C != 0) {
-            scale += l_HIO.m0C * 10;
+            scaleMag += l_HIO.m0C * 10;
         }
         else {
-            scale += mScaleLocal * 10;
+            scaleMag += mScaleLocal * 10;
         }
 
-        scale /= l_HIO.m08;
+        scaleMag /= l_HIO.m08;
 
         cXyz scaleVec;
-        scaleVec.setall(scale);
+        scaleVec.setall(scaleMag);
         mpMdl->setBaseScale(scaleVec);
 
         mDoMtx_stack_c::transS(adjustPos);
@@ -103,16 +103,16 @@ void daObj_Hole_c::modeWaitInit() {
 
 /* 00000410-000004F0       .text modeWait__12daObj_Hole_cFv */
 void daObj_Hole_c::modeWait() {
-    float scale = l_HIO.m08 * mScale.x;
+    f32 scaleMag = l_HIO.m08 * scale.x;
 
     if (l_HIO.m0C != 0) {
-        scale += l_HIO.m0C * 10;
+        scaleMag += l_HIO.m0C * 10;
     }
     else {
-        scale += mScaleLocal * 10;
+        scaleMag += mScaleLocal * 10;
     }
 
-    if (dLib_checkPlayerInCircle(current.pos, scale, 20.0f)) {
+    if (dLib_checkPlayerInCircle(current.pos, scaleMag, 20.0f)) {
         modeProcInit(MODE_EVENT);
     }
 }
@@ -127,7 +127,7 @@ void daObj_Hole_c::modeEventInit() {
 
 /* 000004F4-000005D0       .text modeEvent__12daObj_Hole_cFv */
 void daObj_Hole_c::modeEvent() {
-    if (mEvtInfo.checkCommandDemoAccrpt()) {
+    if (eventInfo.checkCommandDemoAccrpt()) {
         int staffId = dComIfGp_evmng_getMyStaffId("Ypit00");
 
         if (dComIfGp_evmng_endCheck("DEFAULT_PITFALL")) {
@@ -196,8 +196,8 @@ bool daObj_Hole_c::_draw() {
     }
 
     if (mHasModel == 0xFF) {
-        g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &mTevStr);
-        g_env_light.setLightTevColorType(mpMdl, &mTevStr);
+        g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &tevStr);
+        g_env_light.setLightTevColorType(mpMdl, &tevStr);
 
         mDoExt_modelUpdateDL(mpMdl);
     }
@@ -319,7 +319,7 @@ actor_process_profile_definition g_profile_OBJ_HOLE = {
     3,
     fpcPi_CURRENT_e,
     PROC_OBJ_HOLE,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(daObj_Hole_c),
     0,
     0,
diff --git a/src/d/actor/d_a_obj_homensmoke.cpp b/src/d/actor/d_a_obj_homensmoke.cpp
index 472804446..9e7816984 100644
--- a/src/d/actor/d_a_obj_homensmoke.cpp
+++ b/src/d/actor/d_a_obj_homensmoke.cpp
@@ -57,9 +57,9 @@ namespace daObjHomensmoke {
             culling_dat[mType].mMax.x, culling_dat[mType].mMax.y, culling_dat[mType].mMax.z
         );
         
-        fopAc_ac_c* parent = fopAcM_SearchByID(mParentPcId);
+        fopAc_ac_c* parent = fopAcM_SearchByID(parentActorID);
         if (parent) {
-            mTevStr = parent->mTevStr;
+            tevStr = parent->tevStr;
         }
         
         return cPhs_COMPLEATE_e;
@@ -102,7 +102,7 @@ namespace daObjHomensmoke {
             
             JPABaseEmitter* rubbleEmitter = dComIfGp_particle_setToon(0x81B1, &current.pos);
             if (rubbleEmitter) {
-                rubbleEmitter->setGlobalPrmColor(mTevStr.mColorK0.r, mTevStr.mColorK0.g, mTevStr.mColorK0.b);
+                rubbleEmitter->setGlobalPrmColor(tevStr.mColorK0.r, tevStr.mColorK0.g, tevStr.mColorK0.b);
                 if (mType == 1) {
                     JGeometry::TVec3<f32> scale(0.6f, 0.6f, 0.6f);
                     rubbleEmitter->setEmitterScale(scale);
@@ -165,7 +165,7 @@ actor_process_profile_definition g_profile_Obj_Homensmk = {
     /* ListID       */ 3,
     /* ListPrio     */ fpcLy_CURRENT_e,
     /* ProcName     */ PROC_Obj_Homensmk,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daObjHomensmoke::Act_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_obj_kanat.cpp b/src/d/actor/d_a_obj_kanat.cpp
index a4f9ddde5..b303e7ae3 100644
--- a/src/d/actor/d_a_obj_kanat.cpp
+++ b/src/d/actor/d_a_obj_kanat.cpp
@@ -80,7 +80,7 @@ void daObjKanat::Act_c::set_mtx() {
 
 /* 000003F4-00000430       .text init_mtx__Q210daObjKanat5Act_cFv */
 void daObjKanat::Act_c::init_mtx() {
-    mpModel->setBaseScale(mScale);
+    mpModel->setBaseScale(scale);
     set_mtx();
 }
 
@@ -90,17 +90,17 @@ BOOL daObjKanat::Act_c::Execute(Mtx** pMtx) {
         if (fopAcM_isSwitch(this, prm_get_swSave())) {
             mIsBroken = true;
             GXColor color;
-            color.r = mTevStr.mColorC0.r;
-            color.g = mTevStr.mColorC0.g;
-            color.b = mTevStr.mColorC0.b;
-            color.a = mTevStr.mColorC0.a;
+            color.r = tevStr.mColorC0.r;
+            color.g = tevStr.mColorC0.g;
+            color.b = tevStr.mColorC0.b;
+            color.a = tevStr.mColorC0.a;
             dComIfGp_particle_set(
                 0x82A2, &current.pos, &current.angle, NULL, 0xFF,
-                NULL, current.roomNo, &mTevStr.mColorK0, &color
+                NULL, current.roomNo, &tevStr.mColorK0, &color
             );
             dComIfGp_particle_setToon(
                 0xA2A3, &current.pos, &current.angle, NULL, 0xB4,
-                &mSmokeCb, current.roomNo, &mTevStr.mColorK0, &color
+                &mSmokeCb, current.roomNo, &tevStr.mColorK0, &color
             );
         }
     } else {
@@ -116,8 +116,8 @@ BOOL daObjKanat::Act_c::Execute(Mtx** pMtx) {
 
 /* 00000590-00000644       .text Draw__Q210daObjKanat5Act_cFv */
 BOOL daObjKanat::Act_c::Draw() {
-    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(mpModel, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(mpModel, &tevStr);
     if (!mIsVisible) {
         return TRUE;
     }
@@ -164,7 +164,7 @@ actor_process_profile_definition g_profile_Obj_Kanat = {
     /* ListID       */ 3,
     /* ListPrio     */ fpcLy_CURRENT_e,
     /* ProcName     */ PROC_Obj_Kanat,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daObjKanat::Act_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_obj_mknjd.cpp b/src/d/actor/d_a_obj_mknjd.cpp
index b6d317d0b..c80deacde 100644
--- a/src/d/actor/d_a_obj_mknjd.cpp
+++ b/src/d/actor/d_a_obj_mknjd.cpp
@@ -262,7 +262,7 @@ int daObjMknjD::Act_c::Create() {
 
         mTactMode = 4;
         mGiveItemNo = TACT_SONG5;
-        mEvtInfo.setEventName("MKNJD_K_TALK");
+        eventInfo.setEventName("MKNJD_K_TALK");
         m0430 = 0x2910;
     }
     else {
@@ -273,18 +273,18 @@ int daObjMknjD::Act_c::Create() {
 
         mTactMode = 3;
         mGiveItemNo = TACT_SONG4;
-        mEvtInfo.setEventName("MKNJD_D_TALK");
+        eventInfo.setEventName("MKNJD_D_TALK");
         m0430 = 0x2920;
     }
 
-    mAttentionInfo.mDistances[1] = 0x3D;
-    mAttentionInfo.mDistances[3] = 0x3D;
-    mAttentionInfo.mFlags |= fopAc_Attn_ACTION_TALK_e | fopAc_Attn_TALKFLAG_CHECK_e;
+    attention_info.distances[1] = 0x3D;
+    attention_info.distances[3] = 0x3D;
+    attention_info.flags |= fopAc_Attn_ACTION_TALK_e | fopAc_Attn_TALKFLAG_CHECK_e;
 
     if (!checkItemGet(mGiveItemNo, 1)) {
         m043F = 8;
-        mEvtInfo.setXyCheckCB(daObjMknjD_XyCheckCB);
-        mEvtInfo.setXyEventCB(daObjMknjD_XyEventCB);
+        eventInfo.setXyCheckCB(daObjMknjD_XyCheckCB);
+        eventInfo.setXyEventCB(daObjMknjD_XyEventCB);
     }
     else {
         m043F = 0;
@@ -601,12 +601,12 @@ bool daObjMknjD::Act_c::daObjMknjD_break() {
         mEmitters[0] = dComIfGp_particle_set(0x8185, &current.pos, &current.angle);
 
         GXColor emitter2Color;
-        emitter2Color.r = mTevStr.mColorC0.r;
-        emitter2Color.g = mTevStr.mColorC0.g;
-        emitter2Color.b = mTevStr.mColorC0.b;
-        emitter2Color.a = mTevStr.mColorC0.a;
+        emitter2Color.r = tevStr.mColorC0.r;
+        emitter2Color.g = tevStr.mColorC0.g;
+        emitter2Color.b = tevStr.mColorC0.b;
+        emitter2Color.a = tevStr.mColorC0.a;
         
-        mEmitters[1] = dComIfGp_particle_setProjection(0x8186, &current.pos, &current.angle, NULL, 0xFF, NULL, current.roomNo, &mTevStr.mColorK0, &emitter2Color);
+        mEmitters[1] = dComIfGp_particle_setProjection(0x8186, &current.pos, &current.angle, NULL, 0xFF, NULL, current.roomNo, &tevStr.mColorK0, &emitter2Color);
 
         mEmitters[2] = dComIfGp_particle_setToon(0xA187, &current.pos, &current.angle, NULL, 0xFF, &mSmokeCBs[2]);
         mSmokeCBs[2].setRateOff(0);
@@ -708,9 +708,9 @@ int daObjMknjD::Act_c::Execute(Mtx** i_mtx) {
 
     switch (m043F) {
         case 0:
-            mEvtInfo.onCondition(dEvtCnd_CANTALK_e);
+            eventInfo.onCondition(dEvtCnd_CANTALK_e);
 
-            if (mEvtInfo.checkCommandTalk()) {
+            if (eventInfo.checkCommandTalk()) {
                 m0500 = 1;
                 m043F = 0x0B;
             }
@@ -783,7 +783,7 @@ int daObjMknjD::Act_c::Execute(Mtx** i_mtx) {
 
             break;
         case 3:
-            if (mEvtInfo.checkCommandDemoAccrpt()) {
+            if (eventInfo.checkCommandDemoAccrpt()) {
                 m043F = 4;
             }
 
@@ -802,7 +802,7 @@ int daObjMknjD::Act_c::Execute(Mtx** i_mtx) {
 
             break;
         case 6:
-            if (mEvtInfo.checkCommandDemoAccrpt()) {
+            if (eventInfo.checkCommandDemoAccrpt()) {
                 m043F = 7;
 
                 mDoAud_bgmStop(0x1E);
@@ -833,10 +833,10 @@ int daObjMknjD::Act_c::Execute(Mtx** i_mtx) {
 
             break;
         case 8:
-            mEvtInfo.onCondition(dEvtCnd_CANTALK_e);
-            mEvtInfo.onCondition(dEvtCnd_CANTALKITEM_e);
+            eventInfo.onCondition(dEvtCnd_CANTALK_e);
+            eventInfo.onCondition(dEvtCnd_CANTALKITEM_e);
 
-            if (mEvtInfo.checkCommandTalk()) {
+            if (eventInfo.checkCommandTalk()) {
                 if (dComIfGp_event_chkTalkXY()) {
                     m0500 = 0;
                     m043F = 9;
@@ -951,11 +951,11 @@ void daObjMknjD::setMaterial(J3DMaterial* i_mat, u8 i_alpha) {
 
 /* 000022FC-00002430       .text Draw__Q210daObjMknjD5Act_cFv */
 int daObjMknjD::Act_c::Draw() {
-    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(mBreakMdl, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(mBreakMdl, &tevStr);
 
-    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(mMainMdl, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(mMainMdl, &tevStr);
 
     dComIfGd_setListBG();
 
@@ -1019,7 +1019,7 @@ actor_process_profile_definition g_profile_Obj_MknjD = {
     3,
     fpcPi_CURRENT_e,
     PROC_Obj_MknjD,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(daObjMknjD::Act_c),
     0,
     0,
diff --git a/src/d/actor/d_a_obj_monument.cpp b/src/d/actor/d_a_obj_monument.cpp
index 1a2ebef70..ddbfe7893 100644
--- a/src/d/actor/d_a_obj_monument.cpp
+++ b/src/d/actor/d_a_obj_monument.cpp
@@ -93,7 +93,7 @@ void daObjMonument::Act_c::set_mtx() {
 
 /* 00000404-00000440       .text init_mtx__Q213daObjMonument5Act_cFv */
 void daObjMonument::Act_c::init_mtx() {
-    mpModel->setBaseScale(mScale);
+    mpModel->setBaseScale(scale);
     set_mtx();
 }
 
@@ -109,8 +109,8 @@ bool daObjMonument::Act_c::_draw() {
     if (dComIfGs_isSwitch(swSave, fopAcM_GetHomeRoomNo(this)))
         return true;
 
-    g_env_light.settingTevStruct(TEV_TYPE_BG1, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(mpModel, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_BG1, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(mpModel, &tevStr);
     dComIfGd_setListBG();
     mDoExt_modelUpdateDL(mpModel);
     dComIfGd_setList();
@@ -159,7 +159,7 @@ actor_process_profile_definition g_profile_Obj_Monument = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_Obj_Monument,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daObjMonument::Act_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp
index 49f5dcd20..8d140cb17 100644
--- a/src/d/actor/d_a_obj_movebox.cpp
+++ b/src/d/actor/d_a_obj_movebox.cpp
@@ -202,7 +202,7 @@ namespace daObjMovebox {
             cXyz pos;
             mDoMtx_stack_c::multVec(&offset, &pos);
             M_gnd_work[i].SetPos(&pos);
-            M_gnd_work[i].SetActorPid(movebox->mBase.mBsPcId);
+            M_gnd_work[i].SetActorPid(movebox->base.mBsPcId);
             mGroundY[i] = dComIfG_Bgsp()->GroundCross(&M_gnd_work[i]);
             if (mGroundY[i] > maxGroundY) {
                 fopAc_ac_c* groundActor = dComIfG_Bgsp()->GetActorPointer(M_gnd_work[i].GetBgIndex());
@@ -259,7 +259,7 @@ namespace daObjMovebox {
             startPos += movebox->current.pos;
             endPos = startPos + temp_20;
             M_wall_work[i].Set(&startPos, &endPos, const_cast<Act_c*>(movebox));
-            M_wall_work[i].SetActorPid(movebox->mBase.mBsPcId);
+            M_wall_work[i].SetActorPid(movebox->base.mBsPcId);
             if (dComIfG_Bgsp()->LineCross(&M_wall_work[i])) {
                 mWallPos[i] = M_wall_work[i].GetCross();
                 f32 dist = startPos.abs2(mWallPos[i]);
@@ -348,7 +348,7 @@ namespace daObjMovebox {
         startPos += movebox->current.pos;
         endPos = startPos + direction;
         
-        touch_work.SetActorPid(movebox->mBase.mBsPcId);
+        touch_work.SetActorPid(movebox->base.mBsPcId);
         touch_work.Set(&startPos, &endPos, const_cast<Act_c*>(movebox));
         return dComIfG_Bgsp()->LineCross(&touch_work);
     }
@@ -1195,7 +1195,7 @@ namespace daObjMovebox {
     /* 00001674-000016B8       .text init_mtx__Q212daObjMovebox5Act_cFv */
     void Act_c::init_mtx() {
         if (mpModel) {
-            mpModel->mBaseScale = mScale;
+            mpModel->mBaseScale = scale;
         }
         set_mtx();
     }
@@ -1413,7 +1413,7 @@ namespace daObjMovebox {
         );
         
         speedF = 0.0f;
-        mGravity = i_attr()->m14;
+        gravity = i_attr()->m14;
         fopAcM_posMoveF(this, NULL);
         mBgc.proc_vertical(this);
         cLib_offBit(mBgc.mStateFlags, static_cast<Bgc_c::State_e>(Bgc_c::BgcState_JUST_LEFT_GROUND_e | Bgc_c::BgcState_JUST_HIT_GROUND_e | Bgc_c::BgcState_JUST_HIT_WATER_e));
@@ -1574,11 +1574,11 @@ namespace daObjMovebox {
         
         s16 angle = home.angle.y + M_dir_base[m634];
         
-        f32 scale = i_attr()->mScaleXZ;
+        f32 scaleMag = i_attr()->mScaleXZ;
         mDoMtx_stack_c::transS(current.pos);
         mDoMtx_stack_c::YrotM(angle);
         mDoMtx_stack_c::transM(0.0f, 0.0f, 10.0f);
-        mDoMtx_stack_c::scaleM(scale, scale, scale);
+        mDoMtx_stack_c::scaleM(scaleMag, scaleMag, scaleMag);
         
         for (int i = 0; i < (int)ARRAY_SIZE(mSmokeCbs); i++) {
             mDoMtx_stack_c::multVec(&base_pos[i], &mSmokeCbs[i].field_0x20);
@@ -1623,7 +1623,7 @@ namespace daObjMovebox {
     /* 00002AD4-00002B48       .text mode_wait_init__Q212daObjMovebox5Act_cFv */
     void Act_c::mode_wait_init() {
         speedF = 0.0f;
-        mGravity = i_attr()->m14;
+        gravity = i_attr()->m14;
         mpBgW->SetCrrFunc(dBgS_MoveBGProc_Trans);
         clr_moment_cnt();
         m634 = -1;
@@ -1698,7 +1698,7 @@ namespace daObjMovebox {
         mDoMtx_stack_c::multVec(&cXyz::Zero, &temp2);
         current.pos.x = temp2.x;
         current.pos.z = temp2.z;
-        mEyePos = current.pos;
+        eyePos = current.pos;
         sound_slip();
         
         if (r28) {
@@ -1755,7 +1755,7 @@ namespace daObjMovebox {
         
         s16 r3 = i_attr()->m38 * (1.0f + cM_rnd());
         m604 += r3;
-        mGravity = (f0 * i_attr()->m28) + i_attr()->m14 + i_attr()->m34 * cM_ssin(m604) + m608;
+        gravity = (f0 * i_attr()->m28) + i_attr()->m14 + i_attr()->m34 * cM_ssin(m604) + m608;
         m608 = 0.0f;
         
         afl_sway();
@@ -1788,7 +1788,7 @@ namespace daObjMovebox {
         particlePos.set(current.pos.x, current.pos.y + 75.0f, current.pos.z);
         JPABaseEmitter* emitter = dComIfGp_particle_set(
             0x3E6, &particlePos, NULL, NULL, 0xFF, NULL, -1,
-            &mTevStr.mColorK0, &mTevStr.mColorK0, &particle_scale
+            &tevStr.mColorK0, &tevStr.mColorK0, &particle_scale
         );
         if (emitter) {
             emitter->setLifeTime(30);
@@ -1803,7 +1803,7 @@ namespace daObjMovebox {
         cXyz centerPos(current.pos.x, current.pos.y + 100.0f, current.pos.z);
         dBgS_ObjGndChk gndChk;
         gndChk.SetPos(&centerPos);
-        gndChk.SetActorPid(mBase.mBsPcId);
+        gndChk.SetActorPid(base.mBsPcId);
         dComIfG_Bgsp()->GroundCross(&gndChk);
         s32 bgIndex = gndChk.GetBgIndex();
         s32 mtrlSndId = 0;
@@ -1823,7 +1823,7 @@ namespace daObjMovebox {
             }
         }
         
-        mDoAud_seStart(i_attr()->mMoveSE, &mEyePos, mtrlSndId, mReverb);
+        mDoAud_seStart(i_attr()->mMoveSE, &eyePos, mtrlSndId, mReverb);
     }
     
     /* 00003BA4-00003C68       .text sound_limit__Q212daObjMovebox5Act_cFv */
@@ -1836,7 +1836,7 @@ namespace daObjMovebox {
             }
         }
         
-        mDoAud_seStart(i_attr()->mCantMoveSE, &mEyePos, mtrlSndId, mReverb);
+        mDoAud_seStart(i_attr()->mCantMoveSE, &eyePos, mtrlSndId, mReverb);
     }
     
     /* 00003C68-00003D2C       .text sound_land__Q212daObjMovebox5Act_cFv */
@@ -1849,7 +1849,7 @@ namespace daObjMovebox {
             }
         }
         
-        mDoAud_seStart(i_attr()->mNormalFallSE, &mEyePos, mtrlSndId, mReverb);
+        mDoAud_seStart(i_attr()->mNormalFallSE, &eyePos, mtrlSndId, mReverb);
     }
     
     /* 00003D2C-00003D80       .text vib_land__Q212daObjMovebox5Act_cFv */
@@ -1875,7 +1875,7 @@ namespace daObjMovebox {
             fopAcM_delete(this);
         } else {
             if (cLib_checkBit(mBgc.mStateFlags, Bgc_c::BgcState_JUST_HIT_WATER_e)) {
-                mDoAud_seStart(i_attr()->mWaterFallSE, &mEyePos, 0, mReverb);
+                mDoAud_seStart(i_attr()->mWaterFallSE, &eyePos, 0, mReverb);
             }
             
             if (mMode == MODE_WAIT) {
@@ -1896,8 +1896,8 @@ namespace daObjMovebox {
             mode_proc_call();
             mBgc.proc_vertical(this);
             if (mBgc.mMaxGroundIdx >= 0) {
-                mTevStr.mRoomNo = current.roomNo;
-                mTevStr.mEnvrIdxOverride = dComIfG_Bgsp()->GetPolyColor(Bgc_c::M_gnd_work[mBgc.mMaxGroundIdx]);
+                tevStr.mRoomNo = current.roomNo;
+                tevStr.mEnvrIdxOverride = dComIfG_Bgsp()->GetPolyColor(Bgc_c::M_gnd_work[mBgc.mMaxGroundIdx]);
             }
             
             if (m648 > 0) {
@@ -1928,8 +1928,8 @@ namespace daObjMovebox {
     BOOL Act_c::Draw() {
         if (mpModel) {
             int tevType = !i_attr()->mbUseBGTevType ? TEV_TYPE_ACTOR : TEV_TYPE_BG0;
-            g_env_light.settingTevStruct(tevType, &current.pos, &mTevStr);
-            g_env_light.setLightTevColorType(mpModel, &mTevStr);
+            g_env_light.settingTevStruct(tevType, &current.pos, &tevStr);
+            g_env_light.setLightTevColorType(mpModel, &tevStr);
             dComIfGd_setListBG();
             mDoExt_modelUpdateDL(mpModel);
             dComIfGd_setList();
@@ -1998,7 +1998,7 @@ actor_process_profile_definition g_profile_Obj_Movebox = {
     /* ListID       */ 3,
     /* ListPrio     */ fpcLy_CURRENT_e,
     /* ProcName     */ PROC_Obj_Movebox,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daObjMovebox::Act_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_obj_mtest.cpp b/src/d/actor/d_a_obj_mtest.cpp
index e357b0bd2..2961d2af7 100644
--- a/src/d/actor/d_a_obj_mtest.cpp
+++ b/src/d/actor/d_a_obj_mtest.cpp
@@ -159,9 +159,9 @@ BOOL daObjMtest::Act_c::Create() {
         mCyl.SetStts(&mStts);
         mCyl.SetTgVec((cXyz&)cXyz::Zero);
         mCyl.OnTgNoHitMark();
-        f32 scale = mScale.x < mScale.z ? mScale.x : mScale.z;
-        mCyl.SetR(scale * 50.0f);
-        mCyl.SetH(mScale.y * 100.0f);
+        f32 scaleMag = scale.x < scale.z ? scale.x : scale.z;
+        mCyl.SetR(scaleMag * 50.0f);
+        mCyl.SetH(scale.y * 100.0f);
     }
     
     return TRUE;
@@ -295,9 +295,9 @@ s32 daObjMtest::Act_c::Mthd_Create() {
         mbAppear = chk_appear();
         
         cXyz& scl_mult = M_scl_mult[M_type];
-        mScale.x *= scl_mult.x;
-        mScale.y *= scl_mult.y;
-        mScale.z *= scl_mult.z;
+        scale.x *= scl_mult.x;
+        scale.y *= scl_mult.y;
+        scale.z *= scl_mult.z;
         
         phase_state = MoveBGCreate(M_arcname[M_type], dzb_data[dzb_idx][M_type], NULL, heap_size[dzb_idx][M_type]);
         
@@ -333,14 +333,14 @@ void daObjMtest::Act_c::set_mtx() {
     if (mpModel) {
         mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
     }
-    mDoMtx_stack_c::scaleM(mScale);
+    mDoMtx_stack_c::scaleM(scale);
     mDoMtx_copy(mDoMtx_stack_c::get(), mMtx);
 }
 
 /* 00000A4C-00000A90       .text init_mtx__Q210daObjMtest5Act_cFv */
 void daObjMtest::Act_c::init_mtx() {
     if (mpModel) {
-        mpModel->setBaseScale(mScale);
+        mpModel->setBaseScale(scale);
     }
     set_mtx();
 }
@@ -371,8 +371,8 @@ BOOL daObjMtest::Act_c::Execute(Mtx** pMtx) {
 /* 00000B80-00000C64       .text Draw__Q210daObjMtest5Act_cFv */
 BOOL daObjMtest::Act_c::Draw() {
     if (mbAppear && mpModel && prm_get_arg1() != 3 && prm_get_arg1() != 4) {
-        g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &mTevStr);
-        g_env_light.setLightTevColorType(mpModel, &mTevStr);
+        g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &tevStr);
+        g_env_light.setLightTevColorType(mpModel, &tevStr);
         dComIfGd_setListBG();
         mDoExt_modelUpdateDL(mpModel);
         dComIfGd_setList();
@@ -417,7 +417,7 @@ actor_process_profile_definition g_profile_Obj_Mtest = {
     /* ListID       */ 3,
     /* ListPrio     */ fpcLy_CURRENT_e,
     /* ProcName     */ PROC_Obj_Mtest,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daObjMtest::Act_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_obj_ojtree.cpp b/src/d/actor/d_a_obj_ojtree.cpp
index df8a85da1..94ce8faab 100644
--- a/src/d/actor/d_a_obj_ojtree.cpp
+++ b/src/d/actor/d_a_obj_ojtree.cpp
@@ -79,7 +79,7 @@ void daObjOjtree::Act_c::set_mtx() {
 
 /* 000003B8-000003F4       .text init_mtx__Q211daObjOjtree5Act_cFv */
 void daObjOjtree::Act_c::init_mtx() {
-    mpModel->setBaseScale(mScale);
+    mpModel->setBaseScale(scale);
     set_mtx();
 }
 
@@ -99,8 +99,8 @@ int daObjOjtree::Act_c::Execute(Mtx** pMtx) {
 
 /* 0000045C-000004FC       .text Draw__Q211daObjOjtree5Act_cFv */
 BOOL daObjOjtree::Act_c::Draw() {
-    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(mpModel, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(mpModel, &tevStr);
     dComIfGd_setListBG();
     mDoExt_modelUpdateDL(mpModel);
     dComIfGd_setList();
@@ -144,7 +144,7 @@ actor_process_profile_definition g_profile_Obj_Ojtree = {
     /* ListID       */ 3,
     /* ListPrio     */ fpcLy_CURRENT_e,
     /* ProcName     */ PROC_Obj_Ojtree,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daObjOjtree::Act_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_obj_paper.cpp b/src/d/actor/d_a_obj_paper.cpp
index 89c5f43d4..110c5677a 100644
--- a/src/d/actor/d_a_obj_paper.cpp
+++ b/src/d/actor/d_a_obj_paper.cpp
@@ -114,12 +114,12 @@ namespace daObjPaper {
 
         if (result == cPhs_COMPLEATE_e) {
             if (fopAcM_entrySolidHeap(this, solidHeapCB, attr(mType).mHeapSize)) {
-                mEyePos.y += attr(mType).mEyeOffset;
+                eyePos.y += attr(mType).mEyeOffset;
 
-                mAttentionInfo.mPosition.y += attr(mType).mAttentionOffset;
-                mAttentionInfo.mDistances[1] = attr(mType).mAttentionDist1;
-                mAttentionInfo.mDistances[3] = attr(mType).mAttentionDist2;
-                mAttentionInfo.mFlags |= fopAc_Attn_LOCKON_TALK_e | fopAc_Attn_ACTION_TALK_e | fopAc_Attn_TALKFLAG_READ_e;
+                attention_info.position.y += attr(mType).mAttentionOffset;
+                attention_info.distances[1] = attr(mType).mAttentionDist1;
+                attention_info.distances[3] = attr(mType).mAttentionDist2;
+                attention_info.flags |= fopAc_Attn_LOCKON_TALK_e | fopAc_Attn_ACTION_TALK_e | fopAc_Attn_TALKFLAG_READ_e;
 
                 mMsgId = fpcM_ERROR_PROCESS_ID_e;
 
@@ -168,11 +168,11 @@ namespace daObjPaper {
 
     /* 00000748-00000784       .text mode_wait__Q210daObjPaper5Act_cFv */
     void daObjPaper::Act_c::mode_wait() {
-        if (mEvtInfo.mCommand == dEvtCmd_INTALK_e) {
+        if (eventInfo.mCommand == dEvtCmd_INTALK_e) {
             mode_talk0_init();
         }
         else {
-            mEvtInfo.onCondition(dEvtCnd_CANTALK_e);
+            eventInfo.onCondition(dEvtCnd_CANTALK_e);
         }
     }
 
@@ -186,7 +186,7 @@ namespace daObjPaper {
     /* 000007A4-00000820       .text mode_talk0__Q210daObjPaper5Act_cFv */
     void daObjPaper::Act_c::mode_talk0() {
         if (mMsgId == fpcM_ERROR_PROCESS_ID_e && dComIfGp_checkCameraAttentionStatus(dComIfGp_getPlayerCameraID(0), 4)) {
-            mMsgId = fopMsgM_messageSet(prm_get_msgNo(), &mEyePos);
+            mMsgId = fopMsgM_messageSet(prm_get_msgNo(), &eyePos);
 
             mode_talk1_init();
         }
@@ -232,7 +232,7 @@ namespace daObjPaper {
 
     /* 00000948-00000984       .text init_mtx__Q210daObjPaper5Act_cFv */
     void daObjPaper::Act_c::init_mtx() {
-        mpModel->setBaseScale(mScale);
+        mpModel->setBaseScale(scale);
         set_mtx();
     }
 
@@ -240,7 +240,7 @@ namespace daObjPaper {
     void daObjPaper::Act_c::damage_cc_proc() {
         u32 hitResult = mCylinderCol.ChkTgHit();
         if (hitResult) {
-            daObj::HitSeStart(&mEyePos, current.roomNo, &mCylinderCol, 0x0D);
+            daObj::HitSeStart(&eyePos, current.roomNo, &mCylinderCol, 0x0D);
             dKy_Sound_set(current.pos, 4, fopAcM_GetID(this), 100);
 
             daObj::HitEff_hibana(this, &mCylinderCol);
@@ -279,8 +279,8 @@ namespace daObjPaper {
 
     /* 00000B58-00000BD4       .text _draw__Q210daObjPaper5Act_cFv */
     bool daObjPaper::Act_c::_draw() {
-        g_env_light.settingTevStruct(attr(mType).mTevType == 0 ? TEV_TYPE_BG0 : TEV_TYPE_ACTOR, &current.pos, &mTevStr);
-        g_env_light.setLightTevColorType(mpModel, &mTevStr);
+        g_env_light.settingTevStruct(attr(mType).mTevType == 0 ? TEV_TYPE_BG0 : TEV_TYPE_ACTOR, &current.pos, &tevStr);
+        g_env_light.setLightTevColorType(mpModel, &tevStr);
 
         mDoExt_modelUpdateDL(mpModel);
 
@@ -328,7 +328,7 @@ actor_process_profile_definition g_profile_Obj_Paper = {
     7,
     fpcLy_CURRENT_e,
     PROC_Obj_Paper,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(daObjPaper::Act_c),
     0,
     0,
diff --git a/src/d/actor/d_a_obj_pbka.cpp b/src/d/actor/d_a_obj_pbka.cpp
index e8f36a9f8..9fdfbf0ac 100644
--- a/src/d/actor/d_a_obj_pbka.cpp
+++ b/src/d/actor/d_a_obj_pbka.cpp
@@ -35,7 +35,7 @@ void daObjPbka_c::CreateInit() {
 
 /* 000001CC-0000024C       .text set_mtx__11daObjPbka_cFv */
 void daObjPbka_c::set_mtx() {
-    mpModel->setBaseScale(mScale);
+    mpModel->setBaseScale(scale);
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(current.angle.y);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
@@ -73,7 +73,7 @@ static BOOL daObjPbka_Delete(void* i_this) {
 
 BOOL daObjPbka_c::_draw() {
     dKy_tevstr_c * pTevStr;
-    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, pTevStr = &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, pTevStr = &tevStr);
     g_env_light.setLightTevColorType(mpModel, pTevStr);
     dComIfGd_setListBG();
     mDoExt_modelUpdateDL(mpModel);
@@ -118,7 +118,7 @@ actor_process_profile_definition g_profile_Obj_Pbka = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcLy_CURRENT_e,
     /* ProcName     */ PROC_Obj_Pbka,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daObjPbka_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp
index 6a97465ae..c45075828 100644
--- a/src/d/actor/d_a_obj_toripost.cpp
+++ b/src/d/actor/d_a_obj_toripost.cpp
@@ -517,8 +517,8 @@ void daObjTpost_c::eventOrder() {
     };
 
     if(field_0x8F7 == 1 || field_0x8F7 == 2) {
-        mEvtInfo.onCondition(dEvtCnd_CANTALK_e);
-        mEvtInfo.onCondition(dEvtCnd_CANTALKITEM_e);
+        eventInfo.onCondition(dEvtCnd_CANTALK_e);
+        eventInfo.onCondition(dEvtCnd_CANTALKITEM_e);
 
         if(field_0x8F7 == 1) {
             fopAcM_orderSpeakEvent(this);
@@ -531,12 +531,12 @@ void daObjTpost_c::eventOrder() {
 
 /* 00000DC0-00000E48       .text checkOrder__12daObjTpost_cFv */
 void daObjTpost_c::checkOrder() {
-    if(mEvtInfo.checkCommandDemoAccrpt()) {
+    if(eventInfo.checkCommandDemoAccrpt()) {
         field_0x8F7 = 0;
         return;
     }
 
-    if(mEvtInfo.checkCommandTalk()) {
+    if(eventInfo.checkCommandTalk()) {
         if(field_0x8F7 == 1 || field_0x8F7 == 2) {
             field_0x8F7 = 0;
             if(dComIfGp_event_chkTalkXY()) {
@@ -553,10 +553,10 @@ void daObjTpost_c::checkOrder() {
 
 /* 00000E48-00000EA4       .text setAttention__12daObjTpost_cFv */
 void daObjTpost_c::setAttention() {
-    mAttentionInfo.mPosition = current.pos;
-    mAttentionInfo.mPosition.y += l_HIO.attn_pos_offset;
-    mEyePos = current.pos;
-    mEyePos.y += l_HIO.eye_pos_offset;
+    attention_info.position = current.pos;
+    attention_info.position.y += l_HIO.attn_pos_offset;
+    eyePos = current.pos;
+    eyePos.y += l_HIO.eye_pos_offset;
 }
 
 /* 00000EA4-0000100C       .text setAnm__12daObjTpost_cFScb */
@@ -632,7 +632,7 @@ void daObjTpost_c::setAnm(s8 param_1, bool param_2) {
 /* 0000100C-00001094       .text setMtx__12daObjTpost_cFv */
 void daObjTpost_c::setMtx() {
     J3DModel* pModel = mMorf->getModel();
-    pModel->setBaseScale(mScale);
+    pModel->setBaseScale(scale);
 
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -857,7 +857,7 @@ bool daObjTpost_c::_execute() {
     mAcch.CrrPos(*dComIfG_Bgsp());
     mStts.Move();
     if(mCyl.ChkTgHit()) {
-        daObj::HitSeStart(&mEyePos, current.roomNo, &mCyl, 0x0B);
+        daObj::HitSeStart(&eyePos, current.roomNo, &mCyl, 0x0B);
     }
     daObj::HitEff_kikuzu(this, &mCyl);
     fopAcM_rollPlayerCrash(this, 40.0f, 7);
@@ -882,8 +882,8 @@ bool daObjTpost_c::_draw() {
     }
 
     J3DModel* pModel = mMorf->getModel();
-    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(pModel, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(pModel, &tevStr);
     mMorf->entryDL();
     dComIfGd_setSimpleShadow2(&current.pos, mAcch.GetGroundH(), 40.0f, mAcch.m_gnd, shape_angle.y, 1.0f, 0);
 
@@ -916,9 +916,9 @@ void daObjTpost_c::createInit() {
     mCurrMsgBsPcId = fpcM_ERROR_PROCESS_ID_e;
     mpCurrMsg = 0;
 
-    mAttentionInfo.mDistances[1] = 5;
-    mAttentionInfo.mDistances[3] = 6;
-    mAttentionInfo.mFlags = fopAc_Attn_LOCKON_TALK_e | fopAc_Attn_ACTION_TALK_e | fopAc_Attn_TALKFLAG_CHECK_e;
+    attention_info.distances[1] = 5;
+    attention_info.distances[3] = 6;
+    attention_info.flags = fopAc_Attn_LOCKON_TALK_e | fopAc_Attn_ACTION_TALK_e | fopAc_Attn_TALKFLAG_CHECK_e;
 
     setAnm(1, false);
     setMtx();
@@ -938,7 +938,7 @@ void daObjTpost_c::createInit() {
     mAcchCir.SetWall(30.0f, 30.0f);
     mAcch.Set(&current.pos, &old.pos, this, 1, &mAcchCir, &speed);
     mAcch.SetRoofNone();
-    mGravity = -4.5f;
+    gravity = -4.5f;
 
     mEventCut.setActorInfo2("Tpost", this);
 }
@@ -1010,7 +1010,7 @@ actor_process_profile_definition g_profile_OBJ_TORIPOST = {
     3,
     fpcPi_CURRENT_e,
     PROC_OBJ_TORIPOST,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(daObjTpost_c),
     0,
     0,
diff --git a/src/d/actor/d_a_obj_tower.cpp b/src/d/actor/d_a_obj_tower.cpp
index 3482b7b69..f24f54c23 100644
--- a/src/d/actor/d_a_obj_tower.cpp
+++ b/src/d/actor/d_a_obj_tower.cpp
@@ -29,7 +29,7 @@ BOOL daObjTower_c::CreateHeap() {
 
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
-    mDoMtx_stack_c::scaleM(mScale.x, mScale.y, mScale.z);
+    mDoMtx_stack_c::scaleM(scale.x, scale.y, scale.z);
     mDoMtx_copy(mDoMtx_stack_c::get(), mMtx);
 
     mpBgW = new dBgW();
@@ -53,7 +53,7 @@ void daObjTower_c::CreateInit() {
 
 /* 0000028C-0000030C       .text set_mtx__12daObjTower_cFv */
 void daObjTower_c::set_mtx() {
-    mpModel->setBaseScale(mScale);
+    mpModel->setBaseScale(scale);
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(current.angle.y);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
@@ -104,8 +104,8 @@ static BOOL daObjTower_Delete(void* i_this) {
 }
 
 BOOL daObjTower_c::_draw() {
-    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(mpModel, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(mpModel, &tevStr);
 
     dComIfGd_setListBG();
     mDoExt_modelUpdateDL(mpModel);
@@ -120,8 +120,8 @@ static BOOL daObjTower_Draw(void* i_this) {
 }
 
 BOOL daObjTower_c::_execute() {
-    if (mDemoActorId != 0) {
-        dDemo_actor_c* pdVar1 = dComIfGp_demo_getActor(mDemoActorId);
+    if (demoActorID != 0) {
+        dDemo_actor_c* pdVar1 = dComIfGp_demo_getActor(demoActorID);
         if (pdVar1 != NULL && pdVar1->checkEnable(0x02)) {
             current.pos = pdVar1->mTranslation;
         }
@@ -152,7 +152,7 @@ struct actor_process_profile_definition g_profile_Obj_Tower = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcLy_CURRENT_e,
     /* ProcName     */ PROC_Obj_Tower,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daObjTower_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_obj_vfan.cpp b/src/d/actor/d_a_obj_vfan.cpp
index 9dcaf9f1e..5996a2ce7 100644
--- a/src/d/actor/d_a_obj_vfan.cpp
+++ b/src/d/actor/d_a_obj_vfan.cpp
@@ -128,7 +128,7 @@ void daObjVfan::Act_c::set_mtx() {
 
 /* 00000680-000006BC       .text init_mtx__Q29daObjVfan5Act_cFv */
 void daObjVfan::Act_c::init_mtx() {
-    mpModel->setBaseScale(mScale);
+    mpModel->setBaseScale(scale);
 
     set_mtx();
 }
@@ -166,7 +166,7 @@ int daObjVfan::Act_c::Execute(Mtx** mtx) {
         break;
 
     case 1:
-        if (mEvtInfo.checkCommandDemoAccrpt()) {
+        if (eventInfo.checkCommandDemoAccrpt()) {
             mDoAud_seStart(JA_SE_READ_RIDDLE_1);
             fopAcM_seStartCurrent(this, JA_SE_OBJ_GN_SW_DR_LIGHT, 0);
 
@@ -203,8 +203,8 @@ int daObjVfan::Act_c::Execute(Mtx** mtx) {
 
 /* 00000C74-00000D20       .text Draw__Q29daObjVfan5Act_cFv */
 BOOL daObjVfan::Act_c::Draw() {
-    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(mpModel, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(mpModel, &tevStr);
 
     dComIfGd_setListBG();
     // This comparison is necessary to generate "cmplwi 0x1; bne" instead of "cmplwi 0x0; beq"
@@ -247,7 +247,7 @@ actor_process_profile_definition g_profile_Obj_Vfan = {
     /* ListID       */ 3,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_Obj_Vfan,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daObjVfan::Act_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_obj_wood.cpp b/src/d/actor/d_a_obj_wood.cpp
index 14531eb21..5c7dfb053 100644
--- a/src/d/actor/d_a_obj_wood.cpp
+++ b/src/d/actor/d_a_obj_wood.cpp
@@ -71,7 +71,7 @@ actor_process_profile_definition g_profile_Obj_Wood = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_Obj_Wood,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daObjWood::Act_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_obj_zouK.cpp b/src/d/actor/d_a_obj_zouK.cpp
index 010b17f95..61ee2d547 100644
--- a/src/d/actor/d_a_obj_zouK.cpp
+++ b/src/d/actor/d_a_obj_zouK.cpp
@@ -187,7 +187,7 @@ void daObjZouk::Act_c::set_mtx() {
     cXyz trans(0.0f, 0.0f, 0.0f);
     mDoMtx_stack_c::transS(trans);
     mDoMtx_copy(mDoMtx_stack_c::get(), mBgMtx);
-    M_anm->getModel()->setBaseScale(mScale);
+    M_anm->getModel()->setBaseScale(scale);
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
     M_anm->getModel()->setBaseTRMtx(mDoMtx_stack_c::get());
@@ -205,7 +205,7 @@ void daObjZouk::Act_c::play_stop_joint_anime() {
 
 /* 00001270-000012F0       .text jokai_demo__Q29daObjZouk5Act_cFv */
 BOOL daObjZouk::Act_c::jokai_demo() {
-    if (dComIfGp_demo_getActor(mDemoActorId) != NULL) {
+    if (dComIfGp_demo_getActor(demoActorID) != NULL) {
         dDemo_setDemoData(this, 0x6a, M_anm, "VzouK", 0, 0, 0, 0);
         return true;
     } else {
@@ -266,10 +266,10 @@ static void dummy() {
 
 /* 00001510-000015F0       .text _draw__Q29daObjZouk5Act_cFv */
 bool daObjZouk::Act_c::_draw() {
-    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
     dComIfGd_setListBG();
-    g_env_light.setLightTevColorType(M_anm->getModel(), &mTevStr);
-    setEffectMtx(&mEyePos, 0.5f);
+    g_env_light.setLightTevColorType(M_anm->getModel(), &tevStr);
+    setEffectMtx(&eyePos, 0.5f);
     M_anm->updateDL();
     dComIfGd_setList();
     dComIfGd_setSimpleShadow2(&current.pos, mGndY, 388.0f, mGndChk, shape_angle.y, 1.0f, dDlst_shadowControl_c::getSimpleTex());
@@ -277,20 +277,20 @@ bool daObjZouk::Act_c::_draw() {
 }
 
 /* 000015F0-00001804       .text setEffectMtx__Q29daObjZouk5Act_cFPC4cXyzf */
-void daObjZouk::Act_c::setEffectMtx(const cXyz* pos, f32 scale) {
+void daObjZouk::Act_c::setEffectMtx(const cXyz* pos, f32 scaleMag) {
     static Mtx mtx_adj = {
         0.5f, 0.0f, 0.0f, 0.5f,
         0.0f, -0.5f, 0.0f, 0.5f,
         0.0f, 0.0f, 1.0f, 0.0f,
     };
 
-    f32 inv = 1.0f / scale;
+    f32 inv = 1.0f / scaleMag;
     camera_class * camera = dCam_getCamera();
     cXyz lookDir = *pos - camera->mLookat.mEye;
     cXyz lightDir;
     cXyz refl;
 
-    dKyr_get_vectle_calc(&mTevStr.mLightPosWorld, (cXyz*)pos, &lightDir);
+    dKyr_get_vectle_calc(&tevStr.mLightPosWorld, (cXyz*)pos, &lightDir);
     C_VECHalfAngle(&lookDir, &lightDir, &refl);
     Mtx lookatMtx;
     C_MTXLookAt(lookatMtx, &cXyz::Zero, &cXyz::BaseY, &refl);
@@ -350,7 +350,7 @@ actor_process_profile_definition g_profile_Obj_Zouk = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_Obj_Zouk,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daObjZouk::Act_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_player_food.inc b/src/d/actor/d_a_player_food.inc
index 258c8cd2b..20dbc34db 100644
--- a/src/d/actor/d_a_player_food.inc
+++ b/src/d/actor/d_a_player_food.inc
@@ -59,9 +59,9 @@ BOOL daPy_lk_c::procFoodThrow_init() {
         f32 offset2 = cM_scos(shape_angle.y) * 150.0f;
         cXyz start;
         start.set(
-            mAttentionInfo.mPosition.x,
-            mAttentionInfo.mPosition.y - 50.0f,
-            mAttentionInfo.mPosition.z
+            attention_info.position.x,
+            attention_info.position.y - 50.0f,
+            attention_info.position.z
         );
         cXyz end;
         end.set(
diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp
index 0f9173a36..f67a0a3dd 100644
--- a/src/d/actor/d_a_player_main.cpp
+++ b/src/d/actor/d_a_player_main.cpp
@@ -305,7 +305,7 @@ void daPy_lk_c::seStartSwordCut(u32 i_seNum) {
 
 /* 8010314C-801031A4       .text voiceStart__9daPy_lk_cFUl */
 void daPy_lk_c::voiceStart(u32 param_1) {
-    mDoAud_linkVoiceStart(param_1, &mEyePos, mDoAud_getLinkVoiceVowel(param_1), mReverb);
+    mDoAud_linkVoiceStart(param_1, &eyePos, mDoAud_getLinkVoiceVowel(param_1), mReverb);
 }
 
 /* 801031A4-801031DC       .text itemButton__9daPy_lk_cCFv */
@@ -737,7 +737,7 @@ void daPy_lk_c::setDrawHandModel() {
 
 /* 80106BD0-80106C40       .text entryDLSetLight__9daPy_lk_cFP8J3DModelUl */
 void daPy_lk_c::entryDLSetLight(J3DModel* model, u32 param_2) {
-    g_env_light.setLightTevColorType(model, &mTevStr);
+    g_env_light.setLightTevColorType(model, &tevStr);
     if (param_2 != 0) {
         dMat_control_c::iceEntryDL(model, -1, NULL);
     } else {
@@ -747,7 +747,7 @@ void daPy_lk_c::entryDLSetLight(J3DModel* model, u32 param_2) {
 
 /* 80106C40-80106CB0       .text updateDLSetLight__9daPy_lk_cFP8J3DModelUl */
 void daPy_lk_c::updateDLSetLight(J3DModel* model, u32 param_2) {
-    g_env_light.setLightTevColorType(model, &mTevStr);
+    g_env_light.setLightTevColorType(model, &tevStr);
     if (param_2 != 0) {
         dMat_control_c::iceUpdateDL(model, -1, NULL);
     } else {
@@ -786,7 +786,7 @@ BOOL daPy_lk_c::draw() {
     if (mSightPacket.getDrawFlg()) {
         mSightPacket.setSight();
     }
-    g_env_light.settingTevStruct(TEV_TYPE_PLAYER, &current.pos, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_PLAYER, &current.pos, &tevStr);
     if (checkPlayerNoDraw()) {
         offBodyEffect();
         drawMirrorLightModel();
@@ -801,11 +801,11 @@ BOOL daPy_lk_c::draw() {
     
     s16 origFogR, origFogG, origFogB;
     f32 origFogStartZ, origFogEndZ;
-    origFogR = mTevStr.mFogColor.r;
-    origFogG = mTevStr.mFogColor.g;
-    origFogB = mTevStr.mFogColor.b;
-    origFogStartZ = mTevStr.mFogStartZ;
-    origFogEndZ = mTevStr.mFogEndZ;
+    origFogR = tevStr.mFogColor.r;
+    origFogG = tevStr.mFogColor.g;
+    origFogB = tevStr.mFogColor.b;
+    origFogStartZ = tevStr.mFogStartZ;
+    origFogEndZ = tevStr.mFogEndZ;
     if (!checkFreezeState() && mCurProc != daPyProc_ELEC_DAMAGE_e &&
         (daPy_dmEcallBack_c::checkCurse() || checkConfuse() || mDamageWaitTimer > 0)
     ) {
@@ -813,16 +813,16 @@ BOOL daPy_lk_c::draw() {
         mDoLib_pos2camera(&current.pos, &sp18);
         f32 f2 = fabsf(cM_ssin(g_Counter.mTimer * 0x800));
         if (daPy_dmEcallBack_c::checkCurse() || checkConfuse()) {
-            mTevStr.mFogColor.r = 0x80;
-            mTevStr.mFogColor.g = 0x00;
-            mTevStr.mFogColor.b = 0xFF;
+            tevStr.mFogColor.r = 0x80;
+            tevStr.mFogColor.g = 0x00;
+            tevStr.mFogColor.b = 0xFF;
         } else {
-            mTevStr.mFogColor.r = 0xFF;
-            mTevStr.mFogColor.g = 0x3C;
-            mTevStr.mFogColor.b = 0x3C;
+            tevStr.mFogColor.r = 0xFF;
+            tevStr.mFogColor.g = 0x3C;
+            tevStr.mFogColor.b = 0x3C;
         }
-        mTevStr.mFogStartZ = -sp18.z - 200.0f + 200.0f * f2;
-        mTevStr.mFogEndZ = mTevStr.mFogStartZ + 300.0f;
+        tevStr.mFogStartZ = -sp18.z - 200.0f + 200.0f * f2;
+        tevStr.mFogEndZ = tevStr.mFogStartZ + 300.0f;
     }
     
     u16 material_num = mpAnmTexPatternData->getUpdateMaterialNum();
@@ -845,7 +845,7 @@ BOOL daPy_lk_c::draw() {
     mpCLModelData->setTexMtxAnimator(mpTexScrollResData, m_texMtxAnm, NULL);
     mpAnmTexPatternData->setFrame(m3530);
     mpTexScrollResData->setFrame(m3532);
-    g_env_light.setLightTevColorType(mpCLModel, &mTevStr);
+    g_env_light.setLightTevColorType(mpCLModel, &tevStr);
     J3DJoint* link_root_joint = mpCLModelData->getJointNodePointer(0x00); // link_root joint
     mpCLModelData->getJointNodePointer(0x08)->getMesh()->getShape()->hide(); // cl_LhandA joint
     mpCLModelData->getJointNodePointer(0x0C)->getMesh()->getShape()->hide(); // cl_RhandA joint
@@ -984,11 +984,11 @@ BOOL daPy_lk_c::draw() {
         entryDLSetLight(mpHbootsModels[1], mNoResetFlg1 & daPyFlg1_FREEZE_STATE);
     }
     
-    mTevStr.mFogColor.r = origFogR;
-    mTevStr.mFogColor.g = origFogG;
-    mTevStr.mFogColor.b = origFogB;
-    mTevStr.mFogStartZ = origFogStartZ;
-    mTevStr.mFogEndZ = origFogEndZ;
+    tevStr.mFogColor.r = origFogR;
+    tevStr.mFogColor.g = origFogG;
+    tevStr.mFogColor.b = origFogB;
+    tevStr.mFogStartZ = origFogStartZ;
+    tevStr.mFogEndZ = origFogEndZ;
     
     if (!r24) {
         if (mCurProc == daPyProc_CUT_F_e || mCurProc == daPyProc_BT_VERTICAL_JUMP_CUT_e) {
@@ -1196,7 +1196,7 @@ void daPy_lk_c::posMove() {
 /* 80109E80-80109ED8       .text setShapeAngleToAtnActor__9daPy_lk_cFv */
 void daPy_lk_c::setShapeAngleToAtnActor() {
     if (mpAttnActorLockOn != NULL) {
-        s16 targetAngle = cLib_targetAngleY(&current.pos, &mpAttnActorLockOn->mEyePos);
+        s16 targetAngle = cLib_targetAngleY(&current.pos, &mpAttnActorLockOn->eyePos);
         cLib_addCalcAngleS(&shape_angle.y, targetAngle, 2, 0x2000, 0x800);
     }
 }
@@ -2059,7 +2059,7 @@ BOOL daPy_lk_c::commonProcInit(daPy_PROC proc) {
         setSmallFanModel();
     } else if (mCurProc == daPyProc_FAN_GLIDE_e) {
         deleteEquipItem(FALSE);
-        mMaxFallSpeed = daPy_HIO_autoJump_c0::m.field_0x10;
+        maxFallSpeed = daPy_HIO_autoJump_c0::m.field_0x10;
         setSmallFanModel();
         mHeldItemType = dItem_DEKU_LEAF_e;
         m35F0 = m3688.y;
@@ -2067,7 +2067,7 @@ BOOL daPy_lk_c::commonProcInit(daPy_PROC proc) {
         m34E0 = 0;
         m34E4 = 0;
     } else if (mCurProc == daPyProc_SLOW_FALL_e) {
-        mMaxFallSpeed = daPy_HIO_autoJump_c0::m.field_0x10;
+        maxFallSpeed = daPy_HIO_autoJump_c0::m.field_0x10;
     } else if (mCurProc == daPyProc_DEMO_TOOL_e) {
         resetDemoAnime = TRUE;
         speed.y = 0.0f;
@@ -2125,7 +2125,7 @@ BOOL daPy_lk_c::commonProcInit(daPy_PROC proc) {
     dComIfGp_clearPlayerStatus0(0, ~(daPyStts0_BOOMERANG_WAIT_e | daPyStts0_UNK10_e));
     dComIfGp_clearPlayerStatus1(0, ~(daPyStts1_SAIL_e | daPyStts1_UNK8000_e | daPyStts1_UNK40000_e) & 0x000FFFFF);
     
-    mGravity = daPy_HIO_autoJump_c0::m.field_0xC;
+    gravity = daPy_HIO_autoJump_c0::m.field_0xC;
     m34F2 = 0;
     m34F4 = 0;
     onResetFlg0(daPyRFlg0_UNK8000000);
@@ -2734,11 +2734,11 @@ void daPy_lk_c::autoGroundHit() {
 /* 8011AD9C-8011AE20       .text checkAttentionPosAngle__9daPy_lk_cFP10fopAc_ac_cPP4cXyz */
 BOOL daPy_lk_c::checkAttentionPosAngle(fopAc_ac_c* actor, cXyz** pOutPos) {
     if (actor) {
-        s16 targetAngle = cLib_targetAngleY(&current.pos, &actor->mEyePos);
+        s16 targetAngle = cLib_targetAngleY(&current.pos, &actor->eyePos);
         int angleDiff = cLib_distanceAngleS(targetAngle, m34DE);
         if (angleDiff <= 0x6000) {
-            *pOutPos = &actor->mEyePos;
-            if (actor->mGroup == fopAc_ENEMY_e) {
+            *pOutPos = &actor->eyePos;
+            if (actor->group == fopAc_ENEMY_e) {
                 onNoResetFlg1(daPyFlg1_UNK400);
             }
             return TRUE;
@@ -3107,7 +3107,7 @@ BOOL daPy_lk_c::execute() {
     }
     
     if (checkNoControll()) {
-        mAttentionInfo.mFlags = 0;
+        attention_info.flags = 0;
         fopAcM_SetStatusMap(this, 0x10);
         if (!dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e)) {
             mStts.SetWeight(0xFF);
@@ -3116,7 +3116,7 @@ BOOL daPy_lk_c::execute() {
             mStts.SetWeight(120);
         }
     } else {
-        mAttentionInfo.mFlags = ~0;
+        attention_info.flags = ~0;
         fopAcM_SetStatusMap(this, 0x01);
         mStts.SetWeight(120);
     }
@@ -3137,7 +3137,7 @@ BOOL daPy_lk_c::execute() {
     
     if (dComIfGp_event_runCheck()) {
         mStaffIdx = dComIfGp_evmng_getMyStaffId("Link", this);
-        if (mEvtInfo.checkCommandDoor() && !dComIfGp_event_chkEventFlag(0x4) && mHeldItemType == 0x101) {
+        if (eventInfo.checkCommandDoor() && !dComIfGp_event_chkEventFlag(0x4) && mHeldItemType == 0x101) {
             fopAc_ac_c* equipActor = mActorKeepEquip.getActor();
             if (equipActor) {
                 s16 angle = shape_angle.y + 0x8000;
@@ -3200,7 +3200,7 @@ BOOL daPy_lk_c::execute() {
     daPy_matAnm_c::decMorfFrame();
     daPy_matAnm_c::decMabaTimer();
     
-    if (mCurProc == daPyProc_BOTTLE_SWING_e && mEvtInfo.checkCommandCatch()) {
+    if (mCurProc == daPyProc_BOTTLE_SWING_e && eventInfo.checkCommandCatch()) {
         mDemo.setDemoType(5);
     }
     
@@ -3429,8 +3429,8 @@ BOOL daPy_lk_c::execute() {
     
     equipActor = mActorKeepEquip.getActor();
     if (equipActor) {
-        equipActor->mTevStr.mRoomNo = mTevStr.mRoomNo;
-        equipActor->mTevStr.mEnvrIdxOverride = mTevStr.mEnvrIdxOverride;
+        equipActor->tevStr.mRoomNo = tevStr.mRoomNo;
+        equipActor->tevStr.mEnvrIdxOverride = tevStr.mEnvrIdxOverride;
         equipActor->current.roomNo = roomNo;
     }
     
@@ -3493,7 +3493,7 @@ BOOL daPy_lk_c::execute() {
         }
     }
     
-    cMtx_multVec(mpCLModel->getAnmMtx(0x13), &l_eye_offset, &mEyePos);
+    cMtx_multVec(mpCLModel->getAnmMtx(0x13), &l_eye_offset, &eyePos);
     
     m36D0 = mSwordTopPos;
     m36DC = m36C4;
@@ -3533,12 +3533,12 @@ BOOL daPy_lk_c::execute() {
     
     if (!checkNoResetFlg0((daPy_FLG0)(daPyFlg0_UNK20000000 | daPyFlg0_UNK80000000))) {
         if (mAcch.ChkGroundHit() && !daPy_lk_c::checkPlayerFly()) {
-            mEvtInfo.onCondition(dEvtCnd_CANTALK_e | dEvtCnd_CANDOOR_e | dEvtCnd_CANGETITEM_e | dEvtCnd_UNK10_e | dEvtCnd_CANCATCH_e);
+            eventInfo.onCondition(dEvtCnd_CANTALK_e | dEvtCnd_CANDOOR_e | dEvtCnd_CANGETITEM_e | dEvtCnd_UNK10_e | dEvtCnd_CANCATCH_e);
         } else if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e) || (checkModeFlg(ModeFlg_SWIM) && checkNoResetFlg0(daPyFlg0_UNK100))) {
-            mEvtInfo.onCondition(dEvtCnd_CANTALK_e);
+            eventInfo.onCondition(dEvtCnd_CANTALK_e);
         }
     }
-    mEvtInfo.onCondition(dEvtCnd_CANGETITEM_e);
+    eventInfo.onCondition(dEvtCnd_CANGETITEM_e);
     
     JPABaseEmitter* emitter = mSmokeEcallBack.getEmitter();
     if (emitter) {
@@ -4063,8 +4063,8 @@ void daPy_lk_c::playerInit() {
     mAcch.ClrRoofNone();
     mAcch.SetRoofCrrHeight(125.0f);
     field_0x2a8 = daPy_HIO_move_c0::m.field_0x18;
-    mGravity = daPy_HIO_autoJump_c0::m.field_0xC;
-    mMaxFallSpeed = daPy_HIO_autoJump_c0::m.field_0x10;
+    gravity = daPy_HIO_autoJump_c0::m.field_0xC;
+    maxFallSpeed = daPy_HIO_autoJump_c0::m.field_0x10;
     mAcchCir[0].SetWall(30.1f, 35.0f);
     mAcchCir[1].SetWall(89.9f, 35.0f);
     mAcchCir[2].SetWall(125.0f, 35.0f);
@@ -4256,11 +4256,11 @@ int phase_1(daPy_lk_c* i_this) {
     dComIfGp_setLinkPlayer(i_this);
 
     fopAcM_setStageLayer(i_this);
-    i_this->mAttentionInfo.mFlags = ~0;
+    i_this->attention_info.flags = ~0;
 
-    i_this->mAttentionInfo.mPosition.x = i_this->current.pos.x;
-    i_this->mAttentionInfo.mPosition.y = i_this->current.pos.y + 125.0f;
-    i_this->mAttentionInfo.mPosition.z = i_this->current.pos.z;
+    i_this->attention_info.position.x = i_this->current.pos.x;
+    i_this->attention_info.position.y = i_this->current.pos.y + 125.0f;
+    i_this->attention_info.position.z = i_this->current.pos.z;
 
     return cPhs_NEXT_e;
 }
@@ -4624,7 +4624,7 @@ actor_process_profile_definition2 g_profile_PLAYER = {
     /* ListID       */ 5,
     /* ListPrio     */ fpcLy_CURRENT_e,
     /* ProcName     */ PROC_PLAYER,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daPy_lk_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_player_npc.cpp b/src/d/actor/d_a_player_npc.cpp
index 4168db90e..c605f70e6 100644
--- a/src/d/actor/d_a_player_npc.cpp
+++ b/src/d/actor/d_a_player_npc.cpp
@@ -40,7 +40,7 @@ BOOL daPy_npc_c::check_moveStop() {
             speedF = 0.0f;
             m4E8 = 0;
         }
-        if (dComIfGp_getPlayer(0)->mEvtInfo.mCommand != dEvtCmd_INDOOR_e) {
+        if (dComIfGp_getPlayer(0)->eventInfo.mCommand != dEvtCmd_INDOOR_e) {
             offNpcCallCommand();
         }
         return TRUE;
@@ -51,7 +51,7 @@ BOOL daPy_npc_c::check_moveStop() {
 /* 8015A524-8015A590       .text setRestart__10daPy_npc_cFSc */
 void daPy_npc_c::setRestart(s8 option) {
     if (option == dComIfGs_getRestartOption()) {
-        bool playerInDoor = dComIfGp_getPlayer(0)->mEvtInfo.checkCommandDoor();
+        bool playerInDoor = dComIfGp_getPlayer(0)->eventInfo.checkCommandDoor();
         s8 roomNo = current.roomNo;
         s8 optionRoomNo = dComIfGs_getRestartOptionRoomNo();
         if (!playerInDoor && roomNo != optionRoomNo) {
@@ -162,7 +162,7 @@ BOOL daPy_npc_c::checkNowPosMove(const char* pName) {
     if (!dComIfGp_event_runCheck()) {
         return TRUE;
     }
-    if (mEvtInfo.checkCommandTalk()) {
+    if (eventInfo.checkCommandTalk()) {
         return TRUE;
     }
     if (isEventAccept() && !isReturnLink()) {
@@ -186,12 +186,12 @@ void daPy_npc_c::drawDamageFog() {
     cXyz camPos;
     mDoLib_pos2camera(&current.pos, &camPos);
     f32 adjust = fabsf(cM_ssin(g_Counter.mTimer * 0x800));
-    mTevStr.mFogColor.r = 255;
-    mTevStr.mFogColor.g = 60;
-    mTevStr.mFogColor.b = 60;
+    tevStr.mFogColor.r = 255;
+    tevStr.mFogColor.g = 60;
+    tevStr.mFogColor.b = 60;
     
-    mTevStr.mFogStartZ = (-camPos.z - 200.0f) + 200.0f * adjust;
-    mTevStr.mFogEndZ = mTevStr.mFogStartZ + 300.0f;
+    tevStr.mFogStartZ = (-camPos.z - 200.0f) + 200.0f * adjust;
+    tevStr.mFogEndZ = tevStr.mFogStartZ + 300.0f;
 }
 
 /* 8015AD20-8015AEF8       .text chkMoveBlock__10daPy_npc_cFP4cXyz */
diff --git a/src/d/actor/d_a_player_ship.inc b/src/d/actor/d_a_player_ship.inc
index a8c343646..6de47e406 100644
--- a/src/d/actor/d_a_player_ship.inc
+++ b/src/d/actor/d_a_player_ship.inc
@@ -57,7 +57,7 @@ void daPy_lk_c::initShipRideUseItem(int param_1, int param_2) {
         return;
     }
     dComIfGp_getShipActor()->m034D = 2; // TODO probably inline setter
-    mGravity = 0.0f;
+    gravity = 0.0f;
     speed.y = 0.0f;
     if (param_1 == 1) {
         setOldRootQuaternion(0, 0x4000, 0);
diff --git a/src/d/actor/d_a_player_tact.inc b/src/d/actor/d_a_player_tact.inc
index 4e246d690..132510363 100644
--- a/src/d/actor/d_a_player_tact.inc
+++ b/src/d/actor/d_a_player_tact.inc
@@ -208,9 +208,9 @@ BOOL daPy_lk_c::procTactWait_init(int r30) {
             f32 f31 = 200.0f * cM_ssin(shape_angle.y);
             f32 f30 = 200.0f * cM_scos(shape_angle.y);
             cXyz startPos(
-                mAttentionInfo.mPosition.x,
-                mAttentionInfo.mPosition.y - 50.0f,
-                mAttentionInfo.mPosition.z
+                attention_info.position.x,
+                attention_info.position.y - 50.0f,
+                attention_info.position.z
             );
             cXyz endPos(
                 startPos.x + f31,
diff --git a/src/d/actor/d_a_race_item.cpp b/src/d/actor/d_a_race_item.cpp
index 1158743da..9ad1ec26b 100644
--- a/src/d/actor/d_a_race_item.cpp
+++ b/src/d/actor/d_a_race_item.cpp
@@ -43,7 +43,7 @@ static dCcD_SrcCyl l_cyl_src = {
 
 /* 00000078-000000F8       .text set_mtx__12daRaceItem_cFv */
 void daRaceItem_c::set_mtx() {
-    mpModel->setBaseScale(mScale);
+    mpModel->setBaseScale(scale);
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(current.angle.y);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
@@ -90,9 +90,9 @@ BOOL daRaceItem_c::CreateInit() {
     mCyl.SetStts(&mStts);
     f32 height = getHeight();
     f32 radius = getR();
-    if (mScale.x > 1.0f) {
-        height *= mScale.x;
-        radius *= mScale.x;
+    if (scale.x > 1.0f) {
+        height *= scale.x;
+        radius *= scale.x;
     }
     mCyl.SetR(radius);
     mCyl.SetH(height);
@@ -129,8 +129,8 @@ static BOOL daRaceItem_Execute(daRaceItem_c* i_this) {
 BOOL daRaceItem_c::execute() {
     field_0x634++;
     animPlay(1.0f, 1.0f, 1.0f, 1.0f, 1.0f);
-    mEyePos = current.pos;
-    mEyePos.y += mScale.x * dItem_data::getH(m_itemNo) / 2.0f;
+    eyePos = current.pos;
+    eyePos.y += scale.x * dItem_data::getH(m_itemNo) / 2.0f;
     
     daPy_lk_c* player;
     cXyz headPos;
@@ -153,12 +153,12 @@ BOOL daRaceItem_c::execute() {
             current.angle.x = 0;
             shape_angle.z = 0;
             shape_angle.x = 0;
-            mScale.setall(1.0f);
+            scale.setall(1.0f);
 
             field_0x63C = 0xD;
 
             speed.set(0.0f, 23.0f, 0.0f);
-            mGravity = -6.0f;
+            gravity = -6.0f;
 
             mCyl.ClrTgHit();
             mCyl.ClrCoHit();
@@ -240,7 +240,7 @@ BOOL daRaceItem_c::execute() {
     }
 
     if(!checkOffsetPos()) {
-        mScale.setall(1.0f);
+        scale.setall(1.0f);
     }
 
     set_mtx();
@@ -277,7 +277,7 @@ extern actor_process_profile_definition g_profile_RACEITEM = {
     7,
     fpcPi_CURRENT_e,
     PROC_RACEITEM,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(daRaceItem_c),
     0,
     0,
diff --git a/src/d/actor/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp
index 1fbd39bf5..d75549d60 100644
--- a/src/d/actor/d_a_rd.cpp
+++ b/src/d/actor/d_a_rd.cpp
@@ -427,7 +427,7 @@ bool daRd_c::createArrowHeap() {
     };
     mpJntHit = JntHit_create(mpMorf->getModel(), search_data, ARRAY_SIZE(search_data));
     if (mpJntHit) {
-        mJntHit = mpJntHit;
+        jntHit = mpJntHit;
     } else {
         return false;
     }
@@ -610,7 +610,7 @@ bool daRd_c::checkTgHit() {
             fopAcM_seStart(this, JA_SE_LK_ARROW_HIT, 0x44);
             mEnemyIce.mFreezeDuration = l_HIO.m4A;
             enemy_fire_remove(&mEnemyFire);
-            mHealth += 4;
+            health += 4;
             mHitType = 9;
             break;
         case AT_TYPE_FIRE_ARROW:
@@ -645,7 +645,7 @@ bool daRd_c::checkTgHit() {
             }
             break;
         case AT_TYPE_GRAPPLING_HOOK:
-            dComIfGp_particle_set(dPa_name::ID_COMMON_STARS_BLOW, &mAttentionInfo.mPosition);
+            dComIfGp_particle_set(dPa_name::ID_COMMON_STARS_BLOW, &attention_info.position);
             fopAcM_seStart(this, JA_SE_LK_W_WEP_HIT, 0x44);
             mHitType = 0xE;
             r29 = false;
@@ -659,11 +659,11 @@ bool daRd_c::checkTgHit() {
         if (r29) {
             cXyz* hitPos = mCyl.GetTgHitPosP();
             cc_at_check(this, &atInfo);
-            if (mHitType == 1 || mHitType == 7 || mHitType == 8 || mHealth <= 0) {
+            if (mHitType == 1 || mHitType == 7 || mHitType == 8 || health <= 0) {
                 dComIfGp_particle_set(0x10, mCyl.GetTgHitPosP());
                 cXyz scale(2.0f, 2.0f, 2.0f);
                 dComIfGp_particle_set(dPa_name::ID_COMMON_BIG_HIT, hitPos, &player->shape_angle, &scale);
-                if (mHealth <= 0) {
+                if (health <= 0) {
                     modeProcInit(MODE_DEATH);
                 } else {
                     modeProcInit(MODE_DAMAGE);
@@ -673,10 +673,10 @@ bool daRd_c::checkTgHit() {
                 modeProcInit(MODE_DAMAGE);
             }
         } else if (mHitType == 0xE) {
-            s8 origHealth = mHealth;
-            mHealth = 0xA;
+            s8 origHealth = health;
+            health = 0xA;
             cc_at_check(this, &atInfo);
-            mHealth = origHealth;
+            health = origHealth;
         }
         
         return true;
@@ -734,17 +734,17 @@ void daRd_c::setAttention() {
     cXyz attnPos(60.0f, 0.0f, 0.0f);
     cXyz eyePos(60.0f, 0.0f, 0.0f);
     mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(0x0C)); // ree_atama_1 joint
-    mDoMtx_stack_c::multVec(&attnPos, &mAttentionInfo.mPosition);
+    mDoMtx_stack_c::multVec(&attnPos, &attention_info.position);
     mDoMtx_stack_c::multVecZero(&eyePos);
-    mEyePos = eyePos;
-    mAttentionInfo.mPosition.y += l_HIO.m58;
-    mEyePos.y += l_HIO.m5C;
+    eyePos = eyePos;
+    attention_info.position.y += l_HIO.m58;
+    eyePos.y += l_HIO.m5C;
     
     if (dComIfGp_event_runCheck()) {
-        mAttentionInfo.mPosition = current.pos;
-        mEyePos = current.pos;
-        mAttentionInfo.mPosition.y += 150.0f;
-        mEyePos.y += 150.0f;
+        attention_info.position = current.pos;
+        eyePos = current.pos;
+        attention_info.position.y += 150.0f;
+        eyePos.y += 150.0f;
     }
     
     if (mEnemyIce.mFreezeTimer > 20) {
@@ -757,7 +757,7 @@ void daRd_c::setAttention() {
 /* 00001970-000019F8       .text setMtx__6daRd_cFv */
 void daRd_c::setMtx() {
     J3DModel* model = mpMorf->getModel();
-    model->setBaseScale(mScale);
+    model->setBaseScale(scale);
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
     model->setBaseTRMtx(mDoMtx_stack_c::get());
@@ -963,7 +963,7 @@ void daRd_c::modeCry() {
     
     f32 stickPosX = g_mDoCPd_cpadInfo[0].mMainStickPosX;
     f32 stickPosY = g_mDoCPd_cpadInfo[0].mMainStickPosY;
-    if (mEvtInfo.checkCommandDemoAccrpt() || dComIfGp_evmng_startCheck("DEFAULT_RD_CRY")) {
+    if (eventInfo.checkCommandDemoAccrpt() || dComIfGp_evmng_startCheck("DEFAULT_RD_CRY")) {
         if (isLinkControl()) {
             dComIfGp_event_reset();
             modeProcInit(MODE_RETURN);
@@ -1072,7 +1072,7 @@ void daRd_c::modeAttack() {
     
     f32 stickPosX = g_mDoCPd_cpadInfo[0].mMainStickPosX;
     f32 stickPosY = g_mDoCPd_cpadInfo[0].mMainStickPosY;
-    if (mEvtInfo.checkCommandDemoAccrpt()) {
+    if (eventInfo.checkCommandDemoAccrpt()) {
         daPy_py_c* player = (daPy_py_c*)dComIfGp_getLinkPlayer();
         if (isAnm(AnmPrm_ATACK)) {
             f32 frame = player->getBaseAnimeFrame();
@@ -1344,10 +1344,10 @@ void daRd_c::modeProc(daRd_c::Proc_e proc, int newMode) {
         
         if (newMode == MODE_DEATH || newMode == MODE_SW_WAIT) {
             fopAcM_OffStatus(this, fopAcStts_SHOWMAP_e);
-            cLib_offBit<u32>(mAttentionInfo.mFlags, fopAc_Attn_LOCKON_ENEMY_e);
+            cLib_offBit<u32>(attention_info.flags, fopAc_Attn_LOCKON_ENEMY_e);
         } else {
             fopAcM_OnStatus(this, fopAcStts_SHOWMAP_e);
-            cLib_onBit<u32>(mAttentionInfo.mFlags, fopAc_Attn_LOCKON_ENEMY_e);
+            cLib_onBit<u32>(attention_info.flags, fopAc_Attn_LOCKON_ENEMY_e);
         }
         
         mMode = newMode;
@@ -1695,7 +1695,7 @@ bool daRd_c::_execute() {
     modeProc(PROC_EXEC, MODE_NULL);
     setAnm(AnmPrm_NULL, false);
     setBtkAnm(0x5);
-    g_env_light.settingTevStruct(0, &current.pos, &mTevStr);
+    g_env_light.settingTevStruct(0, &current.pos, &tevStr);
     
     return false;
 }
@@ -1725,7 +1725,7 @@ bool daRd_c::_draw() {
     
     J3DModel* model = mpMorf->getModel();
     J3DModelData* modelData = model->getModelData();
-    g_env_light.setLightTevColorType(model, &mTevStr);
+    g_env_light.setLightTevColorType(model, &tevStr);
     
     if (mEnemyIce.mFreezeTimer > 20) {
         dMat_control_c::iceEntryDL(mpMorf, -1, &mInvisModel);
@@ -1740,7 +1740,7 @@ bool daRd_c::_draw() {
     cXyz shadowPos(current.pos.x, current.pos.y + 150.0f, current.pos.z);
     mShadowId = dComIfGd_setShadow(
         mShadowId, 1, mpMorf->getModel(), &shadowPos, 800.0f, 40.0f,
-        current.pos.y, mAcch.GetGroundH(), mAcch.m_gnd, &mTevStr,
+        current.pos.y, mAcch.GetGroundH(), mAcch.m_gnd, &tevStr,
         0, 1.0f, dDlst_shadowControl_c::getSimpleTex()
     );
     
@@ -1794,13 +1794,13 @@ void daRd_c::createInit() {
     mpMorf->play(&current.pos, 0, 0);
     mBrkAnm.setFrame(0.0f);
     mpMorf->calc();
-    g_env_light.settingTevStruct(0, &current.pos, &mTevStr);
+    g_env_light.settingTevStruct(0, &current.pos, &tevStr);
     fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx());
     fopAcM_setCullSizeBox(this, -100.0f, -10.0f, -100.0f, 100.0f, 250.0f, 150.0f);
     
     mD3C = 1;
     mD40 = 1;
-    mStealItemLeft = 5;
+    stealItemLeft = 5;
     
     mEnemyFire.mpMcaMorf = mpMorf;
     mEnemyFire.mpActor = this;
@@ -1820,18 +1820,18 @@ void daRd_c::createInit() {
     mEnemyIce.mWallRadius = 50.0f;
     mEnemyIce.mCylHeight = 250.0f;
     
-    mMaxHealth = l_HIO.m46;
-    mHealth = mMaxHealth;
+    max_health = l_HIO.m46;
+    health = max_health;
     mSpawnPos = current.pos;
     mSpawnAngle = shape_angle.y;
-    mGravity = -4.5f;
+    gravity = -4.5f;
     
     // TODO: figure out if 1 and 2 actually drop different items
     if (mWhichIdleAnm == 0) {
-        mItemTableIdx = dComIfGp_CharTbl()->GetNameIndex("Rdead1", 0);
+        itemTableIdx = dComIfGp_CharTbl()->GetNameIndex("Rdead1", 0);
     }
     if (mWhichIdleAnm == 1) {
-        mItemTableIdx = dComIfGp_CharTbl()->GetNameIndex("Rdead2", 0);
+        itemTableIdx = dComIfGp_CharTbl()->GetNameIndex("Rdead2", 0);
     }
 }
 
@@ -1916,7 +1916,7 @@ actor_process_profile_definition g_profile_RD = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcLy_CURRENT_e,
     /* ProcName     */ PROC_RD,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daRd_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_rectangle.cpp b/src/d/actor/d_a_rectangle.cpp
index 6333be7be..de2ab4481 100644
--- a/src/d/actor/d_a_rectangle.cpp
+++ b/src/d/actor/d_a_rectangle.cpp
@@ -42,7 +42,7 @@ actor_process_profile_definition g_profile_RECTANGLE = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcLy_CURRENT_e,
     /* ProcName     */ PROC_RECTANGLE,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(RECTANGLE_class),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_scene_change.cpp b/src/d/actor/d_a_scene_change.cpp
index 4ab1835ca..1939694a8 100644
--- a/src/d/actor/d_a_scene_change.cpp
+++ b/src/d/actor/d_a_scene_change.cpp
@@ -66,7 +66,7 @@ actor_process_profile_definition g_profile_SCENECHG = {
     3,
     fpcLy_CURRENT_e,
     PROC_SCENECHG,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(d_a_scene_change_c),
     0,
     0,
diff --git a/src/d/actor/d_a_sea.cpp b/src/d/actor/d_a_sea.cpp
index a355580c7..545ed8407 100644
--- a/src/d/actor/d_a_sea.cpp
+++ b/src/d/actor/d_a_sea.cpp
@@ -401,7 +401,7 @@ actor_process_profile_definition g_profile_SEA = {
     /* ListID       */ 2,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_SEA,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(sea_class),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_seatag.cpp b/src/d/actor/d_a_seatag.cpp
index dd35cec67..f7bff090c 100644
--- a/src/d/actor/d_a_seatag.cpp
+++ b/src/d/actor/d_a_seatag.cpp
@@ -45,7 +45,7 @@ actor_process_profile_definition g_profile_SEATAG = {
     2,
     fpcLy_CURRENT_e,
     PROC_SEATAG,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(daSeatag_c),
     0,
     0,
diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp
index 46bdaf7c3..dd7b6e438 100644
--- a/src/d/actor/d_a_shop_item.cpp
+++ b/src/d/actor/d_a_shop_item.cpp
@@ -84,7 +84,7 @@ void daShopItem_c::CreateInit() {
     }
     show();
 
-    mScale = getData()[m_itemNo].mScale;
+    scale = getData()[m_itemNo].mScale;
     home.pos = current.pos;
     set_mtx();
 
@@ -132,7 +132,7 @@ BOOL daShopItem_c::clothCreate() {
         ResTIMG* shopArc = (ResTIMG*)dComIfG_getObjectRes(getShopArcname(), clothRes[field_0x648]);
         ResTIMG* clothArc = (ResTIMG*)dComIfG_getObjectRes(m_cloth_arcname, CLOTH_BTI_CLOTHTOON);
 
-        field_0x644 = (*clothFunc[field_0x648])(shopArc, clothArc, &mTevStr, 0);
+        field_0x644 = (*clothFunc[field_0x648])(shopArc, clothArc, &tevStr, 0);
         if (field_0x644 == 0) {
             return 0;
         }
@@ -146,7 +146,7 @@ BOOL daShopItem_c::clothCreate() {
 
 /* 000003BC-000005A8       .text set_mtx__12daShopItem_cFv */
 void daShopItem_c::set_mtx() {
-    mpModel->setBaseScale(mScale);
+    mpModel->setBaseScale(scale);
     MTXTrans(mDoMtx_stack_c::get(), current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(current.angle.x, current.angle.y, current.angle.z);
     MTXCopy(mDoMtx_stack_c::get(), field_0x64C);
@@ -173,7 +173,7 @@ void daShopItem_c::set_mtx() {
 
         mDoMtx_stack_c::transM(local[field_0x648]);
         mDoMtx_stack_c::YrotM(0x4000);
-        field_0x644->setScale(mScale);
+        field_0x644->setScale(scale);
         field_0x644->setMtx(mDoMtx_stack_c::get());
     }
 }
@@ -203,17 +203,17 @@ bool daShopItem_c::_draw() {
 /* 00000694-0000070C       .text settingBeforeDraw__12daShopItem_cFv */
 void daShopItem_c::settingBeforeDraw() {
     if(isBomb(m_itemNo) || (m_itemNo == BOMB_BAG) || (m_itemNo == dItem_SKULL_HAMMER_e) || m_itemNo == dItem_SMALL_KEY_e || m_itemNo == PRESIDENT_STATUE) {
-        dDlst_texSpecmapST(&mEyePos, &mTevStr, mpModel->getModelData(), 1.0f);
+        dDlst_texSpecmapST(&eyePos, &tevStr, mpModel->getModelData(), 1.0f);
     }
 }
 
 /* 0000070C-000007A4       .text setTevStr__12daShopItem_cFv */
 void daShopItem_c::setTevStr() {
-    g_env_light.settingTevStruct(tevType, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(mpModel, &mTevStr);
+    g_env_light.settingTevStruct(tevType, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(mpModel, &tevStr);
     for(int i = 0; i < 2; i++) {
         if(mpModelArrow[i] != 0) {
-            g_env_light.setLightTevColorType(mpModelArrow[i], &mTevStr);
+            g_env_light.setLightTevColorType(mpModelArrow[i], &tevStr);
         }
     }
     
@@ -314,7 +314,7 @@ actor_process_profile_definition g_profile_ShopItem = {
     7,
     fpcPi_CURRENT_e,
     PROC_ShopItem,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(daShopItem_c),
     0,
     0,
diff --git a/src/d/actor/d_a_spc_item01.cpp b/src/d/actor/d_a_spc_item01.cpp
index 7954bdf18..bd63f2d7a 100644
--- a/src/d/actor/d_a_spc_item01.cpp
+++ b/src/d/actor/d_a_spc_item01.cpp
@@ -54,14 +54,14 @@ static dCcD_SrcCyl l_cyl_src = {
 /* 8015DAF4-8015DBC0       .text set_mtx__13daSpcItem01_cFv */
 void daSpcItem01_c::set_mtx() {
     csXyz angle = current.angle;
-    cXyz scale = mScale;
+    cXyz scaleVec = scale;
     f32 offsetY = 0.0f;
     switch (m_itemNo) {
     case BOKO_BELT:
         offsetY = -24.0f;
         break;
     }
-    mpModel->setBaseScale(scale);
+    mpModel->setBaseScale(scaleVec);
 
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y + offsetY, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(angle);
@@ -103,9 +103,9 @@ BOOL daSpcItem01_c::CreateInit() {
     mCyl.SetStts(&mStts);
     f32 tempVar1 = (f32)getHeight();
     f32 tempVar2 = (f32)getR();
-    if (mScale.x > 1.0f) {
-        tempVar1 *= mScale.x;
-        tempVar2 *= mScale.x;
+    if (scale.x > 1.0f) {
+        tempVar1 *= scale.x;
+        tempVar2 *= scale.x;
     }
     mCyl.SetR(tempVar2);
     mCyl.SetH(tempVar1);
@@ -116,9 +116,9 @@ BOOL daSpcItem01_c::CreateInit() {
     fopAcM_SetGravity(this, -4.0f);
     switch ((s8)m_itemNo) {
     case SHIELD:
-        mScale.x = 1.5f;
-        mScale.y = 1.5f;
-        mScale.z = 1.5f;
+        scale.x = 1.5f;
+        scale.y = 1.5f;
+        scale.z = 1.5f;
         current.angle.x = 4000;
         current.angle.y = 4200;
         current.angle.z = 5200;
@@ -131,8 +131,8 @@ BOOL daSpcItem01_c::CreateInit() {
 
 /* 8015DF4C-8015DFE8       .text _execute__13daSpcItem01_cFv */
 BOOL daSpcItem01_c::_execute() {
-    mEyePos = current.pos;
-    mAttentionInfo.mPosition = current.pos;
+    eyePos = current.pos;
+    attention_info.position = current.pos;
     field_0x634++;
     set_effect();
     scale_anim();
@@ -154,9 +154,9 @@ void daSpcItem01_c::set_effect() {
 /* 8015E070-8015E0D8       .text scale_anim__13daSpcItem01_cFv */
 void daSpcItem01_c::scale_anim() {
     if (isRupee(m_itemNo)) {
-        cLib_chaseF(&mScale.x, 1.0f, 0.05f);
-        cLib_chaseF(&mScale.y, 1.0f, 0.05f);
-        cLib_chaseF(&mScale.z, 1.0f, 0.05f);
+        cLib_chaseF(&scale.x, 1.0f, 0.05f);
+        cLib_chaseF(&scale.y, 1.0f, 0.05f);
+        cLib_chaseF(&scale.z, 1.0f, 0.05f);
     }
 }
 
@@ -188,7 +188,7 @@ void daSpcItem01_c::move() {
         if (mAcch.ChkGroundLanding()) {
             field_0x642 += 1;
             f32 newGravity = field_0x63C * 0.62f;
-            if (newGravity > mGravity - 0.5f) {
+            if (newGravity > gravity - 0.5f) {
                 speedF = 0.0f;
             } else {
                 speed.x = 0.0f;
@@ -229,16 +229,16 @@ BOOL daSpcItem01_c::_draw() {
 /* 8015E2A8-8015E368       .text setTevStr__13daSpcItem01_cFv */
 void daSpcItem01_c::setTevStr() {
     if (m_itemNo == BOKO_BELT) {
-        dKy_getEnvlight().settingTevStruct(TEV_TYPE_BG1, &current.pos, &mTevStr);
+        dKy_getEnvlight().settingTevStruct(TEV_TYPE_BG1, &current.pos, &tevStr);
     } else {
-        dKy_getEnvlight().settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &mTevStr);
+        dKy_getEnvlight().settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
     }
-    dKy_getEnvlight().setLightTevColorType(mpModel, &mTevStr);
+    dKy_getEnvlight().setLightTevColorType(mpModel, &tevStr);
 
     for (s32 modelIndex = 0; modelIndex < (s32)ARRAY_SIZE(mpModelArrow); modelIndex++) {
         J3DModel* modelArrow = mpModelArrow[modelIndex];
         if (modelArrow != NULL) {
-            dKy_getEnvlight().setLightTevColorType(modelArrow, &mTevStr);
+            dKy_getEnvlight().setLightTevColorType(modelArrow, &tevStr);
         }
     }
 }
@@ -281,7 +281,7 @@ actor_process_profile_definition g_profile_SPC_ITEM01 = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_SPC_ITEM01,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daSpcItem01_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_spotbox.cpp b/src/d/actor/d_a_spotbox.cpp
index 4b551add9..9bfc3a4a7 100644
--- a/src/d/actor/d_a_spotbox.cpp
+++ b/src/d/actor/d_a_spotbox.cpp
@@ -13,10 +13,10 @@
 s32 daSpotbox_c::create() {
     fopAcM_SetupActor(this, daSpotbox_c);
     f32 baseScale = getType() != 0 ? 1000.0f : 100.0f;
-    mScale.x *= baseScale;
-    mScale.y *= baseScale;
-    mScale.z *= (baseScale * 1.2f);
-    current.pos.y += mScale.y * 0.5f;
+    scale.x *= baseScale;
+    scale.y *= baseScale;
+    scale.z *= (baseScale * 1.2f);
+    current.pos.y += scale.y * 0.5f;
     fopAcM_SetMtx(this, mMtx);
     fopAcM_setCullSizeBox(this, -0.5f, -0.5f, -0.5f, 0.5f, 0.5f, 0.5f);
 
@@ -33,7 +33,7 @@ BOOL daSpotbox_c::draw() {
 BOOL daSpotbox_c::execute() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(current.angle.y);
-    mDoMtx_stack_c::scaleM(mScale);
+    mDoMtx_stack_c::scaleM(scale);
     cMtx_copy(mDoMtx_stack_c::get(), mMtx);
     return TRUE;
 }
@@ -78,7 +78,7 @@ actor_process_profile_definition g_profile_SPOTBOX = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_SPOTBOX,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daSpotbox_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_swattack.cpp b/src/d/actor/d_a_swattack.cpp
index b897019a0..cac982089 100644
--- a/src/d/actor/d_a_swattack.cpp
+++ b/src/d/actor/d_a_swattack.cpp
@@ -50,8 +50,8 @@ void daSwAt_c::CreateInit() {
     mStts.Init(0xFF, 0xFF, this);
     mCyl.Set(l_cyl_src);
     mCyl.SetStts(&mStts);
-    mCyl.SetR(mScale.x * 25.0f);
-    mCyl.SetH(mScale.y * 50.0f);
+    mCyl.SetR(scale.x * 25.0f);
+    mCyl.SetH(scale.y * 50.0f);
     mAtType = daSwAt_prm::getAtType(this);
     mSwitchNo = daSwAt_prm::getSwitchNo(this);
     fopAcM_offDraw(this);
@@ -165,7 +165,7 @@ actor_process_profile_definition g_profile_SW_ATTACK = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_SW_ATTACK,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daSwAt_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_swc00.cpp b/src/d/actor/d_a_swc00.cpp
index a8c49aaeb..f4f8e7b85 100644
--- a/src/d/actor/d_a_swc00.cpp
+++ b/src/d/actor/d_a_swc00.cpp
@@ -17,7 +17,7 @@ static BOOL daSwc00_Execute(swc00_class* i_this) {
 
         f32 xz_dist2 = fopAcM_searchPlayerDistanceXZ2(i_this);
         f32 y_diff = fopAcM_searchPlayerDistanceY(i_this);
-        if(xz_dist2 < i_this->mScale.x && (-100.0f < y_diff && y_diff < i_this->mScale.y)) {
+        if(xz_dist2 < i_this->scale.x && (-100.0f < y_diff && y_diff < i_this->scale.y)) {
             dComIfGs_onSwitch(swBit, fopAcM_GetRoomNo(i_this));
 
             if(daSwc00_getType(i_this) != 0) {
@@ -58,10 +58,10 @@ static s32 daSwc00_Create(fopAc_ac_c* i_actor) {
         }
     }
 
-    i_this->mScale.x *= 100.0f;
-    i_this->mScale.x += 30.0f;
-    i_this->mScale.x *= i_this->mScale.x;
-    i_this->mScale.y *= 100.0f;
+    i_this->scale.x *= 100.0f;
+    i_this->scale.x += 30.0f;
+    i_this->scale.x *= i_this->scale.x;
+    i_this->scale.y *= 100.0f;
 
     return cPhs_COMPLEATE_e;
 }
@@ -80,7 +80,7 @@ actor_process_profile_definition g_profile_SWC00 = {
     7,
     fpcPi_CURRENT_e,
     PROC_SWC00,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(swc00_class),
     0,
     0,
diff --git a/src/d/actor/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp
index 2b84f1a6e..b797ace02 100644
--- a/src/d/actor/d_a_swhit0.cpp
+++ b/src/d/actor/d_a_swhit0.cpp
@@ -145,11 +145,11 @@ s32 daSwhit0_c::CreateInit() {
 
     mColStatus.Init(0xFF, 0xFF, this);
 
-    mAttentionInfo.mPosition.x += cM_ssin(home.angle.x) * 65.0f * cM_ssin(home.angle.y);
-    mAttentionInfo.mPosition.y += cM_scos(home.angle.x) * 65.0f;
-    mAttentionInfo.mPosition.z += cM_ssin(home.angle.x) * 65.0f * cM_scos(home.angle.y);
+    attention_info.position.x += cM_ssin(home.angle.x) * 65.0f * cM_ssin(home.angle.y);
+    attention_info.position.y += cM_scos(home.angle.x) * 65.0f;
+    attention_info.position.z += cM_ssin(home.angle.x) * 65.0f * cM_scos(home.angle.y);
 
-    mEyePos = mAttentionInfo.mPosition;
+    eyePos = attention_info.position;
 
     if (mRetType == 0) {
         mColCyl.Set(l_cyl_src);
@@ -161,7 +161,7 @@ s32 daSwhit0_c::CreateInit() {
 
     mColSph.Set(l_sph_src);
     mColSph.SetStts(&mColStatus);
-    mColSph.SetC(mAttentionInfo.mPosition);
+    mColSph.SetC(attention_info.position);
     
     if (dComIfGs_isSwitch(getSwNo(), current.roomNo)) {
         mState = 4;
@@ -249,7 +249,7 @@ s32 daSwhit0_c::actionOffWait() {
                 mState = 2;
                 
                 fopAcM_orderOtherEventId(this, mEventIdx, getEvNo());
-                mEvtInfo.onCondition(dEvtCnd_UNK2_e);
+                eventInfo.onCondition(dEvtCnd_UNK2_e);
 
                 break;
             default:
@@ -279,7 +279,7 @@ s32 daSwhit0_c::actionToOnReady() {
         mState = 2;
 
         fopAcM_orderOtherEventId(this, mEventIdx, getEvNo());
-        mEvtInfo.onCondition(dEvtCnd_UNK2_e);
+        eventInfo.onCondition(dEvtCnd_UNK2_e);
     }
 
     return TRUE;
@@ -287,7 +287,7 @@ s32 daSwhit0_c::actionToOnReady() {
 
 /* 00000E24-00000EC8       .text actionToOnOrder__10daSwhit0_cFv */
 s32 daSwhit0_c::actionToOnOrder() {
-    if (mEvtInfo.checkCommandDemoAccrpt()) {
+    if (eventInfo.checkCommandDemoAccrpt()) {
         mState = 3;
         mStaffId = dComIfGp_evmng_getMyStaffId("SWITCH");
         
@@ -295,7 +295,7 @@ s32 daSwhit0_c::actionToOnOrder() {
     }
     else {
         fopAcM_orderOtherEventId(this, mEventIdx, getEvNo());
-        mEvtInfo.onCondition(dEvtCnd_UNK2_e);
+        eventInfo.onCondition(dEvtCnd_UNK2_e);
     }
 
     return TRUE;
@@ -363,7 +363,7 @@ s32 daSwhit0_c::actionOnTimer() {
 
 /* 0000115C-000011E4       .text setDrawMtx__10daSwhit0_cFv */
 void daSwhit0_c::setDrawMtx() {
-    mpModel->setBaseScale(mScale);
+    mpModel->setBaseScale(scale);
 
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::XYZrotM(current.angle);
@@ -379,8 +379,8 @@ s32 daSwhit0_c::draw() {
         { 0x78, 0x64, 0x32, 0x64 }
     };
 
-    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(mpModel, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(mpModel, &tevStr);
 
     J3DModelData* modelData = mpModel->getModelData();
     s32 flag = checkFlag(0x01);
@@ -478,7 +478,7 @@ actor_process_profile_definition g_profile_SWHIT0 = {
     8,
     fpcPi_CURRENT_e,
     PROC_SWHIT0,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(daSwhit0_c),
     0,
     0,
diff --git a/src/d/actor/d_a_switem.cpp b/src/d/actor/d_a_switem.cpp
index 31f6f9820..26e3d689e 100644
--- a/src/d/actor/d_a_switem.cpp
+++ b/src/d/actor/d_a_switem.cpp
@@ -55,14 +55,14 @@ BOOL daSwItem_c::CreateInit() {
     mStts.Init(0xFF, 0xFF, this);
     mCyl.Set(l_cyl_src);
     mCyl.SetStts(&mStts);
-    mCyl.SetR(mScale.x * 25.0f);
-    mCyl.SetH(mScale.y * 50.0f);
+    mCyl.SetR(scale.x * 25.0f);
+    mCyl.SetH(scale.y * 50.0f);
 
     if (fopAcM_isItem(this, itemBitNo) && itemBitNo != 0x7F) {
         return FALSE;
     }
 
-    fopDwTg_DrawQTo(&mDwTg);
+    fopDwTg_DrawQTo(&draw_tag);
     return TRUE;
 }
 
@@ -215,7 +215,7 @@ actor_process_profile_definition g_profile_SW_ITEM = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcLy_CURRENT_e,
     /* ProcName     */ PROC_SW_ITEM,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daSwItem_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_swtact.cpp b/src/d/actor/d_a_swtact.cpp
index bc4cfd8b4..3a63fcfb6 100644
--- a/src/d/actor/d_a_swtact.cpp
+++ b/src/d/actor/d_a_swtact.cpp
@@ -49,8 +49,8 @@ void daSwTact_c::CreateInit() {
     mAnswer = daSwTact_prm::getAnswer(this);
     if (daSwTact_prm::getModel(this) == 1) {
         fopAcM_SetMtx(this, model->getBaseTRMtx());
-        f32 scaleZ = mScale.z;
-        f32 scaleX = mScale.x;
+        f32 scaleZ = scale.z;
+        f32 scaleX = scale.x;
         fopAcM_setCullSizeBox(this, cull_size[0] * scaleX, cull_size[1], cull_size[2] * scaleZ, cull_size[3] * scaleX, cull_size[4], cull_size[5] * scaleZ);
         mRadius = 100.0f;
     } else {
@@ -61,7 +61,7 @@ void daSwTact_c::CreateInit() {
 /* 0000024C-000002CC       .text set_mtx__10daSwTact_cFv */
 void daSwTact_c::set_mtx() {
     if (daSwTact_prm::getModel(this) == 1) {
-        model->setBaseScale(mScale);
+        model->setBaseScale(scale);
         mDoMtx_stack_c::transS(current.pos);
         model->setBaseTRMtx(mDoMtx_stack_c::get());
     }
@@ -172,8 +172,8 @@ bool daSwTact_c::_draw() {
     if (daSwTact_prm::getModel(this) == 0)
         return TRUE;
 
-    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(model, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(model, &tevStr);
     mDoExt_modelUpdateDL(model);
     return TRUE;
 }
@@ -216,7 +216,7 @@ actor_process_profile_definition g_profile_SW_TACT = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_SW_TACT,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daSwTact_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_swtdoor.cpp b/src/d/actor/d_a_swtdoor.cpp
index 0163fb788..5107f215b 100644
--- a/src/d/actor/d_a_swtdoor.cpp
+++ b/src/d/actor/d_a_swtdoor.cpp
@@ -16,14 +16,14 @@
 /* 00000078-000000C4       .text daSwtdoor_Draw__FP13swtdoor_class */
 static BOOL daSwtdoor_Draw(swtdoor_class* i_this) {
     J3DModel * model = i_this->model;
-    g_env_light.setLightTevColorType(model, &i_this->mTevStr);
+    g_env_light.setLightTevColorType(model, &i_this->tevStr);
     mDoExt_modelUpdateDL(model);
     return TRUE;
 }
 
 /* 000000C4-000001BC       .text daSwtdoor_Execute__FP13swtdoor_class */
 static BOOL daSwtdoor_Execute(swtdoor_class* i_this) {
-    g_env_light.settingTevStruct(TEV_TYPE_BG0, &i_this->current.pos, &i_this->mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_BG0, &i_this->current.pos, &i_this->tevStr);
     if (dComIfGs_isSwitch(i_this->mSwitchNo, fopAcM_GetRoomNo(i_this)) && i_this->home.pos.y > -300.0f)
         i_this->home.pos.y -= 10.0f;
 
@@ -98,7 +98,7 @@ actor_process_profile_definition g_profile_SWTDOOR = {
     7,
     fpcPi_CURRENT_e,
     PROC_SWTDOOR,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(swtdoor_class),
     0,
     0,
diff --git a/src/d/actor/d_a_tag_etc.cpp b/src/d/actor/d_a_tag_etc.cpp
index e161e4fcc..a973a01f7 100644
--- a/src/d/actor/d_a_tag_etc.cpp
+++ b/src/d/actor/d_a_tag_etc.cpp
@@ -36,7 +36,7 @@ BOOL daTag_Etc_c::rangeCheck(fopAc_ac_c* pActor) {
     if (delta.y < 0.0f)
         return FALSE;
 
-    if (delta.absXZ() < (mScale.x * 100.0f) && delta.y <= (mScale.y * 100.0f))
+    if (delta.absXZ() < (scale.x * 100.0f) && delta.y <= (scale.y * 100.0f))
         return TRUE;
 
     return FALSE;
@@ -125,9 +125,9 @@ s32 daTag_Etc_c::create() {
     shape_angle.x = 0;
     current.angle.z = 0;
     current.angle.x = 0;
-    mAttentionInfo.mFlags = fopAc_Attn_ACTION_TALK_e;
-    mAttentionInfo.mPosition.y += 150.0f;
-    mEyePos.y += 150.0f;
+    attention_info.flags = fopAc_Attn_ACTION_TALK_e;
+    attention_info.position.y += 150.0f;
+    eyePos.y += 150.0f;
     return cPhs_COMPLEATE_e;
 }
 
@@ -169,7 +169,7 @@ static BOOL daTag_Etc_action_event(daTag_Etc_c* i_this) {
 /* 00000560-0000063C       .text daTag_Etc_action_ready__FP11daTag_Etc_c */
 static BOOL daTag_Etc_action_ready(daTag_Etc_c* i_this) {
     fopAc_ac_c* actor = fopAcM_SearchByID(i_this->mMedliPID);
-    if (i_this->mEvtInfo.checkCommandDemoAccrpt()) {
+    if (i_this->eventInfo.checkCommandDemoAccrpt()) {
         i_this->demoInitProc();
         i_this->setActio(ACT_EVENT);
         daTag_Etc_action_event(i_this);
@@ -256,7 +256,7 @@ actor_process_profile_definition g_profile_TAG_ETC = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_TAG_ETC,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daTag_Etc_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_tag_ghostship.cpp b/src/d/actor/d_a_tag_ghostship.cpp
index ea2633dd0..0e2681269 100644
--- a/src/d/actor/d_a_tag_ghostship.cpp
+++ b/src/d/actor/d_a_tag_ghostship.cpp
@@ -41,7 +41,7 @@ void daTag_Gship_c::modeClearEventInit() {
 
 /* 00000214-00000418 .text modeClearEvent__13daTag_Gship_cFv */
 void daTag_Gship_c::modeClearEvent() {
-    if(mEvtInfo.checkCommandDemoAccrpt()) {
+    if(eventInfo.checkCommandDemoAccrpt()) {
         int staffIdx = dComIfGp_evmng_getMyStaffId("PScnChg");
         if(strcmp(dComIfGp_getPEvtManager()->getMyNowCutName(staffIdx), "WARAIGOE") == 0) {
             if(dComIfGs_getEventReg(0x8803) == 3) {
@@ -175,7 +175,7 @@ actor_process_profile_definition g_profile_TAG_GSHIP = {
     8,
     fpcPi_CURRENT_e,
     PROC_TAG_GSHIP,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(daTag_Gship_c),
     0,
     0,
diff --git a/src/d/actor/d_a_tag_kb_item.cpp b/src/d/actor/d_a_tag_kb_item.cpp
index 80323cbf1..977efe33d 100644
--- a/src/d/actor/d_a_tag_kb_item.cpp
+++ b/src/d/actor/d_a_tag_kb_item.cpp
@@ -96,7 +96,7 @@ actor_process_profile_definition g_profile_TAG_KB_ITEM = {
     7,
     fpcLy_CURRENT_e,
     PROC_TAG_KB_ITEM,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(daTagKbItem_c),
     0,
     0,
diff --git a/src/d/actor/d_a_tag_msg.cpp b/src/d/actor/d_a_tag_msg.cpp
index fd9509a78..9cea2aa54 100644
--- a/src/d/actor/d_a_tag_msg.cpp
+++ b/src/d/actor/d_a_tag_msg.cpp
@@ -32,22 +32,22 @@ static u8 msg_mode;
 
 /* 00000078-00000084       .text getEventNo__11daTag_Msg_cFv */
 u32 daTag_Msg_c::getEventNo() {
-    return mBase.mParameters >> 0x18;
+    return base.mParameters >> 0x18;
 }
 
 /* 00000084-00000090       .text getSwbit__11daTag_Msg_cFv */
 u32 daTag_Msg_c::getSwbit() {
-    return mBase.mParameters >> 8 & 0xff;
+    return base.mParameters >> 8 & 0xff;
 }
 
 /* 00000090-0000009C       .text getSwbit2__11daTag_Msg_cFv */
 u32 daTag_Msg_c::getSwbit2() {
-    return mBase.mParameters >> 0x10 & 0xff;
+    return base.mParameters >> 0x10 & 0xff;
 }
 
 /* 0000009C-000000A8       .text getType2__11daTag_Msg_cFv */
 u32 daTag_Msg_c::getType2() {
-    return mBase.mParameters >> 6 & 3;
+    return base.mParameters >> 6 & 3;
 }
 
 /* 000000A8-0000015C       .text myDemoName__11daTag_Msg_cFv */
@@ -105,8 +105,8 @@ BOOL daTag_Msg_c::rangeCheck() {
     if (diff.y < 0.0f) {
         diff.y = -diff.y;
     }
-    if (diff.abs2XZ() < mScale.x * mScale.x * 10000.0f) {
-        if(diff.y <= mScale.y * 100.0f) {
+    if (diff.abs2XZ() < scale.x * scale.x * 10000.0f) {
+        if(diff.y <= scale.y * 100.0f) {
             return TRUE;
         }
     }
@@ -151,7 +151,7 @@ static BOOL daTag_Msg_actionEvent(daTag_Msg_c* a_this) {
         }
         break;
     case 1:
-        l_msgId = fopMsgM_messageSet(message, &a_this->mAttentionInfo.mPosition);
+        l_msgId = fopMsgM_messageSet(message, &a_this->attention_info.position);
         if (l_msgId != fpcM_ERROR_PROCESS_ID_e) {
             msg_mode++;
         }
@@ -195,7 +195,7 @@ static BOOL daTag_Msg_actionEvent(daTag_Msg_c* a_this) {
 static BOOL daTag_Msg_actionHunt(daTag_Msg_c* a_this) {
     u8 swBit;
 
-    if (a_this->mEvtInfo.mCommand == dEvtCmd_INTALK_e) {
+    if (a_this->eventInfo.mCommand == dEvtCmd_INTALK_e) {
         a_this->setActio(3);
         swBit = a_this->getSwbit();
         if ((swBit & 0xff) != 0xff) {
@@ -211,7 +211,7 @@ static BOOL daTag_Msg_actionHunt(daTag_Msg_c* a_this) {
         if (a_this->getType2() & 1) {
             fopAcM_orderSpeakEvent(a_this);
         }
-        a_this->mEvtInfo.onCondition(dEvtCnd_CANTALK_e);
+        a_this->eventInfo.onCondition(dEvtCnd_CANTALK_e);
     }
     return TRUE;
 }
@@ -222,7 +222,7 @@ static BOOL daTag_Msg_actionArrival(daTag_Msg_c* a_this) {
 
     if (a_this->arrivalTerms() != 0) {
         cutsceneName = (char*)a_this->myDemoName();
-        a_this->mEvtInfo.setEventName(cutsceneName);
+        a_this->eventInfo.setEventName(cutsceneName);
         a_this->setActio(2);
         daTag_Msg_actionHunt(a_this);
     }
@@ -265,10 +265,10 @@ s32 daTag_Msg_c::create() {
     shape_angle.x = 0;
     current.angle.z = 0;
     current.angle.x = 0;
-    mAttentionInfo.mFlags = fopAc_Attn_ACTION_TALK_e | fopAc_Attn_TALKFLAG_CHECK_e;
+    attention_info.flags = fopAc_Attn_ACTION_TALK_e | fopAc_Attn_TALKFLAG_CHECK_e;
     if (getMessage() != 0x836) {
-        mAttentionInfo.mPosition.y += 150;
-        mEyePos.y += 150.0f;
+        attention_info.position.y += 150;
+        eyePos.y += 150.0f;
     }
     return cPhs_COMPLEATE_e;
 }
@@ -308,7 +308,7 @@ actor_process_profile_definition g_profile_TAG_MSG = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_TAG_MSG,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daTag_Msg_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_tag_ret.cpp b/src/d/actor/d_a_tag_ret.cpp
index e74e7058c..9dc4ce111 100644
--- a/src/d/actor/d_a_tag_ret.cpp
+++ b/src/d/actor/d_a_tag_ret.cpp
@@ -53,8 +53,8 @@ namespace daTagRet {
 
         mStts.Init(0xFF, 0xFF, this);
         mCyl.Set(cyl_check_src);
-        mCyl.SetR(1000.0f*mScale.x);
-        mCyl.SetH(100.0f*mScale.y);
+        mCyl.SetR(1000.0f*scale.x);
+        mCyl.SetH(100.0f*scale.y);
         mCyl.SetStts(&mStts);
 
         return cPhs_COMPLEATE_e;
@@ -73,8 +73,8 @@ namespace daTagRet {
     /* 00000398-00000460       .text _execute__Q28daTagRet5Act_cFv */
     bool Act_c::_execute() {
         mCyl.SetC(current.pos);
-        mCyl.SetR(1000.0f*mScale.x);
-        mCyl.SetH(100.0f*mScale.y);
+        mCyl.SetR(1000.0f*scale.x);
+        mCyl.SetH(100.0f*scale.y);
         dComIfG_Ccsp()->Set(&mCyl);
 
         if (mCyl.ChkCoHit()) {
@@ -133,7 +133,7 @@ actor_process_profile_definition g_profile_Tag_Ret = {
     /* ListID       */ 3,
     /* ListPrio     */ fpcLy_CURRENT_e,
     /* ProcName     */ PROC_Tag_Ret,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daTagRet::Act_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_tag_volcano.cpp b/src/d/actor/d_a_tag_volcano.cpp
index 7eb7f9dae..d5574f285 100644
--- a/src/d/actor/d_a_tag_volcano.cpp
+++ b/src/d/actor/d_a_tag_volcano.cpp
@@ -164,7 +164,7 @@ bool daTagvolcano::Act_c::_execute() {
         }
 
         if (field_0x2a4 == 1) {
-            if (mEvtInfo.checkCommandDemoAccrpt()) {
+            if (eventInfo.checkCommandDemoAccrpt()) {
                 if (mType == 1) {
                     dComIfGp_setNextStage("sea", 2, 20);
                 } else {
@@ -221,7 +221,7 @@ actor_process_profile_definition g_profile_Tag_Volcano = {
     /* ListID       */ 2,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_Tag_Volcano,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daTagvolcano::Act_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_tag_waterlevel.cpp b/src/d/actor/d_a_tag_waterlevel.cpp
index 8b23c880b..62253cc0e 100644
--- a/src/d/actor/d_a_tag_waterlevel.cpp
+++ b/src/d/actor/d_a_tag_waterlevel.cpp
@@ -148,7 +148,7 @@ actor_process_profile_definition g_profile_Tag_Waterlevel = {
     /* ListID       */ 9,
     /* ListPrio     */ fpcLy_CURRENT_e,
     /* ProcName     */ PROC_Tag_Waterlevel,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daTagWaterlevel::Act_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_tama.cpp b/src/d/actor/d_a_tama.cpp
index 725322bb6..5e3e1affd 100644
--- a/src/d/actor/d_a_tama.cpp
+++ b/src/d/actor/d_a_tama.cpp
@@ -151,7 +151,7 @@ actor_process_profile_definition g_profile_TAMA = {
     /* ListID       */ 9,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_TAMA,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daTama_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp
index 9ab065920..98cf1d234 100644
--- a/src/d/actor/d_a_tbox.cpp
+++ b/src/d/actor/d_a_tbox.cpp
@@ -200,7 +200,7 @@ s32 daTbox_c::commonShapeSet() {
         }
     }
 
-    mpChestMdl->setBaseScale(mScale);
+    mpChestMdl->setBaseScale(scale);
 
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(current.angle.y);
@@ -605,7 +605,7 @@ void daTbox_c::CreateInit() {
         mAcchCir.SetWall(30.0f, 0.0f);
         mObjAcch.Set(&current.pos, &old.pos, this, 1, &mAcchCir, &speed);
 
-        mGravity = -2.5f;
+        gravity = -2.5f;
     }
 
     mOpenedSwitch = getTboxNo();
@@ -967,7 +967,7 @@ BOOL daTbox_c::actionWait() {
 /* 000024B4-000025A4       .text actionDemo__8daTbox_cFv */
 BOOL daTbox_c::actionDemo() {
     /* Fakematch - the temp variable for play is definitely not right. */
-    s16 eventId = mEvtInfo.getEventId();
+    s16 eventId = eventInfo.getEventId();
     dComIfG_play_c* play = &g_dComIfG_gameInfo.play;
 
     if (dComIfGp_evmng_endCheck(eventId)) {
@@ -1010,7 +1010,7 @@ BOOL daTbox_c::actionDemo2() {
 
 /* 00002634-000027C8       .text actionOpenWait__8daTbox_cFv */
 BOOL daTbox_c::actionOpenWait() {
-    if (mEvtInfo.checkCommandDoor()) {
+    if (eventInfo.checkCommandDoor()) {
         dComIfGp_event_onEventFlag(0x04);
 
         u8 itemNo = getItemNo();
@@ -1042,13 +1042,13 @@ BOOL daTbox_c::actionOpenWait() {
     }
     else {
         if (boxCheck()) {
-            mEvtInfo.onCondition(dEvtCnd_CANDOOR_e);
+            eventInfo.onCondition(dEvtCnd_CANDOOR_e);
 
             if (getShapeType() == 0) {
-                mEvtInfo.setEventName("DEFAULT_TREASURE_A");
+                eventInfo.setEventName("DEFAULT_TREASURE_A");
             }
             else {
-                mEvtInfo.setEventName("DEFAULT_TREASURE");
+                eventInfo.setEventName("DEFAULT_TREASURE");
             }
         }
     }
@@ -1058,7 +1058,7 @@ BOOL daTbox_c::actionOpenWait() {
 
 /* 000027C8-000028A0       .text actionSwOnWait__8daTbox_cFv */
 BOOL daTbox_c::actionSwOnWait() {
-    if (mEvtInfo.checkCommandDemoAccrpt()) {
+    if (eventInfo.checkCommandDemoAccrpt()) {
         setAction(&daTbox_c::actionDemo2);
 
         mStaffId = dComIfGp_evmng_getMyStaffId("TREASURE");
@@ -1067,7 +1067,7 @@ BOOL daTbox_c::actionSwOnWait() {
     else {
         if (dComIfGs_isSwitch(getSwNo(), mRoomNo)) {
             fopAcM_orderOtherEvent2(this, "DEFAULT_TREASURE_APPEAR", 1);
-            mEvtInfo.onCondition(dEvtCnd_UNK2_e);
+            eventInfo.onCondition(dEvtCnd_UNK2_e);
         }
     }
 
@@ -1086,7 +1086,7 @@ BOOL daTbox_c::actionSwOnWait2() {
 
 /* 00002914-00002A2C       .text actionGenocide__8daTbox_cFv */
 BOOL daTbox_c::actionGenocide() {
-    if (mEvtInfo.checkCommandDemoAccrpt()) {
+    if (eventInfo.checkCommandDemoAccrpt()) {
         setAction(&daTbox_c::actionDemo2);
 
         mStaffId = dComIfGp_evmng_getMyStaffId("TREASURE");
@@ -1099,7 +1099,7 @@ BOOL daTbox_c::actionGenocide() {
             }
             else {
                 fopAcM_orderOtherEvent2(this, "DEFAULT_TREASURE_APPEAR", 1);
-                mEvtInfo.onCondition(dEvtCnd_UNK2_e);
+                eventInfo.onCondition(dEvtCnd_UNK2_e);
 
                 dComIfGs_onSwitch(getSwNo(), mRoomNo);
             }
@@ -1125,16 +1125,16 @@ BOOL daTbox_c::draw() {
     }
 
     if (!checkOpen()) {
-        dMap_drawPoint(5, current.pos.x, current.pos.y, current.pos.z, mRoomNo, -0x8000, openFlag, mGbaName, 0);
+        dMap_drawPoint(5, current.pos.x, current.pos.y, current.pos.z, mRoomNo, -0x8000, openFlag, gbaName, 0);
     }
 
-    mTevStr.mRoomNo = mRoomNo;
-    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &mTevStr);
+    tevStr.mRoomNo = mRoomNo;
+    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
 
     if (getFuncType() == FUNC_TYPE_TACT) {
         J3DModelData* platMdlData = mpTactPlatformMdl->getModelData();
 
-        g_env_light.setLightTevColorType(mpTactPlatformMdl, &mTevStr);
+        g_env_light.setLightTevColorType(mpTactPlatformMdl, &tevStr);
         mTactPlatformBrk.entry(platMdlData);
         mDoExt_modelUpdateDL(mpTactPlatformMdl);
     }
@@ -1143,7 +1143,7 @@ BOOL daTbox_c::draw() {
         return TRUE;
     }
 
-    g_env_light.setLightTevColorType(mpChestMdl, &mTevStr);
+    g_env_light.setLightTevColorType(mpChestMdl, &tevStr);
 
     J3DModelData* chestMdlData = mpChestMdl->getModelData();
     mOpenAnm.entry(chestMdlData);
@@ -1233,7 +1233,7 @@ BOOL daTbox_c::execute() {
         fopAcM_posMoveF(this, NULL);
         mObjAcch.CrrPos(*dComIfG_Bgsp());
 
-        mAttentionInfo.mPosition = current.pos;
+        attention_info.position = current.pos;
 
         mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
         mDoMtx_stack_c::YrotM(home.angle.y);
@@ -1320,7 +1320,7 @@ static s32 daTbox_Create(fopAc_ac_c* i_actor) {
         }
         else {
             tbox->CreateInit();
-            tbox->mAttentionInfo.mFlags = fopAc_Attn_ACTION_TREASURE_e;
+            tbox->attention_info.flags = fopAc_Attn_ACTION_TREASURE_e;
         }
     }
 
@@ -1340,7 +1340,7 @@ actor_process_profile_definition g_profile_TBOX = {
     7,
     fpcPi_CURRENT_e,
     PROC_TBOX,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(daTbox_c),
     0,
     0,
diff --git a/src/d/actor/d_a_vrbox.cpp b/src/d/actor/d_a_vrbox.cpp
index 64ec52822..f1d42cfcd 100644
--- a/src/d/actor/d_a_vrbox.cpp
+++ b/src/d/actor/d_a_vrbox.cpp
@@ -207,7 +207,7 @@ actor_process_profile_definition g_profile_VRBOX = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcLy_CURRENT_e,
     /* ProcName     */ PROC_VRBOX,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(vrbox_class),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_vrbox2.cpp b/src/d/actor/d_a_vrbox2.cpp
index 36a478af6..2629b6ce2 100644
--- a/src/d/actor/d_a_vrbox2.cpp
+++ b/src/d/actor/d_a_vrbox2.cpp
@@ -298,7 +298,7 @@ actor_process_profile_definition g_profile_VRBOX2 = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcLy_CURRENT_e,
     /* ProcName     */ PROC_VRBOX2,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(vrbox2_class),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_wall.cpp b/src/d/actor/d_a_wall.cpp
index 16f3635a2..e0e37b9c2 100644
--- a/src/d/actor/d_a_wall.cpp
+++ b/src/d/actor/d_a_wall.cpp
@@ -186,7 +186,7 @@ s32 daWall_c::_create() {
 
 /* 00000800-00000880       .text set_mtx__8daWall_cFv */
 void daWall_c::set_mtx() {
-    mpModel->setBaseScale(mScale);
+    mpModel->setBaseScale(scale);
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(current.angle.y);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
@@ -196,7 +196,7 @@ void daWall_c::set_mtx() {
 void daWall_c::setMoveBGMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(fopAcM_GetShapeAngle_p(this)->y);
-    mDoMtx_stack_c::scaleM(mScale);
+    mDoMtx_stack_c::scaleM(scale);
     mDoMtx_copy(mDoMtx_stack_c::get(), mMtx);
 }
 
@@ -254,7 +254,7 @@ void daWall_c::mode_break() {
             break;
         }
     }
-    fopDwTg_DrawQTo(&mDwTg);
+    fopDwTg_DrawQTo(&draw_tag);
 }
 
 /* 00000B14-00000D84       .text set_tri__8daWall_cFv */
@@ -300,11 +300,11 @@ void daWall_c::set_effect() {
     case 1:
     case 2:
         dComIfGp_particle_setProjection(projection_id[mType], &current.pos, &current.angle, NULL,
-                                        0xFF, NULL, fopAcM_GetRoomNo(this), &mTevStr.mColorK0,
-                                        &mTevStr.mColorK0);
+                                        0xFF, NULL, fopAcM_GetRoomNo(this), &tevStr.mColorK0,
+                                        &tevStr.mColorK0);
         dComIfGp_particle_setProjection(projection_id[mType], &current.pos, &local_28, NULL, 0xFF,
-                                        NULL, fopAcM_GetRoomNo(this), &mTevStr.mColorK0,
-                                        &mTevStr.mColorK0);
+                                        NULL, fopAcM_GetRoomNo(this), &tevStr.mColorK0,
+                                        &tevStr.mColorK0);
         mpEmitter = dComIfGp_particle_set(particle_id[mType], &current.pos, &current.angle, NULL,
                                           mDst, &mSmokeCb, fopAcM_GetRoomNo(this));
         if (mpEmitter != NULL) {
@@ -329,8 +329,8 @@ void daWall_c::set_se() {
 
 /* 00000FE4-00001044       .text _draw__8daWall_cFv */
 bool daWall_c::_draw() {
-    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(mpModel, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_BG0, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(mpModel, &tevStr);
     mDoExt_modelUpdateDL(mpModel);
     return TRUE;
 }
@@ -371,7 +371,7 @@ actor_process_profile_definition g_profile_WALL = {
     /* ListID       */ 7,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_WALL,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(daWall_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/actor/d_a_warpfout.cpp b/src/d/actor/d_a_warpfout.cpp
index dc9014758..8dbc2d850 100644
--- a/src/d/actor/d_a_warpfout.cpp
+++ b/src/d/actor/d_a_warpfout.cpp
@@ -62,7 +62,7 @@ void daWarpfout_c::eventOrder() {}
 void daWarpfout_c::demo_proc() {
     mStaffId = dComIfGp_evmng_getMyStaffId("Warpfo");
 
-    if (dComIfGp_event_runCheck() && !mEvtInfo.checkCommandTalk() && mStaffId != -1) {
+    if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk() && mStaffId != -1) {
         int actIdx =
             dComIfGp_evmng_getMyActIdx(mStaffId, action_table, ARRAY_SIZE(action_table), 0, 0);
 
@@ -222,7 +222,7 @@ actor_process_profile_definition g_profile_WARPFOUT = {
     3,
     fpcPi_CURRENT_e,
     PROC_WARPFOUT,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(daWarpfout_c),
     0,
     0,
diff --git a/src/d/d_a_bomb_static.cpp b/src/d/d_a_bomb_static.cpp
index 724290ea9..bd8cb78c5 100644
--- a/src/d/d_a_bomb_static.cpp
+++ b/src/d/d_a_bomb_static.cpp
@@ -108,7 +108,7 @@ bool daBomb_c::chk_state(daBomb_c::State_e state) const {
 
 /* 800682C0-800682F0       .text change_state__8daBomb_cFQ28daBomb_c7State_e */
 void daBomb_c::change_state(daBomb_c::State_e new_state) {
-    mBase.mParameters = (mBase.mParameters & ~(((1 << PRM_STATE_W) - 1) << PRM_STATE_S)) | (new_state << PRM_STATE_S); // & 0xFF000000
+    base.mParameters = (base.mParameters & ~(((1 << PRM_STATE_W) - 1) << PRM_STATE_S)) | (new_state << PRM_STATE_S); // & 0xFF000000
 
     _prm_chk_version();
 }
diff --git a/src/d/d_a_race_item_static.cpp b/src/d/d_a_race_item_static.cpp
index f4f21711c..7182bea92 100644
--- a/src/d/d_a_race_item_static.cpp
+++ b/src/d/d_a_race_item_static.cpp
@@ -119,10 +119,10 @@ BOOL daRaceItem_c::endOffsetPos(f32 param_1, cXyz* param_2, f32 param_3, f32 par
         current.angle = *param_5;
     }
     if(param_2) {
-        mScale = *param_2;
+        scale = *param_2;
     }
 
-    mGravity = param_1;
+    gravity = param_1;
     speedF = param_4;
     speed.y = param_3;
     field_0x640 = 3;
@@ -142,7 +142,7 @@ BOOL daRaceItem_c::checkOffsetPos() {
 
 /* 80069064-800690E4       .text set_mtx__12daRaceItem_cFP4cXyz */
 void daRaceItem_c::set_mtx(cXyz* param_1) {
-    mpModel->setBaseScale(mScale);
+    mpModel->setBaseScale(scale);
     mDoMtx_stack_c::transS(*param_1);
     mDoMtx_stack_c::YrotM(current.angle.y);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
diff --git a/src/d/d_a_ship_static.cpp b/src/d/d_a_ship_static.cpp
index 74d2eabbb..bce110076 100644
--- a/src/d/d_a_ship_static.cpp
+++ b/src/d/d_a_ship_static.cpp
@@ -12,7 +12,7 @@ void daShip_c::initStartPos(const cXyz* pos, short rotY) {
     shape_angle.y = rotY;
     current.angle.y = shape_angle.y;
     m0358 &= ~0x10;
-    mGravity = -2.5f;
+    gravity = -2.5f;
 
     mWaveL.remove();
     mWaveR.remove();
diff --git a/src/d/d_a_shop_item_static.cpp b/src/d/d_a_shop_item_static.cpp
index c0bde5883..fe2d81589 100644
--- a/src/d/d_a_shop_item_static.cpp
+++ b/src/d/d_a_shop_item_static.cpp
@@ -523,7 +523,7 @@ const u8 daShopItem_c::mModelType[255] = {
 
 /* 800689F0-800689F8       .text getScaleP__12daShopItem_cFv */
 cXyz* daShopItem_c::getScaleP() {
-    return &mScale;
+    return &scale;
 }
 
 /* 800689F8-80068A00       .text getRotateP__12daShopItem_cFv */
diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp
index 39e25ab44..89adac1b6 100644
--- a/src/d/d_attention.cpp
+++ b/src/d/d_attention.cpp
@@ -117,7 +117,7 @@ dAttList_c* dAttention_c::GetLockonList(s32 idx) {
 dAttList_c* dAttention_c::getActionBtnB() {
     /* Nonmatching */
     dAttList_c* list = GetLockonList(0);
-    if (list != NULL && list->getActor() != NULL && list->mType == 1 && LockonTruth() != 0 && !(list->getActor()->mAttentionInfo.mFlags & fopAc_Attn_TALKFLAG_NOTALK_e))
+    if (list != NULL && list->getActor() != NULL && list->mType == 1 && LockonTruth() != 0 && !(list->getActor()->attention_info.flags & fopAc_Attn_TALKFLAG_NOTALK_e))
         return list;
 
     if (mActionNum == 0)
@@ -125,7 +125,7 @@ dAttList_c* dAttention_c::getActionBtnB() {
 
     for (s32 i = 0; i < mActionNum; i++) {
         if (mActionList[i].mType == 3) {
-            if (!(mActionList[i].getActor()->mAttentionInfo.mFlags & fopAc_Attn_TALKFLAG_NOTALK_e))
+            if (!(mActionList[i].getActor()->attention_info.flags & fopAc_Attn_TALKFLAG_NOTALK_e))
                 return &mActionList[i];
         } else {
             return &mActionList[i];
@@ -141,12 +141,12 @@ dAttList_c* dAttention_c::getActionBtnXYZ_local(int button) {
     dAttList_c* list = GetLockonList(0);
     if (list != NULL && list->getActor() != NULL && list->mType == 1 && LockonTruth() != 0) {
         fopAc_ac_c* actor = list->getActor();
-        if (actor->mEvtInfo.chkCondition(dEvtCnd_CANTALKITEM_e)) {
+        if (actor->eventInfo.chkCondition(dEvtCnd_CANTALKITEM_e)) {
             s16 rt;
-            if (actor->mEvtInfo.mpCheckCB == NULL)
+            if (actor->eventInfo.mpCheckCB == NULL)
                 rt = 1;
             else
-                rt = actor->mEvtInfo.mpCheckCB(actor, button);
+                rt = actor->eventInfo.mpCheckCB(actor, button);
 
             if (rt)
                 return list;
@@ -160,12 +160,12 @@ dAttList_c* dAttention_c::getActionBtnXYZ_local(int button) {
         for (s32 i = 0; i < mActionNum; i++) {
             if (mActionList[i].mType == 3) {
                 fopAc_ac_c* actor = mActionList[i].getActor();
-                if (actor->mEvtInfo.chkCondition(dEvtCnd_CANTALKITEM_e)) {
+                if (actor->eventInfo.chkCondition(dEvtCnd_CANTALKITEM_e)) {
                     s16 rt;
-                    if (actor->mEvtInfo.mpCheckCB == NULL)
+                    if (actor->eventInfo.mpCheckCB == NULL)
                         rt = 1;
                     else
-                        rt = actor->mEvtInfo.mpCheckCB(actor, button);
+                        rt = actor->eventInfo.mpCheckCB(actor, button);
 
                     if (rt)
                         return &mActionList[i];
@@ -339,12 +339,12 @@ int dAttention_c::SelectAttention(fopAc_ac_c* ac) {
     if (ac == mpPlayer || mpPlayer == NULL)
         return 0;
 
-    mFlagMask = ac->mAttentionInfo.mFlags;
+    mFlagMask = ac->attention_info.flags;
 
-    cSGlobe globe1(ac->mAttentionInfo.mPosition - mpPlayer->mAttentionInfo.mPosition);
+    cSGlobe globe1(ac->attention_info.position - mpPlayer->attention_info.position);
     cSAngle angle1 = globe1.U() - mpPlayer->shape_angle.y;
 
-    cSGlobe globe2(mpPlayer->mAttentionInfo.mPosition - ac->mAttentionInfo.mPosition);
+    cSGlobe globe2(mpPlayer->attention_info.position - ac->attention_info.position);
     cSAngle angle2 = globe2.U() - mpPlayer->shape_angle.y;
 
     u32 type;
@@ -418,11 +418,11 @@ f32 dAttention_c::EnemyDistance(fopAc_ac_c* actor) {
     if (fopAcM_GetProfName(actor) == PROC_PLAYER)
         return -1.0f;
 
-    if (!(actor->mAttentionInfo.mFlags & 4) && !(actor->mAttentionInfo.mFlags & 0x4000000))
+    if (!(actor->attention_info.flags & 4) && !(actor->attention_info.flags & 0x4000000))
         return -1.0f;
 
     f32 dist = fopAcM_searchActorDistance(actor, mpPlayer);
-    if (dist < (dist_table[actor->mAttentionInfo.mDistances[2]].mDistXZMax + dist_table[actor->mAttentionInfo.mDistances[2]].mDistXZAngleAdjust))
+    if (dist < (dist_table[actor->attention_info.distances[2]].mDistXZMax + dist_table[actor->attention_info.distances[2]].mDistXZAngleAdjust))
         return dist;
     return -1.0f;
 }
diff --git a/src/d/d_bg_s_movebg_actor.cpp b/src/d/d_bg_s_movebg_actor.cpp
index 4d8939d3c..310f808f5 100644
--- a/src/d/d_bg_s_movebg_actor.cpp
+++ b/src/d/d_bg_s_movebg_actor.cpp
@@ -49,7 +49,7 @@ int dBgS_MoveBgActor::MoveBGCreate(const char* i_arcName, int i_dzb_id,
                                    MoveBGActor_SetFunc i_setFunc, u32 i_heapSize) {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
-    mDoMtx_stack_c::scaleM(mScale.x, mScale.y, mScale.z);
+    mDoMtx_stack_c::scaleM(scale.x, scale.y, scale.z);
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 
     m_name = i_arcName;
@@ -89,7 +89,7 @@ int dBgS_MoveBgActor::MoveBGExecute() {
     if (new_mtx == NULL) {
         mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
         mDoMtx_stack_c::YrotM(shape_angle.y);
-        mDoMtx_stack_c::scaleM(mScale.x, mScale.y, mScale.z);
+        mDoMtx_stack_c::scaleM(scale.x, scale.y, scale.z);
         MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
     } else {
         MTXCopy(*new_mtx, mBgMtx);
diff --git a/src/d/d_cc_s.cpp b/src/d/d_cc_s.cpp
index f990ea9f2..6ad3dffe7 100644
--- a/src/d/d_cc_s.cpp
+++ b/src/d/d_cc_s.cpp
@@ -30,7 +30,7 @@ bool dCcS::ChkShieldFrontRange(cCcD_Obj* obj1, cCcD_Obj* obj2) {
     if (ac2 == NULL) { return false; }
     
     cXyz delta;
-    VECSubtract(&ac1->mEyePos, &ac2->mEyePos, &delta);
+    VECSubtract(&ac1->eyePos, &ac2->eyePos, &delta);
     f32 dist = VECMag(&delta);
     if (cM3d_IsZero(dist)) {
         return false;
diff --git a/src/d/d_cc_uty.cpp b/src/d/d_cc_uty.cpp
index 4b35985f7..12e359083 100644
--- a/src/d/d_cc_uty.cpp
+++ b/src/d/d_cc_uty.cpp
@@ -207,18 +207,18 @@ fopAc_ac_c* cc_at_check(fopAc_ac_c* tgActor, CcAtInfo* atInfo) {
             }
         }
         
-        if (fopAcM_GetName(atInfo->mpActor) == PROC_HIMO2 && tgActor->mStealItemLeft != 0) {
-            tgActor->mStealItemLeft--;
-            fopAcM_createStealItem(&tgActor->current.pos, tgActor->mItemTableIdx, tgActor->current.roomNo, NULL, tgActor->mStealItemBitNo);
-            tgActor->mStealItemBitNo++;
+        if (fopAcM_GetName(atInfo->mpActor) == PROC_HIMO2 && tgActor->stealItemLeft != 0) {
+            tgActor->stealItemLeft--;
+            fopAcM_createStealItem(&tgActor->current.pos, tgActor->itemTableIdx, tgActor->current.roomNo, NULL, tgActor->stealItemBitNo);
+            tgActor->stealItemBitNo++;
             atInfo->mDamage = 0;
         }
         
         if ((s8)atInfo->mDamage > 0) {
-            tgActor->mHealth -= atInfo->mDamage;
+            tgActor->health -= atInfo->mDamage;
         }
         
-        if (tgActor->mHealth <= 0) {
+        if (tgActor->health <= 0) {
             atInfo->mbDead = true;
             
             fopAcM_seStart(tgActor, JA_SE_LK_LAST_HIT, 0);
diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp
index 908a066c7..7651cd252 100644
--- a/src/d/d_demo.cpp
+++ b/src/d/d_demo.cpp
@@ -351,7 +351,7 @@ dDemo_object_c::~dDemo_object_c() {
 
 /* 8006A234-8006A2F8       .text appendActor__14dDemo_object_cFP10fopAc_ac_c */
 dDemo_actor_c* dDemo_object_c::appendActor(fopAc_ac_c* ac) {
-    dDemo_actor_c* demoActor = dComIfGp_demo_getActor(ac->mDemoActorId);
+    dDemo_actor_c* demoActor = dComIfGp_demo_getActor(ac->demoActorID);
     if (demoActor != NULL)
         return demoActor;
 
@@ -364,7 +364,7 @@ dDemo_actor_c* dDemo_object_c::appendActor(fopAc_ac_c* ac) {
 
     mpActors[mNumActor++] = demoActor;
     demoActor->setActor(ac);
-    ac->mDemoActorId = mNumActor;
+    ac->demoActorID = mNumActor;
     return demoActor;
 }
 
diff --git a/src/d/d_detect.cpp b/src/d/d_detect.cpp
index 134d7c62b..5fc217477 100644
--- a/src/d/d_detect.cpp
+++ b/src/d/d_detect.cpp
@@ -124,6 +124,6 @@ bool dDetect_c::chk_attention(cXyz* outPos) const {
     if (target == NULL)
         return false;
     
-    *outPos = target->mEyePos;
+    *outPos = target->eyePos;
     return true;
 }
diff --git a/src/d/d_door.cpp b/src/d/d_door.cpp
index 1eda6bc91..0f14e3ea4 100644
--- a/src/d/d_door.cpp
+++ b/src/d/d_door.cpp
@@ -104,15 +104,15 @@ s32 dDoor_info_c::frontCheck() {
 
 /* 8006B6F4-8006B824       .text drawCheck_local__12dDoor_info_cFv */
 s32 dDoor_info_c::drawCheck_local() {
-    if (!adjoinPlayer() && !mEvtInfo.checkCommandDemoAccrpt() && !mEvtInfo.checkCommandDoor())
+    if (!adjoinPlayer() && !eventInfo.checkCommandDemoAccrpt() && !eventInfo.checkCommandDoor())
         return 0;
 
     if (getFRoomNo() == 0x3F || getBRoomNo() == 0x3F)
-        mTevStr.mRoomNo = dComIfGp_roomControl_getStayNo();
+        tevStr.mRoomNo = dComIfGp_roomControl_getStayNo();
     else
-        mTevStr.mRoomNo = getViewRoomNo();
+        tevStr.mRoomNo = getViewRoomNo();
 
-    current.roomNo = mTevStr.mRoomNo;
+    current.roomNo = tevStr.mRoomNo;
 
     u8 front = frontCheck();
     if (front == 2)
@@ -120,7 +120,7 @@ s32 dDoor_info_c::drawCheck_local() {
     else
         mRoomNo = dComIfGp_roomControl_getStayNo();
 
-    if (!dComIfGp_roomControl_checkRoomDisp(mTevStr.mRoomNo))
+    if (!dComIfGp_roomControl_checkRoomDisp(tevStr.mRoomNo))
         return 1;
 
     if (getViewRoomNo() == 0x3F && (getFRoomNo() != 0x3F || getBRoomNo() != 0x3F))
@@ -150,7 +150,7 @@ u8 dDoor_info_c::checkExecute() {
     if (fopAcM_checkStatus(this, fopAcStts_UNK1000_e))
         return 1;
 
-    if (mEvtInfo.checkCommandDemoAccrpt() || mEvtInfo.checkCommandDoor())
+    if (eventInfo.checkCommandDemoAccrpt() || eventInfo.checkCommandDoor())
         return 2;
 
     if (mRoomNo2 != dComIfGp_roomControl_getStayNo())
@@ -345,13 +345,13 @@ void dDoor_info_c::setPlayerAngle(BOOL flip) {
 
 /* 8006C200-8006C2BC       .text setPosAndAngle__12dDoor_info_cFP4cXyzs */
 void dDoor_info_c::setPosAndAngle(cXyz* pPos, s16 angle) {
-    if (mEvtInfo.checkCommandDemoAccrpt() || mEvtInfo.checkCommandDoor()) {
+    if (eventInfo.checkCommandDemoAccrpt() || eventInfo.checkCommandDoor()) {
         return;
     }
     if (pPos) {
-        mAttentionInfo.mPosition = current.pos = *pPos;
-        mAttentionInfo.mPosition.y += 150.0f;
-        mEyePos = mAttentionInfo.mPosition;
+        attention_info.position = current.pos = *pPos;
+        attention_info.position.y += 150.0f;
+        eyePos = attention_info.position;
     }
     current.angle.y = angle;
     shape_angle.y = current.angle.y;
diff --git a/src/d/d_envse.cpp b/src/d/d_envse.cpp
index 1218d6c2b..49615c7d2 100644
--- a/src/d/d_envse.cpp
+++ b/src/d/d_envse.cpp
@@ -200,7 +200,7 @@ kankyo_process_profile_definition g_profile_ENVSE = {
     2,
     fpcPi_CURRENT_e,
     PROC_ENVSE,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(dEnvSe_c),
     0,
     0,
diff --git a/src/d/d_event.cpp b/src/d/d_event.cpp
index aee87e45d..7e31dab60 100644
--- a/src/d/d_event.cpp
+++ b/src/d/d_event.cpp
@@ -97,7 +97,7 @@ void dEvt_control_c::setParam(dEvt_order_c* order) {
 /* 8007015C-8007018C       .text beforeFlagProc__14dEvt_control_cFP12dEvt_order_c */
 BOOL dEvt_control_c::beforeFlagProc(dEvt_order_c* order) {
     fopAc_ac_c* actor2 = order->mActor2;
-    if ((order->mFlag & dEvtFlag_TALK_e) && !actor2->mEvtInfo.chkCondition(dEvtCnd_CANTALK_e))
+    if ((order->mFlag & dEvtFlag_TALK_e) && !actor2->eventInfo.chkCondition(dEvtCnd_CANTALK_e))
         return false;
     return true;
 }
@@ -118,9 +118,9 @@ void dEvt_control_c::afterFlagProc(dEvt_order_c* order) {
 BOOL dEvt_control_c::commonCheck(dEvt_order_c* order, u16 cond, u16 cmd) {
     fopAc_ac_c* actor1 = order->mActor1;
     fopAc_ac_c* actor2 = order->mActor2;
-    if (actor1 != NULL && actor1->mEvtInfo.chkCondition(cond) && actor2 != NULL && actor2->mEvtInfo.chkCondition(cond)) {
-        actor1->mEvtInfo.setCommand(cmd);
-        actor2->mEvtInfo.setCommand(cmd);
+    if (actor1 != NULL && actor1->eventInfo.chkCondition(cond) && actor2 != NULL && actor2->eventInfo.chkCondition(cond)) {
+        actor1->eventInfo.setCommand(cmd);
+        actor2->eventInfo.setCommand(cmd);
         setParam(order);
         return TRUE;
     } else {
@@ -135,8 +135,8 @@ BOOL dEvt_control_c::talkCheck(dEvt_order_c* order) {
     if (commonCheck(order, dEvtCnd_CANTALK_e, dEvtCmd_INTALK_e)) {
         mMode = dEvtMode_TALK_e;
         if (mEventId == -1) {
-            if (actor2 != NULL && actor2->mEvtInfo.getEventName() != NULL) {
-                mEventId = actor2->mEvtInfo.getEventId();
+            if (actor2 != NULL && actor2->eventInfo.getEventName() != NULL) {
+                mEventId = actor2->eventInfo.getEventId();
             } else {
                 mEventId = dComIfGp_evmng_getEventIdx(defaultEventName, 0xFF);
             }
@@ -174,7 +174,7 @@ BOOL dEvt_control_c::talkXyCheck(dEvt_order_c* order) {
         return FALSE;
     }
     
-    if (actor2 == NULL || !actor2->mEvtInfo.chkCondition(dEvtCnd_CANTALKITEM_e)) {
+    if (actor2 == NULL || !actor2->eventInfo.chkCondition(dEvtCnd_CANTALKITEM_e)) {
         return FALSE;
     }
     
@@ -196,7 +196,7 @@ BOOL dEvt_control_c::talkXyCheck(dEvt_order_c* order) {
         
         // Fakematch
         s16 r3;
-        if (actor2 != NULL && (r3 = actor2->mEvtInfo.runXyEventCB(actor2, equippedItemIdx), r3 != -1)) {
+        if (actor2 != NULL && (r3 = actor2->eventInfo.runXyEventCB(actor2, equippedItemIdx), r3 != -1)) {
             mEventId = r3;
         } else {
             mEventId = dComIfGp_evmng_getEventIdx(defaultEventName, 0xFF);
@@ -223,7 +223,7 @@ BOOL dEvt_control_c::photoCheck(dEvt_order_c* order) {
         if (!commonCheck(order, dEvtCnd_CANTALK_e, dEvtCmd_INTALK_e))
             return FALSE;
 
-        s16 eventId = actor2->mEvtInfo.runPhotoEventCB(actor2, 0);
+        s16 eventId = actor2->eventInfo.runPhotoEventCB(actor2, 0);
         if (eventId != -1) {
             mEventId = eventId;
         } else {
@@ -248,12 +248,12 @@ BOOL dEvt_control_c::catchCheck(dEvt_order_c* order) {
     fopAc_ac_c* actor2 = order->mActor2;
     fopAc_ac_c* actor1 = order->mActor1;
 
-    if (actor1 == NULL || (actor2 != NULL && !actor2->mEvtInfo.chkCondition(dEvtCnd_CANCATCH_e)))
+    if (actor1 == NULL || (actor2 != NULL && !actor2->eventInfo.chkCondition(dEvtCnd_CANCATCH_e)))
         return FALSE;
 
-    actor1->mEvtInfo.setCommand(dEvtCmd_INCATCH_e);
+    actor1->eventInfo.setCommand(dEvtCmd_INCATCH_e);
     if (actor2 != NULL)
-        actor2->mEvtInfo.setCommand(dEvtCmd_INCATCH_e);
+        actor2->eventInfo.setCommand(dEvtCmd_INCATCH_e);
     setParam(order);
     mItemNo = dComIfGp_att_getCatchChgItem();
     mMode = dEvtMode_DEMO_e;
@@ -267,10 +267,10 @@ BOOL dEvt_control_c::catchCheck(dEvt_order_c* order) {
 BOOL dEvt_control_c::talkEnd() {
     fopAc_ac_c* actor1 = getPt1();
     if (actor1 != NULL)
-        actor1->mEvtInfo.setCommand(dEvtCmd_NONE_e);
+        actor1->eventInfo.setCommand(dEvtCmd_NONE_e);
     fopAc_ac_c* actor2 = getPt2();
     if (actor2 != NULL)
-        actor2->mEvtInfo.setCommand(dEvtCmd_NONE_e);
+        actor2->eventInfo.setCommand(dEvtCmd_NONE_e);
     if (mEventId != -1) {
         dComIfGp_getPEvtManager()->endProc(mEventId, 1);
         mEventId = -1;
@@ -299,9 +299,9 @@ BOOL dEvt_control_c::demoCheck(dEvt_order_c* order) {
         return FALSE;
 
     if (actor1 != NULL)
-        actor1->mEvtInfo.setCommand(dEvtCmd_INDEMO_e);
+        actor1->eventInfo.setCommand(dEvtCmd_INDEMO_e);
     if (actor2 != NULL)
-        actor2->mEvtInfo.setCommand(dEvtCmd_INDEMO_e);
+        actor2->eventInfo.setCommand(dEvtCmd_INDEMO_e);
 
     mMode = dEvtMode_DEMO_e;
     setParam(order);
@@ -319,10 +319,10 @@ BOOL dEvt_control_c::demoCheck(dEvt_order_c* order) {
 BOOL dEvt_control_c::demoEnd() {
     fopAc_ac_c* actor1 = getPt1();
     if (actor1 != NULL)
-        actor1->mEvtInfo.setCommand(dEvtCmd_NONE_e);
+        actor1->eventInfo.setCommand(dEvtCmd_NONE_e);
     fopAc_ac_c* actor2 = getPt2();
     if (actor2 != NULL)
-        actor2->mEvtInfo.setCommand(dEvtCmd_NONE_e);
+        actor2->eventInfo.setCommand(dEvtCmd_NONE_e);
     if (mEventId != -1) {
         dComIfGp_getPEvtManager()->endProc(mEventId, 1);
         mEventId = -1;
@@ -341,7 +341,7 @@ BOOL dEvt_control_c::potentialCheck(dEvt_order_c* order) {
     if (!beforeFlagProc(order))
         return FALSE;
 
-    actor1->mEvtInfo.setCommand(dEvtCmd_INDEMO_e);
+    actor1->eventInfo.setCommand(dEvtCmd_INDEMO_e);
     mMode = dEvtMode_DEMO_e;
     setParam(order);
     afterFlagProc(order);
@@ -353,8 +353,8 @@ BOOL dEvt_control_c::doorCheck(dEvt_order_c* order) {
     if (commonCheck(order, dEvtCnd_CANDOOR_e, dEvtCmd_INDOOR_e)) {
         mMode = dEvtMode_DEMO_e;
         fopAc_ac_c* actor2 = getPt2();
-        if (mEventId == -1 && actor2 != NULL && actor2->mEvtInfo.getEventId() != -1)
-            mEventId = actor2->mEvtInfo.getEventId();
+        if (mEventId == -1 && actor2 != NULL && actor2->eventInfo.getEventId() != -1)
+            mEventId = actor2->eventInfo.getEventId();
         if (mEventId != -1 && dComIfGp_getPEvtManager()->getEventData(mEventId) != NULL) {
             if (!dComIfGp_evmng_order(mEventId))
                 JUT_ASSERT(0x2c0, 0);
@@ -585,7 +585,7 @@ BOOL dEvt_control_c::photoCheck() {
             if (actor2 == NULL) {
                 return FALSE;
             }
-            if (!(actor2->mAttentionInfo.mFlags & fopAc_Attn_UNK1000000_e)) {
+            if (!(actor2->attention_info.flags & fopAc_Attn_UNK1000000_e)) {
                 return FALSE;
             }
             if (dComIfGp_getPictureStatus() == 2) {
@@ -595,8 +595,8 @@ BOOL dEvt_control_c::photoCheck() {
             if (actor1 == NULL) {
                 return FALSE;
             }
-            if (!actor1->mEvtInfo.chkCondition(dEvtCnd_CANTALK_e) ||
-                !actor2->mEvtInfo.chkCondition(dEvtCnd_CANTALK_e)
+            if (!actor1->eventInfo.chkCondition(dEvtCnd_CANTALK_e) ||
+                !actor2->eventInfo.chkCondition(dEvtCnd_CANTALK_e)
             ) {
                 return FALSE;
             }
@@ -623,7 +623,7 @@ s32 dEvt_control_c::moveApproval(void* actor) {
     case dEvtMode_DEMO_e:
         if (convPId(mPt1) == i_ac || convPId(mPt2) == i_ac)
             return dEvtMove_FORCE_e;
-        if (i_ac->mDemoActorId != 0)
+        if (i_ac->demoActorID != 0)
             return dEvtMove_FORCE_e;
         break;
     case dEvtMode_COMPULSORY_e:
diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp
index 9b01ff0c9..52f17479d 100644
--- a/src/d/d_event_manager.cpp
+++ b/src/d/d_event_manager.cpp
@@ -178,7 +178,7 @@ static void* findObjectCallBack(fopAc_ac_c* actor, void* work) {
     if (inf == NULL)
         return NULL;
 
-    if (inf->mProcName == fopAcM_GetProfName(actor) && inf->mSubtype == actor->mSubtype && (prm->mMask == 0 || (prm->mValue == (prm->mMask & fopAcM_GetParam(actor)))))
+    if (inf->mProcName == fopAcM_GetProfName(actor) && inf->mSubtype == actor->subtype && (prm->mMask == 0 || (prm->mValue == (prm->mMask & fopAcM_GetParam(actor)))))
         return actor;
 
     return NULL;
@@ -200,7 +200,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->mSubtype && (prm->mMask == 0 || (prm->mValue == (prm->mMask & fopAcM_GetParam(actor))))) {
+        if (inf->mProcName == fopAcM_GetProfName(actor) && inf->mSubtype == actor->subtype && (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);
@@ -220,7 +220,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->mSubtype) {
+        if (inf->mProcName == fopAcM_GetProfName(actor) && inf->mSubtype == actor->subtype) {
             fopAcM_OffStatus(actor, fopAcStts_UNK800_e);
         }
         return NULL;
diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp
index c5528d132..3714d54c4 100644
--- a/src/d/d_gameover.cpp
+++ b/src/d/d_gameover.cpp
@@ -412,7 +412,7 @@ msg_process_profile_definition g_profile_GAMEOVER = {
     /* ListID       */ 12,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_GAMEOVER,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(dGameover_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp
index 1d5189ecf..f2890a0b2 100644
--- a/src/d/d_kankyo.cpp
+++ b/src/d/d_kankyo.cpp
@@ -2359,7 +2359,7 @@ kankyo_process_profile_definition g_profile_KANKYO = {
     1,
     fpcPi_CURRENT_e,
     PROC_KANKYO,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(sub_kankyo__class),
     0,
     0,
diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp
index 4beea8e10..c5a5db1a9 100644
--- a/src/d/d_ky_thunder.cpp
+++ b/src/d/d_ky_thunder.cpp
@@ -217,7 +217,7 @@ kankyo_process_profile_definition g_profile_KY_THUNDER = {
     7,
     fpcPi_CURRENT_e,
     PROC_KY_THUNDER,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(dThunder_c),
     0,
     0,
diff --git a/src/d/d_kyeff.cpp b/src/d/d_kyeff.cpp
index 6dc42c96c..0c16577a4 100644
--- a/src/d/d_kyeff.cpp
+++ b/src/d/d_kyeff.cpp
@@ -180,7 +180,7 @@ kankyo_process_profile_definition g_profile_KYEFF = {
     12,
     fpcPi_CURRENT_e,
     PROC_KYEFF,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(dKyeff_c),
     0,
     0,
diff --git a/src/d/d_kyeff2.cpp b/src/d/d_kyeff2.cpp
index ce8b12dd0..e0da5a888 100644
--- a/src/d/d_kyeff2.cpp
+++ b/src/d/d_kyeff2.cpp
@@ -66,7 +66,7 @@ kankyo_process_profile_definition g_profile_KYEFF2 = {
     12,
     fpcPi_CURRENT_e,
     PROC_KYEFF2,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(dKyeff2_c),
     0,
     0,
diff --git a/src/d/d_level_se.cpp b/src/d/d_level_se.cpp
index 5765140e9..606d73d76 100644
--- a/src/d/d_level_se.cpp
+++ b/src/d/d_level_se.cpp
@@ -53,7 +53,7 @@ kankyo_process_profile_definition g_profile_LEVEL_SE = {
     2,
     fpcPi_CURRENT_e,
     PROC_LEVEL_SE,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(dLevelSe_c),
     0,
     0,
diff --git a/src/d/d_npc_event_cut.inc b/src/d/d_npc_event_cut.inc
index 342d53969..7a9693789 100644
--- a/src/d/d_npc_event_cut.inc
+++ b/src/d/d_npc_event_cut.inc
@@ -350,7 +350,7 @@ fopAc_ac_c* dNpc_EventCut_c::findActorCallBack(fopAc_ac_c* pActor, void* pData)
         return 0;
     }
     
-    if(cut->mSetId != 0 && pActor->mSetId == cut->mSetId) {
+    if(cut->mSetId != 0 && pActor->setID == cut->mSetId) {
         cut->mTargetActorPos = pActor->current.pos;
         cut->mpTargetActor = pActor;
 
@@ -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->mSubtype) {
+                if(obj->mProcName == fopAcM_GetProfName(pActor) && obj->mSubtype == pActor->subtype) {
                     if(cut->mTargetActorPos.abs() == 0.0f) {
                         cut->mTargetActorPos = pActor->current.pos;
                         cut->mpTargetActor = pActor;
diff --git a/src/d/d_ovlp_fade.cpp b/src/d/d_ovlp_fade.cpp
index c5125bd5c..18f82ea5a 100644
--- a/src/d/d_ovlp_fade.cpp
+++ b/src/d/d_ovlp_fade.cpp
@@ -105,7 +105,7 @@ overlap_process_profile_definition g_profile_OVERLAP0 = {
     0,
     fpcPi_CURRENT_e,
     PROC_OVERLAP0,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(overlap1_class),
     0,
     0,
@@ -119,7 +119,7 @@ overlap_process_profile_definition g_profile_OVERLAP1 = {
     0,
     fpcPi_CURRENT_e,
     PROC_OVERLAP1,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(overlap1_class),
     0,
     0,
@@ -133,7 +133,7 @@ overlap_process_profile_definition g_profile_OVERLAP6 = {
     0,
     fpcPi_CURRENT_e,
     PROC_OVERLAP6,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(overlap1_class),
     0,
     0,
@@ -147,7 +147,7 @@ overlap_process_profile_definition g_profile_OVERLAP7 = {
     0,
     fpcPi_CURRENT_e,
     PROC_OVERLAP7,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(overlap1_class),
     0,
     0,
@@ -161,7 +161,7 @@ overlap_process_profile_definition g_profile_OVERLAP8 = {
     0,
     fpcPi_CURRENT_e,
     PROC_OVERLAP8,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(overlap1_class),
     0,
     0,
diff --git a/src/d/d_ovlp_fade2.cpp b/src/d/d_ovlp_fade2.cpp
index 8d479e7df..3408bd6ac 100644
--- a/src/d/d_ovlp_fade2.cpp
+++ b/src/d/d_ovlp_fade2.cpp
@@ -81,7 +81,7 @@ overlap_process_profile_definition g_profile_OVERLAP2 = {
     2,
     fpcPi_CURRENT_e,
     PROC_OVERLAP2,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(dOvlpFd2_c),
     0,
     0,
@@ -95,7 +95,7 @@ overlap_process_profile_definition g_profile_OVERLAP3 = {
     2,
     fpcPi_CURRENT_e,
     PROC_OVERLAP3,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(dOvlpFd2_c),
     0,
     0,
diff --git a/src/d/d_ovlp_fade4.cpp b/src/d/d_ovlp_fade4.cpp
index 2d6e5e90c..331b73f5c 100644
--- a/src/d/d_ovlp_fade4.cpp
+++ b/src/d/d_ovlp_fade4.cpp
@@ -51,7 +51,7 @@ dOvlpFd4_c::dOvlpFd4_c() {
     field_0x2ac = 1;
     field_0xcc = &dOvlpFd4_c::execFirstSnap;
     field_0xd8 = &dOvlpFd4_c::drawFadeOut;
-    if (mBase.mProcName == PROC_OVERLAP4) {
+    if (base.mProcName == PROC_OVERLAP4) {
         field_0xfc.init(mDoGph_gInf_c::mFrameBufferTimg, 0.0f, 0.0f, 640.0f, 480.0f, g_saftyWhiteColor);
     } else {
         GXColor tmp = {0, 0, 0, 0};
@@ -146,7 +146,7 @@ overlap_process_profile_definition g_profile_OVERLAP4 = {
     2,
     fpcPi_CURRENT_e,
     PROC_OVERLAP4,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(dOvlpFd4_c),
     0,
     0,
@@ -160,7 +160,7 @@ overlap_process_profile_definition g_profile_OVERLAP5 = {
     2,
     fpcPi_CURRENT_e,
     PROC_OVERLAP5,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(dOvlpFd4_c),
     0,
     0,
diff --git a/src/d/d_place_name.cpp b/src/d/d_place_name.cpp
index 4656fb86b..743e1172d 100644
--- a/src/d/d_place_name.cpp
+++ b/src/d/d_place_name.cpp
@@ -273,7 +273,7 @@ msg_process_profile_definition g_profile_PLACE_NAME = {
     12,
     fpcPi_CURRENT_e,
     PROC_PLACE_NAME,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(dPn_c),
     0,
     0,
diff --git a/src/d/d_s_logo.cpp b/src/d/d_s_logo.cpp
index 13357d9c2..7418012f7 100644
--- a/src/d/d_s_logo.cpp
+++ b/src/d/d_s_logo.cpp
@@ -977,11 +977,11 @@ scene_process_profile_definition g_profile_LOGO_SCENE = {
     1,
     fpcPi_CURRENT_e,
     PROC_LOGO_SCENE,
-    &g_fpcNd_Method.mBase,
+    &g_fpcNd_Method.base,
     sizeof(dScnLogo_c),
     0,
     0,
-    &g_fopScn_Method.mBase,
+    &g_fopScn_Method.base,
     &l_dScnLogo_Method,
     NULL,
 };
diff --git a/src/d/d_s_menu.cpp b/src/d/d_s_menu.cpp
index 12ee3d758..e05803b94 100644
--- a/src/d/d_s_menu.cpp
+++ b/src/d/d_s_menu.cpp
@@ -181,11 +181,11 @@ scene_process_profile_definition g_profile_MENU_SCENE = {
     1,
     fpcPi_CURRENT_e,
     PROC_MENU_SCENE,
-    &g_fpcNd_Method.mBase,
+    &g_fpcNd_Method.base,
     sizeof(menu_of_scene_class),
     0,
     0,
-    &g_fopScn_Method.mBase,
+    &g_fopScn_Method.base,
     &l_dScnMenu_Method,
     NULL,
 };
diff --git a/src/d/d_s_name.cpp b/src/d/d_s_name.cpp
index c9f85fe5c..ec7bd5a2f 100644
--- a/src/d/d_s_name.cpp
+++ b/src/d/d_s_name.cpp
@@ -523,11 +523,11 @@ scene_process_profile_definition g_profile_NAME_SCENE = {
     1,
     fpcPi_CURRENT_e,
     PROC_NAME_SCENE,
-    &g_fpcNd_Method.mBase,
+    &g_fpcNd_Method.base,
     sizeof(dScnName_c),
     0,
     0,
-    &g_fopScn_Method.mBase,
+    &g_fopScn_Method.base,
     &l_dScnName_Method,
     NULL,
 };
@@ -537,11 +537,11 @@ scene_process_profile_definition g_profile_NAMEEX_SCENE = {
     1,
     fpcPi_CURRENT_e,
     PROC_NAMEEX_SCENE,
-    &g_fpcNd_Method.mBase,
+    &g_fpcNd_Method.base,
     sizeof(dScnName_c),
     0,
     0,
-    &g_fopScn_Method.mBase,
+    &g_fopScn_Method.base,
     &l_dScnName_Method,
     NULL,
 };
diff --git a/src/d/d_s_open.cpp b/src/d/d_s_open.cpp
index 0d30336bc..a04b9c5c8 100644
--- a/src/d/d_s_open.cpp
+++ b/src/d/d_s_open.cpp
@@ -136,11 +136,11 @@ scene_process_profile_definition g_profile_OPEN_SCENE = {
     1,
     fpcPi_CURRENT_e,
     PROC_OPEN_SCENE,
-    &g_fpcNd_Method.mBase,
+    &g_fpcNd_Method.base,
     sizeof(dScnOpen_c),
     0,
     0,
-    &g_fopScn_Method.mBase,
+    &g_fopScn_Method.base,
     &l_dScnOpen_Method,
     NULL,
 };
@@ -150,11 +150,11 @@ scene_process_profile_definition g_profile_OPEN2_SCENE = {
     1,
     fpcPi_CURRENT_e,
     PROC_OPEN2_SCENE,
-    &g_fpcNd_Method.mBase,
+    &g_fpcNd_Method.base,
     sizeof(dScnOpen_c),
     0,
     0,
-    &g_fopScn_Method.mBase,
+    &g_fopScn_Method.base,
     &l_dScnOpen_Method,
     NULL,
 };
diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp
index 5d48b878f..d3014fc06 100644
--- a/src/d/d_s_play.cpp
+++ b/src/d/d_s_play.cpp
@@ -1497,11 +1497,11 @@ extern scene_process_profile_definition g_profile_PLAY_SCENE = {
     1,
     fpcPi_CURRENT_e,
     PROC_PLAY_SCENE,
-    &g_fpcNd_Method.mBase,
+    &g_fpcNd_Method.base,
     sizeof(dScnPly_ply_c),
     0,
     0,
-    &g_fopScn_Method.mBase,
+    &g_fopScn_Method.base,
     &l_dScnPly_Method,
 };
 
@@ -1510,11 +1510,11 @@ extern scene_process_profile_definition g_profile_OPENING_SCENE = {
     1,
     fpcPi_CURRENT_e,
     PROC_OPENING_SCENE,
-    &g_fpcNd_Method.mBase,
+    &g_fpcNd_Method.base,
     sizeof(dScnPly_ply_c),
     0,
     0,
-    &g_fopScn_Method.mBase,
+    &g_fopScn_Method.base,
     &l_dScnPly_Method,
 };
 
@@ -1523,10 +1523,10 @@ extern scene_process_profile_definition g_profile_OPENING2_SCENE = {
     1,
     fpcPi_CURRENT_e,
     PROC_OPENING2_SCENE,
-    &g_fpcNd_Method.mBase,
+    &g_fpcNd_Method.base,
     sizeof(dScnPly_ply_c),
     0,
     0,
-    &g_fopScn_Method.mBase,
+    &g_fopScn_Method.base,
     &l_dScnPly_Method,
 };
diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp
index 18f5b92cd..4fc1d2d4f 100644
--- a/src/d/d_s_room.cpp
+++ b/src/d/d_s_room.cpp
@@ -311,11 +311,11 @@ scene_process_profile_definition g_profile_ROOM_SCENE = {
     0,
     fpcPi_CURRENT_e,
     PROC_ROOM_SCENE,
-    &g_fpcNd_Method.mBase,
+    &g_fpcNd_Method.base,
     sizeof(room_of_scene_class),
     0,
     0,
-    &g_fopScn_Method.mBase,
+    &g_fopScn_Method.base,
     &l_dScnRoom_Method,
     NULL,
 };
diff --git a/src/d/d_s_title.cpp b/src/d/d_s_title.cpp
index f22f6e026..78399a25e 100644
--- a/src/d/d_s_title.cpp
+++ b/src/d/d_s_title.cpp
@@ -138,11 +138,11 @@ extern scene_process_profile_definition g_profile_TITLE_SCENE = {
     1,
     fpcPi_CURRENT_e,
     PROC_TITLE_SCENE,
-    &g_fpcNd_Method.mBase,
+    &g_fpcNd_Method.base,
     sizeof(title_of_scene_class),
     0,
     0,
-    &g_fopScn_Method.mBase,
+    &g_fopScn_Method.base,
     &l_dScnTitle_Method,
 };
 
@@ -151,10 +151,10 @@ extern scene_process_profile_definition g_profile_ENDING_SCENE = {
     1,
     fpcPi_CURRENT_e,
     PROC_ENDING_SCENE,
-    &g_fpcNd_Method.mBase,
+    &g_fpcNd_Method.base,
     sizeof(title_of_scene_class),
     0,
     0,
-    &g_fopScn_Method.mBase,
+    &g_fopScn_Method.base,
     &l_dScnTitle_Method,
 };
diff --git a/src/d/d_salvage.cpp b/src/d/d_salvage.cpp
index c1bc519ef..cd7e05c44 100644
--- a/src/d/d_salvage.cpp
+++ b/src/d/d_salvage.cpp
@@ -113,7 +113,7 @@ void dSalvage_control_c::entry(fopAc_ac_c* pact, JPABaseEmitter* emtr) {
 
     mInfo[no].mRoomNo = roomNo;
     mInfo[no].mPos = pact->current.pos;
-    mInfo[no].mScale = pact->mScale;
+    mInfo[no].mScale = pact->scale;
     mInfo[no].mSaveNo = saveNo;
     mInfo[no].mType = type;
     mInfo[no].mKind = kind;
@@ -123,16 +123,16 @@ void dSalvage_control_c::entry(fopAc_ac_c* pact, JPABaseEmitter* emtr) {
 
     switch (kind) {
     case 0:
-        mInfo[no].mH = pact->mScale.y * 1000.0f;
-        mInfo[no].mR = pact->mScale.x * 700.0f;
+        mInfo[no].mH = pact->scale.y * 1000.0f;
+        mInfo[no].mR = pact->scale.x * 700.0f;
         break;
     case 5:
-        mInfo[no].mH = pact->mScale.y * 1000.0f;
-        mInfo[no].mR = pact->mScale.x * 500.0f;
+        mInfo[no].mH = pact->scale.y * 1000.0f;
+        mInfo[no].mR = pact->scale.x * 500.0f;
         break;
     default:
-        mInfo[no].mH = pact->mScale.y * 500.0f;
-        mInfo[no].mR = pact->mScale.x * 400.0f;
+        mInfo[no].mH = pact->scale.y * 500.0f;
+        mInfo[no].mR = pact->scale.x * 400.0f;
         break;
     }
 
diff --git a/src/d/d_shop.cpp b/src/d/d_shop.cpp
index 7a02a57c4..d45c50362 100644
--- a/src/d/d_shop.cpp
+++ b/src/d/d_shop.cpp
@@ -940,7 +940,7 @@ BOOL ShopCam_action_c::rsh_talk_cam_action_init(fopAc_ac_c* param_1, cXyz param_
     daPy_getPlayerActorClass()->onPlayerNoDraw();
     setCamAction(&ShopCam_action_c::rsh_talk_cam_action);
     
-    mDoMtx_stack_c::transS(param_1->mAttentionInfo.mPosition);
+    mDoMtx_stack_c::transS(param_1->attention_info.position);
     mDoMtx_stack_c::YrotM(param_1->current.angle.y);
     cXyz r1_20;
     mDoMtx_stack_c::multVec(&param_2, &r1_20);
diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp
index 76376d4f6..bdbdffdd4 100644
--- a/src/d/d_stage.cpp
+++ b/src/d/d_stage.cpp
@@ -1486,7 +1486,7 @@ int dStage_playerInit(dStage_dt_c* i_stage, void* i_data, int num, void* i_file)
     scene_class* stageProc = fopScnM_SearchByID(dStage_roomControl_c::getProcID());
     JUT_ASSERT(1842, stageProc != 0);
 
-    if (stageProc->mBase.mBase.mProcName != PROC_PLAY_SCENE) {
+    if (stageProc->base.base.mProcName != PROC_PLAY_SCENE) {
         fopAcM_create(PROC_TITLE, 0);
     }
 
diff --git a/src/d/d_throwstone.cpp b/src/d/d_throwstone.cpp
index 2e0b52429..3aa3b4126 100644
--- a/src/d/d_throwstone.cpp
+++ b/src/d/d_throwstone.cpp
@@ -40,7 +40,7 @@ s32 daThrowstone_c::_create() {
         } else {
             mDoMtx_stack_c::transS(current.pos);
             mDoMtx_stack_c::YrotM(shape_angle.y);
-            mDoMtx_stack_c::scaleM(mScale);
+            mDoMtx_stack_c::scaleM(scale);
 
             mDoMtx_copy(mDoMtx_stack_c::get(), mMtx);
             fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
@@ -70,7 +70,7 @@ BOOL daThrowstoneDelete(void* ptr) {
 BOOL daThrowstone_c::_execute() {
     dDemo_setDemoData(this, 0x6a, NULL, NULL, 0, NULL, 0, 0);
 
-    mpModel->setBaseScale(mScale);
+    mpModel->setBaseScale(scale);
     f32 pos_x = current.pos.x;
     mDoMtx_stack_c::transS(pos_x, current.pos.y, current.pos.z);
     s16 rot_x = shape_angle.x;
@@ -91,8 +91,8 @@ bool daThrowstone_c::_draw() {
     if (!dComIfGs_isEventBit(0x0310))
         return TRUE;
 
-    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &mTevStr);
-    g_env_light.setLightTevColorType(mpModel, &mTevStr);
+    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(mpModel, &tevStr);
     mDoExt_modelUpdateDL(mpModel);
 
     return TRUE;
@@ -121,7 +121,7 @@ actor_process_profile_definition g_profile_THROWSTONE = {
     2,
     fpcPi_CURRENT_e,
     PROC_THROWSTONE,
-    &g_fpcLf_Method.mBase,
+    &g_fpcLf_Method.base,
     sizeof(daThrowstone_c),
     0,
     0,
diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp
index 950637370..df420c999 100644
--- a/src/d/d_timer.cpp
+++ b/src/d/d_timer.cpp
@@ -740,7 +740,7 @@ msg_process_profile_definition g_profile_TIMER = {
     /* ListID       */ 12,
     /* ListPrio     */ fpcPi_CURRENT_e,
     /* ProcName     */ PROC_TIMER,
-    /* Proc SubMtd  */ &g_fpcLf_Method.mBase,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
     /* Size         */ sizeof(dTimer_c),
     /* SizeOther    */ 0,
     /* Parameters   */ 0,
diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp
index 4767b8b71..e57557bd3 100644
--- a/src/f_op/f_op_actor.cpp
+++ b/src/f_op/f_op_actor.cpp
@@ -26,7 +26,7 @@ u32 fopAc_ac_c::stopStatus;
 
 /* 80023514-80023540       .text fopAc_IsActor__FPv */
 s32 fopAc_IsActor(void* pProc) {
-    return fpcBs_Is_JustOfType(g_fopAc_type, ((fopAc_ac_c*)pProc)->mAcType);
+    return fpcBs_Is_JustOfType(g_fopAc_type, ((fopAc_ac_c*)pProc)->actor_type);
 }
 
 /* 80023540-8002362C       .text fopAc_Draw__FPv */
@@ -50,7 +50,7 @@ s32 fopAc_Draw(void* pProc) {
             ) && !fopAcM_checkStatus(actor, fopAcStts_NODRAW_e)
         ) {
             fopAcM_OffCondition(actor, fopAcCnd_NODRAW_e);
-            ret = fpcLf_DrawMethod((leafdraw_method_class*)actor->mSubMtd, actor);
+            ret = fpcLf_DrawMethod((leafdraw_method_class*)actor->sub_method, actor);
         } else {
             fopAcM_OnCondition(actor, fopAcCnd_NODRAW_e);
         }
@@ -78,7 +78,7 @@ s32 fopAc_Execute(void* pProc) {
     CHECK_VEC3_RANGE(0x286, actor->current.pos);
 
     if (fopAcM_checkStatus(actor, fopAcStts_NOPAUSE_e) || (!dMenu_flag() && !dScnPly_ply_c::isPause())) {
-        actor->mEvtInfo.beforeProc();
+        actor->eventInfo.beforeProc();
 
         s32 moveApproval = dComIfGp_event_moveApproval(actor);
 
@@ -99,7 +99,7 @@ s32 fopAc_Execute(void* pProc) {
         ) {
             fopAcM_OffCondition(actor, fopAcCnd_NOEXEC_e);
             actor->old = actor->current;
-            ret = fpcMtd_Execute((process_method_class*)actor->mSubMtd, actor);
+            ret = fpcMtd_Execute((process_method_class*)actor->sub_method, actor);
         } else {
             fopAcM_OnCondition(actor, fopAcCnd_NOEXEC_e);
         }
@@ -116,24 +116,24 @@ s32 fopAc_Execute(void* pProc) {
 /* 80023BDC-80023C30       .text fopAc_IsDelete__FPv */
 s32 fopAc_IsDelete(void* pProc) {
     fopAc_ac_c * actor = (fopAc_ac_c *)pProc;
-    s32 ret = fpcMtd_IsDelete((process_method_class*)actor->mSubMtd, actor);
+    s32 ret = fpcMtd_IsDelete((process_method_class*)actor->sub_method, actor);
     if (ret == 1)
-        fopDwTg_DrawQTo(&actor->mDwTg);
+        fopDwTg_DrawQTo(&actor->draw_tag);
     return ret;
 }
 
 /* 80023C30-80023CD4       .text fopAc_Delete__FPv */
 s32 fopAc_Delete(void* pProc) {
     fopAc_ac_c * actor = (fopAc_ac_c *)pProc;
-    s32 ret = fpcMtd_Delete((process_method_class*)actor->mSubMtd, actor);
+    s32 ret = fpcMtd_Delete((process_method_class*)actor->sub_method, actor);
     if (ret == 1) {
-        fopAcTg_ActorQTo(&actor->mAcTg);
-        fopDwTg_DrawQTo(&actor->mDwTg);
+        fopAcTg_ActorQTo(&actor->actor_tag);
+        fopDwTg_DrawQTo(&actor->draw_tag);
         fopAcM_DeleteHeap(actor);
-        dDemo_actor_c *pDemoActor = dComIfGp_demo_getActor(actor->mDemoActorId);
+        dDemo_actor_c *pDemoActor = dComIfGp_demo_getActor(actor->demoActorID);
         if (pDemoActor != NULL)
             pDemoActor->setActor(NULL);
-        mDoAud_seDeleteObject(&actor->mEyePos);
+        mDoAud_seDeleteObject(&actor->eyePos);
         mDoAud_seDeleteObject(&actor->current.pos);
     }
     return ret;
@@ -145,14 +145,14 @@ s32 fopAc_Create(void* pProc) {
 
     if (fpcM_IsFirstCreating(actor)) {
         actor_process_profile_definition* profile = (actor_process_profile_definition*)fpcM_GetProfile(pProc);
-        actor->mAcType = fpcBs_MakeOfType(&g_fopAc_type);
-        actor->mSubMtd = profile->mSubMtd;
-        fopAcTg_Init(&actor->mAcTg, actor);
-        fopAcTg_ToActorQ(&actor->mAcTg);
-        fopDwTg_Init(&actor->mDwTg, actor);
-        actor->mStatus = profile->mStatus;
-        actor->mGroup = profile->mGroup;
-        actor->mCullType = profile->mCullType;
+        actor->actor_type = fpcBs_MakeOfType(&g_fopAc_type);
+        actor->sub_method = profile->sub_method;
+        fopAcTg_Init(&actor->actor_tag, actor);
+        fopAcTg_ToActorQ(&actor->actor_tag);
+        fopDwTg_Init(&actor->draw_tag, actor);
+        actor->actor_status = profile->status;
+        actor->group = profile->group;
+        actor->cullType = profile->cullType;
 
         fopAcM_prm_class* prm = fopAcM_GetAppend(actor);
         if (prm != NULL) {
@@ -160,34 +160,34 @@ s32 fopAc_Create(void* pProc) {
             actor->home.pos = prm->mPos;
             actor->home.angle = prm->mAngle;
             actor->shape_angle = prm->mAngle;
-            actor->mParentPcId = prm->mParentPcId;
-            actor->mSubtype = prm->mSubtype;
-            actor->mGbaName = prm->mGbaName;
-            actor->mScale.set(prm->mScale.x * 0.1f, prm->mScale.y * 0.1f, prm->mScale.z * 0.1f);
-            actor->mSetId = prm->mSetId;
+            actor->parentActorID = prm->mParentPcId;
+            actor->subtype = prm->mSubtype;
+            actor->gbaName = prm->mGbaName;
+            actor->scale.set(prm->mScale.x * 0.1f, prm->mScale.y * 0.1f, prm->mScale.z * 0.1f);
+            actor->setID = prm->mSetId;
             actor->home.roomNo = prm->mRoomNo;
         }
 
         actor->old = actor->home;
         actor->current = actor->home;
-        actor->mEyePos = actor->home.pos;
-        actor->mMaxFallSpeed = -100.0f;
-        actor->mAttentionInfo.mDistances[0] = 1;
-        actor->mAttentionInfo.mDistances[1] = 2;
-        actor->mAttentionInfo.mDistances[2] = 3;
-        actor->mAttentionInfo.mDistances[3] = 7;
-        actor->mAttentionInfo.mDistances[4] = 8;
-        actor->mAttentionInfo.mDistances[7] = 15;
-        actor->mAttentionInfo.mDistances[5] = 16;
-        actor->mAttentionInfo.mDistances[6] = 16;
-        actor->mAttentionInfo.mPosition = actor->home.pos;
-        dKy_tevstr_init(&actor->mTevStr, actor->home.roomNo, 0xFF);
+        actor->eyePos = actor->home.pos;
+        actor->maxFallSpeed = -100.0f;
+        actor->attention_info.distances[0] = 1;
+        actor->attention_info.distances[1] = 2;
+        actor->attention_info.distances[2] = 3;
+        actor->attention_info.distances[3] = 7;
+        actor->attention_info.distances[4] = 8;
+        actor->attention_info.distances[7] = 15;
+        actor->attention_info.distances[5] = 16;
+        actor->attention_info.distances[6] = 16;
+        actor->attention_info.position = actor->home.pos;
+        dKy_tevstr_init(&actor->tevStr, actor->home.roomNo, 0xFF);
     }
 
-    s32 status = fpcMtd_Create((process_method_class*)actor->mSubMtd, actor);
+    s32 status = fpcMtd_Create((process_method_class*)actor->sub_method, actor);
     if (status == cPhs_COMPLEATE_e) {
         s32 priority = fpcLf_GetPriority(actor);
-        fopDwTg_ToDrawQ(&actor->mDwTg, priority);
+        fopDwTg_ToDrawQ(&actor->draw_tag, priority);
     }
 
     return status;
diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp
index 12dab0984..8714a8543 100644
--- a/src/f_op/f_op_actor_mng.cpp
+++ b/src/f_op/f_op_actor_mng.cpp
@@ -414,20 +414,20 @@ bool fopAcM_entrySolidHeap(fopAc_ac_c* i_this, heapCallbackFunc createHeapCB, u3
 
 /* 800250E4-80025100       .text fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff */
 void fopAcM_setCullSizeBox(fopAc_ac_c* i_this, f32 minX, f32 minY, f32 minZ, f32 maxX, f32 maxY, f32 maxZ) {
-    i_this->mCull.mBox.mMin.x = minX;
-    i_this->mCull.mBox.mMin.y = minY;
-    i_this->mCull.mBox.mMin.z = minZ;
-    i_this->mCull.mBox.mMax.x = maxX;
-    i_this->mCull.mBox.mMax.y = maxY;
-    i_this->mCull.mBox.mMax.z = maxZ;
+    i_this->cull.box.min.x = minX;
+    i_this->cull.box.min.y = minY;
+    i_this->cull.box.min.z = minZ;
+    i_this->cull.box.max.x = maxX;
+    i_this->cull.box.max.y = maxY;
+    i_this->cull.box.max.z = maxZ;
 }
 
 /* 80025100-80025114       .text fopAcM_setCullSizeSphere__FP10fopAc_ac_cffff */
 void fopAcM_setCullSizeSphere(fopAc_ac_c* i_this, f32 x, f32 y, f32 z, f32 r) {
-    i_this->mCull.mSphere.mCenter.x = x;
-    i_this->mCull.mSphere.mCenter.y = y;
-    i_this->mCull.mSphere.mCenter.z = z;
-    i_this->mCull.mSphere.mRadius = r;
+    i_this->cull.sphere.center.x = x;
+    i_this->cull.sphere.center.y = y;
+    i_this->cull.sphere.center.z = z;
+    i_this->cull.sphere.radius = r;
 }
 
 /* 80025114-80025144       .text fopAcM_addAngleY__FP10fopAc_ac_css */
@@ -602,11 +602,11 @@ s32 fopAcM_cullingCheck(fopAc_ac_c* i_this) {
             fopAc_cullSizeBox& cullBox = l_cullSizeBox[fopAcM_CULLSIZE_IDX(fopAcM_GetCullSize(i_this))];
             if (fopAcM_getCullSizeFar(i_this) > 0.0f) {
                 mDoLib_clipper::changeFar(cullFar * mDoLib_clipper::getFar());
-                s32 ret = mDoLib_clipper::clip(pMtx, &cullBox.mMax, &cullBox.mMin);
+                s32 ret = mDoLib_clipper::clip(pMtx, &cullBox.max, &cullBox.min);
                 mDoLib_clipper::resetFar();
                 return ret;
             } else {
-                return mDoLib_clipper::clip(pMtx, &cullBox.mMax, &cullBox.mMin);
+                return mDoLib_clipper::clip(pMtx, &cullBox.max, &cullBox.min);
             }
         }
     } else { // Sphere
@@ -626,14 +626,14 @@ s32 fopAcM_cullingCheck(fopAc_ac_c* i_this) {
             fopAc_cullSizeSphere& cullSphere = l_cullSizeSphere[fopAcM_CULLSIZE_Q_IDX(fopAcM_GetCullSize(i_this))];
             if (fopAcM_getCullSizeFar(i_this) > 0.0f) {
                 mDoLib_clipper::changeFar(cullFar * mDoLib_clipper::getFar());
-                f32 radius = cullSphere.mRadius;
-                Vec center = cullSphere.mCenter;
+                f32 radius = cullSphere.radius;
+                Vec center = cullSphere.center;
                 s32 ret = mDoLib_clipper::clip(pMtx, center, radius);
                 mDoLib_clipper::resetFar();
                 return ret;
             } else {
-                f32 radius = cullSphere.mRadius;
-                return mDoLib_clipper::clip(pMtx, cullSphere.mCenter, radius);
+                f32 radius = cullSphere.radius;
+                return mDoLib_clipper::clip(pMtx, cullSphere.center, radius);
             }
         }
     }
@@ -1087,7 +1087,7 @@ void* fopAcM_fastCreateItem(cXyz* pos, int i_itemNo, int roomNo, csXyz* rot, cXy
             if (item) {
                 item->speedF = speedF * (1.0f + cM_rndFX(0.3f));
                 item->speed.y = speedY * (1.0f + cM_rndFX(0.2f));
-                item->mGravity = gravity;
+                item->gravity = gravity;
             }
         }
         // Fall-through
@@ -1103,7 +1103,7 @@ void* fopAcM_fastCreateItem(cXyz* pos, int i_itemNo, int roomNo, csXyz* rot, cXy
         if (item) {
             item->speedF = speedF;
             item->speed.y = speedY;
-            item->mGravity = gravity;
+            item->gravity = gravity;
         }
         return item;
     }
@@ -1113,7 +1113,7 @@ void* fopAcM_fastCreateItem(cXyz* pos, int i_itemNo, int roomNo, csXyz* rot, cXy
 BOOL stealItem_CB(void* actor) {
     if (actor) {
         daItem_c* item = (daItem_c*)actor;
-        item->mScale.setall(1.0f);
+        item->scale.setall(1.0f);
         item->setFlag(daItem_c::FLAG_HOOK);
     }
     return TRUE;
@@ -1239,7 +1239,7 @@ void fopAcM_createWarpFlower(cXyz* p_pos, csXyz* p_angle, int i_roomNo, u8 param
 fopAc_ac_c * enemySearchJugge(void* ptr, void*) {
     if (ptr != NULL && fopAc_IsActor(ptr)) {
         fopAc_ac_c * i_ac = (fopAc_ac_c *)ptr;
-        if (i_ac->mGroup == fopAc_ENEMY_e)
+        if (i_ac->group == fopAc_ENEMY_e)
             return i_ac;
     }
     return NULL;
@@ -1265,7 +1265,7 @@ s32 fopAcM_createDisappear(fopAc_ac_c* i_actor, cXyz* p_pos, u8 i_scale, u8 i_he
     u32 params = (i_itemBitNo & 0xFF) << 0x10 | (i_scale & 0xFF) << 0x08 | i_health & 0xFF;
     fopAc_ac_c* disappear = (fopAc_ac_c*)fopAcM_fastCreate(PROC_DISAPPEAR, params, p_pos, fopAcM_GetRoomNo(i_actor), fopAcM_GetAngle_p(i_actor));
     if (disappear) {
-        disappear->mItemTableIdx = i_actor->mItemTableIdx;
+        disappear->itemTableIdx = i_actor->itemTableIdx;
     }
     return fopAcM_GetID(disappear);
 }
@@ -1331,7 +1331,7 @@ void fopAcM_cancelCarryNow(fopAc_ac_c* i_this) {
         fopAcM_setRoomLayer(i_this, fopAcM_GetRoomNo(i_this));
         i_this->shape_angle.z = 0;
 
-        if (dComIfGp_event_runCheck() && i_this->mGroup != fopAc_ENEMY_e) {
+        if (dComIfGp_event_runCheck() && i_this->group != fopAc_ENEMY_e) {
             fopAcM_OnStatus(i_this, fopAcStts_UNK800_e);
         }
     }
@@ -1341,10 +1341,10 @@ void fopAcM_cancelCarryNow(fopAc_ac_c* i_this) {
 BOOL fopAcM_viewCutoffCheck(fopAc_ac_c* actor, f32 param_2) {
     if (param_2 > 0.0f) {
         camera_class* camera = dComIfGp_getCamera(0);
-        cXyz delta = (camera->mLookat.mEye - actor->mEyePos);
+        cXyz delta = (camera->mLookat.mEye - actor->eyePos);
         if (delta.abs() > param_2) {
             dBgS_LinChk linChk;
-            linChk.Set(&camera->mLookat.mEye, &actor->mEyePos, actor);
+            linChk.Set(&camera->mLookat.mEye, &actor->eyePos, actor);
             return dComIfG_Bgsp()->LineCross(&linChk);
         }
     }
@@ -1365,7 +1365,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->mSubtype);
+    const char * pProcNameString = dStage_getName2(fopAcM_GetProfName(i_this), i_this->subtype);
     if (pProcNameString != NULL)
         return pProcNameString;
     return "UNKOWN";
@@ -1380,7 +1380,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->mSubtype && (Prm->mParamMask == 0 || Prm->mParameter == (fopAcM_GetParam(it) & Prm->mParamMask)))
+    if (inf->mProcName == fopAcM_GetProfName(it) && inf->mSubtype == it->subtype && (Prm->mParamMask == 0 || Prm->mParameter == (fopAcM_GetParam(it) & Prm->mParamMask)))
         return it;
 
     return NULL;
@@ -1430,9 +1430,9 @@ void fopAcM_setGbaName(fopAc_ac_c* i_this, u8 itemNo, u8 gbaName0, u8 gbaName1)
         (itemNo == dItem_BOW_e && (dComIfGs_checkGetItem(dItem_MAGIC_ARROW_e) || dComIfGs_checkGetItem(dItem_LIGHT_ARROW_e))) ||
         (itemNo == dItem_MAGIC_ARROW_e && dComIfGs_checkGetItem(dItem_LIGHT_ARROW_e))
     )
-        i_this->mGbaName = gbaName1;
+        i_this->gbaName = gbaName1;
     else
-        i_this->mGbaName = gbaName0;
+        i_this->gbaName = gbaName0;
 }
 
 // Unused function, only exists in debug.
diff --git a/src/f_op/f_op_camera.cpp b/src/f_op/f_op_camera.cpp
index a5675a26f..7ec04c4e9 100644
--- a/src/f_op/f_op_camera.cpp
+++ b/src/f_op/f_op_camera.cpp
@@ -42,7 +42,7 @@ s32 fopCam_Execute(camera_class* camera) {
 s32 fopCam_IsDelete(camera_class* camera) {
     s32 ret = fpcMtd_IsDelete((process_method_class*)camera->mpMtd, camera);
     if (ret == 1)
-        fopDwTg_DrawQTo(&camera->mDwTg);
+        fopDwTg_DrawQTo(&camera->draw_tag);
     return ret;
 }
 
@@ -50,7 +50,7 @@ s32 fopCam_IsDelete(camera_class* camera) {
 s32 fopCam_Delete(camera_class* camera) {
     s32 ret = fpcMtd_Delete((process_method_class*)camera->mpMtd, camera);
     if (ret == 1)
-        fopDwTg_DrawQTo(&camera->mDwTg);
+        fopDwTg_DrawQTo(&camera->draw_tag);
     return ret;
 }
 
@@ -61,9 +61,9 @@ s32 fopCam_Create(void* pProc) {
     if (fpcM_IsFirstCreating(pProc)) {
         camera_process_profile_definition* profile =
             (camera_process_profile_definition*)fpcM_GetProfile(pProc);
-        camera->mpMtd = profile->mSubMtd;
+        camera->mpMtd = profile->sub_method;
 
-        fopDwTg_Init(&camera->mDwTg, camera);
+        fopDwTg_Init(&camera->draw_tag, camera);
         u32* append = (u32*)fpcM_GetAppend(camera);
 
         if (append) {
@@ -71,10 +71,10 @@ s32 fopCam_Create(void* pProc) {
         }
     }
 
-    s32 ret = fpcMtd_Create(&camera->mpMtd->mBase, camera);
+    s32 ret = fpcMtd_Create(&camera->mpMtd->base, camera);
     if (ret == cPhs_COMPLEATE_e) {
         s32 priority = fpcLf_GetPriority(camera);
-        fopDwTg_ToDrawQ(&camera->mDwTg, priority);
+        fopDwTg_ToDrawQ(&camera->draw_tag, priority);
     }
 
     return ret;
diff --git a/src/f_op/f_op_camera_mng.cpp b/src/f_op/f_op_camera_mng.cpp
index f5361e17a..9cb8dbc2d 100644
--- a/src/f_op/f_op_camera_mng.cpp
+++ b/src/f_op/f_op_camera_mng.cpp
@@ -11,7 +11,7 @@ static u32 l_fopCamM_id[4];
 
 /* 80029468-80029470       .text fopCamM_GetParam__FP12camera_class */
 u32 fopCamM_GetParam(camera_class* i_this) {
-    return i_this->mBase.mParameters;
+    return i_this->base.mParameters;
 }
 
 /* 80029470-800294D4       .text fopCamM_Create__FisPv */
diff --git a/src/f_op/f_op_kankyo.cpp b/src/f_op/f_op_kankyo.cpp
index 841b74ad9..768cf047a 100644
--- a/src/f_op/f_op_kankyo.cpp
+++ b/src/f_op/f_op_kankyo.cpp
@@ -17,7 +17,7 @@ static int fopKy_Draw(void* i_ky) {
     kankyo_class* i_this = (kankyo_class*)i_ky;
 
     if (!dMenu_flag()) {
-        ret = fpcLf_DrawMethod((leafdraw_method_class*)i_this->mSubMtd, i_this);
+        ret = fpcLf_DrawMethod((leafdraw_method_class*)i_this->sub_method, i_this);
     }
 
     return ret;
@@ -29,7 +29,7 @@ static int fopKy_Execute(void* i_ky) {
     kankyo_class* i_this = (kankyo_class*)i_ky;
 
     if (!dScnPly_ply_c::isPause() && (!dMenu_flag() || fpcM_GetName(i_ky) == PROC_ENVSE || fpcM_GetName(i_ky) == PROC_LEVEL_SE)) {
-        ret = fpcMtd_Execute((process_method_class*)i_this->mSubMtd, i_ky);
+        ret = fpcMtd_Execute((process_method_class*)i_this->sub_method, i_ky);
     }
 
     return ret;
@@ -40,9 +40,9 @@ static int fopKy_IsDelete(void* i_ky) {
     int ret;
     kankyo_class* i_this = (kankyo_class*)i_ky;
 
-    ret = fpcMtd_IsDelete((process_method_class*)i_this->mSubMtd, i_this);
+    ret = fpcMtd_IsDelete((process_method_class*)i_this->sub_method, i_this);
     if (ret == 1) {
-        fopDwTg_DrawQTo(&i_this->mDwTg);
+        fopDwTg_DrawQTo(&i_this->draw_tag);
     }
 
     return ret;
@@ -52,8 +52,8 @@ static int fopKy_IsDelete(void* i_ky) {
 static int fopKy_Delete(void* i_ky) {
     kankyo_class* i_this = (kankyo_class*)i_ky;
 
-    int ret = fpcMtd_Delete((process_method_class*)i_this->mSubMtd, i_this);
-    fopDwTg_DrawQTo(&i_this->mDwTg);
+    int ret = fpcMtd_Delete((process_method_class*)i_this->sub_method, i_this);
+    fopDwTg_DrawQTo(&i_this->draw_tag);
 
     return ret;
 }
@@ -68,9 +68,9 @@ static int fopKy_Create(void* i_ky) {
         kankyo_process_profile_definition* profile = (kankyo_process_profile_definition*)fpcM_GetProfile(i_ky);
 
         i_this->mBsType = fpcBs_MakeOfType(&fopKy_KANKYO_TYPE);
-        i_this->mSubMtd = profile->mSubMtd;
+        i_this->sub_method = profile->sub_method;
 
-        fopDwTg_Init(&i_this->mDwTg, i_this);
+        fopDwTg_Init(&i_this->draw_tag, i_this);
         fopKyM_prm_class* append = (fopKyM_prm_class*)fopKyM_GetAppend(i_this);
 
         if (append != NULL) {
@@ -80,10 +80,10 @@ static int fopKy_Create(void* i_ky) {
         }
     }
 
-    int ret = fpcMtd_Create((process_method_class*)i_this->mSubMtd, i_this);
+    int ret = fpcMtd_Create((process_method_class*)i_this->sub_method, i_this);
     if (ret == cPhs_COMPLEATE_e) {
         s32 priority = fpcLf_GetPriority(i_this);
-        fopDwTg_ToDrawQ(&i_this->mDwTg, priority);
+        fopDwTg_ToDrawQ(&i_this->draw_tag, priority);
     }
 
     return ret;
diff --git a/src/f_op/f_op_msg.cpp b/src/f_op/f_op_msg.cpp
index d8a24c64b..da1e83008 100644
--- a/src/f_op/f_op_msg.cpp
+++ b/src/f_op/f_op_msg.cpp
@@ -12,7 +12,7 @@
 /* 8002A688-8002A6B0       .text fopMsg_Draw__FPv */
 int fopMsg_Draw(void* i_this) {
     msg_class* _this = static_cast<msg_class*>(i_this);
-    return fpcLf_DrawMethod((leafdraw_method_class*)_this->mSubMtd, i_this);
+    return fpcLf_DrawMethod((leafdraw_method_class*)_this->sub_method, i_this);
 }
 
 /* 8002A6B0-8002A6E8       .text fopMsg_Execute__FPv */
@@ -21,7 +21,7 @@ int fopMsg_Execute(void* i_this) {
 
     int stat = 1;
     if (!dScnPly_ply_c::isPause()) {
-        stat = fpcMtd_Execute((process_method_class*)_this->mSubMtd, i_this);
+        stat = fpcMtd_Execute((process_method_class*)_this->sub_method, i_this);
     }
 
     return stat;
@@ -31,9 +31,9 @@ int fopMsg_Execute(void* i_this) {
 int fopMsg_IsDelete(void* i_this) {
     msg_class* _this = static_cast<msg_class*>(i_this);
 
-    int stat = fpcMtd_IsDelete((process_method_class*)_this->mSubMtd, i_this);
+    int stat = fpcMtd_IsDelete((process_method_class*)_this->sub_method, i_this);
     if (stat == 1) {
-        fopDwTg_DrawQTo(&_this->mDwTg);
+        fopDwTg_DrawQTo(&_this->draw_tag);
     }
 
     return stat;
@@ -43,8 +43,8 @@ int fopMsg_IsDelete(void* i_this) {
 int fopMsg_Delete(void* i_this) {
     msg_class* _this = static_cast<msg_class*>(i_this);
 
-    int stat = fpcMtd_Delete((process_method_class*)_this->mSubMtd, i_this);
-    fopDwTg_DrawQTo(&_this->mDwTg);
+    int stat = fpcMtd_Delete((process_method_class*)_this->sub_method, i_this);
+    fopDwTg_DrawQTo(&_this->draw_tag);
 
     return stat;
 }
@@ -58,8 +58,8 @@ int fopMsg_Create(void* i_this) {
     if (fpcM_IsFirstCreating(_this)) {
         msg_process_profile_definition* profile = (msg_process_profile_definition*)fpcM_GetProfile(i_this);
         _this->mMsgType = fpcBs_MakeOfType(&fopMsg_MSG_TYPE);
-        _this->mSubMtd = profile->mSubMtd;
-        fopDwTg_Init(&_this->mDwTg, _this);
+        _this->sub_method = profile->sub_method;
+        fopDwTg_Init(&_this->draw_tag, _this);
         fopMsg_prm_class* prm = fopMsgM_GetAppend(_this);
         if (prm != NULL) {
             _this->mpActor = prm->mpActor;
@@ -70,10 +70,10 @@ int fopMsg_Create(void* i_this) {
         }
     }
 
-    int status = fpcMtd_Create((process_method_class*)_this->mSubMtd, _this);
+    int status = fpcMtd_Create((process_method_class*)_this->sub_method, _this);
     if (status == cPhs_COMPLEATE_e) {
         s32 priority = fpcLf_GetPriority(_this);
-        fopDwTg_ToDrawQ(&_this->mDwTg, priority);
+        fopDwTg_ToDrawQ(&_this->draw_tag, priority);
     }
 
     return status;
diff --git a/src/f_op/f_op_overlap.cpp b/src/f_op/f_op_overlap.cpp
index e6b0800db..dfe819295 100644
--- a/src/f_op/f_op_overlap.cpp
+++ b/src/f_op/f_op_overlap.cpp
@@ -10,22 +10,22 @@
 
 static s32 fopOvlp_Draw(void* i_ovlp) {
     overlap_task_class* i_this = (overlap_task_class*)i_ovlp;
-    return fpcLf_DrawMethod((leafdraw_method_class*)i_this->mSubMtd, i_this);
+    return fpcLf_DrawMethod((leafdraw_method_class*)i_this->sub_method, i_this);
 }
 
 static s32 fopOvlp_Execute(void* i_ovlp) {
     overlap_task_class* i_this = (overlap_task_class*)i_ovlp;
-    return fpcMtd_Execute((process_method_class*)i_this->mSubMtd, i_this);
+    return fpcMtd_Execute((process_method_class*)i_this->sub_method, i_this);
 }
 
 static s32 fopOvlp_IsDelete(void* i_ovlp) {
     overlap_task_class* i_this = (overlap_task_class*)i_ovlp;
-    return fpcMtd_IsDelete((process_method_class*)i_this->mSubMtd, i_this);
+    return fpcMtd_IsDelete((process_method_class*)i_this->sub_method, i_this);
 }
 
 static s32 fopOvlp_Delete(void* i_ovlp) {
     overlap_task_class* i_this = (overlap_task_class*)i_ovlp;
-    return fpcMtd_Delete((process_method_class*)i_this->mSubMtd, i_this);
+    return fpcMtd_Delete((process_method_class*)i_this->sub_method, i_this);
 }
 
 static s32 fopOvlp_Create(void* i_ovlp) {
@@ -35,11 +35,11 @@ static s32 fopOvlp_Create(void* i_ovlp) {
         overlap_process_profile_definition* profile = (overlap_process_profile_definition*)fpcM_GetProfile(i_this);
 
         cReq_Create(&i_this->mRq, 1);
-        i_this->mSubMtd = profile->mSubMtd;
+        i_this->sub_method = profile->sub_method;
         i_this->mScenePId = fpcM_ERROR_PROCESS_ID_e;
     }
 
-    return fpcMtd_Create((process_method_class*)i_this->mSubMtd, i_this);
+    return fpcMtd_Create((process_method_class*)i_this->sub_method, i_this);
 }
 
 leafdraw_method_class g_fopOvlp_Method = {
diff --git a/src/f_op/f_op_scene.cpp b/src/f_op/f_op_scene.cpp
index 8e4e304a2..6ac67d5e6 100644
--- a/src/f_op/f_op_scene.cpp
+++ b/src/f_op/f_op_scene.cpp
@@ -33,13 +33,13 @@ static s32 fopScn_Create(void* i_this) {
     scene_class* scene = static_cast<scene_class*>(i_this);
     if (fpcM_IsFirstCreating(i_this)) {
         scene_process_profile_definition* profile = (scene_process_profile_definition*)fpcM_GetProfile(i_this);
-        scene->mpMtd = profile->mpMtd;
+        scene->mpMtd = profile->sub_method;
         fopScnTg_Init(&scene->mScnTg, i_this);
         fopScnTg_ToQueue(&scene->mScnTg);
 
         u32* append = (u32*)fpcM_GetAppend(i_this);
         if (append != NULL) {
-            scene->mBase.mBase.mParameters = *append;
+            scene->base.base.mParameters = *append;
         }
     }
 
diff --git a/src/f_op/f_op_scene_pause.cpp b/src/f_op/f_op_scene_pause.cpp
index ee8445577..71cb3d633 100644
--- a/src/f_op/f_op_scene_pause.cpp
+++ b/src/f_op/f_op_scene_pause.cpp
@@ -19,7 +19,7 @@ int fopScnPause_Enable(scene_class* i_scene) {
 
 int fopScnPause_Disable(scene_class* i_scene) {
     if (i_scene) {
-        void* tmp = (void*)i_scene->mBase.mBase.mLyTg.mpLayer->mpPcNode;
+        void* tmp = (void*)i_scene->base.base.mLyTg.mpLayer->mpPcNode;
 
         if (!tmp) {
             fpcM_PauseDisable(i_scene, 1);
diff --git a/src/f_op/f_op_scene_req.cpp b/src/f_op/f_op_scene_req.cpp
index 2c3b170e7..5545d6333 100644
--- a/src/f_op/f_op_scene_req.cpp
+++ b/src/f_op/f_op_scene_req.cpp
@@ -59,7 +59,7 @@ static void fopScnRq_Execute(scene_request_class* i_sceneReq) {
 static int fopScnRq_PostMethod(void* param_1, scene_request_class* i_sceneReq) {
     fopScnPause_Enable((scene_class*)param_1);
     if (i_sceneReq->mFadeRequest) {
-        fopOvlpM_ToldAboutID(((scene_class*)param_1)->mBase.mBase.mBsPcId);
+        fopOvlpM_ToldAboutID(((scene_class*)param_1)->base.base.mBsPcId);
     }
     return 1;
 }
diff --git a/src/f_op/f_op_view.cpp b/src/f_op/f_op_view.cpp
index 542f7c4ca..7f0995a6f 100644
--- a/src/f_op/f_op_view.cpp
+++ b/src/f_op/f_op_view.cpp
@@ -7,20 +7,20 @@
 #include "f_pc/f_pc_manager.h"
 
 void fopVw_Draw(view_class* i_this) {
-    fpcLf_DrawMethod(i_this->mSubMtd, i_this);
+    fpcLf_DrawMethod(i_this->sub_method, i_this);
 }
 
 void fopVw_Execute(view_class* i_this) {
-    fpcMtd_Execute(&i_this->mSubMtd->mBase, i_this);
+    fpcMtd_Execute(&i_this->sub_method->base, i_this);
 }
 
 s32 fopVw_IsDelete(void* i_this) {
     view_class* _this = (view_class*)i_this;
-    return fpcMtd_IsDelete(&_this->mSubMtd->mBase, _this);
+    return fpcMtd_IsDelete(&_this->sub_method->base, _this);
 }
 
 s32 fopVw_Delete(view_class* i_this) {
-    return fpcMtd_Delete(&i_this->mSubMtd->mBase, i_this);
+    return fpcMtd_Delete(&i_this->sub_method->base, i_this);
 }
 
 s32 fopVw_Create(void* i_this) {
@@ -28,10 +28,10 @@ s32 fopVw_Create(void* i_this) {
 
     view_process_profile_definition* pProf =
         (view_process_profile_definition*)fpcM_GetProfile(_this);
-    _this->mSubMtd = pProf->mSubMtd;
+    _this->sub_method = pProf->sub_method;
     _this->field_0xc4 = pProf->unk28;
 
-    return fpcMtd_Create(&_this->mSubMtd->mBase, _this);
+    return fpcMtd_Create(&_this->sub_method->base, _this);
 }
 
 leafdraw_method_class g_fopVw_Method = {
diff --git a/src/f_pc/f_pc_base.cpp b/src/f_pc/f_pc_base.cpp
index 88f2fc461..cf99f378d 100644
--- a/src/f_pc/f_pc_base.cpp
+++ b/src/f_pc/f_pc_base.cpp
@@ -105,7 +105,7 @@ base_process_class* fpcBs_Create(s16 i_profName, unsigned int i_procID, void* i_
         procClass->mBsType = fpcBs_MakeOfType(&g_fpcBs_type);
         procClass->mProcName = procProfDef->mProcName;
         fpcPause_Init(procClass);
-        procClass->mpPcMtd = procProfDef->mSubMtd;
+        procClass->mpPcMtd = procProfDef->sub_method;
         procClass->mpProf = procProfDef;
         procClass->mpUserData = i_data;
         procClass->mParameters = procProfDef->mParameters;
diff --git a/src/f_pc/f_pc_create_iter.cpp b/src/f_pc/f_pc_create_iter.cpp
index 8ca6f8dc0..a61c642bf 100644
--- a/src/f_pc/f_pc_create_iter.cpp
+++ b/src/f_pc/f_pc_create_iter.cpp
@@ -27,7 +27,7 @@ void* fpcCtIt_Judge(fpcCtIt_JudgeFunc i_judgeFunc, void* i_data) {
 
 /* 8003CC80-8003CCD4       .text fpcCtIt_filter_JudgeInLayer__FP10create_tagP16fpcCtIt_jilprm_c */
 void* fpcCtIt_filter_JudgeInLayer(create_tag* i_createTag, fpcCtIt_jilprm_c* i_iterData) {
-    create_request* create_req = static_cast<create_request*>(i_createTag->mBase.mpTagData);
+    create_request* create_req = static_cast<create_request*>(i_createTag->base.mpTagData);
     if (create_req->mpLayer->mLayerID == i_iterData->mLayerID) {
         return i_iterData->mFunc((node_class*)create_req->mpRes, i_iterData->mpUserData);
     } else {
diff --git a/src/f_pc/f_pc_create_req.cpp b/src/f_pc/f_pc_create_req.cpp
index a9e6f2b12..14b999843 100644
--- a/src/f_pc/f_pc_create_req.cpp
+++ b/src/f_pc/f_pc_create_req.cpp
@@ -14,7 +14,7 @@
 
 /* 8003CD0C-8003CD28       .text fpcCtRq_isCreatingByID__FP10create_tagPUi */
 bool fpcCtRq_isCreatingByID(create_tag* i_createTag, unsigned int* i_procID) {
-    create_request* pReq = static_cast<create_request*>(i_createTag->mBase.mpTagData);
+    create_request* pReq = static_cast<create_request*>(i_createTag->base.mpTagData);
     return pReq->mBsPcId == *i_procID;
 }
 
@@ -25,7 +25,7 @@ BOOL fpcCtRq_IsCreatingByID(unsigned int i_id) {
 
 /* 8003CD60-8003CD9C       .text fpcCtRq_CreateQTo__FP14create_request */
 void fpcCtRq_CreateQTo(create_request* i_request) {
-    fpcCtTg_CreateQTo(&i_request->mBase);
+    fpcCtTg_CreateQTo(&i_request->base);
     fpcLy_CreatedMesg(i_request->mpLayer);
     fpcLy_CancelQTo(&i_request->mMtdTg);
 }
@@ -34,7 +34,7 @@ void fpcCtRq_CreateQTo(create_request* i_request) {
 void fpcCtRq_ToCreateQ(create_request* i_request) {
     fpcLy_CreatingMesg(i_request->mpLayer);
     fpcLy_ToCancelQ(i_request->mpLayer, &i_request->mMtdTg);
-    fpcCtTg_ToCreateQ(&i_request->mBase);
+    fpcCtTg_ToCreateQ(&i_request->base);
 }
 
 /* 8003CDE0-8003CE54       .text fpcCtRq_Delete__FP14create_request */
@@ -117,7 +117,7 @@ create_request* fpcCtRq_Create(layer_class* i_layer, u32 i_size, create_request_
     create_request* pReq = (create_request*)cMl::memalignB(-4, i_size);
 
     if (pReq != NULL) {
-        fpcCtTg_Init(&pReq->mBase, pReq);
+        fpcCtTg_Init(&pReq->base, pReq);
         fpcMtdTg_Init(&pReq->mMtdTg, (process_method_tag_func)fpcCtRq_Cancel, pReq);
         pReq->mpLayer = i_layer;
         pReq->mpCtRqMtd = i_CtRqMethods;
diff --git a/src/f_pc/f_pc_create_tag.cpp b/src/f_pc/f_pc_create_tag.cpp
index 5b7d31b52..21eaa2015 100644
--- a/src/f_pc/f_pc_create_tag.cpp
+++ b/src/f_pc/f_pc_create_tag.cpp
@@ -9,16 +9,16 @@ node_list_class g_fpcCtTg_Queue = {NULL, NULL, 0};
 
 /* 8003D078-8003D0A4       .text fpcCtTg_ToCreateQ__FP10create_tag */
 void fpcCtTg_ToCreateQ(create_tag* i_createTag) {
-    cTg_Addition(&g_fpcCtTg_Queue, &i_createTag->mBase);
+    cTg_Addition(&g_fpcCtTg_Queue, &i_createTag->base);
 }
 
 /* 8003D0A4-8003D0C4       .text fpcCtTg_CreateQTo__FP10create_tag */
 void fpcCtTg_CreateQTo(create_tag* i_createTag) {
-    cTg_SingleCut(&i_createTag->mBase);
+    cTg_SingleCut(&i_createTag->base);
 }
 
 /* 8003D0C4-8003D0E8       .text fpcCtTg_Init__FP10create_tagPv */
 s32 fpcCtTg_Init(create_tag* i_createTag, void* i_data) {
-    cTg_Create(&i_createTag->mBase, i_data);
+    cTg_Create(&i_createTag->base, i_data);
     return 1;
 }
diff --git a/src/f_pc/f_pc_delete_tag.cpp b/src/f_pc/f_pc_delete_tag.cpp
index 2789c0f36..cb2d93bb5 100644
--- a/src/f_pc/f_pc_delete_tag.cpp
+++ b/src/f_pc/f_pc_delete_tag.cpp
@@ -23,12 +23,12 @@ BOOL fpcDtTg_IsEmpty() {
 /* 8003D188-8003D1BC       .text fpcDtTg_ToDeleteQ__FP16delete_tag_class */
 void fpcDtTg_ToDeleteQ(delete_tag_class* i_deleteTag) {
     i_deleteTag->mTimer = 1;
-    cTg_Addition(&g_fpcDtTg_Queue, &i_deleteTag->mBase);
+    cTg_Addition(&g_fpcDtTg_Queue, &i_deleteTag->base);
 }
 
 /* 8003D1BC-8003D1DC       .text fpcDtTg_DeleteQTo__FP16delete_tag_class */
 void fpcDtTg_DeleteQTo(delete_tag_class* i_deleteTag) {
-    cTg_SingleCut(&i_deleteTag->mBase);
+    cTg_SingleCut(&i_deleteTag->base);
 }
 
 /* 8003D1DC-8003D25C       .text fpcDtTg_Do__FP16delete_tag_classPFPv_i */
@@ -36,7 +36,7 @@ s32 fpcDtTg_Do(delete_tag_class* i_deleteTag, delete_tag_func i_func) {
     if (i_deleteTag->mTimer <= 0) {
         s32 ret;
         fpcDtTg_DeleteQTo(i_deleteTag);
-        ret = i_func(i_deleteTag->mBase.mpTagData);
+        ret = i_func(i_deleteTag->base.mpTagData);
         if (ret == 0) {
             fpcDtTg_ToDeleteQ(i_deleteTag);
             return 0;
@@ -51,6 +51,6 @@ s32 fpcDtTg_Do(delete_tag_class* i_deleteTag, delete_tag_func i_func) {
 
 /* 8003D25C-8003D280       .text fpcDtTg_Init__FP16delete_tag_classPv */
 s32 fpcDtTg_Init(delete_tag_class* i_deleteTag, void* i_data) {
-    cTg_Create(&i_deleteTag->mBase, i_data);
+    cTg_Create(&i_deleteTag->base, i_data);
     return 1;
 }
diff --git a/src/f_pc/f_pc_deletor.cpp b/src/f_pc/f_pc_deletor.cpp
index a7872bb28..0b5faeaeb 100644
--- a/src/f_pc/f_pc_deletor.cpp
+++ b/src/f_pc/f_pc_deletor.cpp
@@ -57,7 +57,7 @@ s32 fpcDt_ToDeleteQ(base_process_class* i_proc) {
     if (i_proc->mUnk0 == 1) {
         return 0;
     } else {
-        if (cTg_IsUse(&i_proc->mDtTg.mBase) != 0) {
+        if (cTg_IsUse(&i_proc->mDtTg.base) != 0) {
             return 1;
         } else {
             if (fpcBs_Is_JustOfType(g_fpcNd_type, i_proc->mSubType)) {
diff --git a/src/f_pc/f_pc_executor.cpp b/src/f_pc/f_pc_executor.cpp
index cb330f408..de1754dfb 100644
--- a/src/f_pc/f_pc_executor.cpp
+++ b/src/f_pc/f_pc_executor.cpp
@@ -36,9 +36,9 @@ s32 fpcEx_Execute(base_process_class* i_proc) {
 /* 8003D690-8003D73C       .text fpcEx_ToLineQ__FP18base_process_class */
 s32 fpcEx_ToLineQ(base_process_class* i_proc) {
     layer_class* pLayer = i_proc->mLyTg.mpLayer;
-    base_process_class* pLayerPcNode = &pLayer->mpPcNode->mBase;
+    base_process_class* pLayerPcNode = &pLayer->mpPcNode->base;
 
-    if (pLayer->mLayerID == 0 || cTg_IsUse(&pLayerPcNode->mLnTg.mBase) == TRUE) {
+    if (pLayer->mLayerID == 0 || cTg_IsUse(&pLayerPcNode->mLnTg.base) == TRUE) {
         s32 ret = fpcLnTg_ToQueue(&i_proc->mLnTg, i_proc->mPi.mInfoCurr.mListID);
         if (ret == 0) {
             fpcLyTg_QueueTo(&i_proc->mLyTg);
diff --git a/src/f_pc/f_pc_fstcreate_req.cpp b/src/f_pc/f_pc_fstcreate_req.cpp
index a9d240940..59be9969a 100644
--- a/src/f_pc/f_pc_fstcreate_req.cpp
+++ b/src/f_pc/f_pc_fstcreate_req.cpp
@@ -11,7 +11,7 @@
 
 /* 80040520-80040570       .text fpcFCtRq_Do__FP19fast_create_request */
 s32 fpcFCtRq_Do(fast_create_request* i_createReq) {
-    if (i_createReq->mpFastCreateFunc != NULL && i_createReq->mpFastCreateFunc(i_createReq->mBase.mpRes, i_createReq->mpFastCreateData) == 0) {
+    if (i_createReq->mpFastCreateFunc != NULL && i_createReq->mpFastCreateFunc(i_createReq->base.mpRes, i_createReq->mpFastCreateData) == 0) {
         return cPhs_UNK3_e;
     } else {
         return cPhs_COMPLEATE_e;
@@ -40,8 +40,8 @@ base_process_class* fpcFCtRq_Request(layer_class* i_layer, s16 i_procTypeID,
             proc = fpcBs_Create(i_procTypeID, fpcBs_MakeOfId(), pData);
             if (proc != NULL) {
                 proc->mpCtRq = (struct create_request*)request;
-                request->mBase.mpRes = proc;
-                request->mBase.mBsPcId = proc->mBsPcId;
+                request->base.mpRes = proc;
+                request->base.mBsPcId = proc->mBsPcId;
                 if (fpcBs_SubCreate(proc) == 2) {
                     request->mpFastCreateFunc = i_createFunc;
                     request->mpFastCreateData = i_createData;
@@ -51,7 +51,7 @@ base_process_class* fpcFCtRq_Request(layer_class* i_layer, s16 i_procTypeID,
 #if VERSION == VERSION_JPN
             fpcCtRq_Delete(&request->mBase);
 #else
-            fpcCtRq_Cancel(&request->mBase);
+            fpcCtRq_Cancel(&request->base);
 #endif
         }
         return NULL;
diff --git a/src/f_pc/f_pc_leaf.cpp b/src/f_pc/f_pc_leaf.cpp
index b23ffefc8..94ffaef5b 100644
--- a/src/f_pc/f_pc_leaf.cpp
+++ b/src/f_pc/f_pc_leaf.cpp
@@ -25,19 +25,19 @@ s32 fpcLf_Draw(leafdraw_class* i_leaf) {
 
 /* 8003DCF8-8003DD20       .text fpcLf_Execute__FP14leafdraw_class */
 s32 fpcLf_Execute(leafdraw_class* i_leaf) {
-    return fpcMtd_Execute(&i_leaf->mpDrawMtd->mBase, i_leaf);
+    return fpcMtd_Execute(&i_leaf->mpDrawMtd->base, i_leaf);
 }
 
 /* 8003DD20-8003DD48       .text fpcLf_IsDelete__FP14leafdraw_class */
 s32 fpcLf_IsDelete(leafdraw_class* i_leaf) {
-    return fpcMtd_IsDelete(&i_leaf->mpDrawMtd->mBase, i_leaf);
+    return fpcMtd_IsDelete(&i_leaf->mpDrawMtd->base, i_leaf);
 }
 
 /* 8003DD48-8003DD8C       .text fpcLf_Delete__FP14leafdraw_class */
 s32 fpcLf_Delete(leafdraw_class* i_leaf) {
-    s32 ret = fpcMtd_Delete(&i_leaf->mpDrawMtd->mBase, i_leaf);
+    s32 ret = fpcMtd_Delete(&i_leaf->mpDrawMtd->base, i_leaf);
     if (ret == 1) {
-        i_leaf->mBase.mSubType = 0;
+        i_leaf->base.mSubType = 0;
     }
     return ret;
 }
@@ -47,14 +47,14 @@ int g_fpcLf_type;
 /* 8003DD8C-8003DE00       .text fpcLf_Create__FP14leafdraw_class */
 s32 fpcLf_Create(leafdraw_class* i_leaf) {
     leaf_process_profile_definition* profDef;
-    if (i_leaf->mBase.mInitState == 0) {
-        profDef = (leaf_process_profile_definition*)i_leaf->mBase.mpProf;
-        i_leaf->mpDrawMtd = profDef->mSubMtd;
-        i_leaf->mBase.mSubType = fpcBs_MakeOfType(&g_fpcLf_type);
+    if (i_leaf->base.mInitState == 0) {
+        profDef = (leaf_process_profile_definition*)i_leaf->base.mpProf;
+        i_leaf->mpDrawMtd = profDef->sub_method;
+        i_leaf->base.mSubType = fpcBs_MakeOfType(&g_fpcLf_type);
         fpcDwPi_Init(&i_leaf->mDwPi, profDef->mPriority);
         i_leaf->mbUnk0 = 0;
     }
-    return fpcMtd_Create(&i_leaf->mpDrawMtd->mBase, i_leaf);
+    return fpcMtd_Create(&i_leaf->mpDrawMtd->base, i_leaf);
 }
 
 leafdraw_method_class g_fpcLf_Method = {
diff --git a/src/f_pc/f_pc_line_tag.cpp b/src/f_pc/f_pc_line_tag.cpp
index 27cd0de99..1e41c8531 100644
--- a/src/f_pc/f_pc_line_tag.cpp
+++ b/src/f_pc/f_pc_line_tag.cpp
@@ -18,13 +18,13 @@ s32 fpcLnTg_Move(line_tag* i_lineTag, int i_newListID) {
 
 /* 800400D8-8004010C       .text fpcLnTg_QueueTo__FP8line_tag */
 void fpcLnTg_QueueTo(line_tag* i_lineTag) {
-    cTg_SingleCutFromTree(&i_lineTag->mBase);
+    cTg_SingleCutFromTree(&i_lineTag->base);
     i_lineTag->mLineListID = -1;
 }
 
 /* 8004010C-80040164       .text fpcLnTg_ToQueue__FP8line_tagi */
 s32 fpcLnTg_ToQueue(line_tag* i_lineTag, int lineListID) {
-    s32 ret = cTg_AdditionToTree(&g_fpcLn_Queue, lineListID, &i_lineTag->mBase);
+    s32 ret = cTg_AdditionToTree(&g_fpcLn_Queue, lineListID, &i_lineTag->base);
 
     if (ret) {
         i_lineTag->mLineListID = lineListID;
@@ -36,6 +36,6 @@ s32 fpcLnTg_ToQueue(line_tag* i_lineTag, int lineListID) {
 
 /* 80040164-80040198       .text fpcLnTg_Init__FP8line_tagPv */
 void fpcLnTg_Init(line_tag* i_lineTag, void* i_data) {
-    cTg_Create(&i_lineTag->mBase, i_data);
+    cTg_Create(&i_lineTag->base, i_data);
     i_lineTag->mLineListID = -1;
 }
diff --git a/src/f_pc/f_pc_node.cpp b/src/f_pc/f_pc_node.cpp
index 3fa23c9ba..216c1f6cb 100644
--- a/src/f_pc/f_pc_node.cpp
+++ b/src/f_pc/f_pc_node.cpp
@@ -28,7 +28,7 @@ s32 fpcNd_Execute(process_node_class* i_procNode) {
     s32 ret;
     layer_class* curLayer_p = fpcLy_CurrentLayer();
     fpcLy_SetCurrentLayer(&i_procNode->mLayer);
-    ret = fpcMtd_Execute(&i_procNode->mpNodeMtd->mBase, i_procNode);
+    ret = fpcMtd_Execute(&i_procNode->mpNodeMtd->base, i_procNode);
     fpcLy_SetCurrentLayer(curLayer_p);
     return ret;
 }
@@ -39,7 +39,7 @@ int g_fpcNd_type;
 void* fpcNd_IsCreatingFromUnder(void* i_procNode) {
     layer_class* layer;
     process_node_class* pProcNode = static_cast<process_node_class*>(i_procNode);
-    if (pProcNode != NULL && fpcBs_Is_JustOfType(g_fpcNd_type, pProcNode->mBase.mSubType) != FALSE) {
+    if (pProcNode != NULL && fpcBs_Is_JustOfType(g_fpcNd_type, pProcNode->base.mSubType) != FALSE) {
         layer = &pProcNode->mLayer;
         if (fpcLy_IsCreatingMesg(layer) == 0) {
             return (process_node_class*)fpcLyIt_Judge(
@@ -65,13 +65,13 @@ s32 fpcNd_IsDeleteTiming(process_node_class* i_procNode) {
 
 /* 8003F174-8003F19C       .text fpcNd_IsDelete__FP18process_node_class */
 s32 fpcNd_IsDelete(process_node_class* i_procNode) {
-    return fpcMtd_IsDelete(&i_procNode->mpNodeMtd->mBase, i_procNode);
+    return fpcMtd_IsDelete(&i_procNode->mpNodeMtd->base, i_procNode);
 }
 
 /* 8003F19C-8003F200       .text fpcNd_Delete__FP18process_node_class */
 s32 fpcNd_Delete(process_node_class* i_procNode) {
-    if ((fpcLy_IsDeletingMesg(&i_procNode->mLayer) == 0) && fpcMtd_Delete(&i_procNode->mpNodeMtd->mBase, i_procNode) == 1) {
-        i_procNode->mBase.mSubType = 0;
+    if ((fpcLy_IsDeletingMesg(&i_procNode->mLayer) == 0) && fpcMtd_Delete(&i_procNode->mpNodeMtd->base, i_procNode) == 1) {
+        i_procNode->base.mSubType = 0;
         return fpcLy_Delete(&i_procNode->mLayer);
     } else {
         return 0;
@@ -85,16 +85,16 @@ s32 fpcNd_Create(process_node_class* i_procNode) {
     process_node_class* pProcNode = (process_node_class*)i_procNode;
     layer_class* curLayer_p;
     s32 ret;
-    if (pProcNode->mBase.mInitState == 0) {
-        node_process_profile_definition* pProcProfileDef = (node_process_profile_definition*)pProcNode->mBase.mpProf;
-        pProcNode->mBase.mSubType = fpcBs_MakeOfType(&g_fpcNd_type);
-        pProcNode->mpNodeMtd = (nodedraw_method_class*)pProcProfileDef->mSubMtd;
+    if (pProcNode->base.mInitState == 0) {
+        node_process_profile_definition* pProcProfileDef = (node_process_profile_definition*)pProcNode->base.mpProf;
+        pProcNode->base.mSubType = fpcBs_MakeOfType(&g_fpcNd_type);
+        pProcNode->mpNodeMtd = (nodedraw_method_class*)pProcProfileDef->sub_method;
         fpcLy_Create(&pProcNode->mLayer, pProcNode, pProcNode->mLayerNodeLists, 0x10);
         pProcNode->mUnk0 = 0;
     }
     curLayer_p = fpcLy_CurrentLayer();
     fpcLy_SetCurrentLayer(&pProcNode->mLayer);
-    ret = fpcMtd_Create(&pProcNode->mpNodeMtd->mBase, pProcNode);
+    ret = fpcMtd_Create(&pProcNode->mpNodeMtd->base, pProcNode);
     fpcLy_SetCurrentLayer(curLayer_p);
     return ret;
 }
diff --git a/src/f_pc/f_pc_node_req.cpp b/src/f_pc/f_pc_node_req.cpp
index a1fb96017..e9e5fee87 100644
--- a/src/f_pc/f_pc_node_req.cpp
+++ b/src/f_pc/f_pc_node_req.cpp
@@ -59,7 +59,7 @@ s32 fpcNdRq_phase_IsDeleted(node_create_request* i_NdCtReq) {
 /* 8003F414-8003F468       .text fpcNdRq_phase_Delete__FP19node_create_request */
 s32 fpcNdRq_phase_Delete(node_create_request* i_NdCtReq) {
     if (i_NdCtReq->mNodeProc.mpNodeProc != NULL) {
-        if (fpcDt_Delete(&i_NdCtReq->mNodeProc.mpNodeProc->mBase) == 0) {
+        if (fpcDt_Delete(&i_NdCtReq->mNodeProc.mpNodeProc->base) == 0) {
             return cPhs_INIT_e;
         }
         i_NdCtReq->mNodeProc.mpNodeProc = NULL;
@@ -138,7 +138,7 @@ s32 fpcNdRq_Handler() {
 
 /* 8003F6BC-8003F728       .text fpcNdRq_IsPossibleTarget__FP18process_node_class */
 s32 fpcNdRq_IsPossibleTarget(process_node_class* i_procNode) {
-    s32 bsPcId = i_procNode->mBase.mBsPcId;
+    s32 bsPcId = i_procNode->base.mBsPcId;
     request_node_class* currentNode;
     node_create_request* currentNdCr;
     currentNode = (request_node_class*)l_fpcNdRq_Queue.mpHead;
@@ -146,7 +146,7 @@ s32 fpcNdRq_IsPossibleTarget(process_node_class* i_procNode) {
         currentNdCr = currentNode->mNodeCrReq;
         if ((currentNdCr->mParameter == 2 || currentNdCr->mParameter == 4 || currentNdCr->mParameter == 1) && currentNdCr->mNodeProc.mProcId == bsPcId)
             return 0;
-        currentNode = (request_node_class*)NODE_GET_NEXT((&currentNode->mBase));
+        currentNode = (request_node_class*)NODE_GET_NEXT((&currentNode->base));
     }
     return 1;
 }
@@ -155,13 +155,13 @@ s32 fpcNdRq_IsPossibleTarget(process_node_class* i_procNode) {
 s32 fpcNdRq_IsIng(process_node_class* i_procNode) {
     request_node_class* currentNode;
     node_create_request* currentNodeReq;
-    s32 bsPcId = i_procNode->mBase.mBsPcId;
+    s32 bsPcId = i_procNode->base.mBsPcId;
     currentNode = (request_node_class*)l_fpcNdRq_Queue.mpHead;
     while (currentNode != NULL) {
         currentNodeReq = currentNode->mNodeCrReq;
         if (currentNodeReq->mCreatingID == bsPcId)
             return 1;
-        currentNode = (request_node_class*)NODE_GET_NEXT((&currentNode->mBase));
+        currentNode = (request_node_class*)NODE_GET_NEXT((&currentNode->base));
     }
     return 0;
 }
@@ -203,8 +203,8 @@ node_create_request* fpcNdRq_ChangeNode(u32 i_requestSize, process_node_class* i
         if (req != NULL) {
             req->mpPhsHandler = methods;
             req->mNodeProc.mpNodeProc = i_procNode;
-            req->mNodeProc.mProcId = i_procNode->mBase.mBsPcId;
-            req->mpLayerClass = i_procNode->mBase.mLyTg.mpLayer;
+            req->mNodeProc.mProcId = i_procNode->base.mBsPcId;
+            req->mpLayerClass = i_procNode->base.mLyTg.mpLayer;
             req->mProcName = i_procName;
             req->mpUserData = i_data;
         }
@@ -228,8 +228,8 @@ node_create_request* fpcNdRq_DeleteNode(u32 i_requestSize, process_node_class* i
         if (req != NULL) {
             req->mpPhsHandler = methods;
             req->mNodeProc.mpNodeProc = i_procNode;
-            req->mNodeProc.mProcId = i_procNode->mBase.mBsPcId;
-            req->mpLayerClass = i_procNode->mBase.mLyTg.mpLayer;
+            req->mNodeProc.mProcId = i_procNode->base.mBsPcId;
+            req->mpLayerClass = i_procNode->base.mLyTg.mpLayer;
         }
         return req;
     } else {
@@ -254,7 +254,7 @@ node_create_request* fpcNdRq_CreateNode(u32 i_requestSize, s16 i_procName, void*
             req->mpPhsHandler = methods;
             if (layer->mLayerID != 0) {
                 req->mNodeProc.mpNodeProc = layer->mpPcNode;
-                req->mNodeProc.mProcId = layer->mpPcNode->mBase.mBsPcId;
+                req->mNodeProc.mProcId = layer->mpPcNode->base.mBsPcId;
             }
             req->mpLayerClass = layer;
             req->mProcName = i_procName;
@@ -307,7 +307,7 @@ s32 fpcNdRq_ReChangeNode(unsigned int i_requestID, s16 i_procName, void* i_data)
             }
             return 0;
         }
-        currentNode = (request_node_class*)NODE_GET_NEXT((&currentNode->mBase));
+        currentNode = (request_node_class*)NODE_GET_NEXT((&currentNode->base));
     }
     return 0;
 }
diff --git a/src/f_pc/f_pc_priority.cpp b/src/f_pc/f_pc_priority.cpp
index 19aaf3467..f9c9e8917 100644
--- a/src/f_pc/f_pc_priority.cpp
+++ b/src/f_pc/f_pc_priority.cpp
@@ -10,12 +10,12 @@
 
 /* 8003FC08-8003FC28       .text fpcPi_IsInQueue__FP22process_priority_class */
 s32 fpcPi_IsInQueue(process_priority_class* i_procPriority) {
-    return cTg_IsUse(&i_procPriority->mBase);
+    return cTg_IsUse(&i_procPriority->base);
 }
 
 /* 8003FC28-8003FC60       .text fpcPi_QueueTo__FP22process_priority_class */
 s32 fpcPi_QueueTo(process_priority_class* i_procPriority) {
-    cTg_SingleCut(&i_procPriority->mBase);
+    cTg_SingleCut(&i_procPriority->base);
     fpcLy_CancelQTo(&i_procPriority->mMtdTag);
     return 1;
 }
@@ -26,12 +26,12 @@ static node_list_class l_fpcPi_Queue;
 s32 fpcPi_ToQueue(process_priority_class* i_procPriority) {
     u32 layer = i_procPriority->mInfoQ.mLayer;
 
-    if (cTg_Addition(&l_fpcPi_Queue, &i_procPriority->mBase)) {
+    if (cTg_Addition(&l_fpcPi_Queue, &i_procPriority->base)) {
         if (layer != fpcLy_CURRENT_e) {
             layer_class* pLayer = fpcLy_Layer(layer);
 
             if (!fpcLy_ToCancelQ(pLayer, &i_procPriority->mMtdTag)) {
-                cTg_SingleCut(&i_procPriority->mBase);
+                cTg_SingleCut(&i_procPriority->base);
                 return 0;
             }
         }
@@ -47,7 +47,7 @@ process_priority_class* fpcPi_GetFromQueue() {
     process_priority_class* i_procPriority = (process_priority_class*)cTg_GetFirst(&l_fpcPi_Queue);
 
     if (i_procPriority != NULL) {
-        base_process_class* pProc = (base_process_class*)i_procPriority->mBase.mpTagData;
+        base_process_class* pProc = (base_process_class*)i_procPriority->base.mpTagData;
         process_priority_class* pProcPi = &pProc->mPi;
         fpcLy_CancelQTo(&pProcPi->mMtdTag);
         return pProcPi;
@@ -81,7 +81,7 @@ s32 fpcPi_IsNormal(unsigned int i_layer, u16 i_listID, u16 i_priority) {
 
 /* 8003FDC0-8003FF00       .text fpcPi_Change__FP22process_priority_classUiUsUs */
 s32 fpcPi_Change(process_priority_class* i_procPriority, unsigned int i_layer, u16 i_listID, u16 i_priority) {
-    base_process_class* pProc = (base_process_class*)i_procPriority->mBase.mpTagData;
+    base_process_class* pProc = (base_process_class*)i_procPriority->base.mpTagData;
     BOOL changed = 0;
 
     if (pProc->mInitState == 3)
@@ -126,7 +126,7 @@ s32 fpcPi_Change(process_priority_class* i_procPriority, unsigned int i_layer, u
 s32 fpcPi_Handler() {
     process_priority_class* i_procPriority;
     while (i_procPriority = fpcPi_GetFromQueue()) {
-        base_process_class* pProc = (base_process_class*)i_procPriority->mBase.mpTagData;
+        base_process_class* pProc = (base_process_class*)i_procPriority->base.mpTagData;
         layer_management_tag_class* pLayerTag = &pProc->mLyTg;
         line_tag* pLineTag = &pProc->mLnTg;
         if (fpcLyTg_Move(pLayerTag, i_procPriority->mInfoQ.mLayer, i_procPriority->mInfoQ.mListID, i_procPriority->mInfoQ.mListPrio) == 1) {
@@ -155,7 +155,7 @@ s32 fpcPi_Init(process_priority_class* i_procPriority, void* i_data, unsigned in
     i_procPriority->mInfoCurr.mLayer = i_procPriority->mInfoQ.mLayer;
     i_procPriority->mInfoCurr.mListID = i_procPriority->mInfoQ.mListID;
     i_procPriority->mInfoCurr.mListPrio = i_procPriority->mInfoQ.mListPrio;
-    cTg_Create(&i_procPriority->mBase, i_data);
+    cTg_Create(&i_procPriority->base, i_data);
     fpcMtdTg_Init(&i_procPriority->mMtdTag, (process_method_tag_func)fpcPi_Delete, i_procPriority);
     return 1;
 }
diff --git a/src/f_pc/f_pc_stdcreate_req.cpp b/src/f_pc/f_pc_stdcreate_req.cpp
index 65e4a03b2..90ec5040a 100644
--- a/src/f_pc/f_pc_stdcreate_req.cpp
+++ b/src/f_pc/f_pc_stdcreate_req.cpp
@@ -24,27 +24,27 @@ s32 fpcSCtRq_phase_Load(standard_create_request_class* i_SCtReq) {
 
 /* 8004069C-80040704       .text fpcSCtRq_phase_CreateProcess__FP29standard_create_request_class */
 s32 fpcSCtRq_phase_CreateProcess(standard_create_request_class* i_SCtReq) {
-    fpcLy_SetCurrentLayer(i_SCtReq->mBase.mpLayer);
-    i_SCtReq->mBase.mpRes = fpcBs_Create(i_SCtReq->mProcName, i_SCtReq->mBase.mBsPcId, i_SCtReq->mpUserData);
-    if (i_SCtReq->mBase.mpRes == NULL) {
+    fpcLy_SetCurrentLayer(i_SCtReq->base.mpLayer);
+    i_SCtReq->base.mpRes = fpcBs_Create(i_SCtReq->mProcName, i_SCtReq->base.mBsPcId, i_SCtReq->mpUserData);
+    if (i_SCtReq->base.mpRes == NULL) {
         fpcLd_Free(i_SCtReq->mProcName);
         return cPhs_ERROR_e;
     } else {
-        i_SCtReq->mBase.mpRes->mpCtRq = (struct create_request*)i_SCtReq;
+        i_SCtReq->base.mpRes->mpCtRq = (struct create_request*)i_SCtReq;
         return cPhs_NEXT_e;
     }
 }
 
 /* 80040704-8004073C       .text fpcSCtRq_phase_SubCreateProcess__FP29standard_create_request_class */
 s32 fpcSCtRq_phase_SubCreateProcess(standard_create_request_class* i_SCtReq) {
-    fpcLy_SetCurrentLayer(i_SCtReq->mBase.mpLayer);
-    return fpcBs_SubCreate(i_SCtReq->mBase.mpRes);
+    fpcLy_SetCurrentLayer(i_SCtReq->base.mpLayer);
+    return fpcBs_SubCreate(i_SCtReq->base.mpRes);
 }
 
 /* 8004073C-80040794       .text fpcSCtRq_phase_IsComplete__FP29standard_create_request_class */
 s32 fpcSCtRq_phase_IsComplete(standard_create_request_class* i_SCtReq) {
-    process_node_class* procNode = (process_node_class*)i_SCtReq->mBase.mpRes;
-    if (fpcBs_Is_JustOfType(g_fpcNd_type, procNode->mBase.mSubType) == 1) {
+    process_node_class* procNode = (process_node_class*)i_SCtReq->base.mpRes;
+    if (fpcBs_Is_JustOfType(g_fpcNd_type, procNode->base.mSubType) == 1) {
         if (fpcLy_IsCreatingMesg(&procNode->mLayer) == 1) {
             return cPhs_INIT_e;
         }
@@ -54,7 +54,7 @@ s32 fpcSCtRq_phase_IsComplete(standard_create_request_class* i_SCtReq) {
 
 /* 80040794-800407E4       .text fpcSCtRq_phase_PostMethod__FP29standard_create_request_class */
 s32 fpcSCtRq_phase_PostMethod(standard_create_request_class* i_SCtReq) {
-    if (i_SCtReq->mpCallBack != NULL && i_SCtReq->mpCallBack(i_SCtReq->mBase.mpRes, i_SCtReq->mpCallBackUserData) == 0) {
+    if (i_SCtReq->mpCallBack != NULL && i_SCtReq->mpCallBack(i_SCtReq->base.mpRes, i_SCtReq->mpCallBackUserData) == 0) {
         return cPhs_INIT_e;
     } else {
         return cPhs_NEXT_e;
@@ -122,7 +122,7 @@ s32 fpcSCtRq_Request(layer_class* i_layer, s16 i_procName, stdCreateFunc i_creat
             request->mpCallBack = i_createFunc;
             request->mpCallBackUserData = param_4;
             request->mpUserData = param_5;
-            return request->mBase.mBsPcId;
+            return request->base.mBsPcId;
         }
     }
 }