diff --git a/assets/xml/objects/gameplay_field_keep.xml b/assets/xml/objects/gameplay_field_keep.xml
index 45fa3eccde..596101814c 100644
--- a/assets/xml/objects/gameplay_field_keep.xml
+++ b/assets/xml/objects/gameplay_field_keep.xml
@@ -12,14 +12,14 @@
         <DList Name="gameplay_field_keep_DL_001ED0" Offset="0x1ED0" />
         <DList Name="gameplay_field_keep_DL_001EE0" Offset="0x1EE0" />
         <Texture Name="gameplay_field_keep_Tex_001F30" OutName="tex_001F30" Format="rgba16" Width="32" Height="64" Offset="0x1F30" />
-        <Limb Name="gameplay_field_keep_Standardlimb_002F30" Type="Standard" EnumName="GAMEPLAY_FIELD_KEEP_LIMB_01" Offset="0x2F30" />
-        <Limb Name="gameplay_field_keep_Standardlimb_002F3C" Type="Standard" EnumName="GAMEPLAY_FIELD_KEEP_LIMB_02" Offset="0x2F3C" />
-        <Limb Name="gameplay_field_keep_Standardlimb_002F48" Type="Standard" EnumName="GAMEPLAY_FIELD_KEEP_LIMB_03" Offset="0x2F48" />
-        <Limb Name="gameplay_field_keep_Standardlimb_002F54" Type="Standard" EnumName="GAMEPLAY_FIELD_KEEP_LIMB_04" Offset="0x2F54" />
-        <Limb Name="gameplay_field_keep_Standardlimb_002F60" Type="Standard" EnumName="GAMEPLAY_FIELD_KEEP_LIMB_05" Offset="0x2F60" />
-        <Limb Name="gameplay_field_keep_Standardlimb_002F6C" Type="Standard" EnumName="GAMEPLAY_FIELD_KEEP_LIMB_06" Offset="0x2F6C" />
-        <Limb Name="gameplay_field_keep_Standardlimb_002F78" Type="Standard" EnumName="GAMEPLAY_FIELD_KEEP_LIMB_07" Offset="0x2F78" />
-        <Skeleton Name="gameplay_field_keep_Skel_002FA0" Type="Normal" LimbType="Standard" LimbNone="GAMEPLAY_FIELD_KEEP_LIMB_NONE" LimbMax="GAMEPLAY_FIELD_KEEP_LIMB_MAX" EnumName="gameplay_field_keep_Limbs" Offset="0x2FA0" />
+        <Limb Name="gameplay_field_keep_Standardlimb_002F30" Type="Standard" EnumName="BUTTERFLY_LIMB_01" Offset="0x2F30" />
+        <Limb Name="gameplay_field_keep_Standardlimb_002F3C" Type="Standard" EnumName="BUTTERFLY_LIMB_02" Offset="0x2F3C" />
+        <Limb Name="gameplay_field_keep_Standardlimb_002F48" Type="Standard" EnumName="BUTTERFLY_LIMB_03" Offset="0x2F48" />
+        <Limb Name="gameplay_field_keep_Standardlimb_002F54" Type="Standard" EnumName="BUTTERFLY_LIMB_04" Offset="0x2F54" />
+        <Limb Name="gameplay_field_keep_Standardlimb_002F60" Type="Standard" EnumName="BUTTERFLY_LIMB_05" Offset="0x2F60" />
+        <Limb Name="gameplay_field_keep_Standardlimb_002F6C" Type="Standard" EnumName="BUTTERFLY_LIMB_06" Offset="0x2F6C" />
+        <Limb Name="gameplay_field_keep_Standardlimb_002F78" Type="Standard" EnumName="BUTTERFLY_LIMB_07" Offset="0x2F78" />
+        <Skeleton Name="gameplay_field_keep_Skel_002FA0" Type="Normal" LimbType="Standard" LimbNone="BUTTERFLY_LIMB_NONE" LimbMax="BUTTERFLY_LIMB_MAX" EnumName="ButterflyLimb" Offset="0x2FA0" />
         <Texture Name="gameplay_field_keep_TLUT_002FB0" OutName="tlut_002FB0" Format="rgba16" Width="4" Height="4" Offset="0x2FB0" />
         <Texture Name="gameplay_field_keep_Tex_002FD0" OutName="tex_002FD0" Format="ci4" Width="32" Height="64" Offset="0x2FD0" />
         <Texture Name="gameplay_field_keep_Tex_0033D0" OutName="tex_0033D0" Format="ci4" Width="32" Height="64" Offset="0x33D0" />
diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml
index 3bfb60efde..4f1ad1841a 100644
--- a/assets/xml/objects/gameplay_keep.xml
+++ b/assets/xml/objects/gameplay_keep.xml
@@ -796,7 +796,7 @@
         <Limb Name="gPinkDekuFlowerFrontLeftPetalLimb" Type="Standard" EnumName="PINK_DEKU_FLOWER_LIMB_FRONT_LEFT_PETAL" Offset="0x114CC" />
         <Limb Name="gPinkDekuFlowerLeftLeafLimb" Type="Standard" EnumName="PINK_DEKU_FLOWER_LIMB_LEFT_LEAF" Offset="0x114D8" />
         <Limb Name="gPinkDekuFlowerBackLeftPetalLimb" Type="Standard" EnumName="PINK_DEKU_FLOWER_LIMB_BACK_LEFT_PETAL" Offset="0x114E4" />
-        <Skeleton Name="gPinkDekuFlowerSkel" Type="Normal" LimbType="Standard" LimbNone="PINK_DEKU_FLOWER_LIMB_NONE" LimbMax="PINK_DEKU_FLOWER_LIMB_MAX" EnumName="PinkDekuFlowerLimbs" Offset="0x11518" />
+        <Skeleton Name="gPinkDekuFlowerSkel" Type="Normal" LimbType="Standard" LimbNone="PINK_DEKU_FLOWER_LIMB_NONE" LimbMax="PINK_DEKU_FLOWER_LIMB_MAX" EnumName="PinkDekuFlowerLimb" Offset="0x11518" />
         <Animation Name="gDekuFlowerRustleAnim" Offset="0x117A8" /> <!-- Original name is "dnp_zawa" ("rustling") -->
         <Collision Name="gGoldDekuFlowerCol" Offset="0x118D8" />
         <DList Name="gGoldDekuFlowerIdleDL" Offset="0x11BD0" />
@@ -820,7 +820,7 @@
         <Limb Name="gGoldDekuFlowerFrontLeftPetalLimb" Type="Standard" EnumName="GOLD_DEKU_FLOWER_LIMB_FRONT_LEFT_PETAL" Offset="0x1279C" />
         <Limb Name="gGoldDekuFlowerLeftPetalLimb" Type="Standard" EnumName="GOLD_DEKU_FLOWER_LIMB_LEFT_PETAL" Offset="0x127A8" />
         <Limb Name="gGoldDekuFlowerBackLeftPetalLimb" Type="Standard" EnumName="GOLD_DEKU_FLOWER_LIMB_BACK_LEFT_PETAL" Offset="0x127B4" />
-        <Skeleton Name="gGoldDekuFlowerSkel" Type="Flex" LimbType="Standard" LimbNone="GOLD_DEKU_FLOWER_LIMB_NONE" LimbMax="GOLD_DEKU_FLOWER_LIMB_MAX" EnumName="GoldDekuFlowerLimbs" Offset="0x127E8" />
+        <Skeleton Name="gGoldDekuFlowerSkel" Type="Flex" LimbType="Standard" LimbNone="GOLD_DEKU_FLOWER_LIMB_NONE" LimbMax="GOLD_DEKU_FLOWER_LIMB_MAX" EnumName="GoldDekuFlowerLimb" Offset="0x127E8" />
 
         <Animation Name="gameplay_keep_Anim_012860" Offset="0x12860" />
         <Animation Name="gameplay_keep_Anim_0128BC" Offset="0x128BC" />
@@ -828,11 +828,11 @@
         <Texture Name="gameplay_keep_Tex_0138D0" OutName="tex_0138D0" Format="rgba16" Width="32" Height="16" Offset="0x138D0" />
         <DList Name="gameplay_keep_DL_013FF0" Offset="0x13FF0" />
         <DList Name="gameplay_keep_DL_014370" Offset="0x14370" />
-        <Limb Name="gameplay_keep_Lodlimb_014510" Type="LOD" Offset="0x14510" />
-        <Limb Name="gameplay_keep_Lodlimb_014520" Type="LOD" Offset="0x14520" />
-        <Limb Name="gameplay_keep_Lodlimb_014530" Type="LOD" Offset="0x14530" />
-        <Limb Name="gameplay_keep_Lodlimb_014540" Type="LOD" Offset="0x14540" />
-        <Skeleton Name="gameplay_keep_Skel_014560" Type="Normal" LimbType="Standard" Offset="0x14560" />
+        <Limb Name="gameplay_keep_Lodlimb_014510" Type="LOD" EnumName="ARROW_LIMB_1" Offset="0x14510" />
+        <Limb Name="gameplay_keep_Lodlimb_014520" Type="LOD" EnumName="ARROW_LIMB_2" Offset="0x14520" />
+        <Limb Name="gameplay_keep_Lodlimb_014530" Type="LOD" EnumName="ARROW_LIMB_3" Offset="0x14530" />
+        <Limb Name="gameplay_keep_Lodlimb_014540" Type="LOD" EnumName="ARROW_LIMB_4" Offset="0x14540" />
+        <Skeleton Name="gameplay_keep_Skel_014560" Type="Normal" LimbType="Standard" LimbNone="ARROW_LIMB_NONE" LimbMax="ARROW_LIMB_MAX" EnumName="ArrowLimb" Offset="0x14560" />
         <Texture Name="gameplay_keep_Tex_014570" OutName="tex_014570" Format="rgba32" Width="16" Height="32" Offset="0x14570" />
 
         <!-- Bomb -->
@@ -893,11 +893,11 @@
         <DList Name="gameplay_keep_DL_0221B8" Offset="0x221B8" />
         <Texture Name="gameplay_keep_Tex_0222E8" OutName="tex_0222E8" Format="i4" Width="32" Height="64" Offset="0x222E8" />
         <Texture Name="gameplay_keep_Tex_0226E8" OutName="tex_0226E8" Format="i8" Width="8" Height="128" Offset="0x226E8" />
-        <Limb Name="gameplay_keep_Standardlimb_022AE8" Type="Standard" Offset="0x22AE8" />
-        <Limb Name="gameplay_keep_Standardlimb_022AF4" Type="Standard" Offset="0x22AF4" />
-        <Limb Name="gameplay_keep_Standardlimb_022B00" Type="Standard" Offset="0x22B00" />
-        <Limb Name="gameplay_keep_Standardlimb_022B0C" Type="Standard" Offset="0x22B0C" />
-        <Skeleton Name="gDoorSkel" Type="Normal" LimbType="Standard" Offset="0x22B28" />
+        <Limb Name="gameplay_keep_Standardlimb_022AE8" Type="Standard" EnumName="DOOR_LIMB_1" Offset="0x22AE8" />
+        <Limb Name="gameplay_keep_Standardlimb_022AF4" Type="Standard" EnumName="DOOR_LIMB_2" Offset="0x22AF4" />
+        <Limb Name="gameplay_keep_Standardlimb_022B00" Type="Standard" EnumName="DOOR_LIMB_3" Offset="0x22B00" />
+        <Limb Name="gameplay_keep_Standardlimb_022B0C" Type="Standard" EnumName="DOOR_LIMB_4" Offset="0x22B0C" />
+        <Skeleton Name="gDoorSkel" Type="Normal" LimbType="Standard" LimbNone="DOOR_LIMB_NONE" LimbMax="DOOR_LIMB_MAX" EnumName="DoorLimb" Offset="0x22B28" />
         <Animation Name="gameplay_keep_Anim_022BE8" Offset="0x22BE8" />
         <Animation Name="gameplay_keep_Anim_022CA8" Offset="0x22CA8" />
         <Animation Name="gameplay_keep_Anim_022D90" Offset="0x22D90" />
@@ -944,13 +944,13 @@
         <DList Name="gameplay_keep_DL_029CF0" Offset="0x29CF0" />
         <DList Name="gameplay_keep_DL_029D10" Offset="0x29D10" /> <!-- Used in ObJ_Kinoko to radiate a purple glow -->
         <Texture Name="gameplay_keep_Tex_029EF8" OutName="tex_029EF8" Format="rgba16" Width="32" Height="64" Offset="0x29EF8" />
-        <Limb Name="gameplay_keep_Standardlimb_02AEF8" Type="Standard" Offset="0x2AEF8" />
-        <Limb Name="gameplay_keep_Standardlimb_02AF04" Type="Standard" Offset="0x2AF04" />
-        <Limb Name="gameplay_keep_Standardlimb_02AF10" Type="Standard" Offset="0x2AF10" />
-        <Limb Name="gameplay_keep_Standardlimb_02AF1C" Type="Standard" Offset="0x2AF1C" />
-        <Limb Name="gameplay_keep_Standardlimb_02AF28" Type="Standard" Offset="0x2AF28" />
-        <Limb Name="gameplay_keep_Standardlimb_02AF34" Type="Standard" Offset="0x2AF34" />
-        <Skeleton Name="gameplay_keep_Skel_02AF58" Type="Flex" LimbType="Standard" Offset="0x2AF58" />
+        <Limb Name="gameplay_keep_Standardlimb_02AEF8" Type="Standard" EnumName="FAIRY_LIMB_1" Offset="0x2AEF8" />
+        <Limb Name="gameplay_keep_Standardlimb_02AF04" Type="Standard" EnumName="FAIRY_LIMB_2" Offset="0x2AF04" />
+        <Limb Name="gameplay_keep_Standardlimb_02AF10" Type="Standard" EnumName="FAIRY_LIMB_3" Offset="0x2AF10" />
+        <Limb Name="gameplay_keep_Standardlimb_02AF1C" Type="Standard" EnumName="FAIRY_LIMB_4" Offset="0x2AF1C" />
+        <Limb Name="gameplay_keep_Standardlimb_02AF28" Type="Standard" EnumName="FAIRY_LIMB_5" Offset="0x2AF28" />
+        <Limb Name="gameplay_keep_Standardlimb_02AF34" Type="Standard" EnumName="FAIRY_LIMB_6" Offset="0x2AF34" />
+        <Skeleton Name="gameplay_keep_Skel_02AF58" Type="Flex" LimbType="Standard" LimbNone="FAIRY_LIMB_NONE" LimbMax="FAIRY_LIMB_MAX" EnumName="FairyLimb" Offset="0x2AF58" />
         <Animation Name="gameplay_keep_Anim_02B2E8" Offset="0x2B2E8" />
 
         <!-- Stray Fairy -->
@@ -983,7 +983,7 @@
         <Limb Name="gStrayFairyPelvisAndLegsLimb" Type="Standard" EnumName="STRAY_FAIRY_LIMB_PELVIS_AND_LEGS" Offset="0x2CA50" />
         <Limb Name="gStrayFairyLeftArmLimb" Type="Standard" EnumName="STRAY_FAIRY_LIMB_LEFT_ARM" Offset="0x2CA5C" />
         <Limb Name="gStrayFairyLeftFacingHeadLimb" Type="Standard" EnumName="STRAY_FAIRY_LIMB_LEFT_FACING_HEAD" Offset="0x2CA68" />
-        <Skeleton Name="gStrayFairySkel" Type="Flex" LimbType="Standard" LimbNone="STRAY_FAIRY_LIMB_NONE" LimbMax="STRAY_FAIRY_LIMB_MAX" EnumName="StrayFairyLimbs" Offset="0x2CA98" />
+        <Skeleton Name="gStrayFairySkel" Type="Flex" LimbType="Standard" LimbNone="STRAY_FAIRY_LIMB_NONE" LimbMax="STRAY_FAIRY_LIMB_MAX" EnumName="StrayFairyLimb" Offset="0x2CA98" />
 
         <Texture Name="gameplay_keep_Tex_02CAA8" OutName="tex_02CAA8" Format="i4" Width="16" Height="16" Offset="0x2CAA8" />
         <Texture Name="gameplay_keep_Tex_02CB30" OutName="tex_02CB30" Format="i8" Width="16" Height="16" Offset="0x2CB30" />
@@ -997,13 +997,13 @@
         <DList Name="gameplay_keep_DL_02EAB8" Offset="0x2EAB8" />
         <Texture Name="gameplay_keep_Tex_02EBC8" OutName="tex_02EBC8" Format="rgba16" Width="16" Height="16" Offset="0x2EBC8" />
         <Texture Name="gameplay_keep_Tex_02EDC8" OutName="tex_02EDC8" Format="rgba16" Width="32" Height="8" Offset="0x2EDC8" />
-        <Limb Name="gameplay_keep_Standardlimb_02EFC8" Type="Standard" Offset="0x2EFC8" />
-        <Limb Name="gameplay_keep_Standardlimb_02EFD4" Type="Standard" Offset="0x2EFD4" />
-        <Limb Name="gameplay_keep_Standardlimb_02EFE0" Type="Standard" Offset="0x2EFE0" />
-        <Limb Name="gameplay_keep_Standardlimb_02EFEC" Type="Standard" Offset="0x2EFEC" />
-        <Limb Name="gameplay_keep_Standardlimb_02EFF8" Type="Standard" Offset="0x2EFF8" />
-        <Limb Name="gameplay_keep_Standardlimb_02F004" Type="Standard" Offset="0x2F004" />
-        <Skeleton Name="gameplay_keep_Skel_02F028" Type="Flex" LimbType="Standard" Offset="0x2F028" />
+        <Limb Name="gameplay_keep_Standardlimb_02EFC8" Type="Standard" EnumName="FISH_LIMB_1" Offset="0x2EFC8" />
+        <Limb Name="gameplay_keep_Standardlimb_02EFD4" Type="Standard" EnumName="FISH_LIMB_2" Offset="0x2EFD4" />
+        <Limb Name="gameplay_keep_Standardlimb_02EFE0" Type="Standard" EnumName="FISH_LIMB_3" Offset="0x2EFE0" />
+        <Limb Name="gameplay_keep_Standardlimb_02EFEC" Type="Standard" EnumName="FISH_LIMB_4" Offset="0x2EFEC" />
+        <Limb Name="gameplay_keep_Standardlimb_02EFF8" Type="Standard" EnumName="FISH_LIMB_5" Offset="0x2EFF8" />
+        <Limb Name="gameplay_keep_Standardlimb_02F004" Type="Standard" EnumName="FISH_LIMB_6" Offset="0x2F004" />
+        <Skeleton Name="gameplay_keep_Skel_02F028" Type="Flex" LimbType="Standard" LimbNone="FISH_LIMB_NONE" LimbMax="FISH_LIMB_MAX" EnumName="FishLimb" Offset="0x2F028" />
         <Animation Name="gameplay_keep_Anim_02F0EC" Offset="0x2F0EC" />
         <Texture Name="gEffShockwaveTex" OutName="eff_shockwave" Format="i8" Width="64" Height="64" Offset="0x2F100" />
         <DList Name="gEffShockwaveDL" Offset="0x30100" />
@@ -1152,30 +1152,30 @@
         <DList Name="gameplay_keep_DL_051C60" Offset="0x51C60" />
         <Texture Name="gameplay_keep_Tex_051D30" OutName="tex_051D30" Format="rgba16" Width="16" Height="64" Offset="0x51D30" />
         <Texture Name="gameplay_keep_Tex_052530" OutName="tex_052530" Format="rgba16" Width="8" Height="16" Offset="0x52530" />
-        <Limb Name="gameplay_keep_Standardlimb_052630" Type="Standard" Offset="0x52630" />
-        <Limb Name="gameplay_keep_Standardlimb_05263C" Type="Standard" Offset="0x5263C" />
-        <Limb Name="gameplay_keep_Standardlimb_052648" Type="Standard" Offset="0x52648" />
-        <Limb Name="gameplay_keep_Standardlimb_052654" Type="Standard" Offset="0x52654" />
-        <Limb Name="gameplay_keep_Standardlimb_052660" Type="Standard" Offset="0x52660" />
-        <Limb Name="gameplay_keep_Standardlimb_05266C" Type="Standard" Offset="0x5266C" />
-        <Limb Name="gameplay_keep_Standardlimb_052678" Type="Standard" Offset="0x52678" />
-        <Limb Name="gameplay_keep_Standardlimb_052684" Type="Standard" Offset="0x52684" />
-        <Limb Name="gameplay_keep_Standardlimb_052690" Type="Standard" Offset="0x52690" />
-        <Limb Name="gameplay_keep_Standardlimb_05269C" Type="Standard" Offset="0x5269C" />
-        <Limb Name="gameplay_keep_Standardlimb_0526A8" Type="Standard" Offset="0x526A8" />
-        <Limb Name="gameplay_keep_Standardlimb_0526B4" Type="Standard" Offset="0x526B4" />
-        <Limb Name="gameplay_keep_Standardlimb_0526C0" Type="Standard" Offset="0x526C0" />
-        <Limb Name="gameplay_keep_Standardlimb_0526CC" Type="Standard" Offset="0x526CC" />
-        <Limb Name="gameplay_keep_Standardlimb_0526D8" Type="Standard" Offset="0x526D8" />
-        <Limb Name="gameplay_keep_Standardlimb_0526E4" Type="Standard" Offset="0x526E4" />
-        <Limb Name="gameplay_keep_Standardlimb_0526F0" Type="Standard" Offset="0x526F0" />
-        <Limb Name="gameplay_keep_Standardlimb_0526FC" Type="Standard" Offset="0x526FC" />
-        <Limb Name="gameplay_keep_Standardlimb_052708" Type="Standard" Offset="0x52708" />
-        <Limb Name="gameplay_keep_Standardlimb_052714" Type="Standard" Offset="0x52714" />
-        <Limb Name="gameplay_keep_Standardlimb_052720" Type="Standard" Offset="0x52720" />
-        <Limb Name="gameplay_keep_Standardlimb_05272C" Type="Standard" Offset="0x5272C" />
-        <Limb Name="gameplay_keep_Standardlimb_052738" Type="Standard" Offset="0x52738" />
-        <Skeleton Name="gameplay_keep_Skel_0527A0" Type="Normal" LimbType="Standard" Offset="0x527A0" />
+        <Limb Name="gameplay_keep_Standardlimb_052630" Type="Standard" EnumName="BUG_LIMB_01" Offset="0x52630" />
+        <Limb Name="gameplay_keep_Standardlimb_05263C" Type="Standard" EnumName="BUG_LIMB_02" Offset="0x5263C" />
+        <Limb Name="gameplay_keep_Standardlimb_052648" Type="Standard" EnumName="BUG_LIMB_03" Offset="0x52648" />
+        <Limb Name="gameplay_keep_Standardlimb_052654" Type="Standard" EnumName="BUG_LIMB_04" Offset="0x52654" />
+        <Limb Name="gameplay_keep_Standardlimb_052660" Type="Standard" EnumName="BUG_LIMB_05" Offset="0x52660" />
+        <Limb Name="gameplay_keep_Standardlimb_05266C" Type="Standard" EnumName="BUG_LIMB_06" Offset="0x5266C" />
+        <Limb Name="gameplay_keep_Standardlimb_052678" Type="Standard" EnumName="BUG_LIMB_07" Offset="0x52678" />
+        <Limb Name="gameplay_keep_Standardlimb_052684" Type="Standard" EnumName="BUG_LIMB_08" Offset="0x52684" />
+        <Limb Name="gameplay_keep_Standardlimb_052690" Type="Standard" EnumName="BUG_LIMB_09" Offset="0x52690" />
+        <Limb Name="gameplay_keep_Standardlimb_05269C" Type="Standard" EnumName="BUG_LIMB_0A" Offset="0x5269C" />
+        <Limb Name="gameplay_keep_Standardlimb_0526A8" Type="Standard" EnumName="BUG_LIMB_0B" Offset="0x526A8" />
+        <Limb Name="gameplay_keep_Standardlimb_0526B4" Type="Standard" EnumName="BUG_LIMB_0C" Offset="0x526B4" />
+        <Limb Name="gameplay_keep_Standardlimb_0526C0" Type="Standard" EnumName="BUG_LIMB_0D" Offset="0x526C0" />
+        <Limb Name="gameplay_keep_Standardlimb_0526CC" Type="Standard" EnumName="BUG_LIMB_0E" Offset="0x526CC" />
+        <Limb Name="gameplay_keep_Standardlimb_0526D8" Type="Standard" EnumName="BUG_LIMB_0F" Offset="0x526D8" />
+        <Limb Name="gameplay_keep_Standardlimb_0526E4" Type="Standard" EnumName="BUG_LIMB_10" Offset="0x526E4" />
+        <Limb Name="gameplay_keep_Standardlimb_0526F0" Type="Standard" EnumName="BUG_LIMB_11" Offset="0x526F0" />
+        <Limb Name="gameplay_keep_Standardlimb_0526FC" Type="Standard" EnumName="BUG_LIMB_12" Offset="0x526FC" />
+        <Limb Name="gameplay_keep_Standardlimb_052708" Type="Standard" EnumName="BUG_LIMB_13" Offset="0x52708" />
+        <Limb Name="gameplay_keep_Standardlimb_052714" Type="Standard" EnumName="BUG_LIMB_14" Offset="0x52714" />
+        <Limb Name="gameplay_keep_Standardlimb_052720" Type="Standard" EnumName="BUG_LIMB_15" Offset="0x52720" />
+        <Limb Name="gameplay_keep_Standardlimb_05272C" Type="Standard" EnumName="BUG_LIMB_16" Offset="0x5272C" />
+        <Limb Name="gameplay_keep_Standardlimb_052738" Type="Standard" EnumName="BUG_LIMB_17" Offset="0x52738" />
+        <Skeleton Name="gameplay_keep_Skel_0527A0" Type="Normal" LimbType="Standard" LimbNone="BUG_LIMB_NONE" LimbMax="BUG_LIMB_MAX" EnumName="BugLimb" Offset="0x527A0" />
         <DList Name="gKakeraLeafMiddle" Offset="0x527F0" />
         <DList Name="gKakeraLeafTip" Offset="0x528B0" />
         <Texture Name="gameplay_keep_Tex_052940" OutName="tex_052940" Format="rgba16" Width="32" Height="32" Offset="0x52940" />
diff --git a/assets/xml/objects/object_ah.xml b/assets/xml/objects/object_ah.xml
index 3644f2a902..1bf479e869 100644
--- a/assets/xml/objects/object_ah.xml
+++ b/assets/xml/objects/object_ah.xml
@@ -53,6 +53,6 @@
         <Limb Name="object_ah_Standardlimb_009E0C" Type="Standard" EnumName="OBJECT_AH_LIMB_0E" Offset="0x9E0C" />
         <Limb Name="object_ah_Standardlimb_009E18" Type="Standard" EnumName="OBJECT_AH_LIMB_0F" Offset="0x9E18" />
         <Limb Name="object_ah_Standardlimb_009E24" Type="Standard" EnumName="OBJECT_AH_LIMB_10" Offset="0x9E24" />
-        <Skeleton Name="object_ah_Skel_009E70" Type="Flex" LimbType="Standard" LimbNone="OBJECT_AH_LIMB_NONE" LimbMax="OBJECT_AH_LIMB_MAX" EnumName="object_ah_Limbs" Offset="0x9E70" />
+        <Skeleton Name="object_ah_Skel_009E70" Type="Flex" LimbType="Standard" LimbNone="OBJECT_AH_LIMB_NONE" LimbMax="OBJECT_AH_LIMB_MAX" EnumName="ObjectAhLimb" Offset="0x9E70" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_ahg.xml b/assets/xml/objects/object_ahg.xml
index 7d4c2c7415..7eb4c71263 100644
--- a/assets/xml/objects/object_ahg.xml
+++ b/assets/xml/objects/object_ahg.xml
@@ -48,6 +48,6 @@
         <Limb Name="object_ahg_Standardlimb_005938" Type="Standard" EnumName="OBJECT_AHG_LIMB_0D" Offset="0x5938" />
         <Limb Name="object_ahg_Standardlimb_005944" Type="Standard" EnumName="OBJECT_AHG_LIMB_0E" Offset="0x5944" />
         <Limb Name="object_ahg_Standardlimb_005950" Type="Standard" EnumName="OBJECT_AHG_LIMB_0F" Offset="0x5950" />
-        <Skeleton Name="object_ahg_Skel_005998" Type="Flex" LimbType="Standard" LimbNone="OBJECT_AHG_LIMB_NONE" LimbMax="OBJECT_AHG_LIMB_MAX" EnumName="object_ahg_Limbs" Offset="0x5998" />
+        <Skeleton Name="object_ahg_Skel_005998" Type="Flex" LimbType="Standard" LimbNone="OBJECT_AHG_LIMB_NONE" LimbMax="OBJECT_AHG_LIMB_MAX" EnumName="ObjectAhgLimb" Offset="0x5998" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_al.xml b/assets/xml/objects/object_al.xml
index dc28bcf6bb..db348868ad 100644
--- a/assets/xml/objects/object_al.xml
+++ b/assets/xml/objects/object_al.xml
@@ -65,7 +65,7 @@
         <Limb Name="gMadameAromaLegsLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_LEGS" Offset="0xA04C" />
         <Limb Name="gMadameAromaLeftFootLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_LEFT_FOOT" Offset="0xA058" />
         <Limb Name="gMadameAromaRightFootLimb" Type="Standard" EnumName="MADAME_AROMA_LIMB_RIGHT_FOOT" Offset="0xA064" />
-        <Skeleton Name="gMadameAromaSkel" Type="Flex" LimbType="Standard" LimbNone="MADAME_AROMA_LIMB_NONE" LimbMax="MADAME_AROMA_LIMB_MAX" EnumName="MadameAromaLimbs" Offset="0xA0D8" />
+        <Skeleton Name="gMadameAromaSkel" Type="Flex" LimbType="Standard" LimbNone="MADAME_AROMA_LIMB_NONE" LimbMax="MADAME_AROMA_LIMB_MAX" EnumName="MadameAromaLimb" Offset="0xA0D8" />
         <Animation Name="object_al_Anim_00A764" Offset="0xA764" />
         <Animation Name="object_al_Anim_00ACA0" Offset="0xACA0" />
         <Animation Name="object_al_Anim_00BCA4" Offset="0xBCA4" />
diff --git a/assets/xml/objects/object_am.xml b/assets/xml/objects/object_am.xml
index b0737cb50a..1f738d39be 100644
--- a/assets/xml/objects/object_am.xml
+++ b/assets/xml/objects/object_am.xml
@@ -34,7 +34,7 @@
         <Limb Name="object_am_Standardlimb_0058F0" Type="Standard" EnumName="OBJECT_AM_LIMB_0B" Offset="0x58F0" />
         <Limb Name="object_am_Standardlimb_0058FC" Type="Standard" EnumName="OBJECT_AM_LIMB_BASE" Offset="0x58FC" />
         <Limb Name="object_am_Standardlimb_005908" Type="Standard" EnumName="OBJECT_AM_LIMB_0D" Offset="0x5908" />
-        <Skeleton Name="object_am_Skel_005948" Type="Normal" LimbType="Standard" LimbNone="OBJECT_AM_LIMB_NONE" LimbMax="OBJECT_AM_LIMB_MAX" EnumName="object_am_Limbs" Offset="0x5948" />
+        <Skeleton Name="object_am_Skel_005948" Type="Normal" LimbType="Standard" LimbNone="OBJECT_AM_LIMB_NONE" LimbMax="OBJECT_AM_LIMB_MAX" EnumName="ObjectAmLimb" Offset="0x5948" />
         <Animation Name="gArmosTakeDamageAnim" Offset="0x5B3C" />
         <Collision Name="object_am_Colheader_005CF8" Offset="0x5CF8" />
     </File>
diff --git a/assets/xml/objects/object_an1.xml b/assets/xml/objects/object_an1.xml
index 2c212923d7..2db214bd3c 100644
--- a/assets/xml/objects/object_an1.xml
+++ b/assets/xml/objects/object_an1.xml
@@ -81,7 +81,7 @@
         <Limb Name="object_an1_Standardlimb_0125A4" Type="Standard" EnumName="OBJECT_AN1_LIMB_12" Offset="0x125A4" />
         <Limb Name="object_an1_Standardlimb_0125B0" Type="Standard" EnumName="OBJECT_AN1_LIMB_13" Offset="0x125B0" />
         <Limb Name="object_an1_Standardlimb_0125BC" Type="Standard" EnumName="OBJECT_AN1_LIMB_14" Offset="0x125BC" />
-        <Skeleton Name="object_an1_Skel_012618" Type="Flex" LimbType="Standard" LimbNone="OBJECT_AN1_LIMB_NONE" LimbMax="OBJECT_AN1_LIMB_MAX" EnumName="object_an1_Limbs" Offset="0x12618" />
+        <Skeleton Name="object_an1_Skel_012618" Type="Flex" LimbType="Standard" LimbNone="OBJECT_AN1_LIMB_NONE" LimbMax="OBJECT_AN1_LIMB_MAX" EnumName="ObjectAn1Limb" Offset="0x12618" />
         <Animation Name="object_an1_Anim_013048" Offset="0x13048" />
         <Animation Name="object_an1_Anim_013E1C" Offset="0x13E1C" />
     </File>
diff --git a/assets/xml/objects/object_and.xml b/assets/xml/objects/object_and.xml
index 17cff45978..00c8d7585a 100644
--- a/assets/xml/objects/object_and.xml
+++ b/assets/xml/objects/object_and.xml
@@ -67,7 +67,7 @@
         <Limb Name="object_and_Standardlimb_00B2F8" Type="Standard" EnumName="OBJECT_AND_LIMB_17" Offset="0xB2F8" />
         <Limb Name="object_and_Standardlimb_00B304" Type="Standard" EnumName="OBJECT_AND_LIMB_18" Offset="0xB304" />
         <Limb Name="object_and_Standardlimb_00B310" Type="Standard" EnumName="OBJECT_AND_LIMB_19" Offset="0xB310" />
-        <Skeleton Name="object_and_Skel_00B380" Type="Flex" LimbType="Standard" LimbNone="OBJECT_AND_LIMB_NONE" LimbMax="OBJECT_AND_LIMB_MAX" EnumName="object_and_Limbs" Offset="0xB380" />
+        <Skeleton Name="object_and_Skel_00B380" Type="Flex" LimbType="Standard" LimbNone="OBJECT_AND_LIMB_NONE" LimbMax="OBJECT_AND_LIMB_MAX" EnumName="ObjectAndLimb" Offset="0xB380" />
         <Animation Name="object_and_Anim_00DA58" Offset="0xDA58" />
         <Animation Name="object_and_Anim_00EE00" Offset="0xEE00" />
         <Animation Name="object_and_Anim_00F6C4" Offset="0xF6C4" />
diff --git a/assets/xml/objects/object_ani.xml b/assets/xml/objects/object_ani.xml
index 3d8f7c3857..34fb49f0dc 100644
--- a/assets/xml/objects/object_ani.xml
+++ b/assets/xml/objects/object_ani.xml
@@ -21,7 +21,7 @@
         <Limb Name="gAniRightForArmLimb" Type="Standard" EnumName="ANI_LIMB_RIGHT_FORARM" Offset="0x2840" />
         <Limb Name="gAniRightHandLimb" Type="Standard" EnumName="ANI_LIMB_RIGHT_HAND" Offset="0x284C" />
         <Limb Name="gAniHeadLimb" Type="Standard" EnumName="ANI_LIMB_HEAD" Offset="0x2858" />
-        <Skeleton Name="gAniSkeleton" Type="Flex" LimbType="Standard" LimbNone="ANI_LIMB_NONE" LimbMax="ANI_LIMB_MAX" EnumName="ObjectAniLimbs" Offset="0x28A0" />
+        <Skeleton Name="gAniSkeleton" Type="Flex" LimbType="Standard" LimbNone="ANI_LIMB_NONE" LimbMax="ANI_LIMB_MAX" EnumName="ObjectAniLimb" Offset="0x28A0" />
         <DList Name="gAniRightHandDL" Offset="0x4860" />
         <DList Name="gAniRightForArmDL" Offset="0x4A50" />
         <DList Name="gAniRightUpperArmDL" Offset="0x4B38" />
diff --git a/assets/xml/objects/object_aob.xml b/assets/xml/objects/object_aob.xml
index 3325e9b53b..50de06ea06 100644
--- a/assets/xml/objects/object_aob.xml
+++ b/assets/xml/objects/object_aob.xml
@@ -22,7 +22,7 @@
         <Limb Name="gMamamuYanHeadLimb" Type="Standard" EnumName="MAMAMU_YAN_LIMB_HEAD" Offset="0x138" />
 
         <!-- Mamamu Yan Skeleton -->
-        <Skeleton Name="gMamamuYanSkel" Type="Flex" LimbType="Standard" LimbNone="MAMAMU_YAN_LIMB_NONE" LimbMax="MAMAMU_YAN_LIMB_MAX" EnumName="MamamuYanLimbs" Offset="0x180" />
+        <Skeleton Name="gMamamuYanSkel" Type="Flex" LimbType="Standard" LimbNone="MAMAMU_YAN_LIMB_NONE" LimbMax="MAMAMU_YAN_LIMB_MAX" EnumName="MamamuYanLimb" Offset="0x180" />
 
         <!-- Mamamu Yan Textures -->
         <Texture Name="gMamamuYanTLUT" OutName="mamamu_yan_tlut" Format="rgba16" Width="16" Height="16" Offset="0x198" />
diff --git a/assets/xml/objects/object_az.xml b/assets/xml/objects/object_az.xml
index d4382673f8..81207b06b8 100644
--- a/assets/xml/objects/object_az.xml
+++ b/assets/xml/objects/object_az.xml
@@ -50,7 +50,7 @@
         <Limb Name="object_az_Standardlimb_0073B8" Type="Standard" EnumName="OBJECT_AZ_1_LIMB_15" Offset="0x73B8" />
         <Limb Name="object_az_Standardlimb_0073C4" Type="Standard" EnumName="OBJECT_AZ_1_LIMB_16" Offset="0x73C4" />
         <Limb Name="object_az_Standardlimb_0073D0" Type="Standard" EnumName="OBJECT_AZ_1_LIMB_17" Offset="0x73D0" />
-        <Skeleton Name="object_az_Skel_007438" Type="Flex" LimbType="Standard" LimbNone="OBJECT_AZ_1_LIMB_NONE" LimbMax="OBJECT_AZ_1_LIMB_MAX" EnumName="object_az_1_Limbs" Offset="0x7438" />
+        <Skeleton Name="object_az_Skel_007438" Type="Flex" LimbType="Standard" LimbNone="OBJECT_AZ_1_LIMB_NONE" LimbMax="OBJECT_AZ_1_LIMB_MAX" EnumName="ObjectAz1Limb" Offset="0x7438" />
         <Animation Name="object_az_Anim_00750C" Offset="0x750C" />
         <Animation Name="object_az_Anim_007D3C" Offset="0x7D3C" />
         <Animation Name="object_az_Anim_0086AC" Offset="0x86AC" />
@@ -121,7 +121,7 @@
         <Limb Name="object_az_Standardlimb_017910" Type="Standard" EnumName="OBJECT_AZ_2_LIMB_15" Offset="0x17910" />
         <Limb Name="object_az_Standardlimb_01791C" Type="Standard" EnumName="OBJECT_AZ_2_LIMB_16" Offset="0x1791C" />
         <Limb Name="object_az_Standardlimb_017928" Type="Standard" EnumName="OBJECT_AZ_2_LIMB_17" Offset="0x17928" />
-        <Skeleton Name="object_az_Skel_017990" Type="Flex" LimbType="Standard" LimbNone="OBJECT_AZ_2_LIMB_NONE" LimbMax="OBJECT_AZ_2_LIMB_MAX" EnumName="object_az_2_Limbs" Offset="0x17990" />
+        <Skeleton Name="object_az_Skel_017990" Type="Flex" LimbType="Standard" LimbNone="OBJECT_AZ_2_LIMB_NONE" LimbMax="OBJECT_AZ_2_LIMB_MAX" EnumName="ObjectAz2Limb" Offset="0x17990" />
         <!-- <Blob Name="object_az_Blob_0179A0" Size="0x20" Offset="0x179A0" /> -->
         <Texture Name="object_az_Tex_0179C0" OutName="tex_0179C0" Format="i4" Width="32" Height="64" Offset="0x179C0" />
         <Texture Name="object_az_Tex_017DC0" OutName="tex_017DC0" Format="i4" Width="64" Height="64" Offset="0x17DC0" />
diff --git a/assets/xml/objects/object_bai.xml b/assets/xml/objects/object_bai.xml
index 4225bec840..8130658768 100644
--- a/assets/xml/objects/object_bai.xml
+++ b/assets/xml/objects/object_bai.xml
@@ -47,7 +47,7 @@
         <Limb Name="object_bai_Standardlimb_007898" Type="Standard" EnumName="OBJECT_BAI_LIMB_11" Offset="0x7898" />
         <Limb Name="object_bai_Standardlimb_0078A4" Type="Standard" EnumName="OBJECT_BAI_LIMB_12" Offset="0x78A4" />
         <Limb Name="object_bai_Standardlimb_0078B0" Type="Standard" EnumName="OBJECT_BAI_LIMB_13" Offset="0x78B0" />
-        <Skeleton Name="object_bai_Skel_007908" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BAI_LIMB_NONE" LimbMax="OBJECT_BAI_LIMB_MAX" EnumName="object_bai_Limbs" Offset="0x7908" />
+        <Skeleton Name="object_bai_Skel_007908" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BAI_LIMB_NONE" LimbMax="OBJECT_BAI_LIMB_MAX" EnumName="ObjectBaiLimb" Offset="0x7908" />
         <Animation Name="object_bai_Anim_008198" Offset="0x8198" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_bal.xml b/assets/xml/objects/object_bal.xml
index a16e2fb1fa..2cdfc5c3ab 100644
--- a/assets/xml/objects/object_bal.xml
+++ b/assets/xml/objects/object_bal.xml
@@ -68,7 +68,7 @@
         <Limb Name="object_bal_Standardlimb_00A62C" Type="Standard" EnumName="OBJECT_BAL_LIMB_1E" Offset="0xA62C" />
         <Limb Name="object_bal_Standardlimb_00A638" Type="Standard" EnumName="OBJECT_BAL_LIMB_1F" Offset="0xA638" />
         <Limb Name="object_bal_Standardlimb_00A644" Type="Standard" EnumName="OBJECT_BAL_LIMB_20" Offset="0xA644" />
-        <Skeleton Name="object_bal_Skel_00A6D0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BAL_LIMB_NONE" LimbMax="OBJECT_BAL_LIMB_MAX" EnumName="object_bal_Limbs" Offset="0xA6D0" />
+        <Skeleton Name="object_bal_Skel_00A6D0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BAL_LIMB_NONE" LimbMax="OBJECT_BAL_LIMB_MAX" EnumName="ObjectBalLimb" Offset="0xA6D0" />
         <Animation Name="object_bal_Anim_00A7DC" Offset="0xA7DC" />
         <Animation Name="object_bal_Anim_00B1E8" Offset="0xB1E8" />
         <Animation Name="object_bal_Anim_00B604" Offset="0xB604" />
diff --git a/assets/xml/objects/object_bb.xml b/assets/xml/objects/object_bb.xml
index c9c6a0a908..e03cdb0e20 100644
--- a/assets/xml/objects/object_bb.xml
+++ b/assets/xml/objects/object_bb.xml
@@ -42,6 +42,6 @@
         <Limb Name="gBubbleCraniumLimb" Type="Standard" EnumName="BUBBLE_LIMB_CRANIUM" Offset="0x19E8" />
 
         <!-- Bubble Skeleton -->
-        <Skeleton Name="gBubbleSkel" Type="Normal" LimbType="Standard" LimbNone="BUBBLE_LIMB_NONE" LimbMax="BUBBLE_LIMB_MAX" EnumName="BubbleLimbs" Offset="0x1A30" />
+        <Skeleton Name="gBubbleSkel" Type="Normal" LimbType="Standard" LimbNone="BUBBLE_LIMB_NONE" LimbMax="BUBBLE_LIMB_MAX" EnumName="BubbleLimb" Offset="0x1A30" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_bba.xml b/assets/xml/objects/object_bba.xml
index c3c5a5c1b2..0b22866e76 100644
--- a/assets/xml/objects/object_bba.xml
+++ b/assets/xml/objects/object_bba.xml
@@ -41,7 +41,7 @@
         <Limb Name="gBbaRightLowerArmRootLimb" Type="Standard" EnumName="BBA_LIMB_RIGHT_LOWER_ARM_ROOT" Offset="0x5E88" />
         <Limb Name="gBbaRightForearmLimb" Type="Standard" EnumName="BBA_LIMB_RIGHT_FOREARM" Offset="0x5E94" />
         <Limb Name="gBbaRightHandLimb" Type="Standard" EnumName="BBA_LIMB_RIGHT_HAND" Offset="0x5EA0" />
-        <Skeleton Name="gBbaSkel" Type="Flex" LimbType="Standard" LimbNone="BBA_LIMB_NONE" LimbMax="BBA_LIMB_MAX" EnumName="BbaLimbs" Offset="0x5EF0" />
+        <Skeleton Name="gBbaSkel" Type="Flex" LimbType="Standard" LimbNone="BBA_LIMB_NONE" LimbMax="BBA_LIMB_MAX" EnumName="BbaLimb" Offset="0x5EF0" />
 
          <!-- Animations -->
         <Animation Name="gBbaIdleAnim" Offset="0x6550" />
diff --git a/assets/xml/objects/object_bee.xml b/assets/xml/objects/object_bee.xml
index 8f1d704cf4..735d191f39 100644
--- a/assets/xml/objects/object_bee.xml
+++ b/assets/xml/objects/object_bee.xml
@@ -23,6 +23,6 @@
         <Limb Name="object_bee_Standardlimb_001350" Type="Standard" EnumName="OBJECT_BEE_LIMB_07" Offset="0x1350" />
         <Limb Name="object_bee_Standardlimb_00135C" Type="Standard" EnumName="OBJECT_BEE_LIMB_08" Offset="0x135C" />
         <Limb Name="object_bee_Standardlimb_001368" Type="Standard" EnumName="OBJECT_BEE_LIMB_09" Offset="0x1368" />
-        <Skeleton Name="object_bee_Skel_001398" Type="Normal" LimbType="Standard" LimbNone="OBJECT_BEE_LIMB_NONE" LimbMax="OBJECT_BEE_LIMB_MAX" EnumName="object_bee_Limbs" Offset="0x1398" />
+        <Skeleton Name="object_bee_Skel_001398" Type="Normal" LimbType="Standard" LimbNone="OBJECT_BEE_LIMB_NONE" LimbMax="OBJECT_BEE_LIMB_MAX" EnumName="ObjectBeeLimb" Offset="0x1398" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_bg.xml b/assets/xml/objects/object_bg.xml
index 0602f987d4..fe294cb33b 100644
--- a/assets/xml/objects/object_bg.xml
+++ b/assets/xml/objects/object_bg.xml
@@ -51,7 +51,7 @@
         <Limb Name="object_bg_Standardlimb_008F48" Type="Standard" EnumName="OBJECT_BG_1_LIMB_15" Offset="0x8F48" />
         <Limb Name="object_bg_Standardlimb_008F54" Type="Standard" EnumName="OBJECT_BG_1_LIMB_16" Offset="0x8F54" />
         <Limb Name="object_bg_Standardlimb_008F60" Type="Standard" EnumName="OBJECT_BG_1_LIMB_17" Offset="0x8F60" />
-        <Skeleton Name="object_bg_Skel_008FC8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BG_1_LIMB_NONE" LimbMax="OBJECT_BG_1_LIMB_MAX" EnumName="object_bg_1_Limbs" Offset="0x8FC8" />
+        <Skeleton Name="object_bg_Skel_008FC8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BG_1_LIMB_NONE" LimbMax="OBJECT_BG_1_LIMB_MAX" EnumName="ObjectBg1Limb" Offset="0x8FC8" />
         <Animation Name="object_bg_Anim_009890" Offset="0x9890" />
         <Animation Name="object_bg_Anim_009F20" Offset="0x9F20" />
         <Animation Name="object_bg_Anim_00A280" Offset="0xA280" />
@@ -107,6 +107,6 @@
         <Limb Name="object_bg_Standardlimb_011AE0" Type="Standard" EnumName="OBJECT_BG_2_LIMB_15" Offset="0x11AE0" />
         <Limb Name="object_bg_Standardlimb_011AEC" Type="Standard" EnumName="OBJECT_BG_2_LIMB_16" Offset="0x11AEC" />
         <Limb Name="object_bg_Standardlimb_011AF8" Type="Standard" EnumName="OBJECT_BG_2_LIMB_17" Offset="0x11AF8" />
-        <Skeleton Name="object_bg_Skel_011B60" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BG_2_LIMB_NONE" LimbMax="OBJECT_BG_2_LIMB_MAX" EnumName="object_bg_2_Limbs" Offset="0x11B60" />
+        <Skeleton Name="object_bg_Skel_011B60" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BG_2_LIMB_NONE" LimbMax="OBJECT_BG_2_LIMB_MAX" EnumName="ObjectBg2Limb" Offset="0x11B60" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_bh.xml b/assets/xml/objects/object_bh.xml
index 56b7de5f9b..3e33fb739c 100644
--- a/assets/xml/objects/object_bh.xml
+++ b/assets/xml/objects/object_bh.xml
@@ -13,6 +13,6 @@
         <Limb Name="gBhRightWingToEdgeLimb" Type="Standard" EnumName="OBJECT_BH_LIMB_RIGHT_WING_TO_EDGE" Offset="0x1E28" />
         <Limb Name="gBhLeftWingToBodyLimb" Type="Standard" EnumName="OBJECT_BH_LIMB_LEFT_WING_TO_BODY" Offset="0x1E34" />
         <Limb Name="gBhLeftWingToEdgeLimb" Type="Standard" EnumName="OBJECT_BH_LIMB_LEFT_WING_TO_EDGE" Offset="0x1E40" />
-        <Skeleton Name="gBhSkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BH_LIMB_NONE" LimbMax="OBJECT_BH_LIMB_MAX" EnumName="ObjectBhLimbs" Offset="0x1E60" />
+        <Skeleton Name="gBhSkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BH_LIMB_NONE" LimbMax="OBJECT_BH_LIMB_MAX" EnumName="ObjectBhLimb" Offset="0x1E60" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_bigokuta.xml b/assets/xml/objects/object_bigokuta.xml
index 2c54c6a61a..d8df44ddc6 100644
--- a/assets/xml/objects/object_bigokuta.xml
+++ b/assets/xml/objects/object_bigokuta.xml
@@ -53,6 +53,6 @@
         <Limb Name="gBigOctoCenterSnoutLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_CENTER_SNOUT" Offset="0x6B50" />
         <Limb Name="gBigOctoRightSnoutLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_RIGHT_SNOUT" Offset="0x6B5C" />
         <Limb Name="gBigOctoLeftSnoutLimb" Type="Standard" EnumName="BIGOKUTA_LIMB_LEFT_SNOUT" Offset="0x6B68" />
-        <Skeleton Name="gBigOctoSkel" Type="Flex" LimbType="Standard" LimbNone="BIGOKUTA_LIMB_NONE" LimbMax="BIGOKUTA_LIMB_MAX" EnumName="BigokutaLimbs" Offset="0x6BC0" />
+        <Skeleton Name="gBigOctoSkel" Type="Flex" LimbType="Standard" LimbNone="BIGOKUTA_LIMB_NONE" LimbMax="BIGOKUTA_LIMB_MAX" EnumName="BigokutaLimb" Offset="0x6BC0" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_bigslime.xml b/assets/xml/objects/object_bigslime.xml
index 7195c20c71..84a6eec61a 100644
--- a/assets/xml/objects/object_bigslime.xml
+++ b/assets/xml/objects/object_bigslime.xml
@@ -88,7 +88,7 @@
         <Limb Name="gGekkoJawLimb" Type="Standard" EnumName="GEKKO_LIMB_JAW" Offset="0xDF18" />
         <Limb Name="gGekkoLeftEyeLimb" Type="Standard" EnumName="GEKKO_LIMB_LEFT_EYE" Offset="0xDF24" />
         <Limb Name="gGekkoRightEyeLimb" Type="Standard" EnumName="GEKKO_LIMB_RIGHT_EYE" Offset="0xDF30" />
-        <Skeleton Name="gGekkoSkel" Type="Flex" LimbType="Standard" LimbNone="GEKKO_LIMB_NONE" LimbMax="GEKKO_LIMB_MAX" EnumName="GekkoLimbs" Offset="0xDF98" />
+        <Skeleton Name="gGekkoSkel" Type="Flex" LimbType="Standard" LimbNone="GEKKO_LIMB_NONE" LimbMax="GEKKO_LIMB_MAX" EnumName="GekkoLimb" Offset="0xDF98" />
 
         <Animation Name="gGekkoWindupPunchAnim" Offset="0xF048" />
         <Animation Name="gGekkoSwimUpAnim" Offset="0xF3F0" />
diff --git a/assets/xml/objects/object_bji.xml b/assets/xml/objects/object_bji.xml
index 0fec0c8c36..bef54b0e5c 100644
--- a/assets/xml/objects/object_bji.xml
+++ b/assets/xml/objects/object_bji.xml
@@ -57,7 +57,7 @@
         <Limb Name="gShikashiRightForearmLimb" Type="Standard" EnumName="SHIKASHI_LIMB_RIGHT_FOREARM" Offset="0x572C" />
         <Limb Name="gShikashiRightHandLimb" Type="Standard" EnumName="SHIKASHI_LIMB_RIGHT_HAND" Offset="0x5738" />
         <Limb Name="gShikashiHeadLimb" Type="Standard" EnumName="SHIKASHI_LIMB_HEAD" Offset="0x5744" />
-        <Skeleton Name="gShikashiSkel" Type="Flex" LimbType="Standard" LimbNone="SHIKASHI_LIMB_NONE" LimbMax="SHIKASHI_LIMB_MAX" EnumName="ShikashiLimbs" Offset="0x578C" />
+        <Skeleton Name="gShikashiSkel" Type="Flex" LimbType="Standard" LimbNone="SHIKASHI_LIMB_NONE" LimbMax="SHIKASHI_LIMB_MAX" EnumName="ShikashiLimb" Offset="0x578C" />
 
         <Animation Name="object_bji_Anim_005B58" Offset="0x5B58" />
     </File>
diff --git a/assets/xml/objects/object_bjt.xml b/assets/xml/objects/object_bjt.xml
index 59a71dcee6..27529206f0 100644
--- a/assets/xml/objects/object_bjt.xml
+++ b/assets/xml/objects/object_bjt.xml
@@ -23,6 +23,6 @@
         <Limb Name="gToiletHandOtherFingersLimb" Type="Standard" EnumName="TOILET_HAND_LIMB_OTHER_FINGERS" Offset="0x2354" />
         <Limb Name="gToiletHandThumbLimb" Type="Standard" EnumName="TOILET_HAND_LIMB_THUMB" Offset="0x2360" />
         <Limb Name="gToiletHandIndexFingerLimb" Type="Standard" EnumName="TOILET_HAND_LIMB_INDEX_FINGER" Offset="0x236C" />
-        <Skeleton Name="gToiletHandSkel" Type="Flex" LimbType="Standard" LimbNone="TOILET_HAND_LIMB_NONE" LimbMax="TOILET_HAND_LIMB_MAX" EnumName="ToiletHandLimbs" Offset="0x2390" />
+        <Skeleton Name="gToiletHandSkel" Type="Flex" LimbType="Standard" LimbNone="TOILET_HAND_LIMB_NONE" LimbMax="TOILET_HAND_LIMB_MAX" EnumName="ToiletHandLimb" Offset="0x2390" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_bob.xml b/assets/xml/objects/object_bob.xml
index f942c84db3..13edbe6fef 100644
--- a/assets/xml/objects/object_bob.xml
+++ b/assets/xml/objects/object_bob.xml
@@ -15,7 +15,7 @@
         <Limb Name="object_bob_Standardlimb_000090" Type="Standard" EnumName="OBJECT_BOB_LIMB_0D" Offset="0x90" />
         <Limb Name="object_bob_Standardlimb_00009C" Type="Standard" EnumName="OBJECT_BOB_LIMB_0E" Offset="0x9C" />
         <Limb Name="object_bob_Standardlimb_0000A8" Type="Standard" EnumName="OBJECT_BOB_LIMB_0F" Offset="0xA8" />
-        <Skeleton Name="object_bob_Skel_0000F0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BOB_LIMB_NONE" LimbMax="OBJECT_BOB_LIMB_MAX" EnumName="object_bob_Limbs" Offset="0xF0" />
+        <Skeleton Name="object_bob_Skel_0000F0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BOB_LIMB_NONE" LimbMax="OBJECT_BOB_LIMB_MAX" EnumName="ObjectBobLimb" Offset="0xF0" />
         <Texture Name="object_bob_TLUT_000108" OutName="tlut_000108" Format="rgba16" Width="16" Height="16" Offset="0x108" />
         <Texture Name="object_bob_Tex_000308" OutName="tex_000308" Format="ci8" Width="8" Height="8" Offset="0x308" />
         <Texture Name="object_bob_Tex_000348" OutName="tex_000348" Format="ci8" Width="8" Height="8" Offset="0x348" />
diff --git a/assets/xml/objects/object_boj.xml b/assets/xml/objects/object_boj.xml
index ed42d90314..cfb10e97aa 100644
--- a/assets/xml/objects/object_boj.xml
+++ b/assets/xml/objects/object_boj.xml
@@ -75,7 +75,7 @@
         <Limb Name="object_boj_Standardlimb_00C1E0" Type="Standard" EnumName="OBJECT_BOJ_LIMB_0D" Offset="0xC1E0" />
         <Limb Name="object_boj_Standardlimb_00C1EC" Type="Standard" EnumName="OBJECT_BOJ_LIMB_0E" Offset="0xC1EC" />
         <Limb Name="object_boj_Standardlimb_00C1F8" Type="Standard" EnumName="OBJECT_BOJ_LIMB_0F" Offset="0xC1F8" />
-        <Skeleton Name="object_boj_Skel_00C240" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BOJ_LIMB_NONE" LimbMax="OBJECT_BOJ_LIMB_MAX" EnumName="object_boj_Limbs" Offset="0xC240" /> <!-- object_ginko_skeleton -->
+        <Skeleton Name="object_boj_Skel_00C240" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BOJ_LIMB_NONE" LimbMax="OBJECT_BOJ_LIMB_MAX" EnumName="ObjectBojLimb" Offset="0xC240" /> <!-- object_ginko_skeleton -->
         <Animation Name="object_boj_Anim_00DED8" Offset="0xDED8" />
         <Animation Name="object_boj_Anim_00F920" Offset="0xF920" />
         <Animation Name="object_boj_Anim_00FC1C" Offset="0xFC1C" />
diff --git a/assets/xml/objects/object_boss01.xml b/assets/xml/objects/object_boss01.xml
index 6a10080a33..89cc97a7e0 100644
--- a/assets/xml/objects/object_boss01.xml
+++ b/assets/xml/objects/object_boss01.xml
@@ -113,7 +113,7 @@
         <Limb Name="object_boss01_Standardlimb_00EFB8" Type="Standard" EnumName="OBJECT_BOSS01_1_LIMB_31" Offset="0xEFB8" />
         <Limb Name="object_boss01_Standardlimb_00EFC4" Type="Standard" EnumName="OBJECT_BOSS01_1_LIMB_32" Offset="0xEFC4" />
         <Limb Name="object_boss01_Standardlimb_00EFD0" Type="Standard" EnumName="OBJECT_BOSS01_1_LIMB_33" Offset="0xEFD0" />
-        <Skeleton Name="object_boss01_Skel_00F0A8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BOSS01_1_LIMB_NONE" LimbMax="OBJECT_BOSS01_1_LIMB_MAX" EnumName="object_boss01_1_Limbs" Offset="0xF0A8" />
+        <Skeleton Name="object_boss01_Skel_00F0A8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BOSS01_1_LIMB_NONE" LimbMax="OBJECT_BOSS01_1_LIMB_MAX" EnumName="ObjectBoss011Limb" Offset="0xF0A8" />
         <Animation Name="object_boss01_Anim_00F918" Offset="0xF918" />
         <Animation Name="object_boss01_Anim_00FDEC" Offset="0xFDEC" />
         <Animation Name="object_boss01_Anim_00FF94" Offset="0xFF94" />
@@ -183,7 +183,7 @@
         <Limb Name="object_boss01_Standardlimb_02225C" Type="Standard" EnumName="OBJECT_BOSS01_2_LIMB_12" Offset="0x2225C" />
         <Limb Name="object_boss01_Standardlimb_022268" Type="Standard" EnumName="OBJECT_BOSS01_2_LIMB_13" Offset="0x22268" />
         <Limb Name="object_boss01_Standardlimb_022274" Type="Standard" EnumName="OBJECT_BOSS01_2_LIMB_14" Offset="0x22274" />
-        <Skeleton Name="object_boss01_Skel_0222D0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BOSS01_2_LIMB_NONE" LimbMax="OBJECT_BOSS01_2_LIMB_MAX" EnumName="object_boss01_2_Limbs" Offset="0x222D0" />
+        <Skeleton Name="object_boss01_Skel_0222D0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BOSS01_2_LIMB_NONE" LimbMax="OBJECT_BOSS01_2_LIMB_MAX" EnumName="ObjectBoss012Limb" Offset="0x222D0" />
         <Animation Name="object_boss01_Anim_022550" Offset="0x22550" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_boss02.xml b/assets/xml/objects/object_boss02.xml
index 9a400554b7..8a80a57f25 100644
--- a/assets/xml/objects/object_boss02.xml
+++ b/assets/xml/objects/object_boss02.xml
@@ -62,7 +62,7 @@
         <Limb Name="gTwinmoldHeadLeftAntennaFrontLimb" Type="Standard" EnumName="TWINMOLD_HEAD_LIMB_LEFT_ANTENNA_FRONT" Offset="0x9AD4" />
 
         <!-- Twinmold Head Skeleton -->
-        <Skeleton Name="gTwinmoldHeadSkel" Type="Normal" LimbType="Standard" LimbNone="TWINMOLD_HEAD_LIMB_NONE" LimbMax="TWINMOLD_HEAD_LIMB_MAX" EnumName="TwinmoldHeadLimbs" Offset="0x9B10" />
+        <Skeleton Name="gTwinmoldHeadSkel" Type="Normal" LimbType="Standard" LimbNone="TWINMOLD_HEAD_LIMB_NONE" LimbMax="TWINMOLD_HEAD_LIMB_MAX" EnumName="TwinmoldHeadLimb" Offset="0x9B10" />
 
         <!-- The only used animation for Twinmold's Head -->
         <Animation Name="gTwinmoldHeadFlyAnim" Offset="0x9C78" />
@@ -120,6 +120,6 @@
         <Limb Name="gTwinmoldBodyTailLimb" Type="Standard" EnumName="TWINMOLD_BODY_LIMB_TAIL" Offset="0x13920" />
 
         <!-- Unused Twinmold Body Skeleton -->
-        <Skeleton Name="gTwinmoldBodySkel" Type="Flex" LimbType="Standard" LimbNone="TWINMOLD_BODY_LIMB_NONE" LimbMax="TWINMOLD_BODY_LIMB_MAX" EnumName="TwinmoldBodyLimbs" Offset="0x13988" />
+        <Skeleton Name="gTwinmoldBodySkel" Type="Flex" LimbType="Standard" LimbNone="TWINMOLD_BODY_LIMB_NONE" LimbMax="TWINMOLD_BODY_LIMB_MAX" EnumName="TwinmoldBodyLimb" Offset="0x13988" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_boss03.xml b/assets/xml/objects/object_boss03.xml
index 75ce1d3c9f..da17bf4062 100644
--- a/assets/xml/objects/object_boss03.xml
+++ b/assets/xml/objects/object_boss03.xml
@@ -65,7 +65,7 @@
         <Limb Name="gGyorgJawLimb" Type="Standard" EnumName="GYORG_LIMB_JAW" Offset="0x9364" />
 
         <!-- Gyorg Skeleton-->
-        <Skeleton Name="gGyorgSkel" Type="Flex" LimbType="Standard" LimbNone="GYORG_LIMB_NONE" LimbMax="GYORG_LIMB_MAX" EnumName="GyorgLimbs" Offset="0x93A8" />
+        <Skeleton Name="gGyorgSkel" Type="Flex" LimbType="Standard" LimbNone="GYORG_LIMB_NONE" LimbMax="GYORG_LIMB_MAX" EnumName="GyorgLimb" Offset="0x93A8" />
 
         <!-- Gyorg Animations -->
         <Animation Name="gGyorgFloppingAnim" Offset="0x9554" /> <!-- Original name is "bus_dead" -->
@@ -130,7 +130,7 @@
         <Limb Name="gGyorgSmallFishHeadLimb" Type="Standard" EnumName="GYORG_SMALL_FISH_LIMB_HEAD" Offset="0xD9F0" />
 
         <!-- Small Fishes Skeleton -->
-        <Skeleton Name="gGyorgSmallFishSkel" Type="Flex" LimbType="Standard" LimbNone="GYORG_SMALL_FISH_LIMB_NONE" LimbMax="GYORG_SMALL_FISH_LIMB_MAX" EnumName="GyorgSmallFishLimbs" Offset="0xDA20" />
+        <Skeleton Name="gGyorgSmallFishSkel" Type="Flex" LimbType="Standard" LimbNone="GYORG_SMALL_FISH_LIMB_NONE" LimbMax="GYORG_SMALL_FISH_LIMB_MAX" EnumName="GyorgSmallFishLimb" Offset="0xDA20" />
 
         <!-- Small Fishes Animation -->
         <Animation Name="gGyorgSmallFishSwimAnim" Offset="0xDAAC" /> <!-- Original name is "minibus_b_swim" -->
diff --git a/assets/xml/objects/object_boss04.xml b/assets/xml/objects/object_boss04.xml
index ce54c25b47..d98083a64c 100644
--- a/assets/xml/objects/object_boss04.xml
+++ b/assets/xml/objects/object_boss04.xml
@@ -41,6 +41,6 @@
         <Limb Name="gWartBottomEyelidLimb" Type="Standard" EnumName="WART_LIMB_BOTTOM_EYELID" Offset="0x45BC" />
 
         <!-- Wart Skeleton -->
-        <Skeleton Name="gWartSkel" Type="Flex" LimbType="Standard" LimbNone="WART_LIMB_NONE" LimbMax="WART_LIMB_MAX" EnumName="WartLimbs" Offset="0x45E8" />
+        <Skeleton Name="gWartSkel" Type="Flex" LimbType="Standard" LimbNone="WART_LIMB_NONE" LimbMax="WART_LIMB_MAX" EnumName="WartLimb" Offset="0x45E8" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_boss05.xml b/assets/xml/objects/object_boss05.xml
index b401ae2be9..95bb16edd8 100644
--- a/assets/xml/objects/object_boss05.xml
+++ b/assets/xml/objects/object_boss05.xml
@@ -24,7 +24,7 @@
         <Limb Name="object_boss05_Standardlimb_002498" Type="Standard" EnumName="OBJECT_BOSS05_1_LIMB_07" Offset="0x2498" />
         <Limb Name="object_boss05_Standardlimb_0024A4" Type="Standard" EnumName="OBJECT_BOSS05_1_LIMB_08" Offset="0x24A4" />
         <Limb Name="object_boss05_Standardlimb_0024B0" Type="Standard" EnumName="OBJECT_BOSS05_1_LIMB_09" Offset="0x24B0" />
-        <Skeleton Name="object_boss05_Skel_0024E0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BOSS05_1_LIMB_NONE" LimbMax="OBJECT_BOSS05_1_LIMB_MAX" EnumName="object_boss05_1_Limbs" Offset="0x24E0" />
+        <Skeleton Name="object_boss05_Skel_0024E0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BOSS05_1_LIMB_NONE" LimbMax="OBJECT_BOSS05_1_LIMB_MAX" EnumName="ObjectBoss051Limb" Offset="0x24E0" />
         <Animation Name="object_boss05_Anim_002F0C" Offset="0x2F0C" />
         <Animation Name="object_boss05_Anim_003448" Offset="0x3448" />
         <Animation Name="object_boss05_Anim_003500" Offset="0x3500" />
@@ -72,7 +72,7 @@
         <Limb Name="object_boss05_Standardlimb_006308" Type="Standard" EnumName="OBJECT_BOSS05_2_LIMB_11" Offset="0x6308" />
         <Limb Name="object_boss05_Standardlimb_006314" Type="Standard" EnumName="OBJECT_BOSS05_2_LIMB_12" Offset="0x6314" />
         <Limb Name="object_boss05_Standardlimb_006320" Type="Standard" EnumName="OBJECT_BOSS05_2_LIMB_13" Offset="0x6320" />
-        <Skeleton Name="object_boss05_Skel_006378" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BOSS05_2_LIMB_NONE" LimbMax="OBJECT_BOSS05_2_LIMB_MAX" EnumName="object_boss05_2_Limbs" Offset="0x6378" />
+        <Skeleton Name="object_boss05_Skel_006378" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BOSS05_2_LIMB_NONE" LimbMax="OBJECT_BOSS05_2_LIMB_MAX" EnumName="ObjectBoss052Limb" Offset="0x6378" />
         <Animation Name="object_boss05_Anim_006484" Offset="0x6484" />
         <Animation Name="object_boss05_Anim_006E50" Offset="0x6E50" />
         <Animation Name="object_boss05_Anim_007488" Offset="0x7488" />
diff --git a/assets/xml/objects/object_boss07.xml b/assets/xml/objects/object_boss07.xml
index 15a2e162da..91234f7580 100644
--- a/assets/xml/objects/object_boss07.xml
+++ b/assets/xml/objects/object_boss07.xml
@@ -47,7 +47,7 @@
         <Limb Name="object_boss07_Standardlimb_00991C" Type="Standard" EnumName="OBJECT_BOSS07_1_LIMB_16" Offset="0x991C" />
         <Limb Name="object_boss07_Standardlimb_009928" Type="Standard" EnumName="OBJECT_BOSS07_1_LIMB_17" Offset="0x9928" />
         <Limb Name="object_boss07_Standardlimb_009934" Type="Standard" EnumName="OBJECT_BOSS07_1_LIMB_18" Offset="0x9934" />
-        <Skeleton Name="object_boss07_Skel_0099A0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BOSS07_1_LIMB_NONE" LimbMax="OBJECT_BOSS07_1_LIMB_MAX" EnumName="object_boss07_1_Limbs" Offset="0x99A0" />
+        <Skeleton Name="object_boss07_Skel_0099A0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BOSS07_1_LIMB_NONE" LimbMax="OBJECT_BOSS07_1_LIMB_MAX" EnumName="ObjectBoss071Limb" Offset="0x99A0" />
         <Animation Name="object_boss07_Anim_009C7C" Offset="0x9C7C" />
         <Animation Name="object_boss07_Anim_009EA8" Offset="0x9EA8" />
         <Animation Name="object_boss07_Anim_00A194" Offset="0xA194" />
@@ -116,7 +116,7 @@
         <Limb Name="object_boss07_Standardlimb_019BEC" Type="Standard" EnumName="OBJECT_BOSS07_2_LIMB_10" Offset="0x19BEC" />
         <Limb Name="object_boss07_Standardlimb_019BF8" Type="Standard" EnumName="OBJECT_BOSS07_2_LIMB_11" Offset="0x19BF8" />
         <Limb Name="object_boss07_Standardlimb_019C04" Type="Standard" EnumName="OBJECT_BOSS07_2_LIMB_12" Offset="0x19C04" />
-        <Skeleton Name="object_boss07_Skel_019C58" Type="Normal" LimbType="Standard" LimbNone="OBJECT_BOSS07_2_LIMB_NONE" LimbMax="OBJECT_BOSS07_2_LIMB_MAX" EnumName="object_boss07_2_Limbs" Offset="0x19C58" />
+        <Skeleton Name="object_boss07_Skel_019C58" Type="Normal" LimbType="Standard" LimbNone="OBJECT_BOSS07_2_LIMB_NONE" LimbMax="OBJECT_BOSS07_2_LIMB_MAX" EnumName="ObjectBoss072Limb" Offset="0x19C58" />
         <Animation Name="object_boss07_Anim_019E48" Offset="0x19E48" />
         <Animation Name="object_boss07_Anim_01AE1C" Offset="0x1AE1C" />
         <Animation Name="object_boss07_Anim_01C430" Offset="0x1C430" />
@@ -184,7 +184,7 @@
         <Limb Name="object_boss07_Standardlimb_033560" Type="Standard" EnumName="OBJECT_BOSS07_3_LIMB_19" Offset="0x33560" />
         <Limb Name="object_boss07_Standardlimb_03356C" Type="Standard" EnumName="OBJECT_BOSS07_3_LIMB_1A" Offset="0x3356C" />
         <Limb Name="object_boss07_Standardlimb_033578" Type="Standard" EnumName="OBJECT_BOSS07_3_LIMB_1B" Offset="0x33578" />
-        <Skeleton Name="object_boss07_Skel_0335F0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BOSS07_3_LIMB_NONE" LimbMax="OBJECT_BOSS07_3_LIMB_MAX" EnumName="object_boss07_3_Limbs" Offset="0x335F0" />
+        <Skeleton Name="object_boss07_Skel_0335F0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BOSS07_3_LIMB_NONE" LimbMax="OBJECT_BOSS07_3_LIMB_MAX" EnumName="ObjectBoss073Limb" Offset="0x335F0" />
         <Animation Name="object_boss07_Anim_033F80" Offset="0x33F80" />
         <Animation Name="object_boss07_Anim_034E64" Offset="0x34E64" />
         <Animation Name="object_boss07_Anim_0358C4" Offset="0x358C4" />
diff --git a/assets/xml/objects/object_boss_hakugin.xml b/assets/xml/objects/object_boss_hakugin.xml
index 62d6fb91f6..3444dc0414 100644
--- a/assets/xml/objects/object_boss_hakugin.xml
+++ b/assets/xml/objects/object_boss_hakugin.xml
@@ -73,7 +73,7 @@
         <Limb Name="object_boss_hakugin_Standardlimb_0130B4" Type="Standard" EnumName="OBJECT_BOSS_HAKUGIN_LIMB_1E" Offset="0x130B4" />
         <Limb Name="object_boss_hakugin_Standardlimb_0130C0" Type="Standard" EnumName="OBJECT_BOSS_HAKUGIN_LIMB_1F" Offset="0x130C0" />
         <Limb Name="object_boss_hakugin_Standardlimb_0130CC" Type="Standard" EnumName="OBJECT_BOSS_HAKUGIN_LIMB_20" Offset="0x130CC" />
-        <Skeleton Name="object_boss_hakugin_Skel_013158" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BOSS_HAKUGIN_LIMB_NONE" LimbMax="OBJECT_BOSS_HAKUGIN_LIMB_MAX" EnumName="object_boss_hakugin_Limbs" Offset="0x13158" />
+        <Skeleton Name="object_boss_hakugin_Skel_013158" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BOSS_HAKUGIN_LIMB_NONE" LimbMax="OBJECT_BOSS_HAKUGIN_LIMB_MAX" EnumName="ObjectBossHakuginLimb" Offset="0x13158" />
         <Animation Name="object_boss_hakugin_Anim_0134D0" Offset="0x134D0" />
         <Animation Name="object_boss_hakugin_Anim_013828" Offset="0x13828" />
         <Animation Name="object_boss_hakugin_Anim_014024" Offset="0x14024" />
diff --git a/assets/xml/objects/object_box.xml b/assets/xml/objects/object_box.xml
index 85e7886330..4413ecd7a6 100644
--- a/assets/xml/objects/object_box.xml
+++ b/assets/xml/objects/object_box.xml
@@ -21,7 +21,7 @@
         <Limb Name="object_box_Standardlimb_00666C" Type="Standard" EnumName="OBJECT_BOX_CHEST_LIMB_02" Offset="0x666C" />
         <Limb Name="object_box_Standardlimb_006678" Type="Standard" EnumName="OBJECT_BOX_CHEST_LIMB_03" Offset="0x6678" />
         <Limb Name="object_box_Standardlimb_006684" Type="Standard" EnumName="OBJECT_BOX_CHEST_LIMB_04" Offset="0x6684" />
-        <Skeleton Name="gBoxChestSkel" Type="Normal" LimbType="Standard" LimbNone="OBJECT_BOX_CHEST_LIMB_NONE" LimbMax="OBJECT_BOX_CHEST_LIMB_MAX" EnumName="object_box_Chest_Limbs" Offset="0x66A0" />
+        <Skeleton Name="gBoxChestSkel" Type="Normal" LimbType="Standard" LimbNone="OBJECT_BOX_CHEST_LIMB_NONE" LimbMax="OBJECT_BOX_CHEST_LIMB_MAX" EnumName="ObjectBoxChestLimb" Offset="0x66A0" />
         <CurveAnimation Name="gBoxLightAdultCurveAnim" SkelOffset="0x7D78" Offset="0x6A20"/>
         <CurveAnimation Name="gBoxLightChildCurveAnim" SkelOffset="0x7D78" Offset="0x6E30"/>
         <Texture Name="gBoxLightTex" OutName="box_light_tex" Format="i8" Width="64" Height="32" Offset="0x6E40" />
@@ -44,7 +44,7 @@
         <Limb Name="object_box_Curvelimb_007D1C" Type="Curve" EnumName="OBJECT_BOX_LIGHT_LIMB_12" Offset="0x7D1C" />
         <Limb Name="object_box_Curvelimb_007D28" Type="Curve" EnumName="OBJECT_BOX_LIGHT_LIMB_13" Offset="0x7D28" />
         <Limb Name="object_box_Curvelimb_007D34" Type="Curve" EnumName="OBJECT_BOX_LIGHT_LIMB_14" Offset="0x7D34" />
-        <Skeleton Name="gBoxLightCurveSkel" Type="Curve" LimbType="Curve" LimbNone="OBJECT_BOX_LIGHT_LIMB_NONE" LimbMax="OBJECT_BOX_LIGHT_LIMB_MAX" EnumName="object_box_Light_Limbs" Offset="0x7D78" />
+        <Skeleton Name="gBoxLightCurveSkel" Type="Curve" LimbType="Curve" LimbNone="OBJECT_BOX_LIGHT_LIMB_NONE" LimbMax="OBJECT_BOX_LIGHT_LIMB_MAX" EnumName="ObjectBoxLightLimb" Offset="0x7D78" />
         <Animation Name="gBoxBigChestOpenGoronAnim" Offset="0x7E54" />
         <Animation Name="gBoxBigChestOpenDekuAnim" Offset="0x7F30" />
         <Blob Name="object_box_zeroes_unk_00007F40" Size="0xA0" Offset="0x7F40" />
diff --git a/assets/xml/objects/object_bsb.xml b/assets/xml/objects/object_bsb.xml
index 7ccf12bce2..81cdb99918 100644
--- a/assets/xml/objects/object_bsb.xml
+++ b/assets/xml/objects/object_bsb.xml
@@ -72,7 +72,7 @@
         <Limb Name="object_bsb_Standardlimb_00C36C" Type="Standard" EnumName="OBJECT_BSB_LIMB_12" Offset="0xC36C" />
         <Limb Name="object_bsb_Standardlimb_00C378" Type="Standard" EnumName="OBJECT_BSB_LIMB_13" Offset="0xC378" />
         <Limb Name="object_bsb_Standardlimb_00C384" Type="Standard" EnumName="OBJECT_BSB_LIMB_14" Offset="0xC384" />
-        <Skeleton Name="object_bsb_Skel_00C3E0" Type="Normal" LimbType="Standard" LimbNone="OBJECT_BSB_LIMB_NONE" LimbMax="OBJECT_BSB_LIMB_MAX" EnumName="object_bsb_Limbs" Offset="0xC3E0" />
+        <Skeleton Name="object_bsb_Skel_00C3E0" Type="Normal" LimbType="Standard" LimbNone="OBJECT_BSB_LIMB_NONE" LimbMax="OBJECT_BSB_LIMB_MAX" EnumName="ObjectBsbLimb" Offset="0xC3E0" />
         <Animation Name="object_bsb_Anim_00C790" Offset="0xC790" />
         <Animation Name="object_bsb_Anim_00CD88" Offset="0xCD88" />
         <Animation Name="object_bsb_Anim_00D3CC" Offset="0xD3CC" />
diff --git a/assets/xml/objects/object_cne.xml b/assets/xml/objects/object_cne.xml
index fccbf539f5..a4c8b28e2c 100644
--- a/assets/xml/objects/object_cne.xml
+++ b/assets/xml/objects/object_cne.xml
@@ -18,7 +18,7 @@
         <Limb Name="gCneRightHandLimb" LimbType="Standard" EnumName="CNE_LIMB_RIGHT_HAND" Offset="0x9C"/>
         <Limb Name="gCneHeadLimb" LimbType="Standard" EnumName="CNE_LIMB_HEAD" Offset="0xA8"/>
 
-        <Skeleton Name="gCneSkel" Type="Flex" LimbType="Standard" LimbNone="CNE_LIMB_NONE" LimbMax="CNE_LIMB_MAX" EnumName="CneLimbs" Offset="0xF0"/>
+        <Skeleton Name="gCneSkel" Type="Flex" LimbType="Standard" LimbNone="CNE_LIMB_NONE" LimbMax="CNE_LIMB_MAX" EnumName="CneLimb" Offset="0xF0"/>
 
         <!-- 32-bit aligned textures. -->
         <Texture Name="gCneTLUT" OutName="cne_tlut" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
diff --git a/assets/xml/objects/object_cow.xml b/assets/xml/objects/object_cow.xml
index 535d5dd85b..6895d62177 100644
--- a/assets/xml/objects/object_cow.xml
+++ b/assets/xml/objects/object_cow.xml
@@ -30,7 +30,7 @@
         <Limb Name="gCowNoseRingLimb" Type="Standard" EnumName="COW_LIMB_NOSE_RING" Offset="0x3FF0" />
 
         <!-- Cow Skeleton -->
-        <Skeleton Name="gCowSkel" Type="Flex" LimbType="Standard" LimbNone="COW_LIMB_NONE" LimbMax="COW_LIMB_MAX" EnumName="CowLimbs" Offset="0x4010" />
+        <Skeleton Name="gCowSkel" Type="Flex" LimbType="Standard" LimbNone="COW_LIMB_NONE" LimbMax="COW_LIMB_MAX" EnumName="CowLimb" Offset="0x4010" />
 
         <Animation Name="gCowMooAnim" Offset="0x4264" /> <!-- Original name is "usi_mooo" -->
         <Animation Name="gCowTailIdleAnim" Offset="0x4348" /> <!-- Original name is "ust_daran" ("loosely") -->
@@ -50,7 +50,7 @@
         <Limb Name="gCowTailEndLimb" Type="Standard" EnumName="COW_TAIL_LIMB_END" Offset="0x4C10" />
 
         <!-- Cow Tail Skeleton -->
-        <Skeleton Name="gCowTailSkel" Type="Flex" LimbType="Standard" LimbNone="COW_TAIL_LIMB_NONE" LimbMax="COW_TAIL_LIMB_MAX" EnumName="CowTailLimbs"Offset="0x4C30" />
+        <Skeleton Name="gCowTailSkel" Type="Flex" LimbType="Standard" LimbNone="COW_TAIL_LIMB_NONE" LimbMax="COW_TAIL_LIMB_MAX" EnumName="CowTailLimb" Offset="0x4C30" />
 
         <Animation Name="gCowTailSwishAnim" Offset="0x4E98" /> <!-- Original name is "ust_furifuri" ("fluttery") -->
     </File>
diff --git a/assets/xml/objects/object_crow.xml b/assets/xml/objects/object_crow.xml
index de51da580e..10fc235435 100644
--- a/assets/xml/objects/object_crow.xml
+++ b/assets/xml/objects/object_crow.xml
@@ -19,6 +19,6 @@
         <Limb Name="gGuayLeftWingTipLimb" Type="Standard" EnumName="OBJECT_CROW_LIMB_LEFT_WING_TIP" Offset="0x107C" />
         <Limb Name="gGuayUpperTailLimb" Type="Standard" EnumName="OBJECT_CROW_LIMB_UPPER_TAIL" Offset="0x1088" />
         <Limb Name="gGuayTailLimb" Type="Standard" EnumName="OBJECT_CROW_LIMB_TAIL" Offset="0x1094" />
-        <Skeleton Name="gGuaySkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_CROW_LIMB_NONE" LimbMax="OBJECT_CROW_LIMB_MAX" EnumName="objectCrowLimbs" Offset="0x10C0" />
+        <Skeleton Name="gGuaySkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_CROW_LIMB_NONE" LimbMax="OBJECT_CROW_LIMB_MAX" EnumName="ObjectCrowLimb" Offset="0x10C0" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_cs.xml b/assets/xml/objects/object_cs.xml
index 803d2b02c2..fe614582b6 100644
--- a/assets/xml/objects/object_cs.xml
+++ b/assets/xml/objects/object_cs.xml
@@ -89,7 +89,7 @@
         <Limb Name="object_cs_Standardlimb_00F7B8" Type="Standard" EnumName="OBJECT_CS_LIMB_12" Offset="0xF7B8" />
         <Limb Name="object_cs_Standardlimb_00F7C4" Type="Standard" EnumName="OBJECT_CS_LIMB_13" Offset="0xF7C4" />
         <Limb Name="object_cs_Standardlimb_00F7D0" Type="Standard" EnumName="OBJECT_CS_LIMB_14" Offset="0xF7D0" />
-        <Skeleton Name="object_cs_Skel_00F82C" Type="Flex" LimbType="Standard" LimbNone="OBJECT_CS_LIMB_NONE" LimbMax="OBJECT_CS_LIMB_MAX" EnumName="object_cs_Limbs" Offset="0xF82C" />
+        <Skeleton Name="object_cs_Skel_00F82C" Type="Flex" LimbType="Standard" LimbNone="OBJECT_CS_LIMB_NONE" LimbMax="OBJECT_CS_LIMB_MAX" EnumName="ObjectCsLimb" Offset="0xF82C" />
         <Animation Name="object_cs_Anim_00FAF4" Offset="0xFAF4" />
         <Animation Name="object_cs_Anim_01007C" Offset="0x1007C" />
         <Animation Name="object_cs_Anim_010B68" Offset="0x10B68" />
diff --git a/assets/xml/objects/object_dai.xml b/assets/xml/objects/object_dai.xml
index f613a9ab82..b547897f89 100644
--- a/assets/xml/objects/object_dai.xml
+++ b/assets/xml/objects/object_dai.xml
@@ -81,6 +81,6 @@
         <Limb Name="object_dai_Standardlimb_013064" Type="Standard" EnumName="OBJECT_DAI_LIMB_10" Offset="0x13064" />
         <Limb Name="object_dai_Standardlimb_013070" Type="Standard" EnumName="OBJECT_DAI_LIMB_11" Offset="0x13070" />
         <Limb Name="object_dai_Standardlimb_01307C" Type="Standard" EnumName="OBJECT_DAI_LIMB_12" Offset="0x1307C" />
-        <Skeleton Name="object_dai_Skel_0130D0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DAI_LIMB_NONE" LimbMax="OBJECT_DAI_LIMB_MAX" EnumName="object_dai_Limbs" Offset="0x130D0" />
+        <Skeleton Name="object_dai_Skel_0130D0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DAI_LIMB_NONE" LimbMax="OBJECT_DAI_LIMB_MAX" EnumName="ObjectDaiLimb" Offset="0x130D0" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_daiku.xml b/assets/xml/objects/object_daiku.xml
index 57124bd281..17d8ddbf09 100644
--- a/assets/xml/objects/object_daiku.xml
+++ b/assets/xml/objects/object_daiku.xml
@@ -65,7 +65,7 @@
         <Limb Name="object_daiku_Standardlimb_00A7EC" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_0E" Offset="0xA7EC" />
         <Limb Name="object_daiku_Standardlimb_00A7F8" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_0F" Offset="0xA7F8" />
         <Limb Name="object_daiku_Standardlimb_00A804" Type="Standard" EnumName="OBJECT_DAIKU_LIMB_10" Offset="0xA804" />
-        <Skeleton Name="object_daiku_Skel_00A850" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DAIKU_LIMB_NONE" LimbMax="OBJECT_DAIKU_LIMB_MAX" EnumName="object_daiku_Limbs" Offset="0xA850" />
+        <Skeleton Name="object_daiku_Skel_00A850" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DAIKU_LIMB_NONE" LimbMax="OBJECT_DAIKU_LIMB_MAX" EnumName="ObjectDaikuLimb" Offset="0xA850" />
         <Animation Name="object_daiku_Anim_00ACD0" Offset="0xACD0" />
         <Animation Name="object_daiku_Anim_00B690" Offset="0xB690" />
         <Animation Name="object_daiku_Anim_00BEAC" Offset="0xBEAC" />
diff --git a/assets/xml/objects/object_death.xml b/assets/xml/objects/object_death.xml
index 7d3e1e5969..77d4ccd4a1 100644
--- a/assets/xml/objects/object_death.xml
+++ b/assets/xml/objects/object_death.xml
@@ -75,7 +75,7 @@
         <Limb Name="object_death_Standardlimb_00AC90" Type="Standard" EnumName="OBJECT_DEATH_LIMB_13" Offset="0xAC90" />
         <Limb Name="object_death_Standardlimb_00AC9C" Type="Standard" EnumName="OBJECT_DEATH_LIMB_14" Offset="0xAC9C" />
         <Limb Name="object_death_Standardlimb_00ACA8" Type="Standard" EnumName="OBJECT_DEATH_LIMB_15" Offset="0xACA8" />
-        <Skeleton Name="object_death_Skel_00AD08" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DEATH_LIMB_NONE" LimbMax="OBJECT_DEATH_LIMB_MAX" EnumName="object_death_Limbs" Offset="0xAD08" />
+        <Skeleton Name="object_death_Skel_00AD08" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DEATH_LIMB_NONE" LimbMax="OBJECT_DEATH_LIMB_MAX" EnumName="ObjectDeathLimb" Offset="0xAD08" />
         <Animation Name="object_death_Anim_00B284" Offset="0xB284" />
         <Animation Name="object_death_Anim_00B508" Offset="0xB508" />
         <Animation Name="object_death_Anim_00CB2C" Offset="0xCB2C" />
diff --git a/assets/xml/objects/object_dekubaba.xml b/assets/xml/objects/object_dekubaba.xml
index b82cfb94b7..eb80e770b7 100644
--- a/assets/xml/objects/object_dekubaba.xml
+++ b/assets/xml/objects/object_dekubaba.xml
@@ -20,7 +20,7 @@
         <Limb Name="object_dekubaba_Standardlimb_002A00" Type="Standard" EnumName="OBJECT_DEKUBABA_LIMB_05" Offset="0x2A00" />
         <Limb Name="object_dekubaba_Standardlimb_002A0C" Type="Standard" EnumName="OBJECT_DEKUBABA_LIMB_06" Offset="0x2A0C" />
         <Limb Name="object_dekubaba_Standardlimb_002A18" Type="Standard" EnumName="OBJECT_DEKUBABA_LIMB_07" Offset="0x2A18" />
-        <Skeleton Name="object_dekubaba_Skel_002A40" Type="Normal" LimbType="Standard" LimbNone="OBJECT_DEKUBABA_LIMB_NONE" LimbMax="OBJECT_DEKUBABA_LIMB_MAX" EnumName="object_dekubaba_Limbs" Offset="0x2A40" />
+        <Skeleton Name="object_dekubaba_Skel_002A40" Type="Normal" LimbType="Standard" LimbNone="OBJECT_DEKUBABA_LIMB_NONE" LimbMax="OBJECT_DEKUBABA_LIMB_MAX" EnumName="ObjectDekubabaLimb" Offset="0x2A40" />
         <DList Name="object_dekubaba_DL_003070" Offset="0x3070" />
         <Texture Name="object_dekubaba_Tex_0031C0" OutName="tex_0031C0" Format="rgba16" Width="32" Height="32" Offset="0x31C0" />
     </File>
diff --git a/assets/xml/objects/object_dekunuts.xml b/assets/xml/objects/object_dekunuts.xml
index 8a45dd04a9..909231a770 100644
--- a/assets/xml/objects/object_dekunuts.xml
+++ b/assets/xml/objects/object_dekunuts.xml
@@ -38,7 +38,7 @@
         <Limb Name="gDekuScrubRightFootLimb" Type="Standard" EnumName="DEKU_SCRUB_LIMB_RIGHT_FOOT" Offset="0x2438" />
 
         <!-- Deku Scrub Skeleton -->
-        <Skeleton Name="gDekuScrubSkel" Type="Normal" LimbType="Standard" LimbNone="DEKU_SCRUB_LIMB_NONE" LimbMax="DEKU_SCRUB_LIMB_MAX" EnumName="DekuScrubLimbs" Offset="0x2468" />
+        <Skeleton Name="gDekuScrubSkel" Type="Normal" LimbType="Standard" LimbNone="DEKU_SCRUB_LIMB_NONE" LimbMax="DEKU_SCRUB_LIMB_MAX" EnumName="DekuScrubLimb" Offset="0x2468" />
 
         <!-- Deku Scrub Animations -->
         <Animation Name="gDekuScrubDamageAnim" Offset="0x259C" /> <!-- Original name is "dn_damage" -->
diff --git a/assets/xml/objects/object_dinofos.xml b/assets/xml/objects/object_dinofos.xml
index 7b1ff8c205..8db9c7c4a7 100644
--- a/assets/xml/objects/object_dinofos.xml
+++ b/assets/xml/objects/object_dinofos.xml
@@ -61,7 +61,7 @@
         <Limb Name="object_dinofos_Standardlimb_0094FC" Type="Standard" EnumName="OBJECT_DINOFOS_LIMB_12" Offset="0x94FC" />
         <Limb Name="object_dinofos_Standardlimb_009508" Type="Standard" EnumName="OBJECT_DINOFOS_LIMB_13" Offset="0x9508" />
         <Limb Name="object_dinofos_Standardlimb_009514" Type="Standard" EnumName="OBJECT_DINOFOS_LIMB_14" Offset="0x9514" />
-        <Skeleton Name="object_dinofos_Skel_009570" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DINOFOS_LIMB_NONE" LimbMax="OBJECT_DINOFOS_LIMB_MAX" EnumName="object_dinofos_Limbs" Offset="0x9570" />
+        <Skeleton Name="object_dinofos_Skel_009570" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DINOFOS_LIMB_NONE" LimbMax="OBJECT_DINOFOS_LIMB_MAX" EnumName="ObjectDinofosLimb" Offset="0x9570" />
         <Animation Name="object_dinofos_Anim_009B70" Offset="0x9B70" />
         <Animation Name="object_dinofos_Anim_00ABD0" Offset="0xABD0" />
         <Animation Name="object_dinofos_Anim_00C974" Offset="0xC974" />
diff --git a/assets/xml/objects/object_dnk.xml b/assets/xml/objects/object_dnk.xml
index ad69c7722d..bec6ce45d0 100644
--- a/assets/xml/objects/object_dnk.xml
+++ b/assets/xml/objects/object_dnk.xml
@@ -44,7 +44,7 @@
         <Limb Name="gDekuPalaceGuardEyesLimb" Type="Standard" EnumName="DEKU_PALACE_GUARD_LIMB_EYES" Offset="0x27FC" />
         <Limb Name="gDekuPalaceGuardLeftFootLimb" Type="Standard" EnumName="DEKU_PALACE_GUARD_LIMB_LEFT_FOOT" Offset="0x2808" />
         <Limb Name="gDekuPalaceGuardRightFootLimb" Type="Standard" EnumName="DEKU_PALACE_GUARD_LIMB_RIGHT_FOOT" Offset="0x2814" />
-        <Skeleton Name="gDekuPalaceGuardSkel" Type="Normal" LimbType="Standard" LimbNone="DEKU_PALACE_GUARD_LIMB_NONE" LimbMax="DEKU_PALACE_GUARD_LIMB_MAX" EnumName="DekuPalaceGuardLimbs" Offset="0x2848" />
+        <Skeleton Name="gDekuPalaceGuardSkel" Type="Normal" LimbType="Standard" LimbNone="DEKU_PALACE_GUARD_LIMB_NONE" LimbMax="DEKU_PALACE_GUARD_LIMB_MAX" EnumName="DekuPalaceGuardLimb" Offset="0x2848" />
         <Animation Name="gDekuPalaceGuardWaitAnim" Offset="0x2A08" /> <!-- Original named: dnk_wait -->
         <Animation Name="gDekuPalaceGuardWalkAnim" Offset="0x2B6C" /> <!-- Original named: dnk_walk -->
     </File>
diff --git a/assets/xml/objects/object_dno.xml b/assets/xml/objects/object_dno.xml
index a320be10fe..6646636287 100644
--- a/assets/xml/objects/object_dno.xml
+++ b/assets/xml/objects/object_dno.xml
@@ -81,6 +81,6 @@
         <Limb Name="object_dno_Standardlimb_00E168" Type="Standard" EnumName="OBJECT_DNO_LIMB_19" Offset="0xE168" />
         <Limb Name="object_dno_Standardlimb_00E174" Type="Standard" EnumName="OBJECT_DNO_LIMB_1A" Offset="0xE174" />
         <Limb Name="object_dno_Standardlimb_00E180" Type="Standard" EnumName="OBJECT_DNO_LIMB_1B" Offset="0xE180" />
-        <Skeleton Name="object_dno_Skel_00E1F8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DNO_LIMB_NONE" LimbMax="OBJECT_DNO_LIMB_MAX" EnumName="object_dno_Limbs" Offset="0xE1F8" />
+        <Skeleton Name="object_dno_Skel_00E1F8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DNO_LIMB_NONE" LimbMax="OBJECT_DNO_LIMB_MAX" EnumName="ObjectDnoLimb" Offset="0xE1F8" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_dnp.xml b/assets/xml/objects/object_dnp.xml
index 3763685782..d9494909ce 100644
--- a/assets/xml/objects/object_dnp.xml
+++ b/assets/xml/objects/object_dnp.xml
@@ -81,7 +81,7 @@
         <Limb Name="object_dnp_Standardlimb_010CD8" Type="Standard" EnumName="OBJECT_DNP_LIMB_17" Offset="0x10CD8" />
         <Limb Name="object_dnp_Standardlimb_010CE4" Type="Standard" EnumName="OBJECT_DNP_LIMB_18" Offset="0x10CE4" />
         <Limb Name="object_dnp_Standardlimb_010CF0" Type="Standard" EnumName="OBJECT_DNP_LIMB_19" Offset="0x10CF0" />
-        <Skeleton Name="object_dnp_Skel_010D60" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DNP_LIMB_NONE" LimbMax="OBJECT_DNP_LIMB_MAX" EnumName="object_dnp_Limbs" Offset="0x10D60" />
+        <Skeleton Name="object_dnp_Skel_010D60" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DNP_LIMB_NONE" LimbMax="OBJECT_DNP_LIMB_MAX" EnumName="ObjectDnpLimb" Offset="0x10D60" />
         <Animation Name="object_dnp_Anim_0115B8" Offset="0x115B8" />
         <Animation Name="object_dnp_Anim_012428" Offset="0x12428" />
     </File>
diff --git a/assets/xml/objects/object_dnq.xml b/assets/xml/objects/object_dnq.xml
index 830e6d8e43..92d818a4ba 100644
--- a/assets/xml/objects/object_dnq.xml
+++ b/assets/xml/objects/object_dnq.xml
@@ -88,7 +88,7 @@
         <Limb Name="object_dnq_Standardlimb_00EAA4" Type="Standard" EnumName="OBJECT_DNQ_LIMB_1E" Offset="0xEAA4" />
         <Limb Name="object_dnq_Standardlimb_00EAB0" Type="Standard" EnumName="OBJECT_DNQ_LIMB_1F" Offset="0xEAB0" />
         <Limb Name="object_dnq_Standardlimb_00EABC" Type="Standard" EnumName="OBJECT_DNQ_LIMB_20" Offset="0xEABC" />
-        <Skeleton Name="object_dnq_Skel_00EB48" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DNQ_LIMB_NONE" LimbMax="OBJECT_DNQ_LIMB_MAX" EnumName="object_dnq_Limbs" Offset="0xEB48" />
+        <Skeleton Name="object_dnq_Skel_00EB48" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DNQ_LIMB_NONE" LimbMax="OBJECT_DNQ_LIMB_MAX" EnumName="ObjectDnqLimb" Offset="0xEB48" />
         <Animation Name="object_dnq_Anim_00F504" Offset="0xF504" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_dns.xml b/assets/xml/objects/object_dns.xml
index d42f68f54a..e5d91326f7 100644
--- a/assets/xml/objects/object_dns.xml
+++ b/assets/xml/objects/object_dns.xml
@@ -38,7 +38,7 @@
         <Limb Name="gKingsChamberDekuGuardEyesLimb" Type="Standard" EnumName="KINGS_CHAMBER_DEKU_GUARD_LIMB_EYES" Offset="0x2D84" />
         <Limb Name="gKingsChamberDekuGuardLeftFootLimb" Type="Standard" EnumName="KINGS_CHAMBER_DEKU_GUARD_LIMB_LEFT_FOOT" Offset="0x2D90" />
         <Limb Name="gKingsChamberDekuGuardRightFootLimb" Type="Standard" EnumName="KINGS_CHAMBER_DEKU_GUARD_LIMB_RIGHT_FOOT" Offset="0x2D9C" />
-        <Skeleton Name="gKingsChamberDekuGuardSkel" Type="Normal" LimbType="Standard" LimbNone="KINGS_CHAMBER_DEKU_GUARD_LIMB_NONE" LimbMax="KINGS_CHAMBER_DEKU_GUARD_LIMB_MAX" EnumName="KingsChamberDekuGuardLimbs" Offset="0x2DD8" />
+        <Skeleton Name="gKingsChamberDekuGuardSkel" Type="Normal" LimbType="Standard" LimbNone="KINGS_CHAMBER_DEKU_GUARD_LIMB_NONE" LimbMax="KINGS_CHAMBER_DEKU_GUARD_LIMB_MAX" EnumName="KingsChamberDekuGuardLimb" Offset="0x2DD8" />
         <Animation Name="gKingsChamberDekuGuardIdleAnim" Offset="0x3310" /> <!-- Original name is "dns_wait" -->
         <Animation Name="gKingsChamberDekuGuardWalkAnim" Offset="0x34EC" /> <!-- Original name is "dns_walk" -->
     </File>
diff --git a/assets/xml/objects/object_dnt.xml b/assets/xml/objects/object_dnt.xml
index 6a2b0058d1..96b793849b 100644
--- a/assets/xml/objects/object_dnt.xml
+++ b/assets/xml/objects/object_dnt.xml
@@ -84,7 +84,7 @@
         <Limb Name="object_dnt_Standardlimb_00ABE0" Type="Standard" EnumName="OBJECT_DNT_LIMB_19" Offset="0xABE0" />
         <Limb Name="object_dnt_Standardlimb_00ABEC" Type="Standard" EnumName="OBJECT_DNT_LIMB_1A" Offset="0xABEC" />
         <Limb Name="object_dnt_Standardlimb_00ABF8" Type="Standard" EnumName="OBJECT_DNT_LIMB_1B" Offset="0xABF8" />
-        <Skeleton Name="object_dnt_Skel_00AC70" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DNT_LIMB_NONE" LimbMax="OBJECT_DNT_LIMB_MAX" EnumName="object_dnt_Limbs" Offset="0xAC70" />
+        <Skeleton Name="object_dnt_Skel_00AC70" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DNT_LIMB_NONE" LimbMax="OBJECT_DNT_LIMB_MAX" EnumName="ObjectDntLimb" Offset="0xAC70" />
         <Animation Name="object_dnt_Anim_00B0B4" Offset="0xB0B4" />
         <Texture Name="object_dnt_Tex_00B0D0" OutName="tex_00B0D0" Format="rgba16" Width="16" Height="16" Offset="0xB0D0" />
     </File>
diff --git a/assets/xml/objects/object_dodongo.xml b/assets/xml/objects/object_dodongo.xml
index f63a27467a..df70802d05 100644
--- a/assets/xml/objects/object_dodongo.xml
+++ b/assets/xml/objects/object_dodongo.xml
@@ -58,7 +58,7 @@
         <Limb Name="object_dodongo_Standardlimb_00827C" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_1C" Offset="0x827C" />
         <Limb Name="object_dodongo_Standardlimb_008288" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_1D" Offset="0x8288" />
         <Limb Name="object_dodongo_Standardlimb_008294" Type="Standard" EnumName="OBJECT_DODONGO_LIMB_1E" Offset="0x8294" />
-        <Skeleton Name="object_dodongo_Skel_008318" Type="Normal" LimbType="Standard" LimbNone="OBJECT_DODONGO_LIMB_NONE" LimbMax="OBJECT_DODONGO_LIMB_MAX" EnumName="object_dodongo_Limbs" Offset="0x8318" />
+        <Skeleton Name="object_dodongo_Skel_008318" Type="Normal" LimbType="Standard" LimbNone="OBJECT_DODONGO_LIMB_NONE" LimbMax="OBJECT_DODONGO_LIMB_MAX" EnumName="ObjectDodongoLimb" Offset="0x8318" />
         <Animation Name="object_dodongo_Anim_008B1C" Offset="0x8B1C" />
         <Animation Name="object_dodongo_Anim_008DE0" Offset="0x8DE0" />
         <Animation Name="object_dodongo_Anim_009088" Offset="0x9088" />
diff --git a/assets/xml/objects/object_dog.xml b/assets/xml/objects/object_dog.xml
index 6941cb36c1..0e3d318b40 100644
--- a/assets/xml/objects/object_dog.xml
+++ b/assets/xml/objects/object_dog.xml
@@ -60,6 +60,6 @@
         <Limb Name="gDogTailLimb" Type="Standard" EnumName="DOG_LIMB_TAIL" Offset="0x80B4" />
 
         <!-- Dog Skeleton -->
-        <Skeleton Name="gDogSkel" Type="Flex" LimbType="Standard" LimbNone="DOG_LIMB_NONE" LimbMax="DOG_LIMB_MAX" EnumName="DogLimbs" Offset="0x80F0" />
+        <Skeleton Name="gDogSkel" Type="Flex" LimbType="Standard" LimbNone="DOG_LIMB_NONE" LimbMax="DOG_LIMB_MAX" EnumName="DogLimb" Offset="0x80F0" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_drs.xml b/assets/xml/objects/object_drs.xml
index c5f4ee7261..1b6c295976 100644
--- a/assets/xml/objects/object_drs.xml
+++ b/assets/xml/objects/object_drs.xml
@@ -16,6 +16,6 @@
         <Limb Name="gWeddingDressMannequinLimb" Type="Standard" EnumName="WEDDING_DRESS_MANNEQUIN_LIMB" Offset="0x5A48" />
         <Limb Name="gWeddingDressMannequinMaskLimb" Type="Standard" EnumName="WEDDING_DRESS_MANNEQUIN_LIMB_MASK" Offset="0x5A54" />
         <Limb Name="gWeddingDressMannequinPatternLimb" Type="Standard" EnumName="WEDDING_DRESS_MANNEQUIN_LIMB_PATTERN" Offset="0x5A60" />
-        <Skeleton Name="gWeddingDressMannequinSkel" Type="Flex" LimbType="Standard" LimbNone="WEDDING_DRESS_MANNEQUIN_LIMB_NONE" LimbMax="WEDDING_DRESS_MANNEQUIN_LIMB_MAX" EnumName="WeddingDressMannequinLimbs" Offset="0x5A78" />
+        <Skeleton Name="gWeddingDressMannequinSkel" Type="Flex" LimbType="Standard" LimbNone="WEDDING_DRESS_MANNEQUIN_LIMB_NONE" LimbMax="WEDDING_DRESS_MANNEQUIN_LIMB_MAX" EnumName="WeddingDressMannequinLimb" Offset="0x5A78" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_ds2.xml b/assets/xml/objects/object_ds2.xml
index 1f1fd9d207..1794c4bf80 100644
--- a/assets/xml/objects/object_ds2.xml
+++ b/assets/xml/objects/object_ds2.xml
@@ -27,6 +27,6 @@
         <Limb Name="object_ds2_Standardlimb_004214" Type="Standard" EnumName="OBJECT_DS2_LIMB_06" Offset="0x4214" />
         <Limb Name="object_ds2_Standardlimb_004220" Type="Standard" EnumName="OBJECT_DS2_LIMB_07" Offset="0x4220" />
         <Limb Name="object_ds2_Standardlimb_00422C" Type="Standard" EnumName="OBJECT_DS2_LIMB_08" Offset="0x422C" />
-        <Skeleton Name="object_ds2_Skel_004258" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DS2_LIMB_NONE" LimbMax="OBJECT_DS2_LIMB_MAX" EnumName="object_ds2_Limbs" Offset="0x4258" />
+        <Skeleton Name="object_ds2_Skel_004258" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DS2_LIMB_NONE" LimbMax="OBJECT_DS2_LIMB_MAX" EnumName="ObjectDs2Limb" Offset="0x4258" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_ds2n.xml b/assets/xml/objects/object_ds2n.xml
index 721eec6771..7e7d45f0c5 100644
--- a/assets/xml/objects/object_ds2n.xml
+++ b/assets/xml/objects/object_ds2n.xml
@@ -86,7 +86,7 @@
         <Limb Name="gDs2nRightForarmLimb" Type="Standard" EnumName="DS2N_LIMB_RIGHT_FORARM" Offset="0x8104" />
         <Limb Name="gDs2nRightHandLimb" Type="Standard" EnumName="DS2N_LIMB_RIGHT_HAND" Offset="0x8110" />
         <Limb Name="gDs2nHeadLimb" Type="Standard" EnumName="DS2N_LIMB_HEAD" Offset="0x811C" />
-        <Skeleton Name="gDs2nSkeleton" Type="Flex" LimbType="Standard" LimbNone="DS2N_LIMB_NONE" LimbMax="DS2N_LIMB_MAX" EnumName="Ds2nLimbs" Offset="0x8170" />
+        <Skeleton Name="gDs2nSkeleton" Type="Flex" LimbType="Standard" LimbNone="DS2N_LIMB_NONE" LimbMax="DS2N_LIMB_MAX" EnumName="Ds2nLimb" Offset="0x8170" />
 
         <!-- 8 bytes: 0x11 followed by zeros  <Blob Name="gDs2n_Blob_008178" Size="0x8" Offset="0x8178" /> -->
     </File>
diff --git a/assets/xml/objects/object_dt.xml b/assets/xml/objects/object_dt.xml
index 78ad8046e9..8b2a902176 100644
--- a/assets/xml/objects/object_dt.xml
+++ b/assets/xml/objects/object_dt.xml
@@ -61,7 +61,7 @@
         <Limb Name="object_dt_Standardlimb_00B070" Type="Standard" EnumName="OBJECT_DT_LIMB_0C" Offset="0xB070" />
         <Limb Name="object_dt_Standardlimb_00B07C" Type="Standard" EnumName="OBJECT_DT_LIMB_0D" Offset="0xB07C" />
         <Limb Name="object_dt_Standardlimb_00B088" Type="Standard" EnumName="OBJECT_DT_LIMB_0E" Offset="0xB088" />
-        <Skeleton Name="object_dt_Skel_00B0CC" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DT_LIMB_NONE" LimbMax="OBJECT_DT_LIMB_MAX" EnumName="object_dt_Limbs" Offset="0xB0CC" />
+        <Skeleton Name="object_dt_Skel_00B0CC" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DT_LIMB_NONE" LimbMax="OBJECT_DT_LIMB_MAX" EnumName="ObjectDtLimb" Offset="0xB0CC" />
         <Animation Name="object_dt_Anim_00B500" Offset="0xB500" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_dy_obj.xml b/assets/xml/objects/object_dy_obj.xml
index 8dd90375ab..a64bc975b4 100644
--- a/assets/xml/objects/object_dy_obj.xml
+++ b/assets/xml/objects/object_dy_obj.xml
@@ -91,6 +91,6 @@
         <Limb Name="object_dy_obj_Standardlimb_01C824" Type="Standard" EnumName="OBJECT_DY_OBJ_LIMB_19" Offset="0x1C824" />
         <Limb Name="object_dy_obj_Standardlimb_01C830" Type="Standard" EnumName="OBJECT_DY_OBJ_LIMB_1A" Offset="0x1C830" />
         <Limb Name="object_dy_obj_Standardlimb_01C83C" Type="Standard" EnumName="OBJECT_DY_OBJ_LIMB_1B" Offset="0x1C83C" />
-        <Skeleton Name="object_dy_obj_Skel_01C8B4" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DY_OBJ_LIMB_NONE" LimbMax="OBJECT_DY_OBJ_LIMB_MAX" EnumName="object_dy_obj_Limbs" Offset="0x1C8B4" />
+        <Skeleton Name="object_dy_obj_Skel_01C8B4" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DY_OBJ_LIMB_NONE" LimbMax="OBJECT_DY_OBJ_LIMB_MAX" EnumName="ObjectDyObjLimb" Offset="0x1C8B4" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_efc_tw.xml b/assets/xml/objects/object_efc_tw.xml
index 3cb6468b9f..709224f9d2 100644
--- a/assets/xml/objects/object_efc_tw.xml
+++ b/assets/xml/objects/object_efc_tw.xml
@@ -8,6 +8,6 @@
         <Texture Name="object_efc_tw_Tex_0002C8" OutName="tex_0002C8" Format="i8" Width="64" Height="64" Offset="0x2C8" />
         <Limb Name="object_efc_tw_Curvelimb_0012C8" Type="Curve" EnumName="OBJECT_EFC_TW_LIMB_01" Offset="0x12C8" />
         <Limb Name="object_efc_tw_Curvelimb_0012D4" Type="Curve" EnumName="OBJECT_EFC_TW_LIMB_02" Offset="0x12D4" />
-        <Skeleton Name="object_efc_tw_Skel_0012E8" Type="Curve" LimbType="Curve" LimbNone="OBJECT_EFC_TW_LIMB_NONE" LimbMax="OBJECT_EFC_TW_LIMB_MAX" EnumName="object_efc_tw_Limbs" Offset="0x12E8" />
+        <Skeleton Name="object_efc_tw_Skel_0012E8" Type="Curve" LimbType="Curve" LimbNone="OBJECT_EFC_TW_LIMB_NONE" LimbMax="OBJECT_EFC_TW_LIMB_MAX" EnumName="ObjectEfcTwLimb" Offset="0x12E8" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_eg.xml b/assets/xml/objects/object_eg.xml
index 46d3e00890..9cda7f0a34 100644
--- a/assets/xml/objects/object_eg.xml
+++ b/assets/xml/objects/object_eg.xml
@@ -70,7 +70,7 @@
         <Limb Name="object_eg_Standardlimb_0095E4" Type="Standard" EnumName="OBJECT_EG_LIMB_15" Offset="0x95E4" />
         <Limb Name="object_eg_Standardlimb_0095F0" Type="Standard" EnumName="OBJECT_EG_LIMB_16" Offset="0x95F0" />
         <Limb Name="object_eg_Standardlimb_0095FC" Type="Standard" EnumName="OBJECT_EG_LIMB_17" Offset="0x95FC" />
-        <Skeleton Name="object_eg_Skel_009664" Type="Flex" LimbType="Standard" LimbNone="OBJECT_EG_LIMB_NONE" LimbMax="OBJECT_EG_LIMB_MAX" EnumName="object_eg_Limbs" Offset="0x9664" />
+        <Skeleton Name="object_eg_Skel_009664" Type="Flex" LimbType="Standard" LimbNone="OBJECT_EG_LIMB_NONE" LimbMax="OBJECT_EG_LIMB_MAX" EnumName="ObjectEgLimb" Offset="0x9664" />
         <Animation Name="object_eg_Anim_009D2C" Offset="0x9D2C" />
         <Animation Name="object_eg_Anim_00A204" Offset="0xA204" />
         <Animation Name="object_eg_Anim_00A484" Offset="0xA484" />
diff --git a/assets/xml/objects/object_famos.xml b/assets/xml/objects/object_famos.xml
index cbbf0057c4..d12a94d662 100644
--- a/assets/xml/objects/object_famos.xml
+++ b/assets/xml/objects/object_famos.xml
@@ -22,7 +22,7 @@
         <Limb Name="gFamosSwordLimb" Type="Standard" EnumName="FAMOS_LIMB_SWORD" Offset="0x3D00" />
         <Limb Name="gFamosShieldLimb" Type="Standard" EnumName="FAMOS_LIMB_SHIELD" Offset="0x3D0C" />
         <Limb Name="gFamosHeadLimb" Type="Standard" EnumName="FAMOS_LIMB_HEAD" Offset="0x3D18" />
-        <Skeleton Name="gFamosSkeleton" Type="Normal" LimbType="Standard" LimbNone="FAMOS_LIMB_NONE" LimbMax="FAMOS_LIMB_MAX" EnumName="FamosLimbs" Offset="0x3D38" />
+        <Skeleton Name="gFamosSkeleton" Type="Normal" LimbType="Standard" LimbNone="FAMOS_LIMB_NONE" LimbMax="FAMOS_LIMB_MAX" EnumName="FamosLimb" Offset="0x3D38" />
 
         <Animation Name="gFamosIdleAnim" Offset="0x3DC8" />
         <TextureAnimation Name="gFamosNormalGlowingEmblemTexAnim" Offset="0x3E30" />
diff --git a/assets/xml/objects/object_fb.xml b/assets/xml/objects/object_fb.xml
index f0d3b8111c..bb630781c8 100644
--- a/assets/xml/objects/object_fb.xml
+++ b/assets/xml/objects/object_fb.xml
@@ -55,7 +55,7 @@
         <Limb Name="object_fb_Standardlimb_006110" Type="Standard" EnumName="OBJECT_FB_LIMB_15" Offset="0x6110" />
         <Limb Name="object_fb_Standardlimb_00611C" Type="Standard" EnumName="OBJECT_FB_LIMB_16" Offset="0x611C" />
         <Limb Name="object_fb_Standardlimb_006128" Type="Standard" EnumName="OBJECT_FB_LIMB_17" Offset="0x6128" />
-        <Skeleton Name="object_fb_Skel_006190" Type="Flex" LimbType="Standard" LimbNone="OBJECT_FB_LIMB_NONE" LimbMax="OBJECT_FB_LIMB_MAX" EnumName="object_fb_Limbs" Offset="0x6190" />
+        <Skeleton Name="object_fb_Skel_006190" Type="Flex" LimbType="Standard" LimbNone="OBJECT_FB_LIMB_NONE" LimbMax="OBJECT_FB_LIMB_MAX" EnumName="ObjectFbLimb" Offset="0x6190" />
         <DList Name="object_fb_DL_0061E0" Offset="0x61E0" />
         <Texture Name="object_fb_Tex_0062A8" OutName="tex_0062A8" Format="i4" Width="32" Height="64" Offset="0x62A8" />
         <Texture Name="object_fb_Tex_0066A8" OutName="tex_0066A8" Format="i4" Width="64" Height="64" Offset="0x66A8" />
diff --git a/assets/xml/objects/object_firefly.xml b/assets/xml/objects/object_firefly.xml
index 84018ddd86..4c6aacd166 100644
--- a/assets/xml/objects/object_firefly.xml
+++ b/assets/xml/objects/object_firefly.xml
@@ -49,6 +49,6 @@
         <Limb Name="object_firefly_Standardlimb_001828" Type="Standard" EnumName="OBJECT_FIREFLY_LIMB_19" Offset="0x1828" />
         <Limb Name="object_firefly_Standardlimb_001834" Type="Standard" EnumName="OBJECT_FIREFLY_LIMB_1A" Offset="0x1834" />
         <Limb Name="object_firefly_Standardlimb_001840" Type="Standard" EnumName="OBJECT_FIREFLY_LIMB_1B" Offset="0x1840" />
-        <Skeleton Name="object_firefly_Skel_0018B8" Type="Normal" LimbType="Standard" LimbNone="OBJECT_FIREFLY_LIMB_NONE" LimbMax="OBJECT_FIREFLY_LIMB_MAX" EnumName="object_firefly_Limbs" Offset="0x18B8" />
+        <Skeleton Name="object_firefly_Skel_0018B8" Type="Normal" LimbType="Standard" LimbNone="OBJECT_FIREFLY_LIMB_NONE" LimbMax="OBJECT_FIREFLY_LIMB_MAX" EnumName="ObjectFireflyLimb" Offset="0x18B8" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_fish.xml b/assets/xml/objects/object_fish.xml
index 9da78b6ab8..f01639fbfa 100644
--- a/assets/xml/objects/object_fish.xml
+++ b/assets/xml/objects/object_fish.xml
@@ -35,7 +35,7 @@
         <Limb Name="object_fish_Standardlimb_002960" Type="Standard" EnumName="OBJECT_FISH_1_LIMB_0D" Offset="0x2960" />
         <Limb Name="object_fish_Standardlimb_00296C" Type="Standard" EnumName="OBJECT_FISH_1_LIMB_0E" Offset="0x296C" />
         <Limb Name="object_fish_Standardlimb_002978" Type="Standard" EnumName="OBJECT_FISH_1_LIMB_0F" Offset="0x2978" />
-        <Skeleton Name="gFishingFishSkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_FISH_1_LIMB_NONE" LimbMax="OBJECT_FISH_1_LIMB_MAX" EnumName="object_fish_1_Limbs" Offset="0x29C0" />
+        <Skeleton Name="gFishingFishSkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_FISH_1_LIMB_NONE" LimbMax="OBJECT_FISH_1_LIMB_MAX" EnumName="ObjectFish1Limb" Offset="0x29C0" />
         <Texture Name="object_fish_Tex_0029D0" OutName="tex_0029D0" Format="rgba16" Width="8" Height="16" Offset="0x29D0" />
         <Texture Name="object_fish_Tex_002AD0" OutName="tex_002AD0" Format="rgba16" Width="8" Height="8" Offset="0x2AD0" />
         <DList Name="object_fish_DL_002BD0" Offset="0x2BD0" />
@@ -73,7 +73,7 @@
         <Limb Name="object_fish_Standardlimb_0085B4" Type="Standard" EnumName="OBJECT_FISH_2_LIMB_06" Offset="0x85B4" />
         <Limb Name="object_fish_Standardlimb_0085C0" Type="Standard" EnumName="OBJECT_FISH_2_LIMB_07" Offset="0x85C0" />
         <Limb Name="object_fish_Standardlimb_0085CC" Type="Standard" EnumName="OBJECT_FISH_2_LIMB_08" Offset="0x85CC" />
-        <Skeleton Name="gFishingOwnerSkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_FISH_2_LIMB_NONE" LimbMax="OBJECT_FISH_2_LIMB_MAX" EnumName="object_fish_2_Limbs" Offset="0x85F8" />
+        <Skeleton Name="gFishingOwnerSkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_FISH_2_LIMB_NONE" LimbMax="OBJECT_FISH_2_LIMB_MAX" EnumName="ObjectFish2Limb" Offset="0x85F8" />
         <DList Name="gFishingRippleSetupDL" Offset="0x8610" />
         <DList Name="gFishingRippleVtxDL" Offset="0x8678" />
         <Texture Name="object_fish_Tex_008690" OutName="tex_008690" Format="i4" Width="32" Height="32" Offset="0x8690" />
@@ -131,7 +131,7 @@
         <Limb Name="object_fish_Standardlimb_011008" Type="Standard" EnumName="OBJECT_FISH_3_LIMB_09" Offset="0x11008" />
         <Limb Name="object_fish_Standardlimb_011014" Type="Standard" EnumName="OBJECT_FISH_3_LIMB_0A" Offset="0x11014" />
         <Limb Name="object_fish_Standardlimb_011020" Type="Standard" EnumName="OBJECT_FISH_3_LIMB_0B" Offset="0x11020" />
-        <Skeleton Name="gFishingLoachSkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_FISH_3_LIMB_NONE" LimbMax="OBJECT_FISH_3_LIMB_MAX" EnumName="object_fish_3_Limbs" Offset="0x11058" />
+        <Skeleton Name="gFishingLoachSkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_FISH_3_LIMB_NONE" LimbMax="OBJECT_FISH_3_LIMB_MAX" EnumName="ObjectFish3Limb" Offset="0x11058" />
         <Blob Name="object_fish_Blob_011064" Size="0xC" Offset="0x11064" />
         <Texture Name="gFishingRodSegmentStripTex" OutName="tex_011070" Format="rgba16" Width="16" Height="8" Offset="0x11070" />
         <Texture Name="gFishingRodSegmentBlackTex" OutName="tex_011170" Format="rgba16" Width="16" Height="8" Offset="0x11170" />
diff --git a/assets/xml/objects/object_fr.xml b/assets/xml/objects/object_fr.xml
index cb02087bab..0cd28760ef 100644
--- a/assets/xml/objects/object_fr.xml
+++ b/assets/xml/objects/object_fr.xml
@@ -62,6 +62,6 @@
         <Limb Name="object_fr_Standardlimb_00B4B8" Type="Standard" EnumName="OBJECT_FR_LIMB_15" Offset="0xB4B8" />
         <Limb Name="object_fr_Standardlimb_00B4C4" Type="Standard" EnumName="OBJECT_FR_LIMB_16" Offset="0xB4C4" />
         <Limb Name="object_fr_Standardlimb_00B4D0" Type="Standard" EnumName="OBJECT_FR_LIMB_17" Offset="0xB4D0" />
-        <Skeleton Name="object_fr_Skel_00B538" Type="Flex" LimbType="Standard" LimbNone="OBJECT_FR_LIMB_NONE" LimbMax="OBJECT_FR_LIMB_MAX" EnumName="object_fr_Limbs" Offset="0xB538" />
+        <Skeleton Name="object_fr_Skel_00B538" Type="Flex" LimbType="Standard" LimbNone="OBJECT_FR_LIMB_NONE" LimbMax="OBJECT_FR_LIMB_MAX" EnumName="ObjectFrLimb" Offset="0xB538" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_fsn.xml b/assets/xml/objects/object_fsn.xml
index e3ae8db1bd..dd67874f0e 100644
--- a/assets/xml/objects/object_fsn.xml
+++ b/assets/xml/objects/object_fsn.xml
@@ -103,7 +103,7 @@
         <!-- Skeleton -->
         <!-- @bug: gFsnSkel specifies 18 limbs but only 17 exist, ZAPD breaks if gFsnLimbs is not extracted manually -->
         <LimbTable Name="gFsnLimbs" LimbType="Standard" Count="17" Offset="0x132DC"/>
-        <Skeleton Name="gFsnSkel" Type="Flex" LimbType="Standard" LimbNone="FSN_LIMB_NONE" LimbMax="FSN_LIMB_MAX" EnumName="FsnLimbs" Offset="0x13320" />
+        <Skeleton Name="gFsnSkel" Type="Flex" LimbType="Standard" LimbNone="FSN_LIMB_NONE" LimbMax="FSN_LIMB_MAX" EnumName="FsnLimb" Offset="0x13320" />
 
         <!-- Animations -->
         <Animation Name="gFsnLeanForwardStartAnim" Offset="0x138B0" />
diff --git a/assets/xml/objects/object_fu.xml b/assets/xml/objects/object_fu.xml
index 4094355aeb..19404f90e5 100644
--- a/assets/xml/objects/object_fu.xml
+++ b/assets/xml/objects/object_fu.xml
@@ -47,6 +47,6 @@
         <Limb Name="object_fu_Standardlimb_006C30" Type="Standard" EnumName="OBJECT_FU_LIMB_0D" Offset="0x6C30" />
         <Limb Name="object_fu_Standardlimb_006C3C" Type="Standard" EnumName="OBJECT_FU_LIMB_0E" Offset="0x6C3C" />
         <Limb Name="object_fu_Standardlimb_006C48" Type="Standard" EnumName="OBJECT_FU_LIMB_0F" Offset="0x6C48" />
-        <Skeleton Name="object_fu_Skel_006C90" Type="Flex" LimbType="Standard" LimbNone="OBJECT_FU_LIMB_NONE" LimbMax="OBJECT_FU_LIMB_MAX" EnumName="object_fu_Limbs" Offset="0x6C90" />
+        <Skeleton Name="object_fu_Skel_006C90" Type="Flex" LimbType="Standard" LimbNone="OBJECT_FU_LIMB_NONE" LimbMax="OBJECT_FU_LIMB_MAX" EnumName="ObjectFuLimb" Offset="0x6C90" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_geldb.xml b/assets/xml/objects/object_geldb.xml
index 6338b48d61..5590677eae 100644
--- a/assets/xml/objects/object_geldb.xml
+++ b/assets/xml/objects/object_geldb.xml
@@ -71,7 +71,7 @@
         <Limb Name="object_geldb_Standardlimb_00A788" Type="Standard" EnumName="OBJECT_GELDB_LIMB_15" Offset="0xA788" />
         <Limb Name="object_geldb_Standardlimb_00A794" Type="Standard" EnumName="OBJECT_GELDB_LIMB_16" Offset="0xA794" />
         <Limb Name="object_geldb_Standardlimb_00A7A0" Type="Standard" EnumName="OBJECT_GELDB_LIMB_17" Offset="0xA7A0" />
-        <Skeleton Name="object_geldb_Skel_00A808" Type="Flex" LimbType="Standard" LimbNone="OBJECT_GELDB_LIMB_NONE" LimbMax="OBJECT_GELDB_LIMB_MAX" EnumName="object_geldb_Limbs" Offset="0xA808" />
+        <Skeleton Name="object_geldb_Skel_00A808" Type="Flex" LimbType="Standard" LimbNone="OBJECT_GELDB_LIMB_NONE" LimbMax="OBJECT_GELDB_LIMB_MAX" EnumName="ObjectGeldbLimb" Offset="0xA808" />
         <Animation Name="object_geldb_Anim_00AA8C" Offset="0xAA8C" />
         <Animation Name="object_geldb_Anim_00B0E4" Offset="0xB0E4" />
     </File>
diff --git a/assets/xml/objects/object_gg.xml b/assets/xml/objects/object_gg.xml
index 17c21c93ab..f7483e3383 100644
--- a/assets/xml/objects/object_gg.xml
+++ b/assets/xml/objects/object_gg.xml
@@ -71,7 +71,7 @@
         <Limb Name="object_gg_Standardlimb_00F650" Type="Standard" EnumName="OBJECT_GG_LIMB_11" Offset="0xF650" />
         <Limb Name="object_gg_Standardlimb_00F65C" Type="Standard" EnumName="OBJECT_GG_LIMB_12" Offset="0xF65C" />
         <Limb Name="object_gg_Standardlimb_00F668" Type="Standard" EnumName="OBJECT_GG_LIMB_13" Offset="0xF668" />
-        <Skeleton Name="object_gg_Skel_00F6C0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_GG_LIMB_NONE" LimbMax="OBJECT_GG_LIMB_MAX" EnumName="object_gg_Limbs" Offset="0xF6C0" />
+        <Skeleton Name="object_gg_Skel_00F6C0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_GG_LIMB_NONE" LimbMax="OBJECT_GG_LIMB_MAX" EnumName="ObjectGgLimb" Offset="0xF6C0" />
         <Animation Name="object_gg_Anim_0100C8" Offset="0x100C8" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_giant.xml b/assets/xml/objects/object_giant.xml
index 8698d176b0..491cd0cb0e 100644
--- a/assets/xml/objects/object_giant.xml
+++ b/assets/xml/objects/object_giant.xml
@@ -68,7 +68,7 @@
         <Limb Name="gGiantRightHandLimb" Type="Standard" EnumName="GIANT_LIMB_RIGHT_HAND" Offset="0x7968" />
 
         <!-- Giant Skeleton -->
-        <Skeleton Name="gGiantSkel" Type="Flex" LimbType="Standard" LimbNone="GIANT_LIMB_NONE" LimbMax="GIANT_LIMB_MAX" EnumName="EnGiantLimbs" Offset="0x79B0" />
+        <Skeleton Name="gGiantSkel" Type="Flex" LimbType="Standard" LimbNone="GIANT_LIMB_NONE" LimbMax="GIANT_LIMB_MAX" EnumName="EnGiantLimb" Offset="0x79B0" />
 
         <!-- Giant Animations -->
         <Animation Name="gGiantLookUpStartAnim" Offset="0x8394" /> <!-- Original name is "kyo_kaoage" ("raising face") -->
diff --git a/assets/xml/objects/object_gk.xml b/assets/xml/objects/object_gk.xml
index 3fde40f946..b36aef1535 100644
--- a/assets/xml/objects/object_gk.xml
+++ b/assets/xml/objects/object_gk.xml
@@ -42,7 +42,7 @@
         <Limb Name="object_gk_Standardlimb_007950" Type="Standard" EnumName="OBJECT_GK_LIMB_11" Offset="0x7950" />
         <Limb Name="object_gk_Standardlimb_00795C" Type="Standard" EnumName="OBJECT_GK_LIMB_12" Offset="0x795C" />
         <Limb Name="object_gk_Standardlimb_007968" Type="Standard" EnumName="OBJECT_GK_LIMB_13" Offset="0x7968" />
-        <Skeleton Name="object_gk_Skel_0079C0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_GK_LIMB_NONE" LimbMax="OBJECT_GK_LIMB_MAX" EnumName="object_gk_Limbs" Offset="0x79C0" />
+        <Skeleton Name="object_gk_Skel_0079C0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_GK_LIMB_NONE" LimbMax="OBJECT_GK_LIMB_MAX" EnumName="ObjectGkLimb" Offset="0x79C0" />
         <Animation Name="object_gk_Anim_007DC4" Offset="0x7DC4" />
         <Animation Name="object_gk_Anim_008774" Offset="0x8774" />
         <Animation Name="object_gk_Anim_0092C0" Offset="0x92C0" />
diff --git a/assets/xml/objects/object_gla.xml b/assets/xml/objects/object_gla.xml
index ae80c7dfc2..7463cd2e0c 100644
--- a/assets/xml/objects/object_gla.xml
+++ b/assets/xml/objects/object_gla.xml
@@ -65,7 +65,7 @@
         <Limb Name="object_gla_Standardlimb_008D60" Type="Standard" EnumName="OBJECT_GLA_LIMB_13" Offset="0x8D60" />
         <Limb Name="object_gla_Standardlimb_008D6C" Type="Standard" EnumName="OBJECT_GLA_LIMB_14" Offset="0x8D6C" />
         <Limb Name="object_gla_Standardlimb_008D78" Type="Standard" EnumName="OBJECT_GLA_LIMB_15" Offset="0x8D78" />
-        <Skeleton Name="object_gla_Skel_008DD8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_GLA_LIMB_NONE" LimbMax="OBJECT_GLA_LIMB_MAX" EnumName="object_gla_Limbs" Offset="0x8DD8" />
+        <Skeleton Name="object_gla_Skel_008DD8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_GLA_LIMB_NONE" LimbMax="OBJECT_GLA_LIMB_MAX" EnumName="ObjectGlaLimb" Offset="0x8DD8" />
         <Animation Name="object_gla_Anim_0091D0" Offset="0x91D0" />
         <Animation Name="object_gla_Anim_009D1C" Offset="0x9D1C" />
         <Animation Name="object_gla_Anim_00A344" Offset="0xA344" />
diff --git a/assets/xml/objects/object_gmo.xml b/assets/xml/objects/object_gmo.xml
index 7490a661e5..eaee120b30 100644
--- a/assets/xml/objects/object_gmo.xml
+++ b/assets/xml/objects/object_gmo.xml
@@ -11,6 +11,6 @@
         <Texture Name="gNejironEyeClosedTex" OutName="nejiron_eye_closed" Format="rgba16" Width="16" Height="32" Offset="0x1CC8" />
         <Limb Name="gNejironBodyLimb" Type="Standard" EnumName="NEJIRON_LIMB_BODY" Offset="0x20C8" />
         <Limb Name="gNejironEyeLimb" Type="Standard" EnumName="NEJIRON_LIMB_EYES" Offset="0x20D4" />
-        <Skeleton Name="gNejironSkel" Type="Normal" LimbType="Standard" LimbNone="NEJIRON_LIMB_NONE" LimbMax="NEJIRON_LIMB_MAX" EnumName="NejironLimbs" Offset="0x20E8" />
+        <Skeleton Name="gNejironSkel" Type="Normal" LimbType="Standard" LimbNone="NEJIRON_LIMB_NONE" LimbMax="NEJIRON_LIMB_MAX" EnumName="NejironLimb" Offset="0x20E8" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_grasshopper.xml b/assets/xml/objects/object_grasshopper.xml
index 35120e0c98..3ef7b8e64a 100644
--- a/assets/xml/objects/object_grasshopper.xml
+++ b/assets/xml/objects/object_grasshopper.xml
@@ -58,7 +58,7 @@
         <Limb Name="object_grasshopper_Standardlimb_003E80" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_15" Offset="0x3E80" />
         <Limb Name="object_grasshopper_Standardlimb_003E8C" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_16" Offset="0x3E8C" />
         <Limb Name="object_grasshopper_Standardlimb_003E98" Type="Standard" EnumName="OBJECT_GRASSHOPPER_LIMB_17" Offset="0x3E98" />
-        <Skeleton Name="object_grasshopper_Skel_003F00" Type="Normal" LimbType="Standard" LimbNone="OBJECT_GRASSHOPPER_LIMB_NONE" LimbMax="OBJECT_GRASSHOPPER_LIMB_MAX" EnumName="object_grasshopper_Limbs" Offset="0x3F00" />
+        <Skeleton Name="object_grasshopper_Skel_003F00" Type="Normal" LimbType="Standard" LimbNone="OBJECT_GRASSHOPPER_LIMB_NONE" LimbMax="OBJECT_GRASSHOPPER_LIMB_MAX" EnumName="ObjectGrasshopperLimb" Offset="0x3F00" />
         <Animation Name="object_grasshopper_Anim_0042F0" Offset="0x42F0" />
         <Animation Name="object_grasshopper_Anim_0047AC" Offset="0x47AC" />
         <Animation Name="object_grasshopper_Anim_004BC8" Offset="0x4BC8" />
diff --git a/assets/xml/objects/object_ha.xml b/assets/xml/objects/object_ha.xml
index 4f595b6bed..94973c809c 100644
--- a/assets/xml/objects/object_ha.xml
+++ b/assets/xml/objects/object_ha.xml
@@ -63,7 +63,7 @@
         <Limb Name="object_ha_Standardlimb_008BE0" Type="Standard" EnumName="OBJECT_HA_1_LIMB_17" Offset="0x8BE0" />
         <Limb Name="object_ha_Standardlimb_008BEC" Type="Standard" EnumName="OBJECT_HA_1_LIMB_18" Offset="0x8BEC" />
         <Limb Name="object_ha_Standardlimb_008BF8" Type="Standard" EnumName="OBJECT_HA_1_LIMB_19" Offset="0x8BF8" />
-        <Skeleton Name="object_ha_Skel_008C68" Type="Flex" LimbType="Standard" LimbNone="OBJECT_HA_1_LIMB_NONE" LimbMax="OBJECT_HA_1_LIMB_MAX" EnumName="object_ha_1_Limbs" Offset="0x8C68" />
+        <Skeleton Name="object_ha_Skel_008C68" Type="Flex" LimbType="Standard" LimbNone="OBJECT_HA_1_LIMB_NONE" LimbMax="OBJECT_HA_1_LIMB_MAX" EnumName="ObjectHa1Limb" Offset="0x8C68" />
         <Animation Name="object_ha_Anim_009208" Offset="0x9208" />
         <Animation Name="object_ha_Anim_009858" Offset="0x9858" />
         <Animation Name="object_ha_Anim_00A05C" Offset="0xA05C" />
@@ -130,6 +130,6 @@
         <Limb Name="object_ha_Standardlimb_015050" Type="Standard" EnumName="OBJECT_HA_2_LIMB_17" Offset="0x15050" />
         <Limb Name="object_ha_Standardlimb_01505C" Type="Standard" EnumName="OBJECT_HA_2_LIMB_18" Offset="0x1505C" />
         <Limb Name="object_ha_Standardlimb_015068" Type="Standard" EnumName="OBJECT_HA_2_LIMB_19" Offset="0x15068" />
-        <Skeleton Name="object_ha_Skel_0150D8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_HA_2_LIMB_NONE" LimbMax="OBJECT_HA_2_LIMB_MAX" EnumName="object_ha_2_Limbs" Offset="0x150D8" />
+        <Skeleton Name="object_ha_Skel_0150D8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_HA_2_LIMB_NONE" LimbMax="OBJECT_HA_2_LIMB_MAX" EnumName="ObjectHa2Limb" Offset="0x150D8" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_harfgibud.xml b/assets/xml/objects/object_harfgibud.xml
index 361bbe74c6..61e1fc4576 100644
--- a/assets/xml/objects/object_harfgibud.xml
+++ b/assets/xml/objects/object_harfgibud.xml
@@ -56,7 +56,7 @@
         <Limb Name="gHarfgibudGibdoRightThighLimb" Type="Standard" EnumName="HARFGIBUD_GIBDO_LIMB_RIGHT_THIGH" Offset="0x8514" />
         <Limb Name="gHarfgibudGibdoRightLegLimb" Type="Standard" EnumName="HARFGIBUD_GIBDO_LIMB_RIGHT_LEG" Offset="0x8520" />
         <Limb Name="gHarfgibudGibdoRightFootLimb" Type="Standard" EnumName="HARFGIBUD_GIBDO_LIMB_RIGHT_FOOT" Offset="0x852C" />
-        <Skeleton Name="gHarfgibudGibdoSkel" Type="Flex" LimbType="Standard" LimbNone="HARFGIBUD_GIBDO_LIMB_NONE" LimbMax="HARFGIBUD_GIBDO_LIMB_MAX" EnumName="HarfgibudGibdoLimbs" Offset="0x8580" />
+        <Skeleton Name="gHarfgibudGibdoSkel" Type="Flex" LimbType="Standard" LimbNone="HARFGIBUD_GIBDO_LIMB_NONE" LimbMax="HARFGIBUD_GIBDO_LIMB_MAX" EnumName="HarfgibudGibdoLimb" Offset="0x8580" />
 
         <Animation Name="object_harfgibud_Anim_009D44" Offset="0x9D44" />
         <Animation Name="object_harfgibud_Anim_00A164" Offset="0xA164" />
@@ -116,7 +116,7 @@
         <Limb Name="gHarfgibudHumanRightThighLimb" Type="Standard" EnumName="HARFGIBUD_HUMAN_LIMB_RIGHT_THIGH" Offset="0x129EC" />
         <Limb Name="gHarfgibudHumanRightLegLimb" Type="Standard" EnumName="HARFGIBUD_HUMAN_LIMB_RIGHT_LEG" Offset="0x129F8" />
         <Limb Name="gHarfgibudHumanRightFootLimb" Type="Standard" EnumName="HARFGIBUD_HUMAN_LIMB_RIGHT_FOOT" Offset="0x12A04" />
-        <Skeleton Name="gHarfgibudHumanSkel" Type="Flex" LimbType="Standard" LimbNone="HARFGIBUD_HUMAN_LIMB_NONE" LimbMax="HARFGIBUD_HUMAN_LIMB_MAX" EnumName="HarfgibudHumanLimbs" Offset="0x12A58" />
+        <Skeleton Name="gHarfgibudHumanSkel" Type="Flex" LimbType="Standard" LimbNone="HARFGIBUD_HUMAN_LIMB_NONE" LimbMax="HARFGIBUD_HUMAN_LIMB_MAX" EnumName="HarfgibudHumanLimb" Offset="0x12A58" />
 
         <Animation Name="object_harfgibud_Anim_013684" Offset="0x13684" />
         <Animation Name="object_harfgibud_Anim_014220" Offset="0x14220" />
diff --git a/assets/xml/objects/object_hata.xml b/assets/xml/objects/object_hata.xml
index 3f5e12a381..9271520b79 100644
--- a/assets/xml/objects/object_hata.xml
+++ b/assets/xml/objects/object_hata.xml
@@ -34,6 +34,6 @@
         <Limb Name="object_hata_Standardlimb_002F5C" Type="Standard" EnumName="OBJECT_HATA_LIMB_12" Offset="0x2F5C" />
         <Limb Name="object_hata_Standardlimb_002F68" Type="Standard" EnumName="OBJECT_HATA_LIMB_13" Offset="0x2F68" />
         <Limb Name="object_hata_Standardlimb_002F74" Type="Standard" EnumName="OBJECT_HATA_LIMB_14" Offset="0x2F74" />
-        <Skeleton Name="object_hata_Skel_002FD0" Type="Normal" LimbType="Standard" LimbNone="OBJECT_HATA_LIMB_NONE" LimbMax="OBJECT_HATA_LIMB_MAX" EnumName="object_hata_Limbs" Offset="0x2FD0" />
+        <Skeleton Name="object_hata_Skel_002FD0" Type="Normal" LimbType="Standard" LimbNone="OBJECT_HATA_LIMB_NONE" LimbMax="OBJECT_HATA_LIMB_MAX" EnumName="ObjectHataLimb" Offset="0x2FD0" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_hintnuts.xml b/assets/xml/objects/object_hintnuts.xml
index a500981a7e..483623988c 100644
--- a/assets/xml/objects/object_hintnuts.xml
+++ b/assets/xml/objects/object_hintnuts.xml
@@ -27,7 +27,7 @@
         <Limb Name="object_hintnuts_Standardlimb_002370" Type="Standard" EnumName="OBJECT_HINTNUTS_LIMB_07" Offset="0x2370" />
         <Limb Name="object_hintnuts_Standardlimb_00237C" Type="Standard" EnumName="OBJECT_HINTNUTS_LIMB_08" Offset="0x237C" />
         <Limb Name="object_hintnuts_Standardlimb_002388" Type="Standard" EnumName="OBJECT_HINTNUTS_LIMB_09" Offset="0x2388" />
-        <Skeleton Name="object_hintnuts_Skel_0023B8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_HINTNUTS_LIMB_NONE" LimbMax="OBJECT_HINTNUTS_LIMB_MAX" EnumName="object_hintnuts_Limbs" Offset="0x23B8" />
+        <Skeleton Name="object_hintnuts_Skel_0023B8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_HINTNUTS_LIMB_NONE" LimbMax="OBJECT_HINTNUTS_LIMB_MAX" EnumName="ObjectHintnutsLimb" Offset="0x23B8" />
         <Animation Name="object_hintnuts_Anim_0024CC" Offset="0x24CC" />
         <Animation Name="object_hintnuts_Anim_0026C4" Offset="0x26C4" />
         <Animation Name="object_hintnuts_Anim_002894" Offset="0x2894" />
diff --git a/assets/xml/objects/object_horse_link_child.xml b/assets/xml/objects/object_horse_link_child.xml
index 506135e0c9..60178badb6 100644
--- a/assets/xml/objects/object_horse_link_child.xml
+++ b/assets/xml/objects/object_horse_link_child.xml
@@ -76,7 +76,7 @@
         <Limb Name="object_horse_link_child_Skinlimb_00A398" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_2C" Offset="0xA398" />
         <Limb Name="object_horse_link_child_Skinlimb_00A3A8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_2D" Offset="0xA3A8" />
         <Limb Name="object_horse_link_child_Skinlimb_00A3B8" Type="Skin" EnumName="OBJECT_HORSE_LINK_CHILD_LIMB_2E" Offset="0xA3B8" />
-        <Skeleton Name="object_horse_link_child_Skel_00A480" Type="Normal" LimbType="Standard" LimbNone="OBJECT_HORSE_LINK_CHILD_LIMB_NONE" LimbMax="OBJECT_HORSE_LINK_CHILD_LIMB_MAX" EnumName="object_horse_link_child_Limbs" Offset="0xA480" />
+        <Skeleton Name="object_horse_link_child_Skel_00A480" Type="Normal" LimbType="Standard" LimbNone="OBJECT_HORSE_LINK_CHILD_LIMB_NONE" LimbMax="OBJECT_HORSE_LINK_CHILD_LIMB_MAX" EnumName="ObjectHorseLinkChildLimb" Offset="0xA480" />
         <Animation Name="object_horse_link_child_Anim_00A8DC" Offset="0xA8DC" />
         <Animation Name="object_horse_link_child_Anim_00AD08" Offset="0xAD08" />
         <Animation Name="object_horse_link_child_Anim_00B3E0" Offset="0xB3E0" />
diff --git a/assets/xml/objects/object_hs.xml b/assets/xml/objects/object_hs.xml
index ae025f327c..19ea49b6b7 100644
--- a/assets/xml/objects/object_hs.xml
+++ b/assets/xml/objects/object_hs.xml
@@ -46,6 +46,6 @@
         <!-- shoulders down to toes plus box hes sitting on -->
         <Limb Name="gHsChestAndLowerBodyPlusBox" Type="Standard" EnumName="HS_LIMB_LOWER_BODY_PLUS_BOX" Offset="0x620C" />
         <Limb Name="gHsCuccoFeedBagsLimb" Type="Standard" EnumName="HS_LIMB_CUCCO_FEED_BAGS" Offset="0x6218" />
-        <Skeleton Name="gHsSkeleton" Type="Flex" LimbType="Standard" LimbNone="OBJECT_HS_LIMB_NONE" LimbMax="OBJECT_HS_LIMB_MAX" EnumName="object_hs_Limbs" Offset="0x6260" />
+        <Skeleton Name="gHsSkeleton" Type="Flex" LimbType="Standard" LimbNone="OBJECT_HS_LIMB_NONE" LimbMax="OBJECT_HS_LIMB_MAX" EnumName="ObjectHsLimb" Offset="0x6260" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_ik.xml b/assets/xml/objects/object_ik.xml
index 7042bf10b1..352b824871 100644
--- a/assets/xml/objects/object_ik.xml
+++ b/assets/xml/objects/object_ik.xml
@@ -100,6 +100,6 @@
         <Limb Name="gIronKnuckleChestArmorBackLimb" EnumName="IRON_KNUCKLE_LIMB_CHEST_ARMOR_BACK" Type="Standard" Offset="0x13608" />
         <Limb Name="gIronKnuckleTorsoLimb" EnumName="IRON_KNUCKLE_LIMB_TORSO" Type="Standard" Offset="0x13614" />
         <Limb Name="gIronKnuckleWaistLimb" EnumName="IRON_KNUCKLE_LIMB_WAIST" Type="Standard" Offset="0x13620" />
-        <Skeleton Name="gIronKnuckleSkel" Type="Flex" LimbType="Standard" LimbNone="IRON_KNUCKLE_LIMB_NONE" LimbMax="IRON_KNUCKLE_LIMB_MAX" EnumName="IronKnuckleLimbs" Offset="0x136A0" />
+        <Skeleton Name="gIronKnuckleSkel" Type="Flex" LimbType="Standard" LimbNone="IRON_KNUCKLE_LIMB_NONE" LimbMax="IRON_KNUCKLE_LIMB_MAX" EnumName="IronKnuckleLimb" Offset="0x136A0" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_ikn_demo.xml b/assets/xml/objects/object_ikn_demo.xml
index 56f8fd0e97..53d5c65a11 100644
--- a/assets/xml/objects/object_ikn_demo.xml
+++ b/assets/xml/objects/object_ikn_demo.xml
@@ -43,7 +43,7 @@
         <Limb Name="object_ikn_demo_Standardlimb_00388C" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_0E" Offset="0x388C" />
         <Limb Name="object_ikn_demo_Standardlimb_003898" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_0F" Offset="0x3898" />
         <Limb Name="object_ikn_demo_Standardlimb_0038A4" Type="Standard" EnumName="OBJECT_IKN_DEMO_1_LIMB_10" Offset="0x38A4" />
-        <Skeleton Name="object_ikn_demo_Skel_0038F0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_IKN_DEMO_1_LIMB_NONE" LimbMax="OBJECT_IKN_DEMO_1_LIMB_MAX" EnumName="object_ikn_demo_1_Limbs" Offset="0x38F0" />
+        <Skeleton Name="object_ikn_demo_Skel_0038F0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_IKN_DEMO_1_LIMB_NONE" LimbMax="OBJECT_IKN_DEMO_1_LIMB_MAX" EnumName="ObjectIknDemo1Limb" Offset="0x38F0" />
         <Animation Name="object_ikn_demo_Anim_003CAC" Offset="0x3CAC" />
         <Animation Name="object_ikn_demo_Anim_004208" Offset="0x4208" />
         <Animation Name="object_ikn_demo_Anim_004514" Offset="0x4514" />
@@ -63,7 +63,7 @@
         <Limb Name="object_ikn_demo_Standardlimb_007B0C" Type="Standard" EnumName="OBJECT_IKN_DEMO_2_LIMB_04" Offset="0x7B0C" />
         <Limb Name="object_ikn_demo_Standardlimb_007B18" Type="Standard" EnumName="OBJECT_IKN_DEMO_2_LIMB_05" Offset="0x7B18" />
         <Limb Name="object_ikn_demo_Standardlimb_007B24" Type="Standard" EnumName="OBJECT_IKN_DEMO_2_LIMB_06" Offset="0x7B24" />
-        <Skeleton Name="object_ikn_demo_Skel_007B48" Type="Flex" LimbType="Standard" LimbNone="OBJECT_IKN_DEMO_2_LIMB_NONE" LimbMax="OBJECT_IKN_DEMO_2_LIMB_MAX" EnumName="object_ikn_demo_2_Limbs" Offset="0x7B48" />
+        <Skeleton Name="object_ikn_demo_Skel_007B48" Type="Flex" LimbType="Standard" LimbNone="OBJECT_IKN_DEMO_2_LIMB_NONE" LimbMax="OBJECT_IKN_DEMO_2_LIMB_MAX" EnumName="ObjectIknDemo2Limb" Offset="0x7B48" />
         <Animation Name="object_ikn_demo_Anim_0081A8" Offset="0x81A8" />
         <Animation Name="object_ikn_demo_Anim_0083F4" Offset="0x83F4" />
         <Animation Name="object_ikn_demo_Anim_008724" Offset="0x8724" />
@@ -89,7 +89,7 @@
         <Limb Name="object_ikn_demo_Standardlimb_00B454" Type="Standard" EnumName="OBJECT_IKN_DEMO_3_LIMB_04" Offset="0xB454" />
         <Limb Name="object_ikn_demo_Standardlimb_00B460" Type="Standard" EnumName="OBJECT_IKN_DEMO_3_LIMB_05" Offset="0xB460" />
         <Limb Name="object_ikn_demo_Standardlimb_00B46C" Type="Standard" EnumName="OBJECT_IKN_DEMO_3_LIMB_06" Offset="0xB46C" />
-        <Skeleton Name="object_ikn_demo_Skel_00B490" Type="Flex" LimbType="Standard" LimbNone="OBJECT_IKN_DEMO_3_LIMB_NONE" LimbMax="OBJECT_IKN_DEMO_3_LIMB_MAX" EnumName="object_ikn_demo_3_Limbs" Offset="0xB490" />
+        <Skeleton Name="object_ikn_demo_Skel_00B490" Type="Flex" LimbType="Standard" LimbNone="OBJECT_IKN_DEMO_3_LIMB_NONE" LimbMax="OBJECT_IKN_DEMO_3_LIMB_MAX" EnumName="ObjectIknDemo3Limb" Offset="0xB490" />
         <Animation Name="object_ikn_demo_Anim_00B704" Offset="0xB704" />
         <Animation Name="object_ikn_demo_Anim_00B8C0" Offset="0xB8C0" />
         <Animation Name="object_ikn_demo_Anim_00B9E4" Offset="0xB9E4" />
diff --git a/assets/xml/objects/object_in.xml b/assets/xml/objects/object_in.xml
index 3874e4834d..15b2382aa5 100644
--- a/assets/xml/objects/object_in.xml
+++ b/assets/xml/objects/object_in.xml
@@ -112,7 +112,7 @@
         <Limb Name="object_in_Standardlimb_014E38" Type="Standard" EnumName="OBJECT_IN_LIMB_11" Offset="0x14E38" />
         <Limb Name="object_in_Standardlimb_014E44" Type="Standard" EnumName="OBJECT_IN_LIMB_12" Offset="0x14E44" />
         <Limb Name="object_in_Standardlimb_014E50" Type="Standard" EnumName="OBJECT_IN_LIMB_13" Offset="0x14E50" />
-        <Skeleton Name="object_in_Skel_014EA8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_IN_LIMB_NONE" LimbMax="OBJECT_IN_LIMB_MAX" EnumName="object_in_Limbs" Offset="0x14EA8" />
+        <Skeleton Name="object_in_Skel_014EA8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_IN_LIMB_NONE" LimbMax="OBJECT_IN_LIMB_MAX" EnumName="ObjectInLimb" Offset="0x14EA8" />
         <Animation Name="object_in_Anim_014F8C" Offset="0x14F8C" />
         <Animation Name="object_in_Anim_015918" Offset="0x15918" />
         <Animation Name="object_in_Anim_015E38" Offset="0x15E38" />
diff --git a/assets/xml/objects/object_in2.xml b/assets/xml/objects/object_in2.xml
index 4457defae5..bcd04091b4 100644
--- a/assets/xml/objects/object_in2.xml
+++ b/assets/xml/objects/object_in2.xml
@@ -66,7 +66,7 @@
         <Limb Name="object_in2_Standardlimb_007840" Type="Standard" EnumName="OBJECT_IN2_LIMB_11" Offset="0x7840" />
         <Limb Name="object_in2_Standardlimb_00784C" Type="Standard" EnumName="OBJECT_IN2_LIMB_12" Offset="0x784C" />
         <Limb Name="object_in2_Standardlimb_007858" Type="Standard" EnumName="OBJECT_IN2_LIMB_13" Offset="0x7858" />
-        <Skeleton Name="object_in2_Skel_0078B0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_IN2_LIMB_NONE" LimbMax="OBJECT_IN2_LIMB_MAX" EnumName="object_in2_Limbs" Offset="0x78B0" />
+        <Skeleton Name="object_in2_Skel_0078B0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_IN2_LIMB_NONE" LimbMax="OBJECT_IN2_LIMB_MAX" EnumName="ObjectIn2Limb" Offset="0x78B0" />
         <Animation Name="object_in2_Anim_008090" Offset="0x8090" />
         <Animation Name="object_in2_Anim_00898C" Offset="0x898C" />
         <Animation Name="object_in2_Anim_009450" Offset="0x9450" />
diff --git a/assets/xml/objects/object_jg.xml b/assets/xml/objects/object_jg.xml
index 17889995fd..c3e1ac18a8 100644
--- a/assets/xml/objects/object_jg.xml
+++ b/assets/xml/objects/object_jg.xml
@@ -108,11 +108,11 @@
         <Limb Name="gGoronElderRightFootLimb" Type="Standard" EnumName="GORON_ELDER_LIMB_RIGHT_FOOT" Offset="0x1AF5C" />
 
         <!-- Goron Elder Skeleton -->
-        <Skeleton Name="gGoronElderSkel" Type="Flex" LimbType="Standard" LimbNone="GORON_ELDER_LIMB_NONE" LimbMax="GORON_ELDER_LIMB_MAX" EnumName="GoronElderLimbs" Offset="0x1AFF0" />
+        <Skeleton Name="gGoronElderSkel" Type="Flex" LimbType="Standard" LimbNone="GORON_ELDER_LIMB_NONE" LimbMax="GORON_ELDER_LIMB_MAX" EnumName="GoronElderLimb" Offset="0x1AFF0" />
 
         <!-- Drum Animation, Limb, and Skeleton -->
         <Animation Name="gGoronElderDrumTakeOutAnim" Offset="0x1B1E8" /> <!-- Original name is "jggakki_dasu" ("get out") -->
         <Limb Name="gGoronElderDrumLimb" Type="Standard" EnumName="GORON_ELDER_DRUM_LIMB_ROOT" Offset="0x1B200" />
-        <Skeleton Name="gGoronElderDrumSkel" Type="Normal" LimbType="Standard" LimbNone="GORON_ELDER_DRUM_LIMB_NONE" LimbMax="GORON_ELDER_DRUM_LIMB_MAX" EnumName="GoronElderDrumLimbs"Offset="0x1B210" />
+        <Skeleton Name="gGoronElderDrumSkel" Type="Normal" LimbType="Standard" LimbNone="GORON_ELDER_DRUM_LIMB_NONE" LimbMax="GORON_ELDER_DRUM_LIMB_MAX" EnumName="GoronElderDrumLimb" Offset="0x1B210" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_js.xml b/assets/xml/objects/object_js.xml
index 92f14da0ba..1335b8287f 100644
--- a/assets/xml/objects/object_js.xml
+++ b/assets/xml/objects/object_js.xml
@@ -39,7 +39,7 @@
         <Limb Name="object_js_Standardlimb_00693C" Type="Standard" EnumName="OBJECT_JS_LIMB_0A" Offset="0x693C" />
         <Limb Name="object_js_Standardlimb_006948" Type="Standard" EnumName="OBJECT_JS_LIMB_0B" Offset="0x6948" />
         <Limb Name="object_js_Standardlimb_006954" Type="Standard" EnumName="OBJECT_JS_LIMB_0C" Offset="0x6954" />
-        <Skeleton Name="object_js_Skel_006990" Type="Flex" LimbType="Standard" LimbNone="OBJECT_JS_LIMB_NONE" LimbMax="OBJECT_JS_LIMB_MAX" EnumName="object_js_Limbs" Offset="0x6990" />
+        <Skeleton Name="object_js_Skel_006990" Type="Flex" LimbType="Standard" LimbNone="OBJECT_JS_LIMB_NONE" LimbMax="OBJECT_JS_LIMB_MAX" EnumName="ObjectJsLimb" Offset="0x6990" />
         <Collision Name="object_js_Colheader_0069E8" Offset="0x69E8" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_jso.xml b/assets/xml/objects/object_jso.xml
index 33816a797f..a397311c45 100644
--- a/assets/xml/objects/object_jso.xml
+++ b/assets/xml/objects/object_jso.xml
@@ -49,7 +49,7 @@
         <Limb Name="object_jso_Standardlimb_0030F8" Type="Standard" EnumName="OBJECT_JSO_1_LIMB_11" Offset="0x30F8" />
         <Limb Name="object_jso_Standardlimb_003104" Type="Standard" EnumName="OBJECT_JSO_1_LIMB_12" Offset="0x3104" />
         <Limb Name="object_jso_Standardlimb_003110" Type="Standard" EnumName="OBJECT_JSO_1_LIMB_13" Offset="0x3110" />
-        <Skeleton Name="object_jso_Skel_003168" Type="Flex" LimbType="Standard" LimbNone="OBJECT_JSO_1_LIMB_NONE" LimbMax="OBJECT_JSO_1_LIMB_MAX" EnumName="object_jso_1_Limbs" Offset="0x3168" />
+        <Skeleton Name="object_jso_Skel_003168" Type="Flex" LimbType="Standard" LimbNone="OBJECT_JSO_1_LIMB_NONE" LimbMax="OBJECT_JSO_1_LIMB_MAX" EnumName="ObjectJso1Limb" Offset="0x3168" />
         <Animation Name="object_jso_Anim_003238" Offset="0x3238" />
         <Animation Name="object_jso_Anim_003530" Offset="0x3530" />
         <Animation Name="object_jso_Anim_00378C" Offset="0x378C" />
@@ -114,7 +114,7 @@
         <Limb Name="object_jso_Standardlimb_00A990" Type="Standard" EnumName="OBJECT_JSO_2_LIMB_11" Offset="0xA990" />
         <Limb Name="object_jso_Standardlimb_00A99C" Type="Standard" EnumName="OBJECT_JSO_2_LIMB_12" Offset="0xA99C" />
         <Limb Name="object_jso_Standardlimb_00A9A8" Type="Standard" EnumName="OBJECT_JSO_2_LIMB_13" Offset="0xA9A8" />
-        <Skeleton Name="object_jso_Skel_00AA00" Type="Flex" LimbType="Standard" LimbNone="OBJECT_JSO_2_LIMB_NONE" LimbMax="OBJECT_JSO_2_LIMB_MAX" EnumName="object_jso_2_Limbs" Offset="0xAA00" />
+        <Skeleton Name="object_jso_Skel_00AA00" Type="Flex" LimbType="Standard" LimbNone="OBJECT_JSO_2_LIMB_NONE" LimbMax="OBJECT_JSO_2_LIMB_MAX" EnumName="ObjectJso2Limb" Offset="0xAA00" />
         <Animation Name="object_jso_Anim_00AE80" Offset="0xAE80" />
         <Animation Name="object_jso_Anim_00B1DC" Offset="0xB1DC" />
         <Animation Name="object_jso_Anim_00B5F0" Offset="0xB5F0" />
diff --git a/assets/xml/objects/object_ka.xml b/assets/xml/objects/object_ka.xml
index 36dceb0caf..69ea2d9298 100644
--- a/assets/xml/objects/object_ka.xml
+++ b/assets/xml/objects/object_ka.xml
@@ -58,7 +58,7 @@
         <Limb Name="object_ka_Standardlimb_006520" Type="Standard" EnumName="OBJECT_KA_LIMB_19" Offset="0x6520" />
         <Limb Name="object_ka_Standardlimb_00652C" Type="Standard" EnumName="OBJECT_KA_LIMB_1A" Offset="0x652C" />
         <Limb Name="object_ka_Standardlimb_006538" Type="Standard" EnumName="OBJECT_KA_LIMB_1B" Offset="0x6538" />
-        <Skeleton Name="object_ka_Skel_0065B0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_KA_LIMB_NONE" LimbMax="OBJECT_KA_LIMB_MAX" EnumName="object_ka_Limbs" Offset="0x65B0" />
+        <Skeleton Name="object_ka_Skel_0065B0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_KA_LIMB_NONE" LimbMax="OBJECT_KA_LIMB_MAX" EnumName="ObjectKaLimb" Offset="0x65B0" />
         <Animation Name="object_ka_Anim_00686C" Offset="0x686C" />
         <Animation Name="object_ka_Anim_006A6C" Offset="0x6A6C" />
         <Animation Name="object_ka_Anim_0071EC" Offset="0x71EC" />
diff --git a/assets/xml/objects/object_kamejima.xml b/assets/xml/objects/object_kamejima.xml
index 425e4643d0..e8368051dc 100644
--- a/assets/xml/objects/object_kamejima.xml
+++ b/assets/xml/objects/object_kamejima.xml
@@ -69,7 +69,7 @@
         <Limb Name="object_kamejima_Standardlimb_00E6C8" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_15" Offset="0xE6C8" />
         <Limb Name="object_kamejima_Standardlimb_00E6D4" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_16" Offset="0xE6D4" />
         <Limb Name="object_kamejima_Standardlimb_00E6E0" Type="Standard" EnumName="OBJECT_KAMEJIMA_LIMB_17" Offset="0xE6E0" />
-        <Skeleton Name="object_kamejima_Skel_00E748" Type="Flex" LimbType="Standard" LimbNone="OBJECT_KAMEJIMA_LIMB_NONE" LimbMax="OBJECT_KAMEJIMA_LIMB_MAX" EnumName="object_kamejima_Limbs" Offset="0xE748" />
+        <Skeleton Name="object_kamejima_Skel_00E748" Type="Flex" LimbType="Standard" LimbNone="OBJECT_KAMEJIMA_LIMB_NONE" LimbMax="OBJECT_KAMEJIMA_LIMB_MAX" EnumName="ObjectKamejimaLimb" Offset="0xE748" />
         <Animation Name="object_kamejima_Anim_00EF98" Offset="0xEF98" />
         <Animation Name="object_kamejima_Anim_0100CC" Offset="0x100CC" />
         <Animation Name="object_kamejima_Anim_010918" Offset="0x10918" />
diff --git a/assets/xml/objects/object_kbt.xml b/assets/xml/objects/object_kbt.xml
index aad49e9460..102aed91de 100644
--- a/assets/xml/objects/object_kbt.xml
+++ b/assets/xml/objects/object_kbt.xml
@@ -68,7 +68,7 @@
         <Limb Name="object_kbt_Standardlimb_00DE78" Type="Standard" EnumName="OBJECT_KBT_LIMB_11" Offset="0xDE78" />
         <Limb Name="object_kbt_Standardlimb_00DE84" Type="Standard" EnumName="OBJECT_KBT_LIMB_12" Offset="0xDE84" />
         <Limb Name="object_kbt_Standardlimb_00DE90" Type="Standard" EnumName="OBJECT_KBT_LIMB_13" Offset="0xDE90" />
-        <Skeleton Name="object_kbt_Skel_00DEE8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_KBT_LIMB_NONE" LimbMax="OBJECT_KBT_LIMB_MAX" EnumName="object_kbt_Limbs" Offset="0xDEE8" />
+        <Skeleton Name="object_kbt_Skel_00DEE8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_KBT_LIMB_NONE" LimbMax="OBJECT_KBT_LIMB_MAX" EnumName="ObjectKbtLimb" Offset="0xDEE8" />
         <Animation Name="object_kbt_Anim_00E7BC" Offset="0xE7BC" />
         <Animation Name="object_kbt_Anim_00F0C8" Offset="0xF0C8" />
     </File>
diff --git a/assets/xml/objects/object_kgy.xml b/assets/xml/objects/object_kgy.xml
index 0e2d3be2c3..5bbf177932 100644
--- a/assets/xml/objects/object_kgy.xml
+++ b/assets/xml/objects/object_kgy.xml
@@ -67,7 +67,7 @@
         <Limb Name="object_kgy_Standardlimb_00F894" Type="Standard" EnumName="OBJECT_KGY_LIMB_14" Offset="0xF894" />
         <Limb Name="object_kgy_Standardlimb_00F8A0" Type="Standard" EnumName="OBJECT_KGY_LIMB_15" Offset="0xF8A0" />
         <Limb Name="object_kgy_Standardlimb_00F8AC" Type="Standard" EnumName="OBJECT_KGY_LIMB_16" Offset="0xF8AC" />
-        <Skeleton Name="object_kgy_Skel_00F910" Type="Flex" LimbType="Standard" LimbNone="OBJECT_KGY_LIMB_NONE" LimbMax="OBJECT_KGY_LIMB_MAX" EnumName="object_kgy_Limbs" Offset="0xF910" />
+        <Skeleton Name="object_kgy_Skel_00F910" Type="Flex" LimbType="Standard" LimbNone="OBJECT_KGY_LIMB_NONE" LimbMax="OBJECT_KGY_LIMB_MAX" EnumName="ObjectKgyLimb" Offset="0xF910" />
         <Animation Name="object_kgy_Anim_0101F0" Offset="0x101F0" />
         <Animation Name="object_kgy_Anim_010B84" Offset="0x10B84" />
     </File>
diff --git a/assets/xml/objects/object_kitan.xml b/assets/xml/objects/object_kitan.xml
index 05d090d93e..edc2e5cc64 100644
--- a/assets/xml/objects/object_kitan.xml
+++ b/assets/xml/objects/object_kitan.xml
@@ -49,6 +49,6 @@
         <Limb Name="object_kitan_Standardlimb_007F34" Type="Standard" EnumName="OBJECT_KITAN_LIMB_12" Offset="0x7F34" />
         <Limb Name="object_kitan_Standardlimb_007F40" Type="Standard" EnumName="OBJECT_KITAN_LIMB_13" Offset="0x7F40" />
         <Limb Name="object_kitan_Standardlimb_007F4C" Type="Standard" EnumName="OBJECT_KITAN_LIMB_14" Offset="0x7F4C" />
-        <Skeleton Name="object_kitan_Skel_007FA8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_KITAN_LIMB_NONE" LimbMax="OBJECT_KITAN_LIMB_MAX" EnumName="object_kitan_Limbs" Offset="0x7FA8" />
+        <Skeleton Name="object_kitan_Skel_007FA8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_KITAN_LIMB_NONE" LimbMax="OBJECT_KITAN_LIMB_MAX" EnumName="ObjectKitanLimb" Offset="0x7FA8" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_knight.xml b/assets/xml/objects/object_knight.xml
index 0459cb062f..fa0e900e46 100644
--- a/assets/xml/objects/object_knight.xml
+++ b/assets/xml/objects/object_knight.xml
@@ -171,7 +171,7 @@
         <Limb Name="object_knight_Standardlimb_020114" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_1A" Offset="0x20114" />
         <Limb Name="object_knight_Standardlimb_020120" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_1B" Offset="0x20120" />
         <Limb Name="object_knight_Standardlimb_02012C" Type="Standard" EnumName="OBJECT_KNIGHT_1_LIMB_1C" Offset="0x2012C" />
-        <Skeleton Name="object_knight_Skel_0201A8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_KNIGHT_1_LIMB_NONE" LimbMax="OBJECT_KNIGHT_1_LIMB_MAX" EnumName="object_knight_1_Limbs" Offset="0x201A8" />
+        <Skeleton Name="object_knight_Skel_0201A8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_KNIGHT_1_LIMB_NONE" LimbMax="OBJECT_KNIGHT_1_LIMB_MAX" EnumName="ObjectKnight1Limb" Offset="0x201A8" />
         <Limb Name="object_knight_Standardlimb_0201B4" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_01" Offset="0x201B4" />
         <Limb Name="object_knight_Standardlimb_0201C0" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_02" Offset="0x201C0" />
         <Limb Name="object_knight_Standardlimb_0201CC" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_03" Offset="0x201CC" />
@@ -200,7 +200,7 @@
         <Limb Name="object_knight_Standardlimb_0202E0" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_1A" Offset="0x202E0" />
         <Limb Name="object_knight_Standardlimb_0202EC" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_1B" Offset="0x202EC" />
         <Limb Name="object_knight_Standardlimb_0202F8" Type="Standard" EnumName="OBJECT_KNIGHT_2_LIMB_1C" Offset="0x202F8" />
-        <Skeleton Name="object_knight_Skel_020374" Type="Flex" LimbType="Standard" LimbNone="OBJECT_KNIGHT_2_LIMB_NONE" LimbMax="OBJECT_KNIGHT_2_LIMB_MAX" EnumName="object_knight_2_Limbs" Offset="0x20374" />
+        <Skeleton Name="object_knight_Skel_020374" Type="Flex" LimbType="Standard" LimbNone="OBJECT_KNIGHT_2_LIMB_NONE" LimbMax="OBJECT_KNIGHT_2_LIMB_MAX" EnumName="ObjectKnight2Limb" Offset="0x20374" />
         <Animation Name="object_knight_Anim_020950" Offset="0x20950" />
         <Animation Name="object_knight_Anim_02105C" Offset="0x2105C" />
         <Animation Name="object_knight_Anim_021B10" Offset="0x21B10" />
diff --git a/assets/xml/objects/object_kz.xml b/assets/xml/objects/object_kz.xml
index 2b714be38f..55f980ad24 100644
--- a/assets/xml/objects/object_kz.xml
+++ b/assets/xml/objects/object_kz.xml
@@ -75,7 +75,7 @@
         <Limb Name="object_kz_Standardlimb_00D7A8" Type="Standard" EnumName="OBJECT_KZ_LIMB_15" Offset="0xD7A8" />
         <Limb Name="object_kz_Standardlimb_00D7B4" Type="Standard" EnumName="OBJECT_KZ_LIMB_16" Offset="0xD7B4" />
         <Limb Name="object_kz_Standardlimb_00D7C0" Type="Standard" EnumName="OBJECT_KZ_LIMB_17" Offset="0xD7C0" />
-        <Skeleton Name="object_kz_Skel_00D828" Type="Flex" LimbType="Standard" LimbNone="OBJECT_KZ_LIMB_NONE" LimbMax="OBJECT_KZ_LIMB_MAX" EnumName="object_kz_Limbs" Offset="0xD828" />
+        <Skeleton Name="object_kz_Skel_00D828" Type="Flex" LimbType="Standard" LimbNone="OBJECT_KZ_LIMB_NONE" LimbMax="OBJECT_KZ_LIMB_MAX" EnumName="ObjectKzLimb" Offset="0xD828" />
         <Animation Name="object_kz_Anim_00DBE4" Offset="0xDBE4" />
         <Animation Name="object_kz_Anim_00E1C8" Offset="0xE1C8" />
         <Animation Name="object_kz_Anim_00E8BC" Offset="0xE8BC" />
diff --git a/assets/xml/objects/object_link_boy.xml b/assets/xml/objects/object_link_boy.xml
index b0a85ece51..68ec00737f 100644
--- a/assets/xml/objects/object_link_boy.xml
+++ b/assets/xml/objects/object_link_boy.xml
@@ -76,6 +76,6 @@
         <Limb Name="object_link_boy_Lodlimb_00D7F4" Type="LOD" EnumName="OBJECT_LINK_BOY_LIMB_13" Offset="0xD7F4" />
         <Limb Name="object_link_boy_Lodlimb_00D804" Type="LOD" EnumName="OBJECT_LINK_BOY_LIMB_14" Offset="0xD804" />
         <Limb Name="object_link_boy_Lodlimb_00D814" Type="LOD" EnumName="OBJECT_LINK_BOY_LIMB_15" Offset="0xD814" />
-        <Skeleton Name="object_link_boy_Skel_00D878" Type="Flex" LimbType="Standard" LimbNone="OBJECT_LINK_BOY_LIMB_NONE" LimbMax="OBJECT_LINK_BOY_LIMB_MAX" EnumName="object_link_boy_Limbs" Offset="0xD878" />
+        <Skeleton Name="object_link_boy_Skel_00D878" Type="Flex" LimbType="Standard" LimbNone="OBJECT_LINK_BOY_LIMB_NONE" LimbMax="OBJECT_LINK_BOY_LIMB_MAX" EnumName="ObjectLinkBoyLimb" Offset="0xD878" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_link_child.xml b/assets/xml/objects/object_link_child.xml
index 51145033c5..5ad9030480 100644
--- a/assets/xml/objects/object_link_child.xml
+++ b/assets/xml/objects/object_link_child.xml
@@ -151,6 +151,6 @@
         <Limb Name="object_link_child_Lodlimb_01E1C0" Type="LOD" EnumName="OBJECT_LINK_CHILD_LIMB_13" Offset="0x1E1C0" />
         <Limb Name="object_link_child_Lodlimb_01E1D0" Type="LOD" EnumName="OBJECT_LINK_CHILD_LIMB_14" Offset="0x1E1D0" />
         <Limb Name="object_link_child_Lodlimb_01E1E0" Type="LOD" EnumName="OBJECT_LINK_CHILD_LIMB_15" Offset="0x1E1E0" />
-        <Skeleton Name="object_link_child_Skel_01E244" Type="Flex" LimbType="Standard" LimbNone="OBJECT_LINK_CHILD_LIMB_NONE" LimbMax="OBJECT_LINK_CHILD_LIMB_MAX" EnumName="object_link_child_Limbs" Offset="0x1E244" />
+        <Skeleton Name="object_link_child_Skel_01E244" Type="Flex" LimbType="Standard" LimbNone="OBJECT_LINK_CHILD_LIMB_NONE" LimbMax="OBJECT_LINK_CHILD_LIMB_MAX" EnumName="ObjectLinkChildLimb" Offset="0x1E244" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_link_goron.xml b/assets/xml/objects/object_link_goron.xml
index 1aa57c0107..39686b4f7c 100644
--- a/assets/xml/objects/object_link_goron.xml
+++ b/assets/xml/objects/object_link_goron.xml
@@ -80,7 +80,7 @@
         <Limb Name="object_link_goron_Standardlimb_017784" Type="Standard" EnumName="OBJECT_LINK_GORON_1_LIMB_02" Offset="0x17784" />
         <Limb Name="object_link_goron_Standardlimb_017790" Type="Standard" EnumName="OBJECT_LINK_GORON_1_LIMB_03" Offset="0x17790" />
         <Limb Name="object_link_goron_Standardlimb_01779C" Type="Standard" EnumName="OBJECT_LINK_GORON_1_LIMB_04" Offset="0x1779C" />
-        <Skeleton Name="object_link_goron_Skel_0177B8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_LINK_GORON_1_LIMB_NONE" LimbMax="OBJECT_LINK_GORON_1_LIMB_MAX" EnumName="object_link_goron_1_Limbs" Offset="0x177B8" />
+        <Skeleton Name="object_link_goron_Skel_0177B8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_LINK_GORON_1_LIMB_NONE" LimbMax="OBJECT_LINK_GORON_1_LIMB_MAX" EnumName="ObjectLinkGoron1Limb" Offset="0x177B8" />
         <!-- <Blob Name="object_link_goron_Blob_0178D0" Size="0x10" Offset="0x178D0" /> -->
         <Limb Name="object_link_goron_Lodlimb_0178E0" Type="LOD" EnumName="OBJECT_LINK_GORON_2_LIMB_01" Offset="0x178E0" />
         <Limb Name="object_link_goron_Lodlimb_0178F0" Type="LOD" EnumName="OBJECT_LINK_GORON_2_LIMB_02" Offset="0x178F0" />
@@ -103,6 +103,6 @@
         <Limb Name="object_link_goron_Lodlimb_017A00" Type="LOD" EnumName="OBJECT_LINK_GORON_2_LIMB_13" Offset="0x17A00" />
         <Limb Name="object_link_goron_Lodlimb_017A10" Type="LOD" EnumName="OBJECT_LINK_GORON_2_LIMB_14" Offset="0x17A10" />
         <Limb Name="object_link_goron_Lodlimb_017A20" Type="LOD" EnumName="OBJECT_LINK_GORON_2_LIMB_15" Offset="0x17A20" />
-        <Skeleton Name="object_link_goron_Skel_017A84" Type="Flex" LimbType="Standard" LimbNone="OBJECT_LINK_GORON_2_LIMB_NONE" LimbMax="OBJECT_LINK_GORON_2_LIMB_MAX" EnumName="object_link_goron_2_Limbs" Offset="0x17A84" />
+        <Skeleton Name="object_link_goron_Skel_017A84" Type="Flex" LimbType="Standard" LimbNone="OBJECT_LINK_GORON_2_LIMB_NONE" LimbMax="OBJECT_LINK_GORON_2_LIMB_MAX" EnumName="ObjectLinkGoron2Limb" Offset="0x17A84" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_link_nuts.xml b/assets/xml/objects/object_link_nuts.xml
index e3dab39dac..eb072c940e 100644
--- a/assets/xml/objects/object_link_nuts.xml
+++ b/assets/xml/objects/object_link_nuts.xml
@@ -74,6 +74,6 @@
         <Limb Name="object_link_nuts_Lodlimb_00B9A0" Type="LOD" EnumName="OBJECT_LINK_NUTS_LIMB_13" Offset="0xB9A0" />
         <Limb Name="object_link_nuts_Lodlimb_00B9B0" Type="LOD" EnumName="OBJECT_LINK_NUTS_LIMB_14" Offset="0xB9B0" />
         <Limb Name="object_link_nuts_Lodlimb_00B9C0" Type="LOD" EnumName="OBJECT_LINK_NUTS_LIMB_15" Offset="0xB9C0" />
-        <Skeleton Name="object_link_nuts_Skel_00BA24" Type="Flex" LimbType="Standard" LimbNone="OBJECT_LINK_NUTS_LIMB_NONE" LimbMax="OBJECT_LINK_NUTS_LIMB_MAX" EnumName="object_link_nuts_Limbs" Offset="0xBA24" />
+        <Skeleton Name="object_link_nuts_Skel_00BA24" Type="Flex" LimbType="Standard" LimbNone="OBJECT_LINK_NUTS_LIMB_NONE" LimbMax="OBJECT_LINK_NUTS_LIMB_MAX" EnumName="ObjectLinkNutsLimb" Offset="0xBA24" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_link_zora.xml b/assets/xml/objects/object_link_zora.xml
index fe5c50ea67..9a973c56a7 100644
--- a/assets/xml/objects/object_link_zora.xml
+++ b/assets/xml/objects/object_link_zora.xml
@@ -91,6 +91,6 @@
         <Limb Name="object_link_zora_Lodlimb_012BB0" Type="LOD" EnumName="OBJECT_LINK_ZORA_LIMB_13" Offset="0x12BB0" />
         <Limb Name="object_link_zora_Lodlimb_012BC0" Type="LOD" EnumName="OBJECT_LINK_ZORA_LIMB_14" Offset="0x12BC0" />
         <Limb Name="object_link_zora_Lodlimb_012BD0" Type="LOD" EnumName="OBJECT_LINK_ZORA_LIMB_15" Offset="0x12BD0" />
-        <Skeleton Name="object_link_zora_Skel_012C34" Type="Flex" LimbType="Standard" LimbNone="OBJECT_LINK_ZORA_LIMB_NONE" LimbMax="OBJECT_LINK_ZORA_LIMB_MAX" EnumName="object_link_zora_Limbs" Offset="0x12C34" />
+        <Skeleton Name="object_link_zora_Skel_012C34" Type="Flex" LimbType="Standard" LimbNone="OBJECT_LINK_ZORA_LIMB_NONE" LimbMax="OBJECT_LINK_ZORA_LIMB_MAX" EnumName="ObjectLinkZoraLimb" Offset="0x12C34" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_ma1.xml b/assets/xml/objects/object_ma1.xml
index 4d60bb95fa..b0b1435bc8 100644
--- a/assets/xml/objects/object_ma1.xml
+++ b/assets/xml/objects/object_ma1.xml
@@ -103,7 +103,7 @@
         <Limb Name="gRomaniRightHandLimb" Type="Standard" EnumName="ROMANI_LIMB_RIGHT_HAND" Offset="0x138C4" />
 
         <!-- Romani Skeleton -->
-        <Skeleton Name="gRomaniSkel" Type="Flex" LimbType="Standard" LimbNone="ROMANI_LIMB_NONE" LimbMax="ROMANI_LIMB_MAX" EnumName="RomaniLimbs" Offset="0x13928" />
+        <Skeleton Name="gRomaniSkel" Type="Flex" LimbType="Standard" LimbNone="ROMANI_LIMB_NONE" LimbMax="ROMANI_LIMB_MAX" EnumName="RomaniLimb" Offset="0x13928" />
 
         <!-- Romani Animations -->
         <Animation Name="gRomaniWalkAnim" Offset="0x14088" /> <!-- Original name is "rm_walk" -->
diff --git a/assets/xml/objects/object_ma2.xml b/assets/xml/objects/object_ma2.xml
index 5e642f3409..0d528b37bc 100644
--- a/assets/xml/objects/object_ma2.xml
+++ b/assets/xml/objects/object_ma2.xml
@@ -93,7 +93,7 @@
         <Limb Name="gCremiaDress4Limb" Type="Standard" EnumName="CREMIA_LIMB_DRESS_4" Offset="0x15BC8" />
         
         <!-- Cremia Skeleton -->
-        <Skeleton Name="gCremiaSkel" Type="Flex" LimbType="Standard" LimbNone="CREMIA_LIMB_NONE" LimbMax="CREMIA_LIMB_MAX" EnumName="CremiaLimbs" Offset="0x15C28" />
+        <Skeleton Name="gCremiaSkel" Type="Flex" LimbType="Standard" LimbNone="CREMIA_LIMB_NONE" LimbMax="CREMIA_LIMB_MAX" EnumName="CremiaLimb" Offset="0x15C28" />
 
         <!-- Cremia Animation -->
         <Animation Name="gCremiaWalkAnim" Offset="0x16720" /> <!-- Original name is "kl_walk" -->
diff --git a/assets/xml/objects/object_mk.xml b/assets/xml/objects/object_mk.xml
index 1ee3741bb3..087fcc9e01 100644
--- a/assets/xml/objects/object_mk.xml
+++ b/assets/xml/objects/object_mk.xml
@@ -40,6 +40,6 @@
         <Limb Name="object_mk_Standardlimb_006C4C" Type="Standard" EnumName="OBJECT_MK_LIMB_0A" Offset="0x6C4C" />
         <Limb Name="object_mk_Standardlimb_006C58" Type="Standard" EnumName="OBJECT_MK_LIMB_0B" Offset="0x6C58" />
         <Limb Name="object_mk_Standardlimb_006C64" Type="Standard" EnumName="OBJECT_MK_LIMB_0C" Offset="0x6C64" />
-        <Skeleton Name="object_mk_Skel_006CA0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_MK_LIMB_NONE" LimbMax="OBJECT_MK_LIMB_MAX" EnumName="object_mk_Limbs" Offset="0x6CA0" />
+        <Skeleton Name="object_mk_Skel_006CA0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_MK_LIMB_NONE" LimbMax="OBJECT_MK_LIMB_MAX" EnumName="ObjectMkLimb" Offset="0x6CA0" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_mm.xml b/assets/xml/objects/object_mm.xml
index baac5425d0..43e8e930b3 100644
--- a/assets/xml/objects/object_mm.xml
+++ b/assets/xml/objects/object_mm.xml
@@ -54,7 +54,7 @@
         <Limb Name="object_mm_Standardlimb_009688" Type="Standard" EnumName="OBJECT_MM_LIMB_0D" Offset="0x9688" />
         <Limb Name="object_mm_Standardlimb_009694" Type="Standard" EnumName="OBJECT_MM_LIMB_0E" Offset="0x9694" />
         <Limb Name="object_mm_Standardlimb_0096A0" Type="Standard" EnumName="OBJECT_MM_LIMB_0F" Offset="0x96A0" />
-        <Skeleton Name="object_mm_Skel_0096E8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_MM_LIMB_NONE" LimbMax="OBJECT_MM_LIMB_MAX" EnumName="object_mm_Limbs" Offset="0x96E8" />
+        <Skeleton Name="object_mm_Skel_0096E8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_MM_LIMB_NONE" LimbMax="OBJECT_MM_LIMB_MAX" EnumName="ObjectMmLimb" Offset="0x96E8" />
         <Animation Name="object_mm_Anim_0099B4" Offset="0x99B4" />
         <Animation Name="object_mm_Anim_00A4E0" Offset="0xA4E0" />
         <Animation Name="object_mm_Anim_00A8D8" Offset="0xA8D8" />
diff --git a/assets/xml/objects/object_mnk.xml b/assets/xml/objects/object_mnk.xml
index c6e23399da..d585972c08 100644
--- a/assets/xml/objects/object_mnk.xml
+++ b/assets/xml/objects/object_mnk.xml
@@ -23,7 +23,7 @@
         <Limb Name="object_mnk_Standardlimb_00511C" Type="Standard" EnumName="OBJECT_MNK_1_LIMB_02" Offset="0x511C" />
         <Limb Name="object_mnk_Standardlimb_005128" Type="Standard" EnumName="OBJECT_MNK_1_LIMB_03" Offset="0x5128" />
         <Limb Name="object_mnk_Standardlimb_005134" Type="Standard" EnumName="OBJECT_MNK_1_LIMB_04" Offset="0x5134" />
-        <Skeleton Name="object_mnk_Skel_005150" Type="Flex" LimbType="Standard" LimbNone="OBJECT_MNK_1_LIMB_NONE" LimbMax="OBJECT_MNK_1_LIMB_MAX" EnumName="object_mnk_1_Limbs" Offset="0x5150" />
+        <Skeleton Name="object_mnk_Skel_005150" Type="Flex" LimbType="Standard" LimbNone="OBJECT_MNK_1_LIMB_NONE" LimbMax="OBJECT_MNK_1_LIMB_MAX" EnumName="ObjectMnk1Limb" Offset="0x5150" />
         <Animation Name="object_mnk_Anim_005194" Offset="0x5194" />
         <Animation Name="object_mnk_Anim_0052C4" Offset="0x52C4" />
         <Animation Name="object_mnk_Anim_005390" Offset="0x5390" />
@@ -104,7 +104,7 @@
         <Limb Name="object_mnk_Standardlimb_019B0C" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_14" Offset="0x19B0C" />
         <Limb Name="object_mnk_Standardlimb_019B18" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_15" Offset="0x19B18" />
         <Limb Name="object_mnk_Standardlimb_019B24" Type="Standard" EnumName="OBJECT_MNK_2_LIMB_16" Offset="0x19B24" />
-        <Skeleton Name="object_mnk_Skel_019B88" Type="Flex" LimbType="Standard" LimbNone="OBJECT_MNK_2_LIMB_NONE" LimbMax="OBJECT_MNK_2_LIMB_MAX" EnumName="object_mnk_2_Limbs" Offset="0x19B88" />
+        <Skeleton Name="object_mnk_Skel_019B88" Type="Flex" LimbType="Standard" LimbNone="OBJECT_MNK_2_LIMB_NONE" LimbMax="OBJECT_MNK_2_LIMB_MAX" EnumName="ObjectMnk2Limb" Offset="0x19B88" />
         <Animation Name="object_mnk_Anim_01A4F8" Offset="0x1A4F8" />
         <Animation Name="object_mnk_Anim_01B468" Offset="0x1B468" />
         <Animation Name="object_mnk_Anim_01BB0C" Offset="0x1BB0C" />
@@ -121,6 +121,6 @@
         <Limb Name="object_mnk_Standardlimb_01D4E8" Type="Standard" EnumName="OBJECT_MNK_3_LIMB_01" Offset="0x1D4E8" />
         <Limb Name="object_mnk_Standardlimb_01D4F4" Type="Standard" EnumName="OBJECT_MNK_3_LIMB_02" Offset="0x1D4F4" />
         <Limb Name="object_mnk_Standardlimb_01D500" Type="Standard" EnumName="OBJECT_MNK_3_LIMB_03" Offset="0x1D500" />
-        <Skeleton Name="object_mnk_Skel_01D518" Type="Flex" LimbType="Standard" LimbNone="OBJECT_MNK_3_LIMB_NONE" LimbMax="OBJECT_MNK_3_LIMB_MAX" EnumName="object_mnk_3_Limbs" Offset="0x1D518" />
+        <Skeleton Name="object_mnk_Skel_01D518" Type="Flex" LimbType="Standard" LimbNone="OBJECT_MNK_3_LIMB_NONE" LimbMax="OBJECT_MNK_3_LIMB_MAX" EnumName="ObjectMnk3Limb" Offset="0x1D518" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_ms.xml b/assets/xml/objects/object_ms.xml
index a4a36e1493..93828c76f8 100644
--- a/assets/xml/objects/object_ms.xml
+++ b/assets/xml/objects/object_ms.xml
@@ -27,6 +27,6 @@
         <Limb Name="object_ms_Standardlimb_003D7C" Type="Standard" EnumName="OBJECT_MS_LIMB_06" Offset="0x3D7C" />
         <Limb Name="object_ms_Standardlimb_003D88" Type="Standard" EnumName="OBJECT_MS_LIMB_07" Offset="0x3D88" />
         <Limb Name="object_ms_Standardlimb_003D94" Type="Standard" EnumName="OBJECT_MS_LIMB_08" Offset="0x3D94" />
-        <Skeleton Name="object_ms_Skel_003DC0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_MS_LIMB_NONE" LimbMax="OBJECT_MS_LIMB_MAX" EnumName="object_ms_Limbs" Offset="0x3DC0" />
+        <Skeleton Name="object_ms_Skel_003DC0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_MS_LIMB_NONE" LimbMax="OBJECT_MS_LIMB_MAX" EnumName="ObjectMsLimb" Offset="0x3DC0" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_mu.xml b/assets/xml/objects/object_mu.xml
index 925cb74e94..1f246b07b5 100644
--- a/assets/xml/objects/object_mu.xml
+++ b/assets/xml/objects/object_mu.xml
@@ -56,7 +56,7 @@
         <Limb Name="object_mu_Standardlimb_00B23C" Type="Standard" EnumName="OBJECT_MU_LIMB_12" Offset="0xB23C" />
         <Limb Name="object_mu_Standardlimb_00B248" Type="Standard" EnumName="OBJECT_MU_LIMB_13" Offset="0xB248" />
         <Limb Name="object_mu_Standardlimb_00B254" Type="Standard" EnumName="OBJECT_MU_LIMB_14" Offset="0xB254" />
-        <Skeleton Name="object_mu_Skel_00B2B0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_MU_LIMB_NONE" LimbMax="OBJECT_MU_LIMB_MAX" EnumName="object_mu_Limbs" Offset="0xB2B0" />
+        <Skeleton Name="object_mu_Skel_00B2B0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_MU_LIMB_NONE" LimbMax="OBJECT_MU_LIMB_MAX" EnumName="ObjectMuLimb" Offset="0xB2B0" />
         <Animation Name="object_mu_Anim_00BAC4" Offset="0xBAC4" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_nb.xml b/assets/xml/objects/object_nb.xml
index e8a695b52b..511fddd6c3 100644
--- a/assets/xml/objects/object_nb.xml
+++ b/assets/xml/objects/object_nb.xml
@@ -41,6 +41,6 @@
         <Limb Name="object_nb_Standardlimb_008C00" Type="Standard" EnumName="OBJECT_NB_LIMB_05" Offset="0x8C00" />
         <Limb Name="object_nb_Standardlimb_008C0C" Type="Standard" EnumName="OBJECT_NB_LIMB_06" Offset="0x8C0C" />
         <Limb Name="object_nb_Standardlimb_008C18" Type="Standard" EnumName="OBJECT_NB_LIMB_07" Offset="0x8C18" />
-        <Skeleton Name="object_nb_Skel_008C40" Type="Flex" LimbType="Standard" LimbNone="OBJECT_NB_LIMB_NONE" LimbMax="OBJECT_NB_LIMB_MAX" EnumName="object_nb_Limbs" Offset="0x8C40" />
+        <Skeleton Name="object_nb_Skel_008C40" Type="Flex" LimbType="Standard" LimbNone="OBJECT_NB_LIMB_NONE" LimbMax="OBJECT_NB_LIMB_MAX" EnumName="ObjectNbLimb" Offset="0x8C40" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_niw.xml b/assets/xml/objects/object_niw.xml
index 0e533fb6e6..157d2b3026 100644
--- a/assets/xml/objects/object_niw.xml
+++ b/assets/xml/objects/object_niw.xml
@@ -35,6 +35,6 @@
         <Limb Name="gNiwUpperBodyRootLimb" LimbType="Standard" EnumName="NIW_LIMB_UPPER_BODY" Offset="0x24D0"/>
         <Limb Name="gNiwNeckLimb" LimbType="Standard" EnumName="NIW_LIMB_NECK" Offset="0x24DC"/>
         <Limb Name="gNiwHeadLimb" LimbType="Standard" EnumName="NIW_LIMB_HEAD" Offset="0x24E8"/>
-        <Skeleton Name="gNiwSkeleton" Type="Flex" LimbType="Standard" LimbNone="NIW_LIMB_NONE" LimbMax="NIW_LIMB_MAX" EnumName="ObjectNiwLimbs" Offset="0x2530" />
+        <Skeleton Name="gNiwSkeleton" Type="Flex" LimbType="Standard" LimbNone="NIW_LIMB_NONE" LimbMax="NIW_LIMB_MAX" EnumName="ObjectNiwLimb" Offset="0x2530" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_oF1d_map.xml b/assets/xml/objects/object_oF1d_map.xml
index a55e9c9eab..0f331cbcec 100644
--- a/assets/xml/objects/object_oF1d_map.xml
+++ b/assets/xml/objects/object_oF1d_map.xml
@@ -125,7 +125,7 @@
         <Limb Name="gGoronRightForearmLimb" Type="Standard" EnumName="GORON_LIMB_RIGHT_FOREARM" Offset="0x11A60" />
         <Limb Name="gGoronRightHandLimb" Type="Standard" EnumName="GORON_LIMB_RIGHT_HAND" Offset="0x11A6C" />
         <Limb Name="gGoronHeadLimb" Type="Standard" EnumName="GORON_LIMB_HEAD" Offset="0x11A78" />
-        <Skeleton Name="gGoronSkel" Type="Flex" LimbType="Standard" LimbNone="GORON_LIMB_NONE" LimbMax="GORON_LIMB_MAX" EnumName="GoronLimbs" Offset="0x11AC8" />
+        <Skeleton Name="gGoronSkel" Type="Flex" LimbType="Standard" LimbNone="GORON_LIMB_NONE" LimbMax="GORON_LIMB_MAX" EnumName="GoronLimb" Offset="0x11AC8" />
 
         <!-- Animations -->
         <Animation Name="gGoronLyingDownIdleAnim" Offset="0x11D98" />
diff --git a/assets/xml/objects/object_ob.xml b/assets/xml/objects/object_ob.xml
index 0f79703b57..75217e04e5 100644
--- a/assets/xml/objects/object_ob.xml
+++ b/assets/xml/objects/object_ob.xml
@@ -76,7 +76,7 @@
         <Limb Name="object_ob_Standardlimb_016450" Type="Standard" EnumName="OBJECT_OB_LIMB_0F" Offset="0x16450" />
         <Limb Name="object_ob_Standardlimb_01645C" Type="Standard" EnumName="OBJECT_OB_LIMB_10" Offset="0x1645C" />
         <Limb Name="object_ob_Standardlimb_016468" Type="Standard" EnumName="OBJECT_OB_LIMB_11" Offset="0x16468" />
-        <Skeleton Name="object_ob_Skel_0164B8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_OB_LIMB_NONE" LimbMax="OBJECT_OB_LIMB_MAX" EnumName="object_ob_Limbs" Offset="0x164B8" />
+        <Skeleton Name="object_ob_Skel_0164B8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_OB_LIMB_NONE" LimbMax="OBJECT_OB_LIMB_MAX" EnumName="ObjectObLimb" Offset="0x164B8" />
         <Animation Name="object_ob_Anim_016F58" Offset="0x16F58" />
         <Animation Name="object_ob_Anim_01764C" Offset="0x1764C" />
         <Animation Name="object_ob_Anim_017E98" Offset="0x17E98" />
diff --git a/assets/xml/objects/object_okuta.xml b/assets/xml/objects/object_okuta.xml
index e10afa1355..cad1c57bdc 100644
--- a/assets/xml/objects/object_okuta.xml
+++ b/assets/xml/objects/object_okuta.xml
@@ -60,7 +60,7 @@
         <Limb Name="gOctorokSnoutLimb" Type="Standard" EnumName="OCTOROK_LIMB_SNOUT" Offset="0x3388" />
 
         <!-- Octorok Skeleton -->
-        <Skeleton Name="gOctorokSkel" Type="Normal" LimbType="Standard" LimbNone="OCTOROK_LIMB_NONE" LimbMax="OCTOROK_LIMB_MAX" EnumName="OctorokLimbs" Offset="0x33D0" />
+        <Skeleton Name="gOctorokSkel" Type="Normal" LimbType="Standard" LimbNone="OCTOROK_LIMB_NONE" LimbMax="OCTOROK_LIMB_MAX" EnumName="OctorokLimb" Offset="0x33D0" />
 
         <!-- Octorok Animations -->
         <Animation Name="gOctorokDieAnim" Offset="0x3958" /> <!-- Original name is "oc_dead" -->
diff --git a/assets/xml/objects/object_osn.xml b/assets/xml/objects/object_osn.xml
index 2cb8315ea6..dbcdb84734 100644
--- a/assets/xml/objects/object_osn.xml
+++ b/assets/xml/objects/object_osn.xml
@@ -110,7 +110,7 @@
         <Limb Name="object_osn_Standardlimb_020284" Type="Standard" EnumName="OBJECT_OSN_LIMB_10" Offset="0x20284" />
         <Limb Name="object_osn_Standardlimb_020290" Type="Standard" EnumName="OBJECT_OSN_LIMB_11" Offset="0x20290" />
         <Limb Name="object_osn_Standardlimb_02029C" Type="Standard" EnumName="OBJECT_OSN_LIMB_12" Offset="0x2029C" />
-        <Skeleton Name="object_osn_Skel_0202F0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_OSN_LIMB_NONE" LimbMax="OBJECT_OSN_LIMB_MAX" EnumName="object_osn_Limbs" Offset="0x202F0" />
+        <Skeleton Name="object_osn_Skel_0202F0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_OSN_LIMB_NONE" LimbMax="OBJECT_OSN_LIMB_MAX" EnumName="ObjectOsnLimb" Offset="0x202F0" />
         <Animation Name="object_osn_Anim_020530" Offset="0x20530" />
         <Skeleton Name="gDekuMaskSkel" Type="Flex" LimbType="Standard" Offset="0x20550" />
     </File>
diff --git a/assets/xml/objects/object_ot.xml b/assets/xml/objects/object_ot.xml
index 49a8d89cea..ae3b42d223 100644
--- a/assets/xml/objects/object_ot.xml
+++ b/assets/xml/objects/object_ot.xml
@@ -48,7 +48,7 @@
         <Limb Name="object_ot_Standardlimb_004794" Type="Standard" EnumName="OBJECT_OT_LIMB_10" Offset="0x4794" />
         <Limb Name="object_ot_Standardlimb_0047A0" Type="Standard" EnumName="OBJECT_OT_LIMB_11" Offset="0x47A0" />
         <Limb Name="object_ot_Standardlimb_0047AC" Type="Standard" EnumName="OBJECT_OT_LIMB_12" Offset="0x47AC" />
-        <Skeleton Name="object_ot_Skel_004800" Type="Flex" LimbType="Standard" LimbNone="OBJECT_OT_LIMB_NONE" LimbMax="OBJECT_OT_LIMB_MAX" EnumName="object_ot_Limbs" Offset="0x4800" />
+        <Skeleton Name="object_ot_Skel_004800" Type="Flex" LimbType="Standard" LimbNone="OBJECT_OT_LIMB_NONE" LimbMax="OBJECT_OT_LIMB_MAX" EnumName="ObjectOtLimb" Offset="0x4800" />
         <Animation Name="object_ot_Anim_004B30" Offset="0x4B30" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_owl.xml b/assets/xml/objects/object_owl.xml
index 6c9d798833..5560e33473 100644
--- a/assets/xml/objects/object_owl.xml
+++ b/assets/xml/objects/object_owl.xml
@@ -57,7 +57,7 @@
         <Limb Name="object_owl_Standardlimb_00C584" Type="Standard" EnumName="OBJECT_OWL_1_LIMB_12" Offset="0xC584" />
         <Limb Name="object_owl_Standardlimb_00C590" Type="Standard" EnumName="OBJECT_OWL_1_LIMB_13" Offset="0xC590" />
         <Limb Name="object_owl_Standardlimb_00C59C" Type="Standard" EnumName="OBJECT_OWL_1_LIMB_14" Offset="0xC59C" />
-        <Skeleton Name="object_owl_Skel_00C5F8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_OWL_1_LIMB_NONE" LimbMax="OBJECT_OWL_1_LIMB_MAX" EnumName="object_owl_1_Limbs" Offset="0xC5F8" />
+        <Skeleton Name="object_owl_Skel_00C5F8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_OWL_1_LIMB_NONE" LimbMax="OBJECT_OWL_1_LIMB_MAX" EnumName="ObjectOwl1Limb" Offset="0xC5F8" />
         <Animation Name="object_owl_Anim_00C6D4" Offset="0xC6D4" />
         <Animation Name="object_owl_Anim_00CB94" Offset="0xCB94" />
         <Animation Name="object_owl_Anim_00CDB0" Offset="0xCDB0" />
@@ -90,6 +90,6 @@
         <Limb Name="object_owl_Standardlimb_010560" Type="Standard" EnumName="OBJECT_OWL_2_LIMB_0D" Offset="0x10560" />
         <Limb Name="object_owl_Standardlimb_01056C" Type="Standard" EnumName="OBJECT_OWL_2_LIMB_0E" Offset="0x1056C" />
         <Limb Name="object_owl_Standardlimb_010578" Type="Standard" EnumName="OBJECT_OWL_2_LIMB_0F" Offset="0x10578" />
-        <Skeleton Name="object_owl_Skel_0105C0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_OWL_2_LIMB_NONE" LimbMax="OBJECT_OWL_2_LIMB_MAX" EnumName="object_owl_2_Limbs" Offset="0x105C0" />
+        <Skeleton Name="object_owl_Skel_0105C0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_OWL_2_LIMB_NONE" LimbMax="OBJECT_OWL_2_LIMB_MAX" EnumName="ObjectOwl2Limb" Offset="0x105C0" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_pamera.xml b/assets/xml/objects/object_pamera.xml
index 28f73983e1..61dc17694d 100644
--- a/assets/xml/objects/object_pamera.xml
+++ b/assets/xml/objects/object_pamera.xml
@@ -63,7 +63,7 @@
         <Limb Name="gPamelaBackDressLimb" Type="Standard" EnumName="PAMELA_LIMB_BACK_DRESS" Offset="0x83CC" />
         <Limb Name="gPamelaAbdomenLimb" Type="Standard" EnumName="PAMELA_LIMB_ABDOMEN" Offset="0x83D8" />
         <Limb Name="gPamelaPelvisLimb" Type="Standard" EnumName="PAMELA_LIMB_PELVIS" Offset="0x83E4" />
-        <Skeleton Name="gPamelaSkel" Type="Flex" LimbType="Standard" LimbNone="PAMELA_LIMB_NONE" LimbMax="PAMELA_LIMB_MAX" EnumName="PamelaLimbs" Offset="0x8448" />
+        <Skeleton Name="gPamelaSkel" Type="Flex" LimbType="Standard" LimbNone="PAMELA_LIMB_NONE" LimbMax="PAMELA_LIMB_MAX" EnumName="PamelaLimb" Offset="0x8448" />
         
         <Animation Name="object_pamera_Anim_008AE0" Offset="0x8AE0" /> <!-- Pamela Walking -->
         <Animation Name="object_pamera_Anim_008E38" Offset="0x8E38" />
diff --git a/assets/xml/objects/object_ph.xml b/assets/xml/objects/object_ph.xml
index 2e8a8eb29b..fcf03b765b 100644
--- a/assets/xml/objects/object_ph.xml
+++ b/assets/xml/objects/object_ph.xml
@@ -39,6 +39,6 @@
         <Limb Name="object_ph_Standardlimb_001C00" Type="Standard" EnumName="OBJECT_PH_LIMB_15" Offset="0x1C00" />
         <Limb Name="object_ph_Standardlimb_001C0C" Type="Standard" EnumName="OBJECT_PH_LIMB_16" Offset="0x1C0C" />
         <Limb Name="object_ph_Standardlimb_001C18" Type="Standard" EnumName="OBJECT_PH_LIMB_17" Offset="0x1C18" />
-        <Skeleton Name="object_ph_Skel_001C80" Type="Normal" LimbType="Standard" LimbNone="OBJECT_PH_LIMB_NONE" LimbMax="OBJECT_PH_LIMB_MAX" EnumName="object_ph_Limbs" Offset="0x1C80" />
+        <Skeleton Name="object_ph_Skel_001C80" Type="Normal" LimbType="Standard" LimbNone="OBJECT_PH_LIMB_NONE" LimbMax="OBJECT_PH_LIMB_MAX" EnumName="ObjectPhLimb" Offset="0x1C80" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_po.xml b/assets/xml/objects/object_po.xml
index 2cc6e5cbd8..98dbc61b1a 100644
--- a/assets/xml/objects/object_po.xml
+++ b/assets/xml/objects/object_po.xml
@@ -48,6 +48,6 @@
         <Limb Name="object_po_Standardlimb_00505C" Type="Standard" EnumName="OBJECT_PO_LIMB_12" Offset="0x505C" />
         <Limb Name="object_po_Standardlimb_005068" Type="Standard" EnumName="OBJECT_PO_LIMB_13" Offset="0x5068" />
         <Limb Name="object_po_Standardlimb_005074" Type="Standard" EnumName="OBJECT_PO_LIMB_14" Offset="0x5074" />
-        <Skeleton Name="object_po_Skel_0050D0" Type="Normal" LimbType="Standard" LimbNone="OBJECT_PO_LIMB_NONE" LimbMax="OBJECT_PO_LIMB_MAX" EnumName="object_po_Limbs" Offset="0x50D0" />
+        <Skeleton Name="object_po_Skel_0050D0" Type="Normal" LimbType="Standard" LimbNone="OBJECT_PO_LIMB_NONE" LimbMax="OBJECT_PO_LIMB_MAX" EnumName="ObjectPoLimb" Offset="0x50D0" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_po_composer.xml b/assets/xml/objects/object_po_composer.xml
index ae8ef56e33..c45cf9039b 100644
--- a/assets/xml/objects/object_po_composer.xml
+++ b/assets/xml/objects/object_po_composer.xml
@@ -53,6 +53,6 @@
         <Limb Name="object_po_composer_Standardlimb_0098E0" Type="Standard" EnumName="OBJECT_PO_COMPOSER_LIMB_09" Offset="0x98E0" />
         <Limb Name="object_po_composer_Standardlimb_0098EC" Type="Standard" EnumName="OBJECT_PO_COMPOSER_LIMB_0A" Offset="0x98EC" />
         <Limb Name="object_po_composer_Standardlimb_0098F8" Type="Standard" EnumName="OBJECT_PO_COMPOSER_LIMB_0B" Offset="0x98F8" />
-        <Skeleton Name="object_po_composer_Skel_009930" Type="Flex" LimbType="Standard" LimbNone="OBJECT_PO_COMPOSER_LIMB_NONE" LimbMax="OBJECT_PO_COMPOSER_LIMB_MAX" EnumName="object_po_composer_Limbs" Offset="0x9930" />
+        <Skeleton Name="object_po_composer_Skel_009930" Type="Flex" LimbType="Standard" LimbNone="OBJECT_PO_COMPOSER_LIMB_NONE" LimbMax="OBJECT_PO_COMPOSER_LIMB_MAX" EnumName="ObjectPoComposerLimb" Offset="0x9930" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_po_fusen.xml b/assets/xml/objects/object_po_fusen.xml
index 5885b89a3c..a25c9d9607 100644
--- a/assets/xml/objects/object_po_fusen.xml
+++ b/assets/xml/objects/object_po_fusen.xml
@@ -27,6 +27,6 @@
         <Limb Name="object_po_fusen_Standardlimb_0024A8" Type="Standard" EnumName="OBJECT_PO_FUSEN_LIMB_07" Offset="0x24A8" />
         <Limb Name="object_po_fusen_Standardlimb_0024B4" Type="Standard" EnumName="OBJECT_PO_FUSEN_LIMB_08" Offset="0x24B4" />
         <Limb Name="object_po_fusen_Standardlimb_0024C0" Type="Standard" EnumName="OBJECT_PO_FUSEN_LIMB_09" Offset="0x24C0" />
-        <Skeleton Name="object_po_fusen_Skel_0024F0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_PO_FUSEN_LIMB_NONE" LimbMax="OBJECT_PO_FUSEN_LIMB_MAX" EnumName="object_po_fusen_Limbs" Offset="0x24F0" />
+        <Skeleton Name="object_po_fusen_Skel_0024F0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_PO_FUSEN_LIMB_NONE" LimbMax="OBJECT_PO_FUSEN_LIMB_MAX" EnumName="ObjectPoFusenLimb" Offset="0x24F0" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_po_sisters.xml b/assets/xml/objects/object_po_sisters.xml
index 61bc0b4040..e2e57a31aa 100644
--- a/assets/xml/objects/object_po_sisters.xml
+++ b/assets/xml/objects/object_po_sisters.xml
@@ -65,6 +65,6 @@
         <Limb Name="gPoSistersLowerBodyLimb" Type="Standard" EnumName="POSISTERS_LIMB_LOWER_BODY" Offset="0x6590" />
 
         <!-- PoSister Skeleton -->
-        <Skeleton Name="gPoSistersSkel" Type="Normal" LimbType="Standard" LimbNone="POSISTERS_LIMB_NONE" LimbMax="POSISTERS_LIMB_MAX" EnumName="PoSistersLimbs" Offset="0x65C8" />
+        <Skeleton Name="gPoSistersSkel" Type="Normal" LimbType="Standard" LimbNone="POSISTERS_LIMB_NONE" LimbMax="POSISTERS_LIMB_MAX" EnumName="PoSistersLimb" Offset="0x65C8" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_pr.xml b/assets/xml/objects/object_pr.xml
index 95fc4743c5..52429cb185 100644
--- a/assets/xml/objects/object_pr.xml
+++ b/assets/xml/objects/object_pr.xml
@@ -40,7 +40,7 @@
         <Limb Name="object_pr_Standardlimb_003870" Type="Standard" EnumName="OBJECT_PR_1_LIMB_07" Offset="0x3870" />
         <Limb Name="object_pr_Standardlimb_00387C" Type="Standard" EnumName="OBJECT_PR_1_LIMB_08" Offset="0x387C" />
         <Limb Name="object_pr_Standardlimb_003888" Type="Standard" EnumName="OBJECT_PR_1_LIMB_09" Offset="0x3888" />
-        <Skeleton Name="object_pr_Skel_0038B8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_PR_1_LIMB_NONE" LimbMax="OBJECT_PR_1_LIMB_MAX" EnumName="object_pr_1_Limbs" Offset="0x38B8" />
+        <Skeleton Name="object_pr_Skel_0038B8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_PR_1_LIMB_NONE" LimbMax="OBJECT_PR_1_LIMB_MAX" EnumName="ObjectPr1Limb" Offset="0x38B8" />
         <Animation Name="object_pr_Anim_003904" Offset="0x3904" />
         <DList Name="object_pr_DL_003AB0" Offset="0x3AB0" />
         <DList Name="object_pr_DL_003B50" Offset="0x3B50" />
@@ -55,7 +55,7 @@
         <Limb Name="object_pr_Standardlimb_004154" Type="Standard" EnumName="OBJECT_PR_2_LIMB_02" Offset="0x4154" />
         <Limb Name="object_pr_Standardlimb_004160" Type="Standard" EnumName="OBJECT_PR_2_LIMB_03" Offset="0x4160" />
         <Limb Name="object_pr_Standardlimb_00416C" Type="Standard" EnumName="OBJECT_PR_2_LIMB_04" Offset="0x416C" />
-        <Skeleton Name="object_pr_Skel_004188" Type="Flex" LimbType="Standard" LimbNone="OBJECT_PR_2_LIMB_NONE" LimbMax="OBJECT_PR_2_LIMB_MAX" EnumName="object_pr_2_Limbs" Offset="0x4188" />
+        <Skeleton Name="object_pr_Skel_004188" Type="Flex" LimbType="Standard" LimbNone="OBJECT_PR_2_LIMB_NONE" LimbMax="OBJECT_PR_2_LIMB_MAX" EnumName="ObjectPr2Limb" Offset="0x4188" />
         <Animation Name="object_pr_Anim_004274" Offset="0x4274" />
         <Animation Name="object_pr_Anim_004340" Offset="0x4340" />
     </File>
diff --git a/assets/xml/objects/object_ps.xml b/assets/xml/objects/object_ps.xml
index f341e95a43..689d78fb58 100644
--- a/assets/xml/objects/object_ps.xml
+++ b/assets/xml/objects/object_ps.xml
@@ -33,7 +33,7 @@
         <Limb Name="object_ps_Standardlimb_0071E0" Type="Standard" EnumName="OBJECT_PS_LIMB_09" Offset="0x71E0" />
         <Limb Name="object_ps_Standardlimb_0071EC" Type="Standard" EnumName="OBJECT_PS_LIMB_0A" Offset="0x71EC" />
         <Limb Name="object_ps_Standardlimb_0071F8" Type="Standard" EnumName="OBJECT_PS_LIMB_0B" Offset="0x71F8" />
-        <Skeleton Name="object_ps_Skel_007230" Type="Flex" LimbType="Standard" LimbNone="OBJECT_PS_LIMB_NONE" LimbMax="OBJECT_PS_LIMB_MAX" EnumName="object_ps_Limbs" Offset="0x7230" />
+        <Skeleton Name="object_ps_Skel_007230" Type="Flex" LimbType="Standard" LimbNone="OBJECT_PS_LIMB_NONE" LimbMax="OBJECT_PS_LIMB_MAX" EnumName="ObjectPsLimb" Offset="0x7230" />
         <Collision Name="object_ps_Colheader_0072E0" Offset="0x72E0" />
         <Animation Name="object_ps_Anim_0078FC" Offset="0x78FC" />
     </File>
diff --git a/assets/xml/objects/object_raf.xml b/assets/xml/objects/object_raf.xml
index e3b4d2d934..2322740d52 100644
--- a/assets/xml/objects/object_raf.xml
+++ b/assets/xml/objects/object_raf.xml
@@ -53,6 +53,6 @@
         <Limb Name="gCarnivorousLilyPadRootsLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_ROOTS" Offset="0x33F0" />
 
         <!-- Carnivorous Lily Pad Skeleton -->
-        <Skeleton Name="gCarnivorousLilyPadSkel" Type="Flex" LimbType="Standard" LimbNone="CARNIVOROUS_LILY_PAD_LIMB_NONE" LimbMax="CARNIVOROUS_LILY_PAD_LIMB_MAX" EnumName="CarnivorousLilyPadLimbs" Offset="0x3428" />
+        <Skeleton Name="gCarnivorousLilyPadSkel" Type="Flex" LimbType="Standard" LimbNone="CARNIVOROUS_LILY_PAD_LIMB_NONE" LimbMax="CARNIVOROUS_LILY_PAD_LIMB_MAX" EnumName="CarnivorousLilyPadLimb" Offset="0x3428" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_rb.xml b/assets/xml/objects/object_rb.xml
index 72b3e6cb67..cd0e9c2742 100644
--- a/assets/xml/objects/object_rb.xml
+++ b/assets/xml/objects/object_rb.xml
@@ -48,6 +48,6 @@
         <Limb Name="object_rb_Standardlimb_001E74" Type="Standard" EnumName="OBJECT_RB_LIMB_0E" Offset="0x1E74" />
         <Limb Name="object_rb_Standardlimb_001E80" Type="Standard" EnumName="OBJECT_RB_LIMB_0F" Offset="0x1E80" />
 
-        <Skeleton Name="gLeeverSkel" Type="Normal" LimbType="Standard" LimbNone="LEEVER_LIMB_NONE" LimbMax="LEEVER_LIMB_MAX" EnumName="LeeverLimbs" Offset="0x1EE8" />
+        <Skeleton Name="gLeeverSkel" Type="Normal" LimbType="Standard" LimbNone="LEEVER_LIMB_NONE" LimbMax="LEEVER_LIMB_MAX" EnumName="LeeverLimb" Offset="0x1EE8" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_rd.xml b/assets/xml/objects/object_rd.xml
index 854ded388c..cb16e492fe 100644
--- a/assets/xml/objects/object_rd.xml
+++ b/assets/xml/objects/object_rd.xml
@@ -45,7 +45,7 @@
         <Limb Name="gGibdoHeadRootLimb" Type="Standard" EnumName="GIBDO_LIMB_HEAD_ROOT" Offset="0x5360" />
         <Limb Name="gGibdoHeadLimb" Type="Standard" EnumName="GIBDO_LIMB_HEAD" Offset="0x536C" />
         <Limb Name="gGibdoPelvisLimb" Type="Standard" EnumName="GIBDO_LIMB_PELVIS" Offset="0x5378" />
-        <Skeleton Name="gGibdoSkel" Type="Flex" LimbType="Standard" LimbNone="GIBDO_LIMB_NONE" LimbMax="GIBDO_LIMB_MAX" EnumName="GibdoLimbs" Offset="0x53E8" />
+        <Skeleton Name="gGibdoSkel" Type="Flex" LimbType="Standard" LimbNone="GIBDO_LIMB_NONE" LimbMax="GIBDO_LIMB_MAX" EnumName="GibdoLimb" Offset="0x53E8" />
         <Animation Name="gGibdoRedeadSlumpStartAnim" Offset="0x5DF4" /> <!-- Original name is "gibud_stop" -->
         <Animation Name="gGibdoRedeadSlumpLoopAnim" Offset="0x61E4" /> <!-- Original name is "gibud_stop_loop" -->
         <Animation Name="gGibdoRedeadGrabAttackAnim" Offset="0x6678" /> <!-- Original name is "re_dead_attack" -->
@@ -105,7 +105,7 @@
         <Limb Name="gRedeadHeadRootLimb" Type="Standard" EnumName="REDEAD_LIMB_HEAD_ROOT" Offset="0x10B00" />
         <Limb Name="gRedeadHeadLimb" Type="Standard" EnumName="REDEAD_LIMB_HEAD" Offset="0x10B0C" />
         <Limb Name="gRedeadPelvisLimb" Type="Standard" EnumName="REDEAD_LIMB_PELVIS" Offset="0x10B18" />
-        <Skeleton Name="gRedeadSkel" Type="Flex" LimbType="Standard" LimbNone="REDEAD_LIMB_NONE" LimbMax="REDEAD_LIMB_MAX" EnumName="RedeadLimbs" Offset="0x10B88" />
+        <Skeleton Name="gRedeadSkel" Type="Flex" LimbType="Standard" LimbNone="REDEAD_LIMB_NONE" LimbMax="REDEAD_LIMB_MAX" EnumName="RedeadLimb" Offset="0x10B88" />
         <Animation Name="gGibdoRedeadWalkAnim" Offset="0x113EC" /> <!-- Original name is "re_dead_walk" -->
         <Animation Name="gGibdoRedeadPirouetteAnim" Offset="0x118D8" /> <!-- Original name is "wait_baree" ("ballet") -->
         <Animation Name="gGibdoRedeadClappingDanceAnim" Offset="0x11DB8" /> <!-- Original name is "wait_dance_b" -->
diff --git a/assets/xml/objects/object_rs.xml b/assets/xml/objects/object_rs.xml
index fe58a75559..5334f4fb8c 100644
--- a/assets/xml/objects/object_rs.xml
+++ b/assets/xml/objects/object_rs.xml
@@ -58,6 +58,6 @@
         <Limb Name="gBombShopkeeperRightForearmLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_RIGHT_FOREARM" Offset="0x91C0" />
         <Limb Name="gBombShopkeeperRightHandLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_RIGHT_HAND" Offset="0x91CC" />
         <Limb Name="gBombShopkeeperHeadLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_HEAD" Offset="0x91D8" />
-        <Skeleton Name="gBombShopkeeperSkel" Type="Flex" LimbType="Standard" LimbNone="BOMB_SHOPKEEPER_LIMB_NONE" LimbMax="BOMB_SHOPKEEPER_LIMB_MAX" EnumName="BombShopkeeperLimbs" Offset="0x9220" />
+        <Skeleton Name="gBombShopkeeperSkel" Type="Flex" LimbType="Standard" LimbNone="BOMB_SHOPKEEPER_LIMB_NONE" LimbMax="BOMB_SHOPKEEPER_LIMB_MAX" EnumName="BombShopkeeperLimb" Offset="0x9220" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_ru2.xml b/assets/xml/objects/object_ru2.xml
index f2d3fd2b0c..08f182bb9e 100644
--- a/assets/xml/objects/object_ru2.xml
+++ b/assets/xml/objects/object_ru2.xml
@@ -68,7 +68,7 @@
         <Limb Name="object_ru2_Standardlimb_00C684" Type="Standard" EnumName="OBJECT_RU2_LIMB_14" Offset="0xC684" />
         <Limb Name="object_ru2_Standardlimb_00C690" Type="Standard" EnumName="OBJECT_RU2_LIMB_15" Offset="0xC690" />
         <Limb Name="object_ru2_Standardlimb_00C69C" Type="Standard" EnumName="OBJECT_RU2_LIMB_16" Offset="0xC69C" />
-        <Skeleton Name="object_ru2_Skel_00C700" Type="Flex" LimbType="Standard" LimbNone="OBJECT_RU2_LIMB_NONE" LimbMax="OBJECT_RU2_LIMB_MAX" EnumName="object_ru2_Limbs" Offset="0xC700" />
+        <Skeleton Name="object_ru2_Skel_00C700" Type="Flex" LimbType="Standard" LimbNone="OBJECT_RU2_LIMB_NONE" LimbMax="OBJECT_RU2_LIMB_MAX" EnumName="ObjectRu2Limb" Offset="0xC700" />
         <Animation Name="object_ru2_Anim_00D3DC" Offset="0xD3DC" />
         <Animation Name="object_ru2_Anim_00DCAC" Offset="0xDCAC" />
         <Animation Name="object_ru2_Anim_00E630" Offset="0xE630" />
diff --git a/assets/xml/objects/object_rz.xml b/assets/xml/objects/object_rz.xml
index a75e033f0a..d8740403af 100644
--- a/assets/xml/objects/object_rz.xml
+++ b/assets/xml/objects/object_rz.xml
@@ -66,6 +66,6 @@
         <Limb Name="object_rz_Standardlimb_00D860" Type="Standard" EnumName="OBJECT_RZ_LIMB_13" Offset="0xD860" />
         <Limb Name="object_rz_Standardlimb_00D86C" Type="Standard" EnumName="OBJECT_RZ_LIMB_14" Offset="0xD86C" />
         <Limb Name="object_rz_Standardlimb_00D878" Type="Standard" EnumName="OBJECT_RZ_LIMB_15" Offset="0xD878" />
-        <Skeleton Name="object_rz_Skel_00D8D8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_RZ_LIMB_NONE" LimbMax="OBJECT_RZ_LIMB_MAX" EnumName="object_rz_Limbs" Offset="0xD8D8" />
+        <Skeleton Name="object_rz_Skel_00D8D8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_RZ_LIMB_NONE" LimbMax="OBJECT_RZ_LIMB_MAX" EnumName="ObjectRzLimb" Offset="0xD8D8" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_sb.xml b/assets/xml/objects/object_sb.xml
index 359cff20dd..026b3389b1 100644
--- a/assets/xml/objects/object_sb.xml
+++ b/assets/xml/objects/object_sb.xml
@@ -24,7 +24,7 @@
         <Limb Name="object_sb_Standardlimb_002BAC" Type="Standard" EnumName="OBJECT_SB_LIMB_06" Offset="0x2BAC" />
         <Limb Name="object_sb_Standardlimb_002BB8" Type="Standard" EnumName="OBJECT_SB_LIMB_07" Offset="0x2BB8" />
         <Limb Name="object_sb_Standardlimb_002BC4" Type="Standard" EnumName="OBJECT_SB_LIMB_08" Offset="0x2BC4" />
-        <Skeleton Name="object_sb_Skel_002BF0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_SB_LIMB_NONE" LimbMax="OBJECT_SB_LIMB_MAX" EnumName="object_sb_Limbs" Offset="0x2BF0" />
+        <Skeleton Name="object_sb_Skel_002BF0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_SB_LIMB_NONE" LimbMax="OBJECT_SB_LIMB_MAX" EnumName="ObjectSbLimb" Offset="0x2BF0" />
         <Animation Name="object_sb_Anim_002C8C" Offset="0x2C8C" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_sdn.xml b/assets/xml/objects/object_sdn.xml
index 88c62434e8..8271480bea 100644
--- a/assets/xml/objects/object_sdn.xml
+++ b/assets/xml/objects/object_sdn.xml
@@ -60,7 +60,7 @@
         <Limb Name="gSoldierRightForearmLimb" Type="Standard" EnumName="SOLDIER_LIMB_RIGHT_FOREARM" Offset="0xD5DC" />
         <Limb Name="gSoldierRightHandWithSpearLimb" Type="Standard" EnumName="SOLDIER_LIMB_RIGHT_HAND_WITH_SPEAR" Offset="0xD5E8" />
         <Limb Name="gSoldierHeadLimb" Type="Standard" EnumName="SOLDIER_LIMB_HEAD" Offset="0xD5F4" />
-        <Skeleton Name="gSoldierSkel" Type="Flex" LimbType="Standard" LimbNone="SOLDIER_LIMB_NONE" LimbMax="SOLDIER_LIMB_MAX" EnumName="SoldierLimbs" Offset="0xD640" />
+        <Skeleton Name="gSoldierSkel" Type="Flex" LimbType="Standard" LimbNone="SOLDIER_LIMB_NONE" LimbMax="SOLDIER_LIMB_MAX" EnumName="SoldierLimb" Offset="0xD640" />
         <Animation Name="gSoldierStandAndLookDown" Offset="0xDC7C" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_shn.xml b/assets/xml/objects/object_shn.xml
index 4a8e018675..c4b256f68f 100644
--- a/assets/xml/objects/object_shn.xml
+++ b/assets/xml/objects/object_shn.xml
@@ -103,7 +103,7 @@
         <Limb Name="gBurlyGuyHeadLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_HEAD" Offset="0xE788" />
 
         <!-- Burly Guy Skeleton -->
-        <Skeleton Name="gBurlyGuySkel" Type="Flex" LimbType="Standard" LimbNone="BURLY_GUY_LIMB_NONE" LimbMax="BURLY_GUY_LIMB_MAX" EnumName="BurlyGuyLimbs" Offset="0xE7D0" />
+        <Skeleton Name="gBurlyGuySkel" Type="Flex" LimbType="Standard" LimbNone="BURLY_GUY_LIMB_NONE" LimbMax="BURLY_GUY_LIMB_MAX" EnumName="BurlyGuyLimb" Offset="0xE7D0" />
 
         <!-- DisplayList for the Town Shooting Gallery Man's Head -->
         <DList Name="gTownShootingGalleryManHeadDL" Offset="0xF2D0" />
diff --git a/assets/xml/objects/object_skb.xml b/assets/xml/objects/object_skb.xml
index c9935b64fd..78413a9de4 100644
--- a/assets/xml/objects/object_skb.xml
+++ b/assets/xml/objects/object_skb.xml
@@ -55,7 +55,7 @@
         <Limb Name="object_skb_Standardlimb_005E88" Type="Standard" EnumName="OBJECT_SKB_LIMB_11" Offset="0x5E88" />
         <Limb Name="object_skb_Standardlimb_005E94" Type="Standard" EnumName="OBJECT_SKB_LIMB_12" Offset="0x5E94" />
         <Limb Name="object_skb_Standardlimb_005EA0" Type="Standard" EnumName="OBJECT_SKB_LIMB_13" Offset="0x5EA0" />
-        <Skeleton Name="object_skb_Skel_005EF8" Type="Normal" LimbType="Standard" LimbNone="OBJECT_SKB_LIMB_NONE" LimbMax="OBJECT_SKB_LIMB_MAX" EnumName="object_skb_Limbs" Offset="0x5EF8" />
+        <Skeleton Name="object_skb_Skel_005EF8" Type="Normal" LimbType="Standard" LimbNone="OBJECT_SKB_LIMB_NONE" LimbMax="OBJECT_SKB_LIMB_MAX" EnumName="ObjectSkbLimb" Offset="0x5EF8" />
         <Animation Name="object_skb_Anim_0064E0" Offset="0x64E0" />
         <!-- <Blob Name="object_skb_zeroes_unk_000064F0" Size="0x20" Offset="0x64F0" /> -->
         <Animation Name="object_skb_Anim_00697C" Offset="0x697C" />
diff --git a/assets/xml/objects/object_snowman.xml b/assets/xml/objects/object_snowman.xml
index fde2d911fc..dd5f42c171 100644
--- a/assets/xml/objects/object_snowman.xml
+++ b/assets/xml/objects/object_snowman.xml
@@ -43,7 +43,7 @@
         <Limb Name="gEenoBodyBottomLimb" Type="Standard" EnumName="EENO_LIMB_BODY_BOTTOM" Offset="0x4568" />
 
         <!-- Eeno Skeleton -->
-        <Skeleton Name="gEenoSkel" Type="Flex" LimbType="Standard" LimbNone="EENO_LIMB_NONE" LimbMax="EENO_LIMB_MAX" EnumName="EenoLimbs" Offset="0x45A0" />
+        <Skeleton Name="gEenoSkel" Type="Flex" LimbType="Standard" LimbNone="EENO_LIMB_NONE" LimbMax="EENO_LIMB_MAX" EnumName="EenoLimb" Offset="0x45A0" />
 
         <!-- Eeno Animations -->
         <Animation Name="gEenoDamageAnim" Offset="0x4628" /> <!-- Original name is "sm_damege" -->
@@ -58,7 +58,7 @@
         <Limb Name="gEenoSnowPileTopLimb" Type="Standard" EnumName="EENO_SNOW_PILE_LIMB_TOP" Offset="0x4A7C" />
 
         <!-- Eeno Snow Pile Skeleton -->
-        <Skeleton Name="gEenoSnowPileSkel" Type="Flex" LimbType="Standard" LimbNone="EENO_SNOW_PILE_LIMB_NONE" LimbMax="EENO_SNOW_PILE_LIMB_MAX" EnumName="EenoSnowPileLimbs" Offset="0x4A90" />
+        <Skeleton Name="gEenoSnowPileSkel" Type="Flex" LimbType="Standard" LimbNone="EENO_SNOW_PILE_LIMB_NONE" LimbMax="EENO_SNOW_PILE_LIMB_MAX" EnumName="EenoSnowPileLimb" Offset="0x4A90" />
         
         <!-- Eeno Animations -->
         <Animation Name="gEenoLargeSnowballThrowAnim" Offset="0x4F14" /> <!-- Original name is "sm_nageA" ("throw A") -->
diff --git a/assets/xml/objects/object_ssh.xml b/assets/xml/objects/object_ssh.xml
index 57599fdce3..29cd1fab18 100644
--- a/assets/xml/objects/object_ssh.xml
+++ b/assets/xml/objects/object_ssh.xml
@@ -58,7 +58,7 @@
         <Limb Name="object_ssh_Standardlimb_0063D8" Type="Standard" EnumName="OBJECT_SSH_LIMB_1B" Offset="0x63D8" />
         <Limb Name="object_ssh_Standardlimb_0063E4" Type="Standard" EnumName="OBJECT_SSH_LIMB_1C" Offset="0x63E4" />
         <Limb Name="object_ssh_Standardlimb_0063F0" Type="Standard" EnumName="OBJECT_SSH_LIMB_1D" Offset="0x63F0" />
-        <Skeleton Name="object_ssh_Skel_006470" Type="Normal" LimbType="Standard" LimbNone="OBJECT_SSH_LIMB_NONE" LimbMax="OBJECT_SSH_LIMB_MAX" EnumName="object_ssh_Limbs" Offset="0x6470" />
+        <Skeleton Name="object_ssh_Skel_006470" Type="Normal" LimbType="Standard" LimbNone="OBJECT_SSH_LIMB_NONE" LimbMax="OBJECT_SSH_LIMB_MAX" EnumName="ObjectSshLimb" Offset="0x6470" />
         <Animation Name="object_ssh_Anim_006788" Offset="0x6788" />
         <Animation Name="object_ssh_Anim_006D78" Offset="0x6D78" />
     </File>
diff --git a/assets/xml/objects/object_st.xml b/assets/xml/objects/object_st.xml
index b8b39f94f2..cbb01d3c5d 100644
--- a/assets/xml/objects/object_st.xml
+++ b/assets/xml/objects/object_st.xml
@@ -64,7 +64,7 @@
         <Limb Name="object_st_Standardlimb_005200" Type="Standard" EnumName="OBJECT_ST_LIMB_1B" Offset="0x5200" />
         <Limb Name="object_st_Standardlimb_00520C" Type="Standard" EnumName="OBJECT_ST_LIMB_1C" Offset="0x520C" />
         <Limb Name="object_st_Standardlimb_005218" Type="Standard" EnumName="OBJECT_ST_LIMB_1D" Offset="0x5218" />
-        <Skeleton Name="object_st_Skel_005298" Type="Normal" LimbType="Standard" LimbNone="OBJECT_ST_LIMB_NONE" LimbMax="OBJECT_ST_LIMB_MAX" EnumName="object_st_Limbs" Offset="0x5298" />
+        <Skeleton Name="object_st_Skel_005298" Type="Normal" LimbType="Standard" LimbNone="OBJECT_ST_LIMB_NONE" LimbMax="OBJECT_ST_LIMB_MAX" EnumName="ObjectStLimb" Offset="0x5298" />
         <Animation Name="object_st_Anim_0055A8" Offset="0x55A8" />
         <Animation Name="object_st_Anim_005B98" Offset="0x5B98" />
     </File>
diff --git a/assets/xml/objects/object_sth.xml b/assets/xml/objects/object_sth.xml
index c7a0ffd250..b176cd8cc4 100644
--- a/assets/xml/objects/object_sth.xml
+++ b/assets/xml/objects/object_sth.xml
@@ -37,6 +37,6 @@
         <Limb Name="object_sth_Standardlimb_003198" Type="Standard" EnumName="OBJECT_STH_LIMB_0D" Offset="0x3198" />
         <Limb Name="object_sth_Standardlimb_0031A4" Type="Standard" EnumName="OBJECT_STH_LIMB_0E" Offset="0x31A4" />
         <Limb Name="object_sth_Standardlimb_0031B0" Type="Standard" EnumName="OBJECT_STH_LIMB_0F" Offset="0x31B0" />
-        <Skeleton Name="object_sth_Skel_0031F8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_STH_LIMB_NONE" LimbMax="OBJECT_STH_LIMB_MAX" EnumName="object_sth_Limbs" Offset="0x31F8" />
+        <Skeleton Name="object_sth_Skel_0031F8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_STH_LIMB_NONE" LimbMax="OBJECT_STH_LIMB_MAX" EnumName="ObjectSthLimb" Offset="0x31F8" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_stk.xml b/assets/xml/objects/object_stk.xml
index 9698e335e7..a6f00c89b5 100644
--- a/assets/xml/objects/object_stk.xml
+++ b/assets/xml/objects/object_stk.xml
@@ -100,7 +100,7 @@
         <Limb Name="gSkullKidHatTopLimb" Type="Standard" EnumName="SKULL_KID_LIMB_HAT_TOP" Offset="0x132C8" />
 
         <!-- Skull Kid Skeleton -->
-        <Skeleton Name="gSkullKidSkel" Type="Flex" LimbType="Standard" LimbNone="SKULL_KID_LIMB_NONE" LimbMax="SKULL_KID_LIMB_MAX" EnumName="SkullKidLimbs" Offset="0x13328" />
+        <Skeleton Name="gSkullKidSkel" Type="Flex" LimbType="Standard" LimbNone="SKULL_KID_LIMB_NONE" LimbMax="SKULL_KID_LIMB_MAX" EnumName="SkullKidLimb" Offset="0x13328" />
 
         <Animation Name="gSkullKidHipShakeAndJumpAnim" Offset="0x14920" /> <!-- Original name is "stk_penpen_jump" ("spanking") -->
         <Animation Name="gSkullKidSpankAnim" Offset="0x15028" /> <!-- Original name is "stk_penpen_loop" -->
diff --git a/assets/xml/objects/object_stk2.xml b/assets/xml/objects/object_stk2.xml
index d9bde796db..d526bbc5c4 100644
--- a/assets/xml/objects/object_stk2.xml
+++ b/assets/xml/objects/object_stk2.xml
@@ -42,7 +42,7 @@
         <Limb Name="gClockTowerOcarinaOfTimeRootLimb" Type="Standard" EnumName="CLOCK_TOWER_OCARINA_OF_TIME_LIMB_ROOT" Offset="0xAD58" />
 
         <!-- Clock Tower Ocarina Skeleton -->
-        <Skeleton Name="gClockTowerOcarinaOfTimeSkel" Type="Flex" LimbType="Standard" LimbNone="CLOCK_TOWER_OCARINA_OF_TIME_LIMB_NONE" LimbMax="CLOCK_TOWER_OCARINA_OF_TIME_LIMB_MAX" EnumName="ClockTowerOcarinaOfTimeLimbs" Offset="0xAD68" />
+        <Skeleton Name="gClockTowerOcarinaOfTimeSkel" Type="Flex" LimbType="Standard" LimbNone="CLOCK_TOWER_OCARINA_OF_TIME_LIMB_NONE" LimbMax="CLOCK_TOWER_OCARINA_OF_TIME_LIMB_MAX" EnumName="ClockTowerOcarinaOfTimeLimb" Offset="0xAD68" />
 
         <!-- Skull Kid Animations -->
         <Animation Name="gSkullKidLaughStartAnim" Offset="0xC270" /> <!-- Original name is "oowarai" ("laughing loudly") -->
diff --git a/assets/xml/objects/object_tab.xml b/assets/xml/objects/object_tab.xml
index 9a63c2ed33..0a984b284a 100644
--- a/assets/xml/objects/object_tab.xml
+++ b/assets/xml/objects/object_tab.xml
@@ -57,7 +57,7 @@
         <Limb Name="object_tab_Standardlimb_007F08" Type="Standard" EnumName="OBJECT_TAB_LIMB_11" Offset="0x7F08" />
         <Limb Name="object_tab_Standardlimb_007F14" Type="Standard" EnumName="OBJECT_TAB_LIMB_12" Offset="0x7F14" />
         <Limb Name="object_tab_Standardlimb_007F20" Type="Standard" EnumName="OBJECT_TAB_LIMB_13" Offset="0x7F20" />
-        <Skeleton Name="object_tab_Skel_007F78" Type="Flex" LimbType="Standard" LimbNone="OBJECT_TAB_LIMB_NONE" LimbMax="OBJECT_TAB_LIMB_MAX" EnumName="object_tab_Limbs" Offset="0x7F78" />
+        <Skeleton Name="object_tab_Skel_007F78" Type="Flex" LimbType="Standard" LimbNone="OBJECT_TAB_LIMB_NONE" LimbMax="OBJECT_TAB_LIMB_MAX" EnumName="ObjectTabLimb" Offset="0x7F78" />
         <Animation Name="object_tab_Anim_0086AC" Offset="0x86AC" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_tanron4.xml b/assets/xml/objects/object_tanron4.xml
index 2c988e74b3..491e9a587c 100644
--- a/assets/xml/objects/object_tanron4.xml
+++ b/assets/xml/objects/object_tanron4.xml
@@ -25,6 +25,6 @@
         <Limb Name="object_tanron4_Standardlimb_000E28" Type="Standard" EnumName="OBJECT_TANRON4_LIMB_09" Offset="0xE28" />
         <Limb Name="object_tanron4_Standardlimb_000E34" Type="Standard" EnumName="OBJECT_TANRON4_LIMB_0A" Offset="0xE34" />
 
-        <Skeleton Name="gSeagullSkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_TANRON4_LIMB_NONE" LimbMax="OBJECT_TANRON4_LIMB_MAX" EnumName="object_tanron4_Limbs" Offset="0xE68" />
+        <Skeleton Name="gSeagullSkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_TANRON4_LIMB_NONE" LimbMax="OBJECT_TANRON4_LIMB_MAX" EnumName="ObjectTanron4Limb" Offset="0xE68" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_test3.xml b/assets/xml/objects/object_test3.xml
index 6b0a5349ce..efd0189951 100644
--- a/assets/xml/objects/object_test3.xml
+++ b/assets/xml/objects/object_test3.xml
@@ -63,6 +63,6 @@
         <Limb Name="object_test3_Lodlimb_00F768" Type="LOD" EnumName="OBJECT_TEST3_LIMB_13" Offset="0xF768" />
         <Limb Name="object_test3_Lodlimb_00F778" Type="LOD" EnumName="OBJECT_TEST3_LIMB_14" Offset="0xF778" />
         <Limb Name="object_test3_Lodlimb_00F788" Type="LOD" EnumName="OBJECT_TEST3_LIMB_15" Offset="0xF788" />
-        <Skeleton Name="object_test3_Skel_00F7EC" Type="Flex" LimbType="Standard" LimbNone="OBJECT_TEST3_LIMB_NONE" LimbMax="OBJECT_TEST3_LIMB_MAX" EnumName="object_test3_Limbs" Offset="0xF7EC" />
+        <Skeleton Name="object_test3_Skel_00F7EC" Type="Flex" LimbType="Standard" LimbNone="OBJECT_TEST3_LIMB_NONE" LimbMax="OBJECT_TEST3_LIMB_MAX" EnumName="ObjectTest3Limb" Offset="0xF7EC" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_tite.xml b/assets/xml/objects/object_tite.xml
index 681b732e8c..351b4f56af 100644
--- a/assets/xml/objects/object_tite.xml
+++ b/assets/xml/objects/object_tite.xml
@@ -49,6 +49,6 @@
         <Limb Name="object_tite_Standardlimb_00399C" Type="Standard" EnumName="OBJECT_TITE_LIMB_16" Offset="0x399C" />
         <Limb Name="object_tite_Standardlimb_0039A8" Type="Standard" EnumName="OBJECT_TITE_LIMB_17" Offset="0x39A8" />
         <Limb Name="object_tite_Standardlimb_0039B4" Type="Standard" EnumName="OBJECT_TITE_LIMB_18" Offset="0x39B4" />
-        <Skeleton Name="object_tite_Skel_003A20" Type="Normal" LimbType="Standard" LimbNone="OBJECT_TITE_LIMB_NONE" LimbMax="OBJECT_TITE_LIMB_MAX" EnumName="object_tite_Limbs" Offset="0x3A20" />
+        <Skeleton Name="object_tite_Skel_003A20" Type="Normal" LimbType="Standard" LimbNone="OBJECT_TITE_LIMB_NONE" LimbMax="OBJECT_TITE_LIMB_MAX" EnumName="ObjectTiteLimb" Offset="0x3A20" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_tk.xml b/assets/xml/objects/object_tk.xml
index 0c0ea38314..b11b474885 100644
--- a/assets/xml/objects/object_tk.xml
+++ b/assets/xml/objects/object_tk.xml
@@ -60,6 +60,6 @@
         <Limb Name="object_tk_Standardlimb_00B980" Type="Standard" EnumName="OBJECT_TK_LIMB_0F" Offset="0xB980" />
         <Limb Name="object_tk_Standardlimb_00B98C" Type="Standard" EnumName="OBJECT_TK_LIMB_10" Offset="0xB98C" />
         <Limb Name="object_tk_Standardlimb_00B998" Type="Standard" EnumName="OBJECT_TK_LIMB_11" Offset="0xB998" />
-        <Skeleton Name="object_tk_Skel_00B9E8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_TK_LIMB_NONE" LimbMax="OBJECT_TK_LIMB_MAX" EnumName="object_tk_Limbs" Offset="0xB9E8" />
+        <Skeleton Name="object_tk_Skel_00B9E8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_TK_LIMB_NONE" LimbMax="OBJECT_TK_LIMB_MAX" EnumName="ObjectTkLimb" Offset="0xB9E8" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_tl.xml b/assets/xml/objects/object_tl.xml
index 6397283af1..7f0cfd7565 100644
--- a/assets/xml/objects/object_tl.xml
+++ b/assets/xml/objects/object_tl.xml
@@ -10,7 +10,7 @@
         <Limb Name="object_tl_Standardlimb_001A20" Type="Standard" EnumName="OBJECT_TL_1_LIMB_01" Offset="0x1A20" />
         <Limb Name="object_tl_Standardlimb_001A2C" Type="Standard" EnumName="OBJECT_TL_1_LIMB_02" Offset="0x1A2C" />
         <Limb Name="object_tl_Standardlimb_001A38" Type="Standard" EnumName="OBJECT_TL_1_LIMB_03" Offset="0x1A38" />
-        <Skeleton Name="object_tl_Skel_001A50" Type="Flex" LimbType="Standard" LimbNone="OBJECT_TL_1_LIMB_NONE" LimbMax="OBJECT_TL_1_LIMB_MAX" EnumName="object_tl_1_Limbs" Offset="0x1A50" />
+        <Skeleton Name="object_tl_Skel_001A50" Type="Flex" LimbType="Standard" LimbNone="OBJECT_TL_1_LIMB_NONE" LimbMax="OBJECT_TL_1_LIMB_MAX" EnumName="ObjectTl1Limb" Offset="0x1A50" />
         <Animation Name="object_tl_Anim_001C68" Offset="0x1C68" />
         <Animation Name="object_tl_Anim_002510" Offset="0x2510" />
         <Animation Name="object_tl_Anim_0027D8" Offset="0x27D8" />
@@ -55,7 +55,7 @@
         <Limb Name="object_tl_Standardlimb_007C1C" Type="Standard" EnumName="OBJECT_TL_2_LIMB_0A" Offset="0x7C1C" />
         <Limb Name="object_tl_Standardlimb_007C28" Type="Standard" EnumName="OBJECT_TL_2_LIMB_0B" Offset="0x7C28" />
         <Limb Name="object_tl_Standardlimb_007C34" Type="Standard" EnumName="OBJECT_TL_2_LIMB_0C" Offset="0x7C34" />
-        <Skeleton Name="object_tl_Skel_007C70" Type="Flex" LimbType="Standard" LimbNone="OBJECT_TL_2_LIMB_NONE" LimbMax="OBJECT_TL_2_LIMB_MAX" EnumName="object_tl_2_Limbs" Offset="0x7C70" />
+        <Skeleton Name="object_tl_Skel_007C70" Type="Flex" LimbType="Standard" LimbNone="OBJECT_TL_2_LIMB_NONE" LimbMax="OBJECT_TL_2_LIMB_MAX" EnumName="ObjectTl2Limb" Offset="0x7C70" />
         <Animation Name="object_tl_Anim_00823C" Offset="0x823C" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_toryo.xml b/assets/xml/objects/object_toryo.xml
index 45d3da1005..e19f2c540a 100644
--- a/assets/xml/objects/object_toryo.xml
+++ b/assets/xml/objects/object_toryo.xml
@@ -48,6 +48,6 @@
         <Limb Name="object_toryo_Standardlimb_0070EC" Type="Standard" EnumName="OBJECT_TORYO_LIMB_0E" Offset="0x70EC" />
         <Limb Name="object_toryo_Standardlimb_0070F8" Type="Standard" EnumName="OBJECT_TORYO_LIMB_0F" Offset="0x70F8" />
         <Limb Name="object_toryo_Standardlimb_007104" Type="Standard" EnumName="OBJECT_TORYO_LIMB_10" Offset="0x7104" />
-        <Skeleton Name="object_toryo_Skel_007150" Type="Flex" LimbType="Standard" LimbNone="OBJECT_TORYO_LIMB_NONE" LimbMax="OBJECT_TORYO_LIMB_MAX" EnumName="object_toryo_Limbs" Offset="0x7150" />
+        <Skeleton Name="object_toryo_Skel_007150" Type="Flex" LimbType="Standard" LimbNone="OBJECT_TORYO_LIMB_NONE" LimbMax="OBJECT_TORYO_LIMB_MAX" EnumName="ObjectToryoLimb" Offset="0x7150" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_trt.xml b/assets/xml/objects/object_trt.xml
index a0d83076e8..c7fb813214 100644
--- a/assets/xml/objects/object_trt.xml
+++ b/assets/xml/objects/object_trt.xml
@@ -89,6 +89,6 @@
         <Limb Name="object_trt_Standardlimb_00FE64" Type="Standard" EnumName="OBJECT_TRT_LIMB_18" Offset="0xFE64" />
         <Limb Name="object_trt_Standardlimb_00FE70" Type="Standard" EnumName="OBJECT_TRT_LIMB_19" Offset="0xFE70" />
         <Limb Name="object_trt_Standardlimb_00FE7C" Type="Standard" EnumName="OBJECT_TRT_LIMB_1A" Offset="0xFE7C" />
-        <Skeleton Name="object_trt_Skel_00FEF0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_TRT_LIMB_NONE" LimbMax="OBJECT_TRT_LIMB_MAX" EnumName="object_trt_Limbs" Offset="0xFEF0" />
+        <Skeleton Name="object_trt_Skel_00FEF0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_TRT_LIMB_NONE" LimbMax="OBJECT_TRT_LIMB_MAX" EnumName="ObjectTrtLimb" Offset="0xFEF0" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_tru.xml b/assets/xml/objects/object_tru.xml
index dd0e6d20c8..138723cebf 100644
--- a/assets/xml/objects/object_tru.xml
+++ b/assets/xml/objects/object_tru.xml
@@ -102,7 +102,7 @@
         <Limb Name="object_tru_Standardlimb_01A9D4" Type="Standard" EnumName="OBJECT_TRU_LIMB_18" Offset="0x1A9D4" />
         <Limb Name="object_tru_Standardlimb_01A9E0" Type="Standard" EnumName="OBJECT_TRU_LIMB_19" Offset="0x1A9E0" />
         <Limb Name="object_tru_Standardlimb_01A9EC" Type="Standard" EnumName="OBJECT_TRU_LIMB_1A" Offset="0x1A9EC" />
-        <Skeleton Name="object_tru_Skel_01AA60" Type="Flex" LimbType="Standard" LimbNone="OBJECT_TRU_LIMB_NONE" LimbMax="OBJECT_TRU_LIMB_MAX" EnumName="object_tru_Limbs" Offset="0x1AA60" />
+        <Skeleton Name="object_tru_Skel_01AA60" Type="Flex" LimbType="Standard" LimbNone="OBJECT_TRU_LIMB_NONE" LimbMax="OBJECT_TRU_LIMB_MAX" EnumName="ObjectTruLimb" Offset="0x1AA60" />
         <Animation Name="object_tru_Anim_01B5C4" Offset="0x1B5C4" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_tsn.xml b/assets/xml/objects/object_tsn.xml
index 761a6e0d74..d610b185e6 100644
--- a/assets/xml/objects/object_tsn.xml
+++ b/assets/xml/objects/object_tsn.xml
@@ -47,7 +47,7 @@
         <Limb Name="object_tsn_Standardlimb_008A54" Type="Standard" EnumName="OBJECT_TSN_LIMB_0E" Offset="0x8A54" />
         <Limb Name="object_tsn_Standardlimb_008A60" Type="Standard" EnumName="OBJECT_TSN_LIMB_0F" Offset="0x8A60" />
         <Limb Name="object_tsn_Standardlimb_008A6C" Type="Standard" EnumName="OBJECT_TSN_LIMB_10" Offset="0x8A6C" />
-        <Skeleton Name="object_tsn_Skel_008AB8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_TSN_LIMB_NONE" LimbMax="OBJECT_TSN_LIMB_MAX" EnumName="object_tsn_Limbs" Offset="0x8AB8" />
+        <Skeleton Name="object_tsn_Skel_008AB8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_TSN_LIMB_NONE" LimbMax="OBJECT_TSN_LIMB_MAX" EnumName="ObjectTsnLimb" Offset="0x8AB8" />
         <Animation Name="object_tsn_Anim_0092FC" Offset="0x92FC" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_uch.xml b/assets/xml/objects/object_uch.xml
index e61be5042b..d82bf5b10e 100644
--- a/assets/xml/objects/object_uch.xml
+++ b/assets/xml/objects/object_uch.xml
@@ -59,6 +59,6 @@
         <Limb Name="gAlienRightEyeLimb" Type="Standard" EnumName="ALIEN_LIMB_RIGHT_EYE" Offset="0x4E10" />
 
         <!-- Alien Skeleton -->
-        <Skeleton Name="gAlienSkel" Type="Flex" LimbType="Standard" LimbNone="ALIEN_LIMB_NONE" LimbMax="ALIEN_LIMB_MAX" EnumName="AlienLimbs" Offset="0x4E50" />
+        <Skeleton Name="gAlienSkel" Type="Flex" LimbType="Standard" LimbNone="ALIEN_LIMB_NONE" LimbMax="ALIEN_LIMB_MAX" EnumName="AlienLimb" Offset="0x4E50" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_um.xml b/assets/xml/objects/object_um.xml
index aa979bf754..aac86a9a7f 100644
--- a/assets/xml/objects/object_um.xml
+++ b/assets/xml/objects/object_um.xml
@@ -77,7 +77,7 @@
         <Limb Name="gUmCremiaRightHandLimb" Type="Standard" EnumName="UM_LIMB_CREMIA_RIGHT_HAND" Offset="0x11D8C" />
         <Limb Name="gUmCremiaLowerBodyLimb" Type="Standard" EnumName="UM_LIMB_CREMIA_LOWER_BODY" Offset="0x11D98" />
 
-        <Skeleton Name="gUmSkel" Type="Flex" LimbType="Standard" LimbNone="UM_LIMB_NONE" LimbMax="UM_LIMB_MAX" EnumName="ObjectUmLimbs" Offset="0x11DF8" />
+        <Skeleton Name="gUmSkel" Type="Flex" LimbType="Standard" LimbNone="UM_LIMB_NONE" LimbMax="UM_LIMB_MAX" EnumName="ObjectUmLimb" Offset="0x11DF8" />
 
         <Animation Name="gUmGallopAnim" Offset="0x1213C" />
         <Animation Name="gUmLookBackAnim" Offset="0x126C4" />
diff --git a/assets/xml/objects/object_utubo.xml b/assets/xml/objects/object_utubo.xml
index a1f499eb6a..4ce3d64f09 100644
--- a/assets/xml/objects/object_utubo.xml
+++ b/assets/xml/objects/object_utubo.xml
@@ -42,7 +42,7 @@
         <Limb Name="gDeepPythonJawLimb" Type="Standard" EnumName="DEEP_PYTHON_LIMB_JAW" Offset="0x4350" />
 
         <!-- Deep Python Skeleton -->
-        <Skeleton Name="gDeepPythonSkel" Type="Flex" LimbType="Standard" LimbNone="DEEP_PYTHON_LIMB_NONE" LimbMax="DEEP_PYTHON_LIMB_MAX" EnumName="DeepPythonLimbs" Offset="0x4398" />
+        <Skeleton Name="gDeepPythonSkel" Type="Flex" LimbType="Standard" LimbNone="DEEP_PYTHON_LIMB_NONE" LimbMax="DEEP_PYTHON_LIMB_MAX" EnumName="DeepPythonLimb" Offset="0x4398" />
 
         <!-- Deep Python Animations -->
         <Animation Name="gDeepPythonUnusedSideSwayAnim" Offset="0x4518" /> <!-- Unused duplicate of gDeepPythonSmallSideSwayAnim -->
diff --git a/assets/xml/objects/object_vm.xml b/assets/xml/objects/object_vm.xml
index b6c1cdfa29..bf13f3b404 100644
--- a/assets/xml/objects/object_vm.xml
+++ b/assets/xml/objects/object_vm.xml
@@ -25,6 +25,6 @@
         <Limb Name="object_vm_Standardlimb_003F14" Type="Standard" EnumName="OBJECT_VM_LIMB_08" Offset="0x3F14" />
         <Limb Name="object_vm_Standardlimb_003F20" Type="Standard" EnumName="OBJECT_VM_LIMB_09" Offset="0x3F20" />
         <Limb Name="object_vm_Standardlimb_003F2C" Type="Standard" EnumName="OBJECT_VM_LIMB_0A" Offset="0x3F2C" />
-        <Skeleton Name="object_vm_Skel_003F60" Type="Normal" LimbType="Standard" LimbNone="OBJECT_VM_LIMB_NONE" LimbMax="OBJECT_VM_LIMB_MAX" EnumName="object_vm_Limbs" Offset="0x3F60" />
+        <Skeleton Name="object_vm_Skel_003F60" Type="Normal" LimbType="Standard" LimbNone="OBJECT_VM_LIMB_NONE" LimbMax="OBJECT_VM_LIMB_MAX" EnumName="ObjectVmLimb" Offset="0x3F60" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_wallmaster.xml b/assets/xml/objects/object_wallmaster.xml
index fba2bc2460..afe3843e39 100644
--- a/assets/xml/objects/object_wallmaster.xml
+++ b/assets/xml/objects/object_wallmaster.xml
@@ -65,7 +65,7 @@
         <Limb Name="gWallmasterThumbDistalLimb" Type="Standard" EnumName="WALLMASTER_LIMB_THUMB_DISTAL" Offset="0x8F44" />
 
         <!-- Wallmaster/Floormaster Skeleton-->
-        <Skeleton Name="gWallmasterSkel" Type="Flex" LimbType="Standard" LimbNone="WALLMASTER_LIMB_NONE" LimbMax="WALLMASTER_LIMB_MAX" EnumName="WallmasterLimbs" Offset="0x8FB0" />
+        <Skeleton Name="gWallmasterSkel" Type="Flex" LimbType="Standard" LimbNone="WALLMASTER_LIMB_NONE" LimbMax="WALLMASTER_LIMB_MAX" EnumName="WallmasterLimb" Offset="0x8FB0" />
         
         <Animation Name="gWallmasterStopWalkAnim" Offset="0x9244" /> <!-- Original name is "wm_move_wait" -->
         <Animation Name="gWallmasterHoverAnim" Offset="0x9520" /> <!-- Original name is "wm_success" -->
diff --git a/assets/xml/objects/object_warp1.xml b/assets/xml/objects/object_warp1.xml
index 8143347923..6ac25e8270 100644
--- a/assets/xml/objects/object_warp1.xml
+++ b/assets/xml/objects/object_warp1.xml
@@ -32,7 +32,7 @@
         <Limb Name="object_warp1_Standardlimb_002C30" Type="Standard" EnumName="OBJECT_WARP1_LIMB_13" Offset="0x2C30" />
         <Limb Name="object_warp1_Standardlimb_002C3C" Type="Standard" EnumName="OBJECT_WARP1_LIMB_14" Offset="0x2C3C" />
         <Limb Name="object_warp1_Standardlimb_002C48" Type="Standard" EnumName="OBJECT_WARP1_LIMB_15" Offset="0x2C48" />
-        <Skeleton Name="object_warp1_Skel_002CA8" Type="Normal" LimbType="Standard" LimbNone="OBJECT_WARP1_LIMB_NONE" LimbMax="OBJECT_WARP1_LIMB_MAX" EnumName="object_warp1_Limbs" Offset="0x2CA8" />
+        <Skeleton Name="object_warp1_Skel_002CA8" Type="Normal" LimbType="Standard" LimbNone="OBJECT_WARP1_LIMB_NONE" LimbMax="OBJECT_WARP1_LIMB_MAX" EnumName="ObjectWarp1Limb" Offset="0x2CA8" />
         <DList Name="object_warp1_DL_003230" Offset="0x3230" />
         <DList Name="object_warp1_DL_0034C8" Offset="0x34C8" />
         <Texture Name="object_warp1_Tex_0034D0" OutName="tex_0034D0" Format="i8" Width="32" Height="64" Offset="0x34D0" />
diff --git a/assets/xml/objects/object_wdhand.xml b/assets/xml/objects/object_wdhand.xml
index bcd5b0ce36..311d9299f5 100644
--- a/assets/xml/objects/object_wdhand.xml
+++ b/assets/xml/objects/object_wdhand.xml
@@ -23,6 +23,6 @@
         <Limb Name="object_wdhand_Standardlimb_001DE0" Type="Standard" EnumName="OBJECT_WDHAND_LIMB_05" Offset="0x1DE0" />
         <Limb Name="object_wdhand_Standardlimb_001DEC" Type="Standard" EnumName="OBJECT_WDHAND_LIMB_06" Offset="0x1DEC" />
         <Limb Name="object_wdhand_Standardlimb_001DF8" Type="Standard" EnumName="OBJECT_WDHAND_LIMB_07" Offset="0x1DF8" />
-        <Skeleton Name="object_wdhand_Skel_001E20" Type="Flex" LimbType="Standard" LimbNone="OBJECT_WDHAND_LIMB_NONE" LimbMax="OBJECT_WDHAND_LIMB_MAX" EnumName="object_wdhand_Limbs" Offset="0x1E20" />
+        <Skeleton Name="object_wdhand_Skel_001E20" Type="Flex" LimbType="Standard" LimbNone="OBJECT_WDHAND_LIMB_NONE" LimbMax="OBJECT_WDHAND_LIMB_MAX" EnumName="ObjectWdhandLimb" Offset="0x1E20" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_wf.xml b/assets/xml/objects/object_wf.xml
index 3d9ce392db..b6c5b640d8 100644
--- a/assets/xml/objects/object_wf.xml
+++ b/assets/xml/objects/object_wf.xml
@@ -62,7 +62,7 @@
         <Limb Name="gWolfosWhiteFrontLeftClawLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_FRONT_LEFT_CLAW" Offset="0x3B60" />
 
         <!-- White Wolfos Skeleton -->
-        <Skeleton Name="gWolfosWhiteSkel" Type="Flex" LimbType="Standard" LimbNone="WOLFOS_WHITE_LIMB_NONE" LimbMax="WOLFOS_WHITE_LIMB_MAX" EnumName="WolfosWhiteLimbs" Offset="0x3BC0" />
+        <Skeleton Name="gWolfosWhiteSkel" Type="Flex" LimbType="Standard" LimbNone="WOLFOS_WHITE_LIMB_NONE" LimbMax="WOLFOS_WHITE_LIMB_MAX" EnumName="WolfosWhiteLimb" Offset="0x3BC0" />
 
         <!-- Wolfos/White Wolfos Animations -->
         <Animation Name="gWolfosSlashingAnim" Offset="0x4638" /> <!-- Original name is "wolfman_attack" -->
@@ -132,7 +132,7 @@
         <Limb Name="gWolfosNormalFrontLeftClawLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_FRONT_LEFT_CLAW" Offset="0x9570" />
 
         <!-- Wolfos Skeleton -->
-        <Skeleton Name="gWolfosNormalSkel" Type="Flex" LimbType="Standard" LimbNone="WOLFOS_NORMAL_LIMB_NONE" LimbMax="WOLFOS_NORMAL_LIMB_MAX" EnumName="WolfosNormalLimbs" Offset="0x95D0" />
+        <Skeleton Name="gWolfosNormalSkel" Type="Flex" LimbType="Standard" LimbNone="WOLFOS_NORMAL_LIMB_NONE" LimbMax="WOLFOS_NORMAL_LIMB_MAX" EnumName="WolfosNormalLimb" Offset="0x95D0" />
 
         <!-- Wolfos/White Wolfos Animations -->
         <Animation Name="gWolfosSidesteppingAnim" Offset="0x9808" /> <!-- Original name is "wolfman_side_walk" -->
diff --git a/assets/xml/objects/object_wiz.xml b/assets/xml/objects/object_wiz.xml
index 947cab3c7c..2928083aa2 100644
--- a/assets/xml/objects/object_wiz.xml
+++ b/assets/xml/objects/object_wiz.xml
@@ -97,6 +97,6 @@
         <Limb Name="object_wiz_Standardlimb_00B2B0" Type="Standard" EnumName="OBJECT_WIZ_LIMB_11" Offset="0xB2B0" />
         <Limb Name="object_wiz_Standardlimb_00B2BC" Type="Standard" EnumName="OBJECT_WIZ_LIMB_12" Offset="0xB2BC" />
         <Limb Name="object_wiz_Standardlimb_00B2C8" Type="Standard" EnumName="OBJECT_WIZ_LIMB_13" Offset="0xB2C8" />
-        <Skeleton Name="object_wiz_Skel_00B320" Type="Flex" LimbType="Standard" LimbNone="OBJECT_WIZ_LIMB_NONE" LimbMax="OBJECT_WIZ_LIMB_MAX" EnumName="object_wiz_Limbs" Offset="0xB320" />
+        <Skeleton Name="object_wiz_Skel_00B320" Type="Flex" LimbType="Standard" LimbNone="OBJECT_WIZ_LIMB_NONE" LimbMax="OBJECT_WIZ_LIMB_MAX" EnumName="ObjectWizLimb" Offset="0xB320" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_yb.xml b/assets/xml/objects/object_yb.xml
index 1a8503a6e9..3bbfc7cce7 100644
--- a/assets/xml/objects/object_yb.xml
+++ b/assets/xml/objects/object_yb.xml
@@ -56,6 +56,6 @@
         <Limb Name="gYbRightHandLimb" Type="Standard" EnumName="YB_LIMB_RIGHT_HAND" Offset="0x5ED0" />
         <Limb Name="gYbEmpty5EDCLimb" Type="Standard" EnumName="YB_LIMB_EMPTY_5EDC" Offset="0x5EDC" />
         <Limb Name="gYbUpperTorsoLimb" Type="Standard" EnumName="YB_LIMB_TORSO" Offset="0x5EE8" />
-        <Skeleton Name="gYbSkeleton" Type="Flex" LimbType="Standard" LimbNone="YB_LIMB_NONE" LimbMax="YB_LIMB_MAX" EnumName="ObjectYBLimbs" Offset="0x5F48" />
+        <Skeleton Name="gYbSkeleton" Type="Flex" LimbType="Standard" LimbNone="YB_LIMB_NONE" LimbMax="YB_LIMB_MAX" EnumName="ObjectYbLimb" Offset="0x5F48" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_zl1.xml b/assets/xml/objects/object_zl1.xml
index 04d4ae406e..2b8a101bc1 100644
--- a/assets/xml/objects/object_zl1.xml
+++ b/assets/xml/objects/object_zl1.xml
@@ -74,7 +74,7 @@
         <Limb Name="object_zl1_Standardlimb_00F570" Type="Standard" EnumName="OBJECT_ZL1_LIMB_0F" Offset="0xF570" />
         <Limb Name="object_zl1_Standardlimb_00F57C" Type="Standard" EnumName="OBJECT_ZL1_LIMB_10" Offset="0xF57C" />
         <Limb Name="object_zl1_Standardlimb_00F588" Type="Standard" EnumName="OBJECT_ZL1_LIMB_11" Offset="0xF588" />
-        <Skeleton Name="object_zl1_Skel_00F5D8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_ZL1_LIMB_NONE" LimbMax="OBJECT_ZL1_LIMB_MAX" EnumName="object_zl1_Limbs" Offset="0xF5D8" />
+        <Skeleton Name="object_zl1_Skel_00F5D8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_ZL1_LIMB_NONE" LimbMax="OBJECT_ZL1_LIMB_MAX" EnumName="ObjectZl1Limb" Offset="0xF5D8" />
         <Animation Name="object_zl1_Anim_010B38" Offset="0x10B38" />
         <Animation Name="object_zl1_Anim_011348" Offset="0x11348" />
         <Animation Name="object_zl1_Anim_0116E4" Offset="0x116E4" />
diff --git a/assets/xml/objects/object_zl4.xml b/assets/xml/objects/object_zl4.xml
index 65596c3708..73ebb86065 100644
--- a/assets/xml/objects/object_zl4.xml
+++ b/assets/xml/objects/object_zl4.xml
@@ -93,7 +93,7 @@
         <Limb Name="gDmZl4RightForearmLimb" Type="Standard" EnumName="ZL4_LIMB_RIGHT_FOREARM" Offset="0xDFD0" />
         <Limb Name="gDmZl4RightHandLimb" Type="Standard" EnumName="ZL4_LIMB_RIGHT_HAND" Offset="0xDFDC" />
         <Limb Name="gDmZl4HeadLimb" Type="Standard" EnumName="ZL4_LIMB_HEAD" Offset="0xDFE8" />
-        <Skeleton Name="gZl4Skeleton" Type="Flex" LimbType="Standard" LimbNone="ZL4_LIMB_NONE" LimbMax="ZL4_LIMB_MAX" EnumName="zl4_Limbs" Offset="0xE038" />
+        <Skeleton Name="gZl4Skeleton" Type="Flex" LimbType="Standard" LimbNone="ZL4_LIMB_NONE" LimbMax="ZL4_LIMB_MAX" EnumName="Zl4Limb" Offset="0xE038" />
 
         
         <!-- Unused Flute Animations -->
diff --git a/assets/xml/objects/object_zm.xml b/assets/xml/objects/object_zm.xml
index f6f1b95e5a..c35d5aecb4 100644
--- a/assets/xml/objects/object_zm.xml
+++ b/assets/xml/objects/object_zm.xml
@@ -55,7 +55,7 @@
         <Limb Name="object_zm_Standardlimb_00A910" Type="Standard" EnumName="OBJECT_ZM_LIMB_0F" Offset="0xA910" />
         <Limb Name="object_zm_Standardlimb_00A91C" Type="Standard" EnumName="OBJECT_ZM_LIMB_10" Offset="0xA91C" />
         <Limb Name="object_zm_Standardlimb_00A928" Type="Standard" EnumName="OBJECT_ZM_LIMB_11" Offset="0xA928" />
-        <Skeleton Name="object_zm_Skel_00A978" Type="Flex" LimbType="Standard" LimbNone="OBJECT_ZM_LIMB_NONE" LimbMax="OBJECT_ZM_LIMB_MAX" EnumName="object_zm_Limbs" Offset="0xA978" />
+        <Skeleton Name="object_zm_Skel_00A978" Type="Flex" LimbType="Standard" LimbNone="OBJECT_ZM_LIMB_NONE" LimbMax="OBJECT_ZM_LIMB_MAX" EnumName="ObjectZmLimb" Offset="0xA978" />
         <Animation Name="object_zm_Anim_00B3E0" Offset="0xB3E0" />
         <Animation Name="object_zm_Anim_00B894" Offset="0xB894" />
         <Animation Name="object_zm_Anim_00BC08" Offset="0xBC08" />
diff --git a/assets/xml/objects/object_zo.xml b/assets/xml/objects/object_zo.xml
index d2a16cfacf..0cd5c8546f 100644
--- a/assets/xml/objects/object_zo.xml
+++ b/assets/xml/objects/object_zo.xml
@@ -74,7 +74,7 @@
         <Limb Name="gZoraHeadTail2Limb" Type="Standard" EnumName="ZORA_LIMB_HEAD_TAIL_2" Offset="0xD198" />
         <Limb Name="gZoraHeadTail3Limb" Type="Standard" EnumName="ZORA_LIMB_HEAD_TAIL_3" Offset="0xD1A4" />
         <Limb Name="gZoraHeadTailFinLimb" Type="Standard" EnumName="ZORA_LIMB_HEAD_TAIL_FIN" Offset="0xD1B0" />
-        <Skeleton Name="gZoraSkel" Type="Flex" LimbType="Standard" LimbNone="ZORA_LIMB_NONE" LimbMax="ZORA_LIMB_MAX" EnumName="ZoraLimbs" Offset="0xD208" />
+        <Skeleton Name="gZoraSkel" Type="Flex" LimbType="Standard" LimbNone="ZORA_LIMB_NONE" LimbMax="ZORA_LIMB_MAX" EnumName="ZoraLimb" Offset="0xD208" />
 
         <!-- Effects -->
         <DList Name="gZoraRippleMaterialDL" Offset="0xD220" />
diff --git a/assets/xml/objects/object_zob.xml b/assets/xml/objects/object_zob.xml
index bc4d61c6a6..8d27f260f5 100644
--- a/assets/xml/objects/object_zob.xml
+++ b/assets/xml/objects/object_zob.xml
@@ -67,7 +67,7 @@
         <Limb Name="object_zob_Standardlimb_010790" Type="Standard" EnumName="OBJECT_ZOB_LIMB_15" Offset="0x10790" />
         <Limb Name="object_zob_Standardlimb_01079C" Type="Standard" EnumName="OBJECT_ZOB_LIMB_16" Offset="0x1079C" />
         <Limb Name="object_zob_Standardlimb_0107A8" Type="Standard" EnumName="OBJECT_ZOB_LIMB_17" Offset="0x107A8" />
-        <Skeleton Name="object_zob_Skel_010810" Type="Flex" LimbType="Standard" LimbNone="OBJECT_ZOB_LIMB_NONE" LimbMax="OBJECT_ZOB_LIMB_MAX" EnumName="object_zob_Limbs" Offset="0x10810" />
+        <Skeleton Name="object_zob_Skel_010810" Type="Flex" LimbType="Standard" LimbNone="OBJECT_ZOB_LIMB_NONE" LimbMax="OBJECT_ZOB_LIMB_MAX" EnumName="ObjectZobLimb" Offset="0x10810" />
         <Animation Name="object_zob_Anim_011144" Offset="0x11144" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_zod.xml b/assets/xml/objects/object_zod.xml
index 3e0b6567a0..2616dbcdfd 100644
--- a/assets/xml/objects/object_zod.xml
+++ b/assets/xml/objects/object_zod.xml
@@ -44,7 +44,7 @@
         <Limb Name="object_zod_Standardlimb_00D610" Type="Standard" EnumName="OBJECT_ZOD_LIMB_07" Offset="0xD610" />
         <Limb Name="object_zod_Standardlimb_00D61C" Type="Standard" EnumName="OBJECT_ZOD_LIMB_08" Offset="0xD61C" />
         <Limb Name="object_zod_Standardlimb_00D628" Type="Standard" EnumName="OBJECT_ZOD_LIMB_09" Offset="0xD628" />
-        <Skeleton Name="object_zod_Skel_00D658" Type="Flex" LimbType="Standard" LimbNone="OBJECT_ZOD_LIMB_NONE" LimbMax="OBJECT_ZOD_LIMB_MAX" EnumName="object_zod_Limbs" Offset="0xD658" />
+        <Skeleton Name="object_zod_Skel_00D658" Type="Flex" LimbType="Standard" LimbNone="OBJECT_ZOD_LIMB_NONE" LimbMax="OBJECT_ZOD_LIMB_MAX" EnumName="ObjectZodLimb" Offset="0xD658" />
         <Animation Name="object_zod_Anim_00D9B0" Offset="0xD9B0" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_zog.xml b/assets/xml/objects/object_zog.xml
index 15265596d9..1ede14ad22 100644
--- a/assets/xml/objects/object_zog.xml
+++ b/assets/xml/objects/object_zog.xml
@@ -107,6 +107,6 @@
         <Limb Name="object_zog_Standardlimb_0290F4" Type="Standard" EnumName="OBJECT_ZOG_LIMB_14" Offset="0x290F4" />
         <Limb Name="object_zog_Standardlimb_029100" Type="Standard" EnumName="OBJECT_ZOG_LIMB_15" Offset="0x29100" />
         <Limb Name="object_zog_Standardlimb_02910C" Type="Standard" EnumName="OBJECT_ZOG_LIMB_16" Offset="0x2910C" />
-        <Skeleton Name="object_zog_Skel_029170" Type="Flex" LimbType="Standard" LimbNone="OBJECT_ZOG_LIMB_NONE" LimbMax="OBJECT_ZOG_LIMB_MAX" EnumName="object_zog_Limbs" Offset="0x29170" />
+        <Skeleton Name="object_zog_Skel_029170" Type="Flex" LimbType="Standard" LimbNone="OBJECT_ZOG_LIMB_NONE" LimbMax="OBJECT_ZOG_LIMB_MAX" EnumName="ObjectZogLimb" Offset="0x29170" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_zoraegg.xml b/assets/xml/objects/object_zoraegg.xml
index 367d2df760..175c6aeb2c 100644
--- a/assets/xml/objects/object_zoraegg.xml
+++ b/assets/xml/objects/object_zoraegg.xml
@@ -22,7 +22,7 @@
         <Limb Name="object_zoraegg_Standardlimb_004C54" Type="Standard" EnumName="OBJECT_ZORAEGG_LIMB_04" Offset="0x4C54" />
         <Limb Name="object_zoraegg_Standardlimb_004C60" Type="Standard" EnumName="OBJECT_ZORAEGG_LIMB_05" Offset="0x4C60" />
         <Limb Name="object_zoraegg_Standardlimb_004C6C" Type="Standard" EnumName="OBJECT_ZORAEGG_LIMB_06" Offset="0x4C6C" />
-        <Skeleton Name="object_zoraegg_Skel_004C90" Type="Flex" LimbType="Standard" LimbNone="OBJECT_ZORAEGG_LIMB_NONE" LimbMax="OBJECT_ZORAEGG_LIMB_MAX" EnumName="object_zoraegg_Limbs" Offset="0x4C90" />
+        <Skeleton Name="object_zoraegg_Skel_004C90" Type="Flex" LimbType="Standard" LimbNone="OBJECT_ZORAEGG_LIMB_NONE" LimbMax="OBJECT_ZORAEGG_LIMB_MAX" EnumName="ObjectZoraeggLimb" Offset="0x4C90" />
         <Animation Name="object_zoraegg_Anim_004D20" Offset="0x4D20" />
         <Animation Name="object_zoraegg_Anim_004E04" Offset="0x4E04" />
         <Animation Name="object_zoraegg_Anim_004FE4" Offset="0x4FE4" />
diff --git a/assets/xml/objects/object_zos.xml b/assets/xml/objects/object_zos.xml
index 1f5a2a5429..016831ac55 100644
--- a/assets/xml/objects/object_zos.xml
+++ b/assets/xml/objects/object_zos.xml
@@ -62,7 +62,7 @@
         <Limb Name="object_zos_Standardlimb_0151D0" Type="Standard" EnumName="OBJECT_ZOS_LIMB_0F" Offset="0x151D0" />
         <Limb Name="object_zos_Standardlimb_0151DC" Type="Standard" EnumName="OBJECT_ZOS_LIMB_10" Offset="0x151DC" />
         <Limb Name="object_zos_Standardlimb_0151E8" Type="Standard" EnumName="OBJECT_ZOS_LIMB_11" Offset="0x151E8" />
-        <Skeleton Name="object_zos_Skel_015238" Type="Flex" LimbType="Standard" LimbNone="OBJECT_ZOS_LIMB_NONE" LimbMax="OBJECT_ZOS_LIMB_MAX" EnumName="object_zos_Limbs" Offset="0x15238" />
+        <Skeleton Name="object_zos_Skel_015238" Type="Flex" LimbType="Standard" LimbNone="OBJECT_ZOS_LIMB_NONE" LimbMax="OBJECT_ZOS_LIMB_MAX" EnumName="ObjectZosLimb" Offset="0x15238" />
         <Animation Name="object_zos_Anim_01621C" Offset="0x1621C" />
         <Animation Name="object_zos_Anim_016980" Offset="0x16980" />
     </File>
diff --git a/assets/xml/objects/object_zov.xml b/assets/xml/objects/object_zov.xml
index abbc52268b..440782f102 100644
--- a/assets/xml/objects/object_zov.xml
+++ b/assets/xml/objects/object_zov.xml
@@ -76,6 +76,6 @@
         <Limb Name="object_zov_Standardlimb_0161DC" Type="Standard" EnumName="OBJECT_ZOV_LIMB_14" Offset="0x161DC" />
         <Limb Name="object_zov_Standardlimb_0161E8" Type="Standard" EnumName="OBJECT_ZOV_LIMB_15" Offset="0x161E8" />
         <Limb Name="object_zov_Standardlimb_0161F4" Type="Standard" EnumName="OBJECT_ZOV_LIMB_16" Offset="0x161F4" />
-        <Skeleton Name="object_zov_Skel_016258" Type="Flex" LimbType="Standard" LimbNone="OBJECT_ZOV_LIMB_NONE" LimbMax="OBJECT_ZOV_LIMB_MAX" EnumName="object_zov_Limbs" Offset="0x16258" />
+        <Skeleton Name="object_zov_Skel_016258" Type="Flex" LimbType="Standard" LimbNone="OBJECT_ZOV_LIMB_NONE" LimbMax="OBJECT_ZOV_LIMB_MAX" EnumName="ObjectZovLimb" Offset="0x16258" />
     </File>
 </Root>