diff --git a/LEGO1/lego/legoomni/include/legoracers.h b/LEGO1/lego/legoomni/include/legoracers.h
index 211aa218..5f77998e 100644
--- a/LEGO1/lego/legoomni/include/legoracers.h
+++ b/LEGO1/lego/legoomni/include/legoracers.h
@@ -16,10 +16,10 @@ struct EdgeReference {
 
 // SIZE 0x10
 struct SkeletonKickPhase {
-	EdgeReference* m_edgeRef;
-	float m_lower;
-	float m_upper;
-	unsigned char m_userState;
+	EdgeReference* m_edgeRef;  // 0x00
+	float m_lower;             // 0x04
+	float m_upper;             // 0x08
+	unsigned char m_userState; // 0x0c
 };
 
 // VTABLE: LEGO1 0x100d58a0 LegoRaceActor
@@ -53,7 +53,7 @@ class LegoRaceCar : public LegoCarRaceActor, public LegoRaceMap {
 		return !strcmp(p_name, LegoRaceCar::ClassName()) || LegoCarRaceActor::IsA(p_name);
 	}
 
-	void ParseAction(char*) override;                  // vtable+0x20
+	void ParseAction(char* p_extra) override;          // vtable+0x20
 	void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30
 	MxU32 VTable0x6c(
 		LegoPathBoundary* p_boundary,
@@ -70,8 +70,8 @@ class LegoRaceCar : public LegoCarRaceActor, public LegoRaceMap {
 	MxResult VTable0x9c() override; // vtable+0x9c
 
 	virtual void SetMaxLinearVelocity(float p_maxLinearVelocity);
-	virtual void FUN_10012ff0(float);
-	virtual MxS32 HandleSkeletonKicks(float);
+	virtual void FUN_10012ff0(float p_param);
+	virtual MxS32 HandleSkeletonKicks(float p_param1);
 
 	// SYNTHETIC: LEGO1 0x10014240
 	// LegoRaceCar::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/raceskel.h b/LEGO1/lego/legoomni/include/raceskel.h
index 44c3e33a..fca57dde 100644
--- a/LEGO1/lego/legoomni/include/raceskel.h
+++ b/LEGO1/lego/legoomni/include/raceskel.h
@@ -12,7 +12,7 @@ class RaceSkel : public LegoAnimActor {
 public:
 	RaceSkel();
 
-	void GetCurrentAnimData(float*, float*);
+	void GetCurrentAnimData(float* p_outCurAnimPosition, float* p_outCurAnimDuration);
 
 private:
 	float m_animPosition; // 0x1c
diff --git a/tools/isledecomp/isledecomp/compare/core.py b/tools/isledecomp/isledecomp/compare/core.py
index b691cb95..3cf827e9 100644
--- a/tools/isledecomp/isledecomp/compare/core.py
+++ b/tools/isledecomp/isledecomp/compare/core.py
@@ -291,12 +291,12 @@ def _add_match_in_array(
 
             assert node.data_type.members is not None
 
-            for i, array_element in enumerate(node.data_type.members):
+            for array_element in node.data_type.members:
                 orig_element_base_addr = orig_addr + array_element.offset
                 recomp_element_base_addr = recomp_addr + array_element.offset
                 if array_element_type.members is None:
                     _add_match_in_array(
-                        f"{name}[{i}]",
+                        f"{name}{array_element.name}",
                         array_element_type.key,
                         orig_element_base_addr,
                         recomp_element_base_addr,
@@ -304,7 +304,7 @@ def _add_match_in_array(
                 else:
                     for member in array_element_type.members:
                         _add_match_in_array(
-                            f"{name}[{i}].{member.name}",
+                            f"{name}{array_element.name}.{member.name}",
                             array_element_type.key,
                             orig_element_base_addr + member.offset,
                             recomp_element_base_addr + member.offset,