diff --git a/assets/xml/objects/object_am.xml b/assets/xml/objects/object_am.xml
index 259700dc8..bec26eb3a 100644
--- a/assets/xml/objects/object_am.xml
+++ b/assets/xml/objects/object_am.xml
@@ -1,6 +1,6 @@
 <Root>
     <File Name="object_am" Segment="6">
-        <Collision Name="object_am_Colheader_000118" Offset="0x118" />
+        <Collision Name="object_am_Colheader_000118" Offset="0x118" /> <!-- Original name is "am_bgdatainfo" -->
         <Animation Name="gArmosHopAnim" Offset="0x238" /> <!-- Original name is "am_jump" -->
         <Animation Name="gArmosPushedBackAnim" Offset="0x33C" /> <!-- Original name is "am_mamori" ("protection; defense") -->
         <DList Name="object_am_DL_0005D0" Offset="0x5D0" />
@@ -36,6 +36,6 @@
         <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="ObjectAmLimb" Offset="0x5948" />
         <Animation Name="gArmosTakeDamageAnim" Offset="0x5B3C" /> <!-- Original name is "am_yarare" ("to suffer damage") -->
-        <Collision Name="object_am_Colheader_005CF8" Offset="0x5CF8" />
+        <Collision Name="object_am_Colheader_005CF8" Offset="0x5CF8" /> <!-- Original name is "armos_test_bgdatainfo" -->
     </File>
 </Root>
diff --git a/assets/xml/objects/object_astr_obj.xml b/assets/xml/objects/object_astr_obj.xml
index 75a8e7ca2..233de785b 100644
--- a/assets/xml/objects/object_astr_obj.xml
+++ b/assets/xml/objects/object_astr_obj.xml
@@ -8,6 +8,6 @@
         <DList Name="object_astr_obj_DL_002178" Offset="0x2178" /> <!-- Original name is "z2_tennmondai_hahen_model" ("tennmondai" = "astronomical observatory​", "hahen" = "fragment") -->
         <DList Name="object_astr_obj_DL_0022E0" Offset="0x22E0" />
         <DList Name="object_astr_obj_DL_002380" Offset="0x2380" /> <!-- Original name is "z2_tennmondai_kabe_model" ("tennmondai" = "astronomical observatory​", "kabe" = "wall") -->
-        <Collision Name="object_astr_obj_Colheader_002498" Offset="0x2498" />
+        <Collision Name="object_astr_obj_Colheader_002498" Offset="0x2498" /> <!-- Original name is "z2_tennmondai_kabe_bgdatainfo" -->
     </File>
 </Root>
diff --git a/assets/xml/objects/object_botihasira.xml b/assets/xml/objects/object_botihasira.xml
index f949abcc7..0a2212760 100644
--- a/assets/xml/objects/object_botihasira.xml
+++ b/assets/xml/objects/object_botihasira.xml
@@ -6,6 +6,6 @@
         <Texture Name="object_botihasira_Tex_000648" OutName="tex_000648" Format="rgba16" Width="32" Height="64" Offset="0x648" />
         <Texture Name="object_botihasira_Tex_001648" OutName="tex_001648" Format="rgba16" Width="32" Height="16" Offset="0x1648" />
         <!-- <Blob Name="object_botihasira_Blob_001A48" Size="0x18" Offset="0x1A48" /> -->
-        <Collision Name="object_botihasira_Colheader_001BD8" Offset="0x1BD8" />
+        <Collision Name="object_botihasira_Colheader_001BD8" Offset="0x1BD8" /> <!-- Original name is "z2_botihasira_bgdatainfo" -->
     </File>
 </Root>
diff --git a/assets/xml/objects/object_box.xml b/assets/xml/objects/object_box.xml
index be4f34b87..c0603a6cf 100644
--- a/assets/xml/objects/object_box.xml
+++ b/assets/xml/objects/object_box.xml
@@ -48,6 +48,6 @@
         <Animation Name="gBoxBigChestOpenGoronAnim" Offset="0x7E54" /> <!-- Original name is "pg_Tbox" -->
         <Animation Name="gBoxBigChestOpenDekuAnim" Offset="0x7F30" /> <!-- Original name is "pn_Tbox" -->
         <Blob Name="object_box_zeroes_unk_00007F40" Size="0xA0" Offset="0x7F40" />
-        <Collision Name="gBoxChestCol" Offset="0x80E8" />
+        <Collision Name="gBoxChestCol" Offset="0x80E8" /> <!-- Original name is "takara_hako_bgdatainfo" -->
     </File>
 </Root>
diff --git a/assets/xml/objects/object_crace_object.xml b/assets/xml/objects/object_crace_object.xml
index af0cb89e0..63dd9913d 100644
--- a/assets/xml/objects/object_crace_object.xml
+++ b/assets/xml/objects/object_crace_object.xml
@@ -4,6 +4,6 @@
         <DList Name="gDekuShrineSlidingDoorDL" Offset="0x3A0" /> <!-- Original name is "Y2_DANPEI_shutter_model" -->
         <Texture Name="gDekuShrineSlidingDoorTLUT" OutName="deku_shrine_sliding_door_tlut" Format="rgba16" Width="4" Height="4" Offset="0x540" />
         <Texture Name="gDekuShrineSlidingDoorTex" OutName="deku_shrine_sliding_door" Format="ci4" Width="32" Height="128" Offset="0x560" />
-        <Collision Name="gDekuShrineSlidingDoorCol" Offset="0xE00" />
+        <Collision Name="gDekuShrineSlidingDoorCol" Offset="0xE00" /> <!-- Original name is "Y2_DANPEI_shutter_bgdatainfo" -->
     </File>
 </Root>
diff --git a/assets/xml/objects/object_ctower_rot.xml b/assets/xml/objects/object_ctower_rot.xml
index ad2336257..044443c98 100644
--- a/assets/xml/objects/object_ctower_rot.xml
+++ b/assets/xml/objects/object_ctower_rot.xml
@@ -73,12 +73,12 @@
         <!-- Corridor -->
         <DList Name="gClockTowerCorridorFoliageDL" Offset="0x129D0" />
         <DList Name="gClockTowerCorridorDL" Offset="0x12DA0" /> <!-- Original name is "w2_hineri_model" ("twist; spin") -->
-        <Collision Name="gClockTowerCorridorCol" Offset="0x142E8" />
+        <Collision Name="gClockTowerCorridorCol" Offset="0x142E8" /> <!-- Original name is "w2_hineri_bgdatainfo" -->
         
         <!-- Organ -->
         <DList Name="gClockTowerOrganPipesDL" Offset="0x15F30" /> <!-- Original name is "w2_piano_modelT" -->
         <DList Name="gClockTowerOrganDL" Offset="0x160A0" /> <!-- Original name is "w2_piano_model" -->
-        <Collision Name="gClockTowerOrganCol" Offset="0x16E70" />
+        <Collision Name="gClockTowerOrganCol" Offset="0x16E70" /> <!-- Original name is "w2_piano_bgdatainfo" -->
         
         <!-- CenterCog -->
         <DList Name="gClockTowerEmpty2DL" Offset="0x17010" /> <!-- Original name is "w2_shaft_modelT" -->
@@ -86,15 +86,15 @@
         
         <!-- StoneDoorMain -->
         <DList Name="gClockTowerStoneDoorMainDL" Offset="0x17220" /> <!-- Original name is "w2_shatter_higashi_model" ("higashi" = "east") -->
-        <Collision Name="gClockTowerStoneDoorMainCol" Offset="0x17410" />
+        <Collision Name="gClockTowerStoneDoorMainCol" Offset="0x17410" /> <!-- Original name is "w2_shatter_higashi_bgdatainfo" -->
         
         <!-- StoneDoor -->
         <DList Name="gClockTowerStoneDoorDL" Offset="0x174E0" /> <!-- Original name is "w2_shatter_nishi_model" ("nishi" = "west") -->
-        <Collision Name="gClockTowerStoneDoorCol" Offset="0x17650" />
+        <Collision Name="gClockTowerStoneDoorCol" Offset="0x17650" /> <!-- Original name is "w2_shatter_nishi_bgdatainfo" -->
         
         <!-- WaterWheel -->
         <DList Name="gClockTowerEmpty3DL" Offset="0x18110" /> <!-- Original name is "w2_suisha_modelT" ("water wheel") -->
         <DList Name="gClockTowerWaterWheelDL" Offset="0x18118" /> <!-- Original name is "w2_suisha_model" -->
-        <Collision Name="gClockTowerWaterWheelCol" Offset="0x18588" />
+        <Collision Name="gClockTowerWaterWheelCol" Offset="0x18588" /> <!-- Original name is "w2_suisha_bgdatainfo" -->
     </File>
 </Root>
diff --git a/assets/xml/objects/object_d_hsblock.xml b/assets/xml/objects/object_d_hsblock.xml
index b43647dc3..ee61d0a54 100644
--- a/assets/xml/objects/object_d_hsblock.xml
+++ b/assets/xml/objects/object_d_hsblock.xml
@@ -1,10 +1,10 @@
 <Root>
     <!-- Assets for the hookshot post -->
     <File Name="object_d_hsblock" Segment="6">
-        <DList Name="gHookshotPostDL" Offset="0x210" />
-        <DList Name="gHookshotTargetDL" Offset="0x470" />
-        <Collision Name="gHookshotTargetCol" Offset="0x578" />
-        <Collision Name="gHookshotPostCol" Offset="0x730" />
+        <DList Name="gHookshotPostDL" Offset="0x210" /> <!-- Original name is "field_fshot_model" -->
+        <DList Name="gHookshotTargetDL" Offset="0x470" /> <!-- Original name is "field_fshot2_model" -->
+        <Collision Name="gHookshotTargetCol" Offset="0x578" /> <!-- Original name is "field_fshot2_bgdatainfo" -->
+        <Collision Name="gHookshotPostCol" Offset="0x730" /> <!-- Original name is "field_fshot_bgdatainfo" -->
         <Texture Name="gHookshotTargetTex" OutName="tex_000760" Format="i4" Width="64" Height="64" Offset="0x760" />
         <Texture Name="gHookshotPostTex" OutName="tex_000F60" Format="i8" Width="32" Height="64" Offset="0xF60" />
     </File>
diff --git a/assets/xml/objects/object_d_lift.xml b/assets/xml/objects/object_d_lift.xml
index 475f7fd3e..868eccd85 100644
--- a/assets/xml/objects/object_d_lift.xml
+++ b/assets/xml/objects/object_d_lift.xml
@@ -3,8 +3,8 @@
         <DList Name="object_d_lift_DL_000180" Offset="0x180" />
         <Texture Name="object_d_lift_Tex_000298" OutName="tex_000298" Format="rgba16" Width="32" Height="32" Offset="0x298" />
         <Collision Name="object_d_lift_Colheader_000BA0" Offset="0xBA0" />
-        <DList Name="gDampeGraveBrownElevatorDL" Offset="0xD10" />
-        <Collision Name="gDampeGraveBrownElevatorCol" Offset="0xF00" />
+        <DList Name="gDampeGraveBrownElevatorDL" Offset="0xD10" /> <!-- Original name is "lift_l_model" -->
+        <Collision Name="gDampeGraveBrownElevatorCol" Offset="0xF00" /> <!-- Original name is "lift_l_bgdatainfo" -->
         <Texture Name="gDampeGraveBrownElevatorSideTex" OutName="brown_elevator_side" Format="i8" Width="64" Height="16" Offset="0xF30" />
         <Texture Name="gDampeGraveBrownElevatorTopBottomTex" OutName="brown_elevator_top_bottom" Format="i8" Width="64" Height="64" Offset="0x1330" />
     </File>
diff --git a/assets/xml/objects/object_dai.xml b/assets/xml/objects/object_dai.xml
index b547897f8..927e3f1e1 100644
--- a/assets/xml/objects/object_dai.xml
+++ b/assets/xml/objects/object_dai.xml
@@ -2,21 +2,21 @@
     <File Name="object_dai" Segment="6">
         <Texture Name="object_dai_Tex_000000" OutName="tex_000000" Format="i4" Width="32" Height="32" Offset="0x0" />
         <DList Name="object_dai_DL_000230" Offset="0x230" />
-        <DList Name="object_dai_DL_0002E8" Offset="0x2E8" />
-        <Animation Name="object_dai_Anim_000CEC" Offset="0xCEC" />
-        <Animation Name="object_dai_Anim_0010F8" Offset="0x10F8" />
-        <Animation Name="object_dai_Anim_0014BC" Offset="0x14BC" />
-        <Animation Name="object_dai_Anim_001E44" Offset="0x1E44" />
-        <Animation Name="object_dai_Anim_002E58" Offset="0x2E58" />
-        <Animation Name="object_dai_Anim_003CAC" Offset="0x3CAC" />
-        <Animation Name="object_dai_Anim_0040E0" Offset="0x40E0" />
-        <Animation Name="object_dai_Anim_0048B4" Offset="0x48B4" />
-        <Animation Name="object_dai_Anim_005100" Offset="0x5100" />
-        <Animation Name="object_dai_Anim_00563C" Offset="0x563C" />
-        <Animation Name="object_dai_Anim_006590" Offset="0x6590" />
-        <Animation Name="object_dai_Anim_0069DC" Offset="0x69DC" />
-        <Animation Name="object_dai_Anim_007354" Offset="0x7354" />
-        <Animation Name="object_dai_Anim_0079E4" Offset="0x79E4" />
+        <DList Name="object_dai_DL_0002E8" Offset="0x2E8" /> <!-- Original name is "dai_ball_modelT" -->
+        <Animation Name="object_dai_Anim_000CEC" Offset="0xCEC" /> <!-- Original name is "dg_haku" ("to breathe out​") -->
+        <Animation Name="object_dai_Anim_0010F8" Offset="0x10F8" /> <!-- Original name is "dg_iare" ("are" = "huh?; eh?"") -->
+        <Animation Name="object_dai_Anim_0014BC" Offset="0x14BC" /> <!-- Original name is "dg_iareend" -->
+        <Animation Name="object_dai_Anim_001E44" Offset="0x1E44" /> <!-- Original name is "dg_iareloop" -->
+        <Animation Name="object_dai_Anim_002E58" Offset="0x2E58" /> <!-- Original name is "dg_inemuri" ("nemuri" = "to fall asleep") -->
+        <Animation Name="object_dai_Anim_003CAC" Offset="0x3CAC" /> <!-- Original name is "dg_isuwaru" ("suwari" = "to sit" )-->
+        <Animation Name="object_dai_Anim_0040E0" Offset="0x40E0" /> <!-- Original name is "dg_isuwaruloop" -->
+        <Animation Name="object_dai_Anim_0048B4" Offset="0x48B4" /> <!-- Original name is "dg_iwait" -->
+        <Animation Name="object_dai_Anim_005100" Offset="0x5100" /> <!-- Original name is "dg_iwalk" -->
+        <Animation Name="object_dai_Anim_00563C" Offset="0x563C" /> <!-- Original name is "dg_korogeoti" ("to fall off; to tumble down​") -->
+        <Animation Name="object_dai_Anim_006590" Offset="0x6590" /> <!-- Original name is "dg_marumari" ("to roll into a ball") -->
+        <Animation Name="object_dai_Anim_0069DC" Offset="0x69DC" /> <!-- Original name is "dg_modoru" ("to return; to go back​") -->
+        <Animation Name="object_dai_Anim_007354" Offset="0x7354" /> <!-- Original name is "dg_tame" ("to amass; to accumulate; to store​") -->
+        <Animation Name="object_dai_Anim_0079E4" Offset="0x79E4" /> <!-- Original name is "dg_wait" -->
         <DList Name="object_dai_DL_008710" Offset="0x8710" />
         <DList Name="object_dai_DL_0087B8" Offset="0x87B8" />
         <DList Name="object_dai_DL_0089D8" Offset="0x89D8" />
diff --git a/assets/xml/objects/object_daiku.xml b/assets/xml/objects/object_daiku.xml
index 17d8ddbf0..0152a6e7d 100644
--- a/assets/xml/objects/object_daiku.xml
+++ b/assets/xml/objects/object_daiku.xml
@@ -1,11 +1,11 @@
 <Root>
     <File Name="object_daiku" Segment="6">
-        <Animation Name="object_daiku_Anim_000600" Offset="0x600" />
-        <Animation Name="object_daiku_Anim_000C44" Offset="0xC44" />
-        <Animation Name="object_daiku_Anim_001114" Offset="0x1114" />
-        <Animation Name="object_daiku_Anim_001A24" Offset="0x1A24" />
-        <Animation Name="object_daiku_Anim_002134" Offset="0x2134" />
-        <Animation Name="object_daiku_Anim_002FA0" Offset="0x2FA0" />
+        <Animation Name="object_daiku_Anim_000600" Offset="0x600" /> <!-- Original name is "dk2_hanasi" ("talk") -->
+        <Animation Name="object_daiku_Anim_000C44" Offset="0xC44" /> <!-- Original name is "dk2_hashiru" ("to run​") -->
+        <Animation Name="object_daiku_Anim_001114" Offset="0x1114" /> <!-- Original name is "dk2_katugi" ("to carry") -->
+        <Animation Name="object_daiku_Anim_001A24" Offset="0x1A24" /> <!-- Original name is "dk2_kowasu" ("to break; to destroy; to demolish​") -->
+        <Animation Name="object_daiku_Anim_002134" Offset="0x2134" /> <!-- Original name is "dk2_kowasu2wait" -->
+        <Animation Name="object_daiku_Anim_002FA0" Offset="0x2FA0" /> <!-- Original name is "dk2_matsu" ("to wait​") -->
         <Texture Name="object_daiku_TLUT_002FB0" OutName="tlut_002FB0" Format="rgba16" Width="16" Height="16" Offset="0x2FB0" />
         <Texture Name="object_daiku_Tex_0031B0" OutName="tex_0031B0" Format="ci8" Width="8" Height="8" Offset="0x31B0" />
         <Texture Name="object_daiku_Tex_0031F0" OutName="tex_0031F0" Format="ci8" Width="16" Height="16" Offset="0x31F0" />
@@ -39,10 +39,10 @@
         <DList Name="object_daiku_DL_008870" Offset="0x8870" />
         <DList Name="object_daiku_DL_008B20" Offset="0x8B20" />
         <DList Name="object_daiku_DL_008C30" Offset="0x8C30" />
-        <DList Name="object_daiku_DL_008EC8" Offset="0x8EC8" />
+        <DList Name="object_daiku_DL_008EC8" Offset="0x8EC8" /> <!-- Original name is "dk2_hashira_model" -->
         <Texture Name="object_daiku_TLUT_008FA8" OutName="tlut_008FA8" Format="rgba16" Width="16" Height="16" Offset="0x8FA8" />
         <Texture Name="object_daiku_Tex_0091A8" OutName="tex_0091A8" Format="ci8" Width="16" Height="16" Offset="0x91A8" />
-        <DList Name="object_daiku_DL_009638" Offset="0x9638" />
+        <DList Name="object_daiku_DL_009638" Offset="0x9638" /> <!-- Original name is "dk2_2_turuhashi_model" -->
         <Texture Name="object_daiku_TLUT_0097B0" OutName="tlut_0097B0" Format="rgba16" Width="16" Height="16" Offset="0x97B0" />
         <Texture Name="object_daiku_Tex_0099B0" OutName="tex_0099B0" Format="i8" Width="32" Height="32" Offset="0x99B0" />
         <Texture Name="object_daiku_Tex_009DB0" OutName="tex_009DB0" Format="ci8" Width="16" Height="16" Offset="0x9DB0" />
@@ -66,11 +66,11 @@
         <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="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" />
-        <Animation Name="object_daiku_Anim_00C234" Offset="0xC234" />
-        <Animation Name="object_daiku_Anim_00C92C" Offset="0xC92C" />
-        <Animation Name="object_daiku_Anim_00D328" Offset="0xD328" />
+        <Animation Name="object_daiku_Anim_00ACD0" Offset="0xACD0" /> <!-- Original name is "dk2_roya" -->
+        <Animation Name="object_daiku_Anim_00B690" Offset="0xB690" /> <!-- Original name is "dk2_shiji" (perhaps "instructions; directions​"?) -->
+        <Animation Name="object_daiku_Anim_00BEAC" Offset="0xBEAC" /> <!-- Original name is "dk2_shiji02" -->
+        <Animation Name="object_daiku_Anim_00C234" Offset="0xC234" /> <!-- Original name is "dk2_suwari" ("sitting") -->
+        <Animation Name="object_daiku_Anim_00C92C" Offset="0xC92C" /> <!-- Original name is "dk2_tasuke" ("to save; to rescue​") -->
+        <Animation Name="object_daiku_Anim_00D328" Offset="0xD328" /> <!-- Original name is "dk2_turuwait" ("turu" = "to hang; to suspend; to sling") -->
     </File>
 </Root>
diff --git a/assets/xml/objects/object_danpei_object.xml b/assets/xml/objects/object_danpei_object.xml
index 3f373a8ce..8e86f2f79 100644
--- a/assets/xml/objects/object_danpei_object.xml
+++ b/assets/xml/objects/object_danpei_object.xml
@@ -3,9 +3,9 @@
         <DList Name="object_danpei_object_DL_000300" Offset="0x300" />
         <Texture Name="object_danpei_object_TLUT_000438" OutName="tlut_000438" Format="rgba16" Width="4" Height="4" Offset="0x438" />
         <Texture Name="object_danpei_object_Tex_000458" OutName="tex_000458" Format="ci4" Width="64" Height="64" Offset="0x458" />
-        <Collision Name="object_danpei_object_Colheader_000D60" Offset="0xD60" />
-        <DList Name="object_danpei_object_DL_0012C0" Offset="0x12C0" />
-        <DList Name="object_danpei_object_DL_002110" Offset="0x2110" />
+        <Collision Name="object_danpei_object_Colheader_000D60" Offset="0xD60" /> <!-- Original name is "y2_kanokefuta_bgdatainfo" -->
+        <DList Name="object_danpei_object_DL_0012C0" Offset="0x12C0" /> <!-- Original name is "Y2_DP2_RASENsita_model" ("rasen" = "spiral", "sita" = "below") -->
+        <DList Name="object_danpei_object_DL_002110" Offset="0x2110" /> <!-- Original name is "Y2_DP2_RASENue_model" ("ue" = "above") -->
         <Texture Name="object_danpei_object_TLUT_002B10" OutName="tlut_002B10" Format="rgba16" Width="16" Height="16" Offset="0x2B10" />
         <Texture Name="object_danpei_object_Tex_002D10" OutName="tex_002D10" Format="ci8" Width="32" Height="64" Offset="0x2D10" />
         <Texture Name="object_danpei_object_Tex_003510" OutName="tex_003510" Format="ci8" Width="32" Height="32" Offset="0x3510" />
diff --git a/assets/xml/objects/object_dblue_object.xml b/assets/xml/objects/object_dblue_object.xml
index 8611c539b..08cb20ec3 100644
--- a/assets/xml/objects/object_dblue_object.xml
+++ b/assets/xml/objects/object_dblue_object.xml
@@ -4,17 +4,17 @@
         <!-- DisplayLists and Collision for the elevator platforms. -->
         <DList Name="gGreatBayTempleObjectElevatorEmptyDL" Offset="0x2C0" /> <!-- Probably was the transparent component for the below DL -->
         <DList Name="gGreatBayTempleObjectElevatorDL" Offset="0x2C8" /> <!-- Original name is "m2_KON_ELE_model" -->
-        <Collision Name="gGreatBayTempleObjectElevatorCol" Offset="0x5C4" />
+        <Collision Name="gGreatBayTempleObjectElevatorCol" Offset="0x5C4" /> <!-- Original name is "m2_KON_ELE_bgdatainfo" -->
 
         <!-- DisplayLists and Collision for the rotating waterwheel with two platforms. -->
         <DList Name="gGreatBayTempleObjectWaterwheelWithPlatformsEmptyDL" Offset="0x1E60" /> <!-- Probably was the transparent component for the below DL -->
         <DList Name="gGreatBayTempleObjectWaterwheelWithPlatformsDL" Offset="0x1E68" /> <!-- Original name is "m2_KON_GEAR09_model" -->
-        <Collision Name="gGreatBayTempleObjectWaterwheelWithPlatformsCol" Offset="0x2E78" />
+        <Collision Name="gGreatBayTempleObjectWaterwheelWithPlatformsCol" Offset="0x2E78" /> <!-- Original name is "m2_KON_GEAR09_bgdatainfo" -->
 
         <!-- DisplayLists and Collision for the ice stalactites that can be thawed with Fire Arrows.  -->
         <DList Name="gGreatBayTempleObjectIceStalactiteRimDL" Offset="0x3250" />
         <DList Name="gGreatBayTempleObjectIceStalactiteDL" Offset="0x3358" /> <!-- Original name is "m2_KON_ICE_model" -->
-        <Collision Name="gGreatBayTempleObjectIceStalactiteCol" Offset="0x3540" /> <!-- Unused -->
+        <Collision Name="gGreatBayTempleObjectIceStalactiteCol" Offset="0x3540" /> <!-- Original name is "m2_KON_ICE_bgdatainfo". Unused -->
 
         <!-- DisplayLists for the frozen version of the waterfall that briefly appears when you hit it with an Ice Arrow. -->
         <DList Name="gGreatBayTempleObjectFrozenWaterfallDL" Offset="0x3770" />
@@ -25,22 +25,22 @@
         <DList Name="gGreatBayTempleObjectGearShaftWithPlatformsDL" Offset="0x4848" /> <!-- Original name is "m2_KON_Screw_model" -->
         <DList Name="gGreatBayTempleObjectGearShaftEmptyDL" Offset="0x52B0" /> <!-- Probably was the transparent component for the below DL -->
         <DList Name="gGreatBayTempleObjectGearShaftDL" Offset="0x52B8" /> <!-- Original name is "m2_KON_ScrewFor8_model" -->
-        <Collision Name="gGreatBayTempleObjectGearShaftWithPlatformsCol" Offset="0x5D28" />
+        <Collision Name="gGreatBayTempleObjectGearShaftWithPlatformsCol" Offset="0x5D28" /> <!-- Original name is "m2_KON_Screw_bgdatainfo" -->
 
         <!-- DisplayLists and Collision for the switches that can be pushed or pulled. -->
         <DList Name="gGreatBayTempleObjectOneWaySwitchEmptyDL" Offset="0x61B0" /> <!-- Probably was the transparent component for the below DL -->
         <DList Name="gGreatBayTempleObjectOneWaySwitchDL" Offset="0x61B8" /> <!-- Original name is "m2_KON_Sen_model" (perhaps "tap; faucet") -->
         <DList Name="gGreatBayTempleObjectTwoWaySwitchEmptyDL" Offset="0x69D0" /> <!-- Probably was the transparent component for the below DL -->
         <DList Name="gGreatBayTempleObjectTwoWaySwitchDL" Offset="0x69D8" /> <!-- Original name is "m2_KON_SenP2_model" -->
-        <Collision Name="gGreatBayTempleObjectTwoWaySwitchCol" Offset="0x6EA8" />
-        <Collision Name="gGreatBayTempleObjectOneWaySwitchCol" Offset="0x714C" />
+        <Collision Name="gGreatBayTempleObjectTwoWaySwitchCol" Offset="0x6EA8" /> <!-- Original name is "m2_KON_SenP2_bgdatainfo" -->
+        <Collision Name="gGreatBayTempleObjectOneWaySwitchCol" Offset="0x714C" /> <!-- Original name is "m2_KON_Sen_bgdatainfo" -->
 
         <!-- DisplayLists and Collision for the giant waterwheel near the start of the dungeon. -->
         <DList Name="gGreatBayTempleObjectWaterwheelEmptyDL" Offset="0x8770" /> <!-- Probably was the transparent component for the below DL -->
         <DList Name="gGreatBayTempleObjectWaterwheelDL" Offset="0x8778" /> <!-- Original name is "m2_KON_SuisyaFor0_model" ("waterwheel") -->
         <DList Name="gGreatBayTempleObjectWaterwheelWithFakeGearEmptyDL" Offset="0xA520" /> <!-- Probably was the transparent component for the below DL -->
         <DList Name="gGreatBayTempleObjectWaterwheelWithFakeGearDL" Offset="0xA528" /> <!-- Original name is "m2_KON_SuisyaFor8_model" -->
-        <Collision Name="gGreatBayTempleObjectWaterwheelCol" Offset="0xAED0" />
+        <Collision Name="gGreatBayTempleObjectWaterwheelCol" Offset="0xAED0" /> <!-- Original name is "m2_KON_SuisyaFor8_bgdatainfo" -->
 
         <!-- DisplayLists and TextureAnimation for the waterfalls that can be frozen with Ice Arrows. -->
         <DList Name="gGreatBayTempleObjectWaterfallDL" Offset="0xB280" /> <!-- Original name is "m2_KON_TAKI_modelT" ("waterfall​") -->
@@ -50,17 +50,17 @@
         <!-- DisplayLists and Collision for the "shaft" of the seesaw, i.e., the bar that connects the two platforms. -->
         <DList Name="gGreatBayTempleObjectSeesawShaftEmptyDL" Offset="0xB8F0" /> <!-- Probably was the transparent component for the below DL -->
         <DList Name="gGreatBayTempleObjectSeesawShaftDL" Offset="0xB8F8" /> <!-- Original name is "m2_KON_TENBIN_model" ("(balance) scales​") -->
-        <Collision Name="gGreatBayTempleObjectSeesawShaftCol" Offset="0xBC08" />
+        <Collision Name="gGreatBayTempleObjectSeesawShaftCol" Offset="0xBC08" /> <!-- Original name is "m2_KON_TENBIN_bgdatainfo" -->
 
         <!-- DisplayLists and Collision for the large seesaw platform. -->
         <DList Name="gGreatBayTempleObjectLargeSeesawPlatformEmptyDL" Offset="0xBF40" /> <!-- Probably was the transparent component for the below DL -->
         <DList Name="gGreatBayTempleObjectLargeSeesawPlatformDL" Offset="0xBF48" /> <!-- Original name is "m2_KON_TENBINstepBIG_model" -->
-        <Collision Name="gGreatBayTempleObjectLargeSeesawPlatformCol" Offset="0xC180" />
+        <Collision Name="gGreatBayTempleObjectLargeSeesawPlatformCol" Offset="0xC180" /> <!-- Original name is "m2_KON_TENBINstepBIG_bgdatainfo" -->
 
         <!-- DisplayLists and Collision for the small seesaw platform. -->
         <DList Name="gGreatBayTempleObjectSmallSeesawPlatformEmptyDL" Offset="0xC4B0" /> <!-- Probably was the transparent component for the below DL -->
         <DList Name="gGreatBayTempleObjectSmallSeesawPlatformDL" Offset="0xC4B8" /> <!-- Original name is "m2_KON_TENBINstepSML_model" -->
-        <Collision Name="gGreatBayTempleObjectSmallSeesawPlatformCol" Offset="0xC700" />
+        <Collision Name="gGreatBayTempleObjectSmallSeesawPlatformCol" Offset="0xC700" /> <!-- Original name is "m2_KON_TENBINstepSML_bgdatainfo" -->
 
         <!-- DisplayLists and TextureAnimation for the large whirlpool at the bottom of the main room. -->
         <DList Name="gGreatBayTempleObjectWhirlpoolDL" Offset="0xCAA0" /> <!-- Original name is "m2_KON_UZUdis_modelT" ("whirlpool; swirl") -->
diff --git a/assets/xml/objects/object_death.xml b/assets/xml/objects/object_death.xml
index 77d4ccd4a..7588c484a 100644
--- a/assets/xml/objects/object_death.xml
+++ b/assets/xml/objects/object_death.xml
@@ -1,17 +1,17 @@
 <Root>
     <File Name="object_death" Segment="6">
-        <Animation Name="object_death_Anim_000E64" Offset="0xE64" />
-        <Animation Name="object_death_Anim_0015B4" Offset="0x15B4" />
-        <Animation Name="object_death_Anim_001834" Offset="0x1834" />
-        <Animation Name="object_death_Anim_001F80" Offset="0x1F80" />
-        <Animation Name="object_death_Anim_002DE8" Offset="0x2DE8" />
-        <Animation Name="object_death_Anim_00352C" Offset="0x352C" />
-        <Animation Name="object_death_Anim_003CAC" Offset="0x3CAC" />
+        <Animation Name="object_death_Anim_000E64" Offset="0xE64" /> <!-- Original name is "d13_atack" -->
+        <Animation Name="object_death_Anim_0015B4" Offset="0x15B4" /> <!-- Original name is "d13_callenemy" -->
+        <Animation Name="object_death_Anim_001834" Offset="0x1834" /> <!-- Original name is "d13_callingenemy" -->
+        <Animation Name="object_death_Anim_001F80" Offset="0x1F80" /> <!-- Original name is "d13_damage" -->
+        <Animation Name="object_death_Anim_002DE8" Offset="0x2DE8" /> <!-- Original name is "d13_deadhit" -->
+        <Animation Name="object_death_Anim_00352C" Offset="0x352C" /> <!-- Original name is "d13_deadwait" -->
+        <Animation Name="object_death_Anim_003CAC" Offset="0x3CAC" /> <!-- Original name is "d13_fly" -->
         <DList Name="object_death_DL_006B80" Offset="0x6B80" />
         <DList Name="object_death_DL_006D18" Offset="0x6D18" />
         <DList Name="object_death_DL_006E08" Offset="0x6E08" />
-        <DList Name="object_death_DL_006F88" Offset="0x6F88" />
-        <DList Name="object_death_DL_0073D0" Offset="0x73D0" />
+        <DList Name="object_death_DL_006F88" Offset="0x6F88" /> <!-- Original name is "d13_kama_model" ("sickle​") -->
+        <DList Name="object_death_DL_0073D0" Offset="0x73D0" /> <!-- Original name is "d13_kamahaA_model" -->
         <DList Name="object_death_DL_0074B8" Offset="0x74B8" />
         <DList Name="object_death_DL_007560" Offset="0x7560" />
         <DList Name="object_death_DL_007638" Offset="0x7638" />
@@ -41,7 +41,7 @@
         <Texture Name="object_death_Tex_009808" OutName="tex_009808" Format="i4" Width="16" Height="16" Offset="0x9808" />
         <DList Name="object_death_DL_009988" Offset="0x9988" />
         <Texture Name="object_death_Tex_009AA0" OutName="tex_009AA0" Format="i4" Width="16" Height="16" Offset="0x9AA0" />
-        <DList Name="object_death_DL_009BA0" Offset="0x9BA0" />
+        <DList Name="object_death_DL_009BA0" Offset="0x9BA0" /> <!-- Original name is "d13_cover_model" -->
         <Texture Name="object_death_Tex_009C40" OutName="tex_009C40" Format="rgba16" Width="16" Height="16" Offset="0x9C40" />
         <DList Name="object_death_DL_009F10" Offset="0x9F10" />
         <DList Name="object_death_DL_009F88" Offset="0x9F88" />
@@ -76,9 +76,9 @@
         <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="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" />
+        <Animation Name="object_death_Anim_00B284" Offset="0xB284" /> <!-- Original name is "d13_gahaha" -->
+        <Animation Name="object_death_Anim_00B508" Offset="0xB508" /> <!-- Original name is "d13_guard" -->
+        <Animation Name="object_death_Anim_00CB2C" Offset="0xCB2C" /> <!-- Original name is "d13_jakin" -->
         <TextureAnimation Name="object_death_Matanimheader_00CB84" Offset="0xCB84" />
         <TextureAnimation Name="object_death_Matanimheader_00CBC0" Offset="0xCBC0" />
     </File>
diff --git a/assets/xml/objects/object_dekubaba.xml b/assets/xml/objects/object_dekubaba.xml
index 87634d654..053b82f61 100644
--- a/assets/xml/objects/object_dekubaba.xml
+++ b/assets/xml/objects/object_dekubaba.xml
@@ -3,16 +3,16 @@
     <File Name="object_dekubaba" Segment="6">
 
         <!-- Deku Baba animations -->
-        <Animation Name="gDekuBabaPauseChompAnim" Offset="0x208"/>
-        <Animation Name="gDekuBabaFastChompAnim" Offset="0x2B8"/>
+        <Animation Name="gDekuBabaPauseChompAnim" Offset="0x208"/> <!-- Original name is "db_P_kougeki" ("attack; assault") -->
+        <Animation Name="gDekuBabaFastChompAnim" Offset="0x2B8"/> <!-- Original name is "db_P_tobidasu" ("to appear (suddenly)​") -->
 
         <!-- Deku Baba body DLists (not all are limb DLists) -->
         <DList Name="gDekuBabaLowerJawDL" Offset="0x580"/>
         <DList Name="gDekuBabaUpperJawDL" Offset="0xB68"/>
-        <DList Name="gDekuBabaBaseLeavesDL" Offset="0x10F0"/>
-        <DList Name="gDekuBabaStemTopDL" Offset="0x1330"/>
-        <DList Name="gDekuBabaStemMiddleDL" Offset="0x1628"/>
-        <DList Name="gDekuBabaStemBaseDL" Offset="0x1828"/>
+        <DList Name="gDekuBabaBaseLeavesDL" Offset="0x10F0"/> <!-- Original name is "db_ha_model" ("leaf; blade of grass") -->
+        <DList Name="gDekuBabaStemTopDL" Offset="0x1330"/> <!-- Original name is "db_miki1_model" ("miki" = "trunk") -->
+        <DList Name="gDekuBabaStemMiddleDL" Offset="0x1628"/> <!-- Original name is "db_miki2_model" -->
+        <DList Name="gDekuBabaStemBaseDL" Offset="0x1828"/> <!-- Original name is "db_miki3_model" -->
 
         <!-- Deku Baba body textures -->
         <Texture Name="gDekuBabaJawOuterTex" OutName="deku_baba_jaw_outer" Format="rgba16" Width="16" Height="32" Offset="0x18D0"/>
diff --git a/assets/xml/objects/object_dekucity_obj.xml b/assets/xml/objects/object_dekucity_obj.xml
index 1d680965e..2d1da14a0 100644
--- a/assets/xml/objects/object_dekucity_obj.xml
+++ b/assets/xml/objects/object_dekucity_obj.xml
@@ -1,22 +1,22 @@
 <Root>
     <File Name="object_dekucity_obj" Segment="6">
-        <Collision Name="object_dekucity_obj_Colheader_0002AC" Offset="0x2AC" />
-        <DList Name="object_dekucity_obj_DL_0004E0" Offset="0x4E0" />
+        <Collision Name="object_dekucity_obj_Colheader_0002AC" Offset="0x2AC" /> <!-- Original name is "z2_22_DOKUcode_bgdatainfo" ("doku" = "poison") -->
+        <DList Name="object_dekucity_obj_DL_0004E0" Offset="0x4E0" /> <!-- Original name is "z2_22_DOKUwter_modelT" -->
         <DList Name="object_dekucity_obj_DL_000610" Offset="0x610" />
         <Texture Name="object_dekucity_obj_Tex_000618" OutName="tex_000618" Format="rgba16" Width="32" Height="32" Offset="0x618" />
         <TextureAnimation Name="object_dekucity_obj_Matanimheader_000E28" Offset="0xE28" />
-        <DList Name="object_dekucity_obj_DL_001030" Offset="0x1030" />
+        <DList Name="object_dekucity_obj_DL_001030" Offset="0x1030" /> <!-- Original name is "z2_22_wter_modelT" -->
         <DList Name="object_dekucity_obj_DL_001160" Offset="0x1160" />
         <Texture Name="object_dekucity_obj_Tex_001168" OutName="tex_001168" Format="rgba16" Width="32" Height="32" Offset="0x1168" />
         <TextureAnimation Name="object_dekucity_obj_Matanimheader_001978" Offset="0x1978" />
         <DList Name="object_dekucity_obj_DL_001D80" Offset="0x1D80" />
-        <DList Name="object_dekucity_obj_DL_001ED8" Offset="0x1ED8" />
+        <DList Name="object_dekucity_obj_DL_001ED8" Offset="0x1ED8" /> <!-- Original name is "z2_22_yama01_model" ("yama" = "mountain; hill​") -->
         <Texture Name="object_dekucity_obj_Tex_002008" OutName="tex_002008" Format="rgba16" Width="16" Height="64" Offset="0x2008" />
         <Texture Name="object_dekucity_obj_Tex_002808" OutName="tex_002808" Format="rgba16" Width="32" Height="32" Offset="0x2808" />
         <Texture Name="object_dekucity_obj_Tex_003008" OutName="tex_003008" Format="i4" Width="64" Height="64" Offset="0x3008" />
         <TextureAnimation Name="object_dekucity_obj_Matanimheader_003820" Offset="0x3820" />
         <DList Name="object_dekucity_obj_DL_003990" Offset="0x3990" />
-        <DList Name="object_dekucity_obj_DL_003998" Offset="0x3998" />
+        <DList Name="object_dekucity_obj_DL_003998" Offset="0x3998" /> <!-- Original name is "z2_22_yama02_model" -->
         <Texture Name="object_dekucity_obj_Tex_003AC0" OutName="tex_003AC0" Format="rgba16" Width="16" Height="32" Offset="0x3AC0" />
         <Texture Name="object_dekucity_obj_Tex_003EC0" OutName="tex_003EC0" Format="rgba16" Width="32" Height="32" Offset="0x3EC0" />
     </File>
diff --git a/assets/xml/objects/object_delf.xml b/assets/xml/objects/object_delf.xml
index 39996c0f0..85f3138e1 100644
--- a/assets/xml/objects/object_delf.xml
+++ b/assets/xml/objects/object_delf.xml
@@ -1,82 +1,82 @@
 <Root>
     <File Name="object_delf" Segment="6">
-        <Animation Name="object_delf_Anim_00046C" Offset="0x46C" />
-        <Animation Name="object_delf_Anim_00065C" Offset="0x65C" />
-        <Animation Name="object_delf_Anim_0008E0" Offset="0x8E0" />
-        <Animation Name="object_delf_Anim_000A94" Offset="0xA94" />
-        <Animation Name="object_delf_Anim_000E44" Offset="0xE44" />
-        <Animation Name="object_delf_Anim_0010F8" Offset="0x10F8" />
-        <Animation Name="object_delf_Anim_001410" Offset="0x1410" />
-        <Animation Name="object_delf_Anim_001754" Offset="0x1754" />
-        <Animation Name="object_delf_Anim_00199C" Offset="0x199C" />
-        <Animation Name="object_delf_Anim_001B28" Offset="0x1B28" />
-        <Animation Name="object_delf_Anim_001ED4" Offset="0x1ED4" />
-        <Animation Name="object_delf_Anim_003148" Offset="0x3148" />
-        <Animation Name="object_delf_Anim_00377C" Offset="0x377C" />
-        <Animation Name="object_delf_Anim_003BB4" Offset="0x3BB4" />
-        <Animation Name="object_delf_Anim_003FAC" Offset="0x3FAC" />
-        <Animation Name="object_delf_Anim_0042E8" Offset="0x42E8" />
-        <Animation Name="object_delf_Anim_004798" Offset="0x4798" />
-        <Animation Name="object_delf_Anim_004C44" Offset="0x4C44" />
-        <Animation Name="object_delf_Anim_004FF4" Offset="0x4FF4" />
-        <Animation Name="object_delf_Anim_0053A4" Offset="0x53A4" />
-        <Animation Name="object_delf_Anim_005B68" Offset="0x5B68" />
-        <Animation Name="object_delf_Anim_006328" Offset="0x6328" />
-        <Animation Name="object_delf_Anim_006614" Offset="0x6614" />
-        <Animation Name="object_delf_Anim_006B28" Offset="0x6B28" />
-        <Animation Name="object_delf_Anim_006D74" Offset="0x6D74" />
-        <Animation Name="object_delf_Anim_00706C" Offset="0x706C" />
-        <Animation Name="object_delf_Anim_0072B0" Offset="0x72B0" />
-        <Animation Name="object_delf_Anim_007570" Offset="0x7570" />
-        <Animation Name="object_delf_Anim_007B04" Offset="0x7B04" />
-        <Animation Name="object_delf_Anim_0080A4" Offset="0x80A4" />
-        <Animation Name="object_delf_Anim_00859C" Offset="0x859C" />
-        <Animation Name="object_delf_Anim_008A44" Offset="0x8A44" />
-        <Animation Name="object_delf_Anim_009010" Offset="0x9010" />
-        <Animation Name="object_delf_Anim_0091BC" Offset="0x91BC" />
-        <Animation Name="object_delf_Anim_0094B0" Offset="0x94B0" />
-        <Animation Name="object_delf_Anim_0097C4" Offset="0x97C4" />
-        <Animation Name="object_delf_Anim_009C4C" Offset="0x9C4C" />
-        <Animation Name="object_delf_Anim_009F40" Offset="0x9F40" />
-        <Animation Name="object_delf_Anim_00A2A4" Offset="0xA2A4" />
-        <Animation Name="object_delf_Anim_00A4B4" Offset="0xA4B4" />
-        <Animation Name="object_delf_Anim_00A7B4" Offset="0xA7B4" />
-        <Animation Name="object_delf_Anim_00AF78" Offset="0xAF78" />
-        <Animation Name="object_delf_Anim_00B2B8" Offset="0xB2B8" />
-        <Animation Name="object_delf_Anim_00BCD8" Offset="0xBCD8" />
-        <Animation Name="object_delf_Anim_00BDFC" Offset="0xBDFC" />
-        <Animation Name="object_delf_Anim_00C0BC" Offset="0xC0BC" />
-        <Animation Name="object_delf_Anim_00C248" Offset="0xC248" />
-        <Animation Name="object_delf_Anim_00C588" Offset="0xC588" />
-        <Animation Name="object_delf_Anim_00C690" Offset="0xC690" />
-        <Animation Name="object_delf_Anim_00C790" Offset="0xC790" />
-        <Animation Name="object_delf_Anim_00CCD4" Offset="0xCCD4" />
-        <Animation Name="object_delf_Anim_00CEE0" Offset="0xCEE0" />
-        <Animation Name="object_delf_Anim_00D260" Offset="0xD260" />
-        <Animation Name="object_delf_Anim_00E024" Offset="0xE024" />
-        <Animation Name="object_delf_Anim_00EB18" Offset="0xEB18" />
-        <Animation Name="object_delf_Anim_00EBB0" Offset="0xEBB0" />
-        <Animation Name="object_delf_Anim_00EE30" Offset="0xEE30" />
-        <Animation Name="object_delf_Anim_00F0D0" Offset="0xF0D0" />
-        <Animation Name="object_delf_Anim_00FB30" Offset="0xFB30" />
-        <Animation Name="object_delf_Anim_010590" Offset="0x10590" />
-        <Animation Name="object_delf_Anim_01088C" Offset="0x1088C" />
-        <Animation Name="object_delf_Anim_011088" Offset="0x11088" />
-        <Animation Name="object_delf_Anim_0118FC" Offset="0x118FC" />
-        <Animation Name="object_delf_Anim_011C70" Offset="0x11C70" />
-        <Animation Name="object_delf_Anim_011FE0" Offset="0x11FE0" />
-        <Animation Name="object_delf_Anim_012388" Offset="0x12388" />
-        <Animation Name="object_delf_Anim_012738" Offset="0x12738" />
-        <Animation Name="object_delf_Anim_012BBC" Offset="0x12BBC" />
-        <Animation Name="object_delf_Anim_012EF8" Offset="0x12EF8" />
-        <Animation Name="object_delf_Anim_013040" Offset="0x13040" />
-        <Animation Name="object_delf_Anim_013378" Offset="0x13378" />
-        <Animation Name="object_delf_Anim_013BE0" Offset="0x13BE0" />
-        <Animation Name="object_delf_Anim_013E80" Offset="0x13E80" />
-        <Animation Name="object_delf_Anim_014190" Offset="0x14190" />
-        <Animation Name="object_delf_Anim_01447C" Offset="0x1447C" />
-        <Animation Name="object_delf_Anim_01498C" Offset="0x1498C" />
-        <Animation Name="object_delf_Anim_014E9C" Offset="0x14E9C" />
-        <Animation Name="object_delf_Anim_015114" Offset="0x15114" />
+        <Animation Name="object_delf_Anim_00046C" Offset="0x46C" /> <!-- Original name is "chat_bikkuri" -->
+        <Animation Name="object_delf_Anim_00065C" Offset="0x65C" /> <!-- Original name is "chat_bikkuri_wait" -->
+        <Animation Name="object_delf_Anim_0008E0" Offset="0x8E0" /> <!-- Original name is "chat_deru" -->
+        <Animation Name="object_delf_Anim_000A94" Offset="0xA94" /> <!-- Original name is "chat_deru_wait" -->
+        <Animation Name="object_delf_Anim_000E44" Offset="0xE44" /> <!-- Original name is "chat_fly_loop" -->
+        <Animation Name="object_delf_Anim_0010F8" Offset="0x10F8" /> <!-- Original name is "chat_hena_wait" -->
+        <Animation Name="object_delf_Anim_001410" Offset="0x1410" /> <!-- Original name is "chat_henahena" -->
+        <Animation Name="object_delf_Anim_001754" Offset="0x1754" /> <!-- Original name is "chat_mae_wait" -->
+        <Animation Name="object_delf_Anim_00199C" Offset="0x199C" /> <!-- Original name is "chat_modoru" -->
+        <Animation Name="object_delf_Anim_001B28" Offset="0x1B28" /> <!-- Original name is "chat_nani_to_fly" -->
+        <Animation Name="object_delf_Anim_001ED4" Offset="0x1ED4" /> <!-- Original name is "chat_nani_wait" -->
+        <Animation Name="object_delf_Anim_003148" Offset="0x3148" /> <!-- Original name is "chat_okarina_play" -->
+        <Animation Name="object_delf_Anim_00377C" Offset="0x377C" /> <!-- Original name is "chat_okarina_wait" -->
+        <Animation Name="object_delf_Anim_003BB4" Offset="0x3BB4" /> <!-- Original name is "chat_sowasowa" -->
+        <Animation Name="object_delf_Anim_003FAC" Offset="0x3FAC" /> <!-- Original name is "elf_amayadori" -->
+        <Animation Name="object_delf_Anim_0042E8" Offset="0x42E8" /> <!-- Original name is "elf_amayadori2" -->
+        <Animation Name="object_delf_Anim_004798" Offset="0x4798" /> <!-- Original name is "elf_amayadori_loop" -->
+        <Animation Name="object_delf_Anim_004C44" Offset="0x4C44" /> <!-- Original name is "elf_amayadori_loop2" -->
+        <Animation Name="object_delf_Anim_004FF4" Offset="0x4FF4" /> <!-- Original name is "elf_attack_1a" -->
+        <Animation Name="object_delf_Anim_0053A4" Offset="0x53A4" /> <!-- Original name is "elf_attack_1b" -->
+        <Animation Name="object_delf_Anim_005B68" Offset="0x5B68" /> <!-- Original name is "elf_attack_2a" -->
+        <Animation Name="object_delf_Anim_006328" Offset="0x6328" /> <!-- Original name is "elf_attack_1b" -->
+        <Animation Name="object_delf_Anim_006614" Offset="0x6614" /> <!-- Original name is "elf_bata_wait" -->
+        <Animation Name="object_delf_Anim_006B28" Offset="0x6B28" /> <!-- Original name is "elf_boo" -->
+        <Animation Name="object_delf_Anim_006D74" Offset="0x6D74" /> <!-- Original name is "elf_guru1" -->
+        <Animation Name="object_delf_Anim_00706C" Offset="0x706C" /> <!-- Original name is "elf_guru1_loop" -->
+        <Animation Name="object_delf_Anim_0072B0" Offset="0x72B0" /> <!-- Original name is "elf_guru2" -->
+        <Animation Name="object_delf_Anim_007570" Offset="0x7570" /> <!-- Original name is "elf_guru2_loop" -->
+        <Animation Name="object_delf_Anim_007B04" Offset="0x7B04" /> <!-- Original name is "elf_haigo_1" -->
+        <Animation Name="object_delf_Anim_0080A4" Offset="0x80A4" /> <!-- Original name is "elf_haigo_2" -->
+        <Animation Name="object_delf_Anim_00859C" Offset="0x859C" /> <!-- Original name is "elf_haigo_wait_1" -->
+        <Animation Name="object_delf_Anim_008A44" Offset="0x8A44" /> <!-- Original name is "elf_haigo_wait_2" -->
+        <Animation Name="object_delf_Anim_009010" Offset="0x9010" /> <!-- Original name is "elf_hataku" -->
+        <Animation Name="object_delf_Anim_0091BC" Offset="0x91BC" /> <!-- Original name is "elf_hataku_kaodasi" -->
+        <Animation Name="object_delf_Anim_0094B0" Offset="0x94B0" /> <!-- Original name is "elf_hataku_kaodasi_loop" -->
+        <Animation Name="object_delf_Anim_0097C4" Offset="0x97C4" /> <!-- Original name is "elf_hataku_loop" -->
+        <Animation Name="object_delf_Anim_009C4C" Offset="0x9C4C" /> <!-- Original name is "elf_hataku_mawarikomi" -->
+        <Animation Name="object_delf_Anim_009F40" Offset="0x9F40" /> <!-- Original name is "elf_hataku_mawarikomi_loop" -->
+        <Animation Name="object_delf_Anim_00A2A4" Offset="0xA2A4" /> <!-- Original name is "elf_hayai_turn" -->
+        <Animation Name="object_delf_Anim_00A4B4" Offset="0xA4B4" /> <!-- Original name is "elf_ht_wait" -->
+        <Animation Name="object_delf_Anim_00A7B4" Offset="0xA7B4" /> <!-- Original name is "elf_ikari" -->
+        <Animation Name="object_delf_Anim_00AF78" Offset="0xAF78" /> <!-- Original name is "elf_kakureru" -->
+        <Animation Name="object_delf_Anim_00B2B8" Offset="0xB2B8" /> <!-- Original name is "elf_kakureru_loop" -->
+        <Animation Name="object_delf_Anim_00BCD8" Offset="0xBCD8" /> <!-- Original name is "elf_kizetu" -->
+        <Animation Name="object_delf_Anim_00BDFC" Offset="0xBDFC" /> <!-- Original name is "elf_maederu" -->
+        <Animation Name="object_delf_Anim_00C0BC" Offset="0xC0BC" /> <!-- Original name is "elf_maederu_loop" -->
+        <Animation Name="object_delf_Anim_00C248" Offset="0xC248" /> <!-- Original name is "elf_mawarikomi" -->
+        <Animation Name="object_delf_Anim_00C588" Offset="0xC588" /> <!-- Original name is "elf_mawarikomi_loop" -->
+        <Animation Name="object_delf_Anim_00C690" Offset="0xC690" /> <!-- Original name is "elf_miwoyoseau" -->
+        <Animation Name="object_delf_Anim_00C790" Offset="0xC790" /> <!-- Original name is "elf_miwoyoseau2" -->
+        <Animation Name="object_delf_Anim_00CCD4" Offset="0xCCD4" /> <!-- Original name is "elf_modoru" -->
+        <Animation Name="object_delf_Anim_00CEE0" Offset="0xCEE0" /> <!-- Original name is "elf_nanikairu2" -->
+        <Animation Name="object_delf_Anim_00D260" Offset="0xD260" /> <!-- Original name is "elf_nanikairu_loop2" -->
+        <Animation Name="object_delf_Anim_00E024" Offset="0xE024" /> <!-- Original name is "elf_okizari" -->
+        <Animation Name="object_delf_Anim_00EB18" Offset="0xEB18" /> <!-- Original name is "elf_okizari_no" -->
+        <Animation Name="object_delf_Anim_00EBB0" Offset="0xEBB0" /> <!-- Original name is "elf_okizari_sakebu" -->
+        <Animation Name="object_delf_Anim_00EE30" Offset="0xEE30" /> <!-- Original name is "elf_okizari_sakebu_wait" -->
+        <Animation Name="object_delf_Anim_00F0D0" Offset="0xF0D0" /> <!-- Original name is "elf_okizari_wait" -->
+        <Animation Name="object_delf_Anim_00FB30" Offset="0xFB30" /> <!-- Original name is "elf_sakimawari_1" -->
+        <Animation Name="object_delf_Anim_010590" Offset="0x10590" /> <!-- Original name is "elf_sakimawari_2" -->
+        <Animation Name="object_delf_Anim_01088C" Offset="0x1088C" /> <!-- Original name is "elf_samui" -->
+        <Animation Name="object_delf_Anim_011088" Offset="0x11088" /> <!-- Original name is "elf_seisi_1" -->
+        <Animation Name="object_delf_Anim_0118FC" Offset="0x118FC" /> <!-- Original name is "elf_seisi_2" -->
+        <Animation Name="object_delf_Anim_011C70" Offset="0x11C70" /> <!-- Original name is "elf_seisi_taiki_1" -->
+        <Animation Name="object_delf_Anim_011FE0" Offset="0x11FE0" /> <!-- Original name is "elf_seisi_taiki_2" -->
+        <Animation Name="object_delf_Anim_012388" Offset="0x12388" /> <!-- Original name is "elf_seisi_wait_1" -->
+        <Animation Name="object_delf_Anim_012738" Offset="0x12738" /> <!-- Original name is "elf_seisi_wait_2" -->
+        <Animation Name="object_delf_Anim_012BBC" Offset="0x12BBC" /> <!-- Original name is "elf_urusai" -->
+        <Animation Name="object_delf_Anim_012EF8" Offset="0x12EF8" /> <!-- Original name is "elf_urusai_wait" -->
+        <Animation Name="object_delf_Anim_013040" Offset="0x13040" /> <!-- Original name is "elf_usirohiku" -->
+        <Animation Name="object_delf_Anim_013378" Offset="0x13378" /> <!-- Original name is "elf_usirohiku_loop" -->
+        <Animation Name="object_delf_Anim_013BE0" Offset="0x13BE0" /> <!-- Original name is "elf_vs_yousei" -->
+        <Animation Name="object_delf_Anim_013E80" Offset="0x13E80" /> <!-- Original name is "elf_vs_yousei_wait" -->
+        <Animation Name="object_delf_Anim_014190" Offset="0x14190" /> <!-- Original name is "elf_yokeru" -->
+        <Animation Name="object_delf_Anim_01447C" Offset="0x1447C" /> <!-- Original name is "elf_yokeru_loop" -->
+        <Animation Name="object_delf_Anim_01498C" Offset="0x1498C" /> <!-- Original name is "elf_yorisou" -->
+        <Animation Name="object_delf_Anim_014E9C" Offset="0x14E9C" /> <!-- Original name is "elf_yorisou_loop" -->
+        <Animation Name="object_delf_Anim_015114" Offset="0x15114" /> <!-- Original name is "elf_yururi_wait" -->
     </File>
 </Root>
diff --git a/assets/xml/objects/object_dhouse.xml b/assets/xml/objects/object_dhouse.xml
index dd95b8b98..a5894a4df 100644
--- a/assets/xml/objects/object_dhouse.xml
+++ b/assets/xml/objects/object_dhouse.xml
@@ -9,25 +9,25 @@
         <Texture Name="object_dhouse_Tex_002840" OutName="tex_002840" Format="rgba16" Width="32" Height="32" Offset="0x2840" />
         <Texture Name="object_dhouse_Tex_003040" OutName="tex_003040" Format="i4" Width="64" Height="64" Offset="0x3040" />
         <DList Name="object_dhouse_DL_004920" Offset="0x4920" />
-        <DList Name="object_dhouse_DL_004928" Offset="0x4928" />
+        <DList Name="object_dhouse_DL_004928" Offset="0x4928" /> <!-- Original name is "z2_broken_dhouse_model" -->
         <DList Name="object_dhouse_DL_005A70" Offset="0x5A70" />
-        <DList Name="object_dhouse_DL_005A78" Offset="0x5A78" />
+        <DList Name="object_dhouse_DL_005A78" Offset="0x5A78" /> <!-- Original name is "z2_dhouse_model" -->
         <DList Name="object_dhouse_DL_006CE0" Offset="0x6CE0" />
-        <DList Name="object_dhouse_DL_006E28" Offset="0x6E28" />
+        <DList Name="object_dhouse_DL_006E28" Offset="0x6E28" /> <!-- Original name is "d_hahen_01_model" -->
         <DList Name="object_dhouse_DL_006EF8" Offset="0x6EF8" />
-        <DList Name="object_dhouse_DL_0070A8" Offset="0x70A8" />
+        <DList Name="object_dhouse_DL_0070A8" Offset="0x70A8" /> <!-- Original name is "d_hahen_02_model" -->
         <DList Name="object_dhouse_DL_007190" Offset="0x7190" />
-        <DList Name="object_dhouse_DL_007348" Offset="0x7348" />
+        <DList Name="object_dhouse_DL_007348" Offset="0x7348" /> <!-- Original name is "d_hahen_03_model" -->
         <DList Name="object_dhouse_DL_007438" Offset="0x7438" />
-        <DList Name="object_dhouse_DL_007568" Offset="0x7568" />
+        <DList Name="object_dhouse_DL_007568" Offset="0x7568" /> <!-- Original name is "d_hahen_04_model" -->
         <DList Name="object_dhouse_DL_007638" Offset="0x7638" />
-        <DList Name="object_dhouse_DL_007780" Offset="0x7780" />
+        <DList Name="object_dhouse_DL_007780" Offset="0x7780" /> <!-- Original name is "d_hahen_05_model" -->
         <DList Name="object_dhouse_DL_007850" Offset="0x7850" />
-        <DList Name="object_dhouse_DL_007A00" Offset="0x7A00" />
+        <DList Name="object_dhouse_DL_007A00" Offset="0x7A00" /> <!-- Original name is "d_hahen_06_model" -->
         <DList Name="object_dhouse_DL_007AE8" Offset="0x7AE8" />
-        <DList Name="object_dhouse_DL_007C98" Offset="0x7C98" />
-        <Collision Name="object_dhouse_Colheader_008040" Offset="0x8040" />
+        <DList Name="object_dhouse_DL_007C98" Offset="0x7C98" /> <!-- Original name is "d_hahen_07_model" -->
+        <Collision Name="object_dhouse_Colheader_008040" Offset="0x8040" /> <!-- Original name is "z2_dhouse_hahen_bgdatainfo" -->
         <DList Name="object_dhouse_DL_0081D0" Offset="0x81D0" />
-        <DList Name="object_dhouse_DL_0081D8" Offset="0x81D8" />
+        <DList Name="object_dhouse_DL_0081D8" Offset="0x81D8" /> <!-- Original name is "z2_small_hahen_model" -->
     </File>
 </Root>
diff --git a/assets/xml/objects/object_dinofos.xml b/assets/xml/objects/object_dinofos.xml
index 8db9c7c4a..435d60e95 100644
--- a/assets/xml/objects/object_dinofos.xml
+++ b/assets/xml/objects/object_dinofos.xml
@@ -1,13 +1,13 @@
 <Root>
     <File Name="object_dinofos" Segment="6">
-        <Animation Name="object_dinofos_Anim_000580" Offset="0x580" />
-        <Animation Name="object_dinofos_Anim_000AF0" Offset="0xAF0" />
-        <Animation Name="object_dinofos_Anim_001040" Offset="0x1040" />
-        <Animation Name="object_dinofos_Anim_0013C0" Offset="0x13C0" />
-        <Animation Name="object_dinofos_Anim_0017B8" Offset="0x17B8" />
-        <Animation Name="object_dinofos_Anim_001CCC" Offset="0x1CCC" />
-        <Animation Name="object_dinofos_Anim_0025B4" Offset="0x25B4" />
-        <Animation Name="object_dinofos_Anim_002E40" Offset="0x2E40" />
+        <Animation Name="object_dinofos_Anim_000580" Offset="0x580" /> <!-- Original name is "zf2_aruku" -->
+        <Animation Name="object_dinofos_Anim_000AF0" Offset="0xAF0" /> <!-- Original name is "zf2_chakuti" -->
+        <Animation Name="object_dinofos_Anim_001040" Offset="0x1040" /> <!-- Original name is "zf2_fire1" -->
+        <Animation Name="object_dinofos_Anim_0013C0" Offset="0x13C0" /> <!-- Original name is "zf2_fire2" -->
+        <Animation Name="object_dinofos_Anim_0017B8" Offset="0x17B8" /> <!-- Original name is "zf2_fire3" -->
+        <Animation Name="object_dinofos_Anim_001CCC" Offset="0x1CCC" /> <!-- Original name is "zf2_jump" -->
+        <Animation Name="object_dinofos_Anim_0025B4" Offset="0x25B4" /> <!-- Original name is "zf2_kiru" -->
+        <Animation Name="object_dinofos_Anim_002E40" Offset="0x2E40" /> <!-- Original name is "zf2_matsu" -->
         <DList Name="object_dinofos_DL_005B10" Offset="0x5B10" />
         <DList Name="object_dinofos_DL_005D00" Offset="0x5D00" />
         <DList Name="object_dinofos_DL_005E60" Offset="0x5E60" />
@@ -62,10 +62,10 @@
         <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="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" />
-        <Animation Name="object_dinofos_Anim_00D21C" Offset="0xD21C" />
-        <Animation Name="object_dinofos_Anim_00D62C" Offset="0xD62C" />
+        <Animation Name="object_dinofos_Anim_009B70" Offset="0x9B70" /> <!-- Original name is "zf2_sakebi" -->
+        <Animation Name="object_dinofos_Anim_00ABD0" Offset="0xABD0" /> <!-- Original name is "zf2_shini" -->
+        <Animation Name="object_dinofos_Anim_00C974" Offset="0xC974" /> <!-- Original name is "zf2_startDEMO" -->
+        <Animation Name="object_dinofos_Anim_00D21C" Offset="0xD21C" /> <!-- Original name is "zf2_yarare" -->
+        <Animation Name="object_dinofos_Anim_00D62C" Offset="0xD62C" /> <!-- Original name is "zf2_yokoaruki" -->
     </File>
 </Root>
diff --git a/assets/xml/objects/object_dkjail_obj.xml b/assets/xml/objects/object_dkjail_obj.xml
index ada181475..d0d2775c3 100644
--- a/assets/xml/objects/object_dkjail_obj.xml
+++ b/assets/xml/objects/object_dkjail_obj.xml
@@ -1,9 +1,9 @@
 <Root>
     <File Name="object_dkjail_obj" Segment="6">
-        <DList Name="gDkjailIvyDL" Offset="0x80" />
+        <DList Name="gDkjailIvyDL" Offset="0x80" /> <!-- Original name is "m2_Mn_TUTA_modelT" -->
         <DList Name="object_dkjail_obj_DL_000150" Offset="0x150" />
         <Texture Name="object_dkjail_obj_Tex_000158" OutName="tex_000158" Format="rgba16" Width="32" Height="32" Offset="0x158" />
         <Texture Name="object_dkjail_obj_Tex_000958" OutName="tex_000958" Format="ia8" Width="32" Height="64" Offset="0x958" />
-        <Collision Name="object_dkjail_obj_Colheader_0011A8" Offset="0x11A8" />
+        <Collision Name="object_dkjail_obj_Colheader_0011A8" Offset="0x11A8" /> <!-- Original name is "m2_Mn_TUTA_bgdatainfo" -->
     </File>
 </Root>
diff --git a/assets/xml/objects/object_dmask.xml b/assets/xml/objects/object_dmask.xml
index a7b3874ec..29f245b1b 100644
--- a/assets/xml/objects/object_dmask.xml
+++ b/assets/xml/objects/object_dmask.xml
@@ -1,17 +1,17 @@
 <Root>
     <File Name="object_dmask" Segment="6">
-        <Animation Name="object_dmask_Anim_00017C" Offset="0x17C" />
-        <Animation Name="object_dmask_Anim_0001A8" Offset="0x1A8" />
+        <Animation Name="object_dmask_Anim_00017C" Offset="0x17C" /> <!-- Original name is "gbm_fall" -->
+        <Animation Name="object_dmask_Anim_0001A8" Offset="0x1A8" /> <!-- Original name is "gbm_normal" -->
         <Limb Name="object_dmask_Standardlimb_01C0" Type="Standard" Offset="0x1C0" />
         <Skeleton Name="object_dmask_Skel_001D0" Type="Flex" LimbType="Standard" Offset="0x1D0" />
         <DList Name="object_dmask_DL_000430" Offset="0x430" />
         <Texture Name="object_dmask_Tex_000578" OutName="tex_000578" Format="i8" Width="64" Height="32" Offset="0x578" />
         <Texture Name="object_dmask_Tex_000D78" OutName="tex_000D78" Format="i8" Width="32" Height="16" Offset="0xD78" />
-        <Animation Name="object_dmask_Anim_001090" Offset="0x1090" />
+        <Animation Name="object_dmask_Anim_001090" Offset="0x1090" /> <!-- Original name is "gmask_rakka" -->
         <Limb Name="object_dmask_Standardlimb_010A0" Type="Standard" Offset="0x10A0" />
         <Skeleton Name="object_dmask_Skel_010B0" Type="Normal" LimbType="Standard" Offset="0x10B0" />
-        <Animation Name="object_dmask_Anim_0011A0" Offset="0x11A0" />
-        <Animation Name="object_dmask_Anim_0013A4" Offset="0x13A4" />
+        <Animation Name="object_dmask_Anim_0011A0" Offset="0x11A0" /> <!-- Original name is "mjm_suteru" -->
+        <Animation Name="object_dmask_Anim_0013A4" Offset="0x13A4" /> <!-- Original name is "mjm_suteru_loop" -->
         <Limb Name="object_dmask_Standardlimb_013C0" Type="Standard" Offset="0x13C0" />
         <Skeleton Name="object_dmask_Skel_013D0" Type="Normal" LimbType="Standard" Offset="0x13D0" />
         <DList Name="object_dmask_DL_001E70" Offset="0x1E70" />
@@ -21,7 +21,7 @@
         <Texture Name="object_dmask_Tex_003620" OutName="tex_003620" Format="rgba16" Width="16" Height="16" Offset="0x3620" />
         <Texture Name="object_dmask_Tex_003820" OutName="tex_003820" Format="rgba16" Width="16" Height="16" Offset="0x3820" />
         <Texture Name="object_dmask_Tex_003A20" OutName="tex_003A20" Format="rgba16" Width="32" Height="32" Offset="0x3A20" />
-        <Animation Name="object_dmask_Anim_004288" Offset="0x4288" />
+        <Animation Name="object_dmask_Anim_004288" Offset="0x4288" /> <!-- Original name is "pzmask_taoreru" -->
         <Limb Name="object_dmask_Standardlimb_042A0" Type="Standard" Offset="0x42A0" />
         <Skeleton Name="object_dmask_Skel_042B0" Type="Normal" LimbType="Standard" Offset="0x42B0" />
     </File>
diff --git a/assets/xml/objects/object_dnk.xml b/assets/xml/objects/object_dnk.xml
index bec6ce45d..b085eed28 100644
--- a/assets/xml/objects/object_dnk.xml
+++ b/assets/xml/objects/object_dnk.xml
@@ -1,11 +1,11 @@
 <Root>
     <!-- Assets for Deku Palace Guards -->
     <File Name="object_dnk" Segment="6">
-        <Animation Name="gDekuPalaceGuardAttackAnim" Offset="0x31C" /> <!-- Original named: dnk_attack -->
-        <Animation Name="gDekuPalaceGuardDigAnim" Offset="0x430" /> <!-- Original named: dnk_dig -->
-        <Animation Name="gDekuPalaceGuardHappyAnim" Offset="0x6CC" /> <!-- Original named: dnk_happy -->
-        <Animation Name="gDekuPalaceGuardJumpAnim" Offset="0x894" /> <!-- Original named: dnk_jump -->
-        <Animation Name="gDekuPalaceGuardStartAnim" Offset="0xB70" /> <!-- Original named: dnk_start -->
+        <Animation Name="gDekuPalaceGuardAttackAnim" Offset="0x31C" /> <!-- Original name is "dnk_attack" -->
+        <Animation Name="gDekuPalaceGuardDigAnim" Offset="0x430" /> <!-- Original name is "dnk_dig" -->
+        <Animation Name="gDekuPalaceGuardHappyAnim" Offset="0x6CC" /> <!-- Original name is "dnk_happy" -->
+        <Animation Name="gDekuPalaceGuardJumpAnim" Offset="0x894" /> <!-- Original name is "dnk_jump" -->
+        <Animation Name="gDekuPalaceGuardStartAnim" Offset="0xB70" /> <!-- Original name is "dnk_start" -->
         <Texture Name="gDekuPalaceGuardLeafTorsoTex" OutName="deku_palace_guard_leaf_torso" Format="rgba16" Width="32" Height="32" Offset="0xB80" />
         <Texture Name="gDekuPalaceGuardFootTex" OutName="deku_palace_guard_foot" Format="rgba16" Width="16" Height="16" Offset="0x1380" />
         <Texture Name="gDekuPalaceGuardHeadTex" OutName="deku_palace_guard_head" Format="rgba16" Width="8" Height="8" Offset="0x1580" />
@@ -45,7 +45,7 @@
         <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="DekuPalaceGuardLimb" Offset="0x2848" />
-        <Animation Name="gDekuPalaceGuardWaitAnim" Offset="0x2A08" /> <!-- Original named: dnk_wait -->
-        <Animation Name="gDekuPalaceGuardWalkAnim" Offset="0x2B6C" /> <!-- Original named: dnk_walk -->
+        <Animation Name="gDekuPalaceGuardWaitAnim" Offset="0x2A08" /> <!-- Original name is "dnk_wait" -->
+        <Animation Name="gDekuPalaceGuardWalkAnim" Offset="0x2B6C" /> <!-- Original name is "dnk_walk" -->
     </File>
 </Root>
diff --git a/assets/xml/objects/object_dnt.xml b/assets/xml/objects/object_dnt.xml
index 96b793849..9f3fcf996 100644
--- a/assets/xml/objects/object_dnt.xml
+++ b/assets/xml/objects/object_dnt.xml
@@ -1,25 +1,25 @@
 <Root>
     <File Name="object_dnt" Segment="6">
-        <Animation Name="object_dnt_Anim_000994" Offset="0x994" />
-        <Animation Name="object_dnt_Anim_0012F4" Offset="0x12F4" />
+        <Animation Name="object_dnt_Anim_000994" Offset="0x994" /> <!-- Original name is "dnt_banban" -->
+        <Animation Name="object_dnt_Anim_0012F4" Offset="0x12F4" /> <!-- Original name is "dnt_boyon" -->
         <DList Name="object_dnt_DL_001350" Offset="0x1350" />
         <DList Name="object_dnt_DL_001420" Offset="0x1420" />
-        <Animation Name="object_dnt_Anim_001BC8" Offset="0x1BC8" />
-        <Animation Name="object_dnt_Anim_001E2C" Offset="0x1E2C" />
-        <Animation Name="object_dnt_Anim_002268" Offset="0x2268" />
-        <Animation Name="object_dnt_Anim_002670" Offset="0x2670" />
-        <Animation Name="object_dnt_Anim_0029E8" Offset="0x29E8" />
-        <Animation Name="object_dnt_Anim_002F08" Offset="0x2F08" />
-        <Animation Name="object_dnt_Anim_003438" Offset="0x3438" />
-        <Animation Name="object_dnt_Anim_0038CC" Offset="0x38CC" />
-        <Animation Name="object_dnt_Anim_003CC0" Offset="0x3CC0" />
+        <Animation Name="object_dnt_Anim_001BC8" Offset="0x1BC8" /> <!-- Original name is "dnt_fly" -->
+        <Animation Name="object_dnt_Anim_001E2C" Offset="0x1E2C" /> <!-- Original name is "dnt_iyaiya" -->
+        <Animation Name="object_dnt_Anim_002268" Offset="0x2268" /> <!-- Original name is "dnt_iyaiyaTOmuun" -->
+        <Animation Name="object_dnt_Anim_002670" Offset="0x2670" /> <!-- Original name is "dnt_kouka" -->
+        <Animation Name="object_dnt_Anim_0029E8" Offset="0x29E8" /> <!-- Original name is "dnt_moguru" -->
+        <Animation Name="object_dnt_Anim_002F08" Offset="0x2F08" /> <!-- Original name is "dnt_muun" -->
+        <Animation Name="object_dnt_Anim_003438" Offset="0x3438" /> <!-- Original name is "dnt_nooo" -->
+        <Animation Name="object_dnt_Anim_0038CC" Offset="0x38CC" /> <!-- Original name is "dnt_onedari" -->
+        <Animation Name="object_dnt_Anim_003CC0" Offset="0x3CC0" /> <!-- Original name is "dnt_onedariTOwait" -->
         <Blob Name="object_dnt_Blob_003CD0" Size="0x10" Offset="0x3CD0" />
-        <Animation Name="object_dnt_Anim_004700" Offset="0x4700" />
-        <Animation Name="object_dnt_Anim_004AA0" Offset="0x4AA0" />
-        <Animation Name="object_dnt_Anim_004E38" Offset="0x4E38" />
-        <Animation Name="object_dnt_Anim_005488" Offset="0x5488" />
-        <Animation Name="object_dnt_Anim_00577C" Offset="0x577C" />
-        <Animation Name="object_dnt_Anim_005CA8" Offset="0x5CA8" />
+        <Animation Name="object_dnt_Anim_004700" Offset="0x4700" /> <!-- Original name is "dnt_spoon" -->
+        <Animation Name="object_dnt_Anim_004AA0" Offset="0x4AA0" /> <!-- Original name is "dnt_tobidasu01" -->
+        <Animation Name="object_dnt_Anim_004E38" Offset="0x4E38" /> <!-- Original name is "dnt_tobidasu02" -->
+        <Animation Name="object_dnt_Anim_005488" Offset="0x5488" /> <!-- Original name is "dnt_wait" -->
+        <Animation Name="object_dnt_Anim_00577C" Offset="0x577C" /> <!-- Original name is "dnt_wait02" -->
+        <Animation Name="object_dnt_Anim_005CA8" Offset="0x5CA8" /> <!-- Original name is "dnt_waitTOonedari" -->
         <DList Name="object_dnt_DL_007EA0" Offset="0x7EA0" />
         <DList Name="object_dnt_DL_008048" Offset="0x8048" />
         <DList Name="object_dnt_DL_008290" Offset="0x8290" />
@@ -85,7 +85,7 @@
         <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="ObjectDntLimb" Offset="0xAC70" />
-        <Animation Name="object_dnt_Anim_00B0B4" Offset="0xB0B4" />
+        <Animation Name="object_dnt_Anim_00B0B4" Offset="0xB0B4" /> <!-- Original name is "dnt_walk" -->
         <Texture Name="object_dnt_Tex_00B0D0" OutName="tex_00B0D0" Format="rgba16" Width="16" Height="16" Offset="0xB0D0" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_dodongo.xml b/assets/xml/objects/object_dodongo.xml
index 8de3f4653..cc9b41e25 100644
--- a/assets/xml/objects/object_dodongo.xml
+++ b/assets/xml/objects/object_dodongo.xml
@@ -1,15 +1,15 @@
 <Root>
     <File Name="object_dodongo" Segment="6">
-        <Animation Name="object_dodongo_Anim_0013C4" Offset="0x13C4" />
+        <Animation Name="object_dodongo_Anim_0013C4" Offset="0x13C4" /> <!-- Original name is "da_die" -->
         <Animation Name="object_dodongo_Anim_0015F4" Offset="0x15F4" />
-        <Animation Name="object_dodongo_Anim_001A44" Offset="0x1A44" />
-        <Animation Name="object_dodongo_Anim_001F44" Offset="0x1F44" />
-        <Animation Name="object_dodongo_Anim_0028F0" Offset="0x28F0" />
-        <Animation Name="object_dodongo_Anim_003088" Offset="0x3088" />
+        <Animation Name="object_dodongo_Anim_001A44" Offset="0x1A44" /> <!-- Original name is "da_dmg" -->
+        <Animation Name="object_dodongo_Anim_001F44" Offset="0x1F44" /> <!-- Original name is "da_dmg_wait" -->
+        <Animation Name="object_dodongo_Anim_0028F0" Offset="0x28F0" /> <!-- Original name is "da_fire" -->
+        <Animation Name="object_dodongo_Anim_003088" Offset="0x3088" /> <!-- Original name is "da_fire_wait" -->
         <Animation Name="object_dodongo_Anim_003368" Offset="0x3368" />
-        <Animation Name="object_dodongo_Anim_003B14" Offset="0x3B14" />
-        <Animation Name="object_dodongo_Anim_0042C4" Offset="0x42C4" />
-        <Animation Name="object_dodongo_Anim_004C20" Offset="0x4C20" />
+        <Animation Name="object_dodongo_Anim_003B14" Offset="0x3B14" /> <!-- Original name is "da_right" -->
+        <Animation Name="object_dodongo_Anim_0042C4" Offset="0x42C4" /> <!-- Original name is "da_left" -->
+        <Animation Name="object_dodongo_Anim_004C20" Offset="0x4C20" /> <!-- Original name is "da_wait" -->
         <DList Name="object_dodongo_DL_006640" Offset="0x6640" />
         <DList Name="object_dodongo_DL_006750" Offset="0x6750" />
         <DList Name="object_dodongo_DL_006860" Offset="0x6860" />
@@ -59,9 +59,9 @@
         <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="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" />
+        <Animation Name="object_dodongo_Anim_008B1C" Offset="0x8B1C" /> <!-- Original name is "da_walk" -->
+        <Animation Name="object_dodongo_Anim_008DE0" Offset="0x8DE0" /> <!-- Original name is "da_walk_start" -->
+        <Animation Name="object_dodongo_Anim_009088" Offset="0x9088" /> <!-- Original name is "da_walk_end" -->
         
         <!-- Fire Effect Textures -->
         <Texture Name="gDodongoFire0Tex" OutName="dodongo_fire_0" Format="i4" Width="32" Height="32" Offset="0x90A0"/>
diff --git a/assets/xml/objects/object_dor01.xml b/assets/xml/objects/object_dor01.xml
index 39c950680..9708d97c6 100644
--- a/assets/xml/objects/object_dor01.xml
+++ b/assets/xml/objects/object_dor01.xml
@@ -1,7 +1,7 @@
 <Root>
     <File Name="object_dor01" Segment="6">
-        <DList Name="object_dor01_DL_000440" Offset="0x440" />
-        <DList Name="object_dor01_DL_000448" Offset="0x448" />
+        <DList Name="object_dor01_DL_000440" Offset="0x440" /> <!-- Original name is "z2_dor01_modelT" -->
+        <DList Name="object_dor01_DL_000448" Offset="0x448" /> <!-- Original name is "z2_dor01_model" -->
         <Texture Name="object_dor01_Tex_000650" OutName="tex_000650" Format="rgba16" Width="16" Height="128" Offset="0x650" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_dor02.xml b/assets/xml/objects/object_dor02.xml
index c60fa9ba9..3cc3d1411 100644
--- a/assets/xml/objects/object_dor02.xml
+++ b/assets/xml/objects/object_dor02.xml
@@ -1,7 +1,7 @@
 <Root>
     <File Name="object_dor02" Segment="6">
-        <DList Name="object_dor02_DL_000420" Offset="0x420"/>
-        <DList Name="gZoraHallDoorDL" Offset="0x428"/>
+        <DList Name="object_dor02_DL_000420" Offset="0x420"/> <!-- Original name is "z2_dor02_modelT" -->
+        <DList Name="gZoraHallDoorDL" Offset="0x428"/> <!-- Original name is "z2_dor02_model" -->
         <Texture Name="gZoraHallDoorTex" OutName="zora_hall_door" Format="rgba16" Width="32" Height="64" Offset="0x610"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_dor03.xml b/assets/xml/objects/object_dor03.xml
index 941fa6fcc..c7971db0c 100644
--- a/assets/xml/objects/object_dor03.xml
+++ b/assets/xml/objects/object_dor03.xml
@@ -1,6 +1,6 @@
 <Root>
     <File Name="object_dor03" Segment="6">
-        <DList Name="gSwampDoorDL" Offset="0x3C0" />
+        <DList Name="gSwampDoorDL" Offset="0x3C0" /> <!-- Original name is "z2_dor03_model" -->
         <Texture Name="gSwampDoorTex" OutName="swamp_door" Format="rgba16" Width="32" Height="64" Offset="0x4D0" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_dor04.xml b/assets/xml/objects/object_dor04.xml
index 394f5a6fe..4e78d9efe 100644
--- a/assets/xml/objects/object_dor04.xml
+++ b/assets/xml/objects/object_dor04.xml
@@ -1,7 +1,7 @@
 <Root>
     <File Name="object_dor04" Segment="6">
-        <DList Name="gMagicHagPotionShopDoorEndDL" Offset="0x460"/>
-        <DList Name="gMagicHagPotionShopDoorDL" Offset="0x468"/>
+        <DList Name="gMagicHagPotionShopDoorEndDL" Offset="0x460"/> <!-- Original name is "z2_dor04_modelT" -->
+        <DList Name="gMagicHagPotionShopDoorDL" Offset="0x468"/> <!-- Original name is "z2_dor04_model" -->
         <Texture Name="gMagicHagPotionShopDoorTex" OutName="magic_hag_potion_shop_door" Format="rgba16" Width="64" Height="32" Offset="0x658"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/object_dora.xml b/assets/xml/objects/object_dora.xml
index ab4b09cf7..09732ba0a 100644
--- a/assets/xml/objects/object_dora.xml
+++ b/assets/xml/objects/object_dora.xml
@@ -1,17 +1,17 @@
 <Root>
     <!-- Object for the Gong and KendoKanban board in the Swordsman's School -->
     <File Name="object_dora" Segment="6">
-        <DList Name="gKendoKanbanDL" Offset="0x180" />
+        <DList Name="gKendoKanbanDL" Offset="0x180" /> <!-- Original name is "djo_kanban_model" -->
         <Texture Name="gKendoKanbanFrontTex" OutName="kendo_kanban_front" Format="rgba16" Width="32" Height="64" Offset="0x280" />
         <Texture Name="gKendoKanbanSideTex" OutName="kendo_kanban_side" Format="rgba16" Width="32" Height="32" Offset="0x1280" />
-        <DList Name="gKendoKanbanTopRightDL" Offset="0x2080" />
-        <DList Name="gKendoKanbanTopLeftDL" Offset="0x2180" />
-        <DList Name="gKendoKanbanBottomLeftDL" Offset="0x2280" />
-        <DList Name="gKendoKanbanBottomRightDL" Offset="0x2380" />
+        <DList Name="gKendoKanbanTopRightDL" Offset="0x2080" /> <!-- Original name is "ita_tR_model" -->
+        <DList Name="gKendoKanbanTopLeftDL" Offset="0x2180" /> <!-- Original name is "ita_tL_model" -->
+        <DList Name="gKendoKanbanBottomLeftDL" Offset="0x2280" /> <!-- Original name is "ita_bL_model" -->
+        <DList Name="gKendoKanbanBottomRightDL" Offset="0x2380" /> <!-- Original name is "ita_bR_model" -->
         <Texture Name="gKendoKanbanSplitFrontTex" OutName="kendo_kanban_front_split_alt" Format="rgba16" Width="32" Height="64" Offset="0x2480" />
         <Texture Name="gKendoKanbanSplitSideTex" OutName="kendo_kanban_side_split_alt" Format="rgba16" Width="32" Height="32" Offset="0x3480" />
-        <DList Name="gDoraChainDL" Offset="0x3FD0" />
-        <DList Name="gDoraGongDL" Offset="0x4160" />
+        <DList Name="gDoraGongDL" Offset="0x3FD0" /> <!-- Original name is "dora_hontai_model" -->
+        <DList Name="gDoraChainDL" Offset="0x4160" /> <!-- Original name is "kusariT_model" -->
         <Texture Name="gDoraGongTex" OutName="dora_gong" Format="rgba16" Width="32" Height="32" Offset="0x4208" />
         <Texture Name="gDoraChainTex" OutName="dora_chain" Format="rgba16" Width="16" Height="64" Offset="0x4A08" />
     </File>
diff --git a/assets/xml/objects/object_driftice.xml b/assets/xml/objects/object_driftice.xml
index 0ddb6e204..c380c09c1 100644
--- a/assets/xml/objects/object_driftice.xml
+++ b/assets/xml/objects/object_driftice.xml
@@ -5,7 +5,7 @@
         <Texture Name="object_driftice_TLUT_000420" OutName="tlut_000420" Format="rgba16" Width="4" Height="4" Offset="0x420" />
         <Texture Name="object_driftice_Tex_000440" OutName="tex_000440" Format="ci4" Width="64" Height="64" Offset="0x440" />
         <Texture Name="object_driftice_Tex_000C40" OutName="tex_000C40" Format="ci4" Width="64" Height="64" Offset="0xC40" />
-        <DList Name="object_driftice_DL_0016A0" Offset="0x16A0" />
-        <Collision Name="object_driftice_Colheader_001AA8" Offset="0x1AA8" />
+        <DList Name="object_driftice_DL_0016A0" Offset="0x16A0" /> <!-- Original name is "obj_iceblock_model" -->
+        <Collision Name="object_driftice_Colheader_001AA8" Offset="0x1AA8" /> <!-- Original name is "obj_iceblock_bgdatainfo" -->
     </File>
 </Root>
diff --git a/assets/xml/objects/object_drs.xml b/assets/xml/objects/object_drs.xml
index 1b6c29597..ef9788fd5 100644
--- a/assets/xml/objects/object_drs.xml
+++ b/assets/xml/objects/object_drs.xml
@@ -1,7 +1,7 @@
 <Root>
     <!-- Object for the mannequin inside Anju's room which holds her wedding dress --> 
     <File Name="object_drs" Segment="6">
-        <Animation Name="gWeddingDressMannequinIdleAnim" Offset="0x1C" />
+        <Animation Name="gWeddingDressMannequinIdleAnim" Offset="0x1C" /> <!-- Original name is "drs_kihon" -->
         <DList Name="gWeddingDressMannequinDL" Offset="0x3120" />
         <DList Name="gWeddingDressMannequinPatternDL" Offset="0x3EA8" />
         <DList Name="gWeddingDressMannequinMaskDL" Offset="0x3F80" />
diff --git a/assets/xml/objects/object_ds2.xml b/assets/xml/objects/object_ds2.xml
index 1794c4bf8..0eb35db79 100644
--- a/assets/xml/objects/object_ds2.xml
+++ b/assets/xml/objects/object_ds2.xml
@@ -1,6 +1,6 @@
 <Root>
     <File Name="object_ds2" Segment="6">
-        <Animation Name="object_ds2_Anim_0002E4" Offset="0x2E4" />
+        <Animation Name="object_ds2_Anim_0002E4" Offset="0x2E4" /> <!-- Original name is "ds2_matsu" -->
         <DList Name="object_ds2_DL_001990" Offset="0x1990" />
         <DList Name="object_ds2_DL_001C98" Offset="0x1C98" />
         <DList Name="object_ds2_DL_002188" Offset="0x2188" />
diff --git a/assets/xml/objects/object_ds2n.xml b/assets/xml/objects/object_ds2n.xml
index 7e7d45f0c..da6ce5e87 100644
--- a/assets/xml/objects/object_ds2n.xml
+++ b/assets/xml/objects/object_ds2n.xml
@@ -65,7 +65,7 @@
         <Texture Name="gDs2nEyeOpen2Tex" OutName="eye_open2" Format="ci8" Width="32" Height="32" Offset="0x7990" TlutOffset="0x6850" />
         <Texture Name="gDs2nMouthOpen2Tex" OutName="mouth_open2" Format="ci8" Width="32" Height="16" Offset="0x7D90" TlutOffset="0x6450" />
         
-        <Animation Name="gDs2nIdleAnim" Offset="0x8038" />
+        <Animation Name="gDs2nIdleAnim" Offset="0x8038" /> <!-- Original name is "ds2n_wait" -->
 
         <!-- z64Utils cannot render this skeleton, no idea what the three limbs with no DL are for, our actor doesnt use them -->
         <Limb Name="gDs2nHipsLimb" Type="Standard" EnumName="DS2N_LIMB_HIPS" Offset="0x8050" />
diff --git a/assets/xml/objects/object_dt.xml b/assets/xml/objects/object_dt.xml
index 8b2a90217..f1e62d59a 100644
--- a/assets/xml/objects/object_dt.xml
+++ b/assets/xml/objects/object_dt.xml
@@ -1,10 +1,10 @@
 <Root>
     <File Name="object_dt" Segment="6">
-        <Animation Name="object_dt_Anim_0005A4" Offset="0x5A4" />
-        <Animation Name="object_dt_Anim_000854" Offset="0x854" />
-        <Animation Name="object_dt_Anim_000BE0" Offset="0xBE0" />
-        <Animation Name="object_dt_Anim_000DA8" Offset="0xDA8" />
-        <Animation Name="object_dt_Anim_00112C" Offset="0x112C" />
+        <Animation Name="object_dt_Anim_0005A4" Offset="0x5A4" /> <!-- Original name is "dt_aiya" -->
+        <Animation Name="object_dt_Anim_000854" Offset="0x854" /> <!-- Original name is "dt_aiya2yomesan" -->
+        <Animation Name="object_dt_Anim_000BE0" Offset="0xBE0" /> <!-- Original name is "dt_arigato" -->
+        <Animation Name="object_dt_Anim_000DA8" Offset="0xDA8" /> <!-- Original name is "dt_mojimoji" -->
+        <Animation Name="object_dt_Anim_00112C" Offset="0x112C" /> <!-- Original name is "dt_wait" -->
         <DList Name="object_dt_DL_004DB0" Offset="0x4DB0" />
         <DList Name="object_dt_DL_005130" Offset="0x5130" />
         <DList Name="object_dt_DL_0054C8" Offset="0x54C8" />
@@ -62,6 +62,6 @@
         <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="ObjectDtLimb" Offset="0xB0CC" />
-        <Animation Name="object_dt_Anim_00B500" Offset="0xB500" />
+        <Animation Name="object_dt_Anim_00B500" Offset="0xB500" /> <!-- Original name is "dt_yome2arigato" -->
     </File>
 </Root>
diff --git a/assets/xml/objects/object_dy_obj.xml b/assets/xml/objects/object_dy_obj.xml
index a64bc975b..91b9a55fb 100644
--- a/assets/xml/objects/object_dy_obj.xml
+++ b/assets/xml/objects/object_dy_obj.xml
@@ -1,15 +1,15 @@
 <Root>
     <File Name="object_dy_obj" Segment="6">
-        <Animation Name="object_dy_obj_Anim_00129C" Offset="0x129C" />
-        <Animation Name="object_dy_obj_Anim_002338" Offset="0x2338" />
-        <Animation Name="object_dy_obj_Anim_0027B0" Offset="0x27B0" />
-        <Animation Name="object_dy_obj_Anim_0045FC" Offset="0x45FC" />
-        <Animation Name="object_dy_obj_Anim_005238" Offset="0x5238" />
-        <Animation Name="object_dy_obj_Anim_005E20" Offset="0x5E20" />
-        <Animation Name="object_dy_obj_Anim_006DE4" Offset="0x6DE4" />
-        <Animation Name="object_dy_obj_Anim_008090" Offset="0x8090" />
-        <Animation Name="object_dy_obj_Anim_00C500" Offset="0xC500" />
-        <Animation Name="object_dy_obj_Anim_00D15C" Offset="0xD15C" />
+        <Animation Name="object_dy_obj_Anim_00129C" Offset="0x129C" /> <!-- Original name is "be_mahoukousi" -->
+        <Animation Name="object_dy_obj_Anim_002338" Offset="0x2338" /> <!-- Original name is "be_mahoukousi_loop" -->
+        <Animation Name="object_dy_obj_Anim_0027B0" Offset="0x27B0" /> <!-- Original name is "be_syutugen" -->
+        <Animation Name="object_dy_obj_Anim_0045FC" Offset="0x45FC" /> <!-- Original name is "be_utubuse" -->
+        <Animation Name="object_dy_obj_Anim_005238" Offset="0x5238" /> <!-- Original name is "be_utubuse_loop" -->
+        <Animation Name="object_dy_obj_Anim_005E20" Offset="0x5E20" /> <!-- Original name is "bigelf_denjyu" -->
+        <Animation Name="object_dy_obj_Anim_006DE4" Offset="0x6DE4" /> <!-- Original name is "bigelf_hakusyu" -->
+        <Animation Name="object_dy_obj_Anim_008090" Offset="0x8090" /> <!-- Original name is "bigelf_itemdasu" -->
+        <Animation Name="object_dy_obj_Anim_00C500" Offset="0xC500" /> <!-- Original name is "bigelf_syutugen" -->
+        <Animation Name="object_dy_obj_Anim_00D15C" Offset="0xD15C" /> <!-- Original name is "bigelf_udegumi" -->
         <DList Name="object_dy_obj_DL_00D1B0" Offset="0xD1B0" />
         <DList Name="object_dy_obj_DL_00D228" Offset="0xD228" />
         <Texture Name="object_dy_obj_Tex_00D240" OutName="tex_00D240" Format="i4" Width="32" Height="32" Offset="0xD240" />
@@ -18,7 +18,7 @@
         <Array Name="object_dy_obj_Vtx_00DD40" Count="27" Offset="0xDD40">
             <Vtx/>
         </Array>
-        <DList Name="object_dy_obj_DL_00DEF0" Offset="0xDEF0" />
+        <DList Name="object_dy_obj_DL_00DEF0" Offset="0xDEF0" /> <!-- Original name is "efc_g_fairly_modelT" -->
         <DList Name="object_dy_obj_DL_013810" Offset="0x13810" />
         <DList Name="object_dy_obj_DL_013928" Offset="0x13928" />
         <DList Name="object_dy_obj_DL_013CF8" Offset="0x13CF8" />
diff --git a/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c
index 9b6c81266..509f285fe 100644
--- a/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c
+++ b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c
@@ -332,20 +332,20 @@ void ObjDora_Draw(Actor* thisx, PlayState* play) {
         Matrix_Push();
         Matrix_RotateXS(this->gongRotation.x, MTXMODE_APPLY);
         gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-        gSPDisplayList(POLY_OPA_DISP++, &gDoraGongDL);
+        gSPDisplayList(POLY_OPA_DISP++, &gDoraChainDL);
 
         Matrix_Translate(position.x, position.y + gongForceX, position.z + gongForceX, MTXMODE_APPLY);
         Matrix_RotateXS(this->gongRotation.z - this->gongRotation.x, MTXMODE_APPLY);
         Matrix_Translate(-position.x, -position.y, -position.z, MTXMODE_APPLY);
 
         gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-        gSPDisplayList(POLY_OPA_DISP++, &gDoraChainDL);
+        gSPDisplayList(POLY_OPA_DISP++, &gDoraGongDL);
 
         Matrix_Pop();
     } else {
         gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-        gSPDisplayList(POLY_OPA_DISP++, &gDoraChainDL);
         gSPDisplayList(POLY_OPA_DISP++, &gDoraGongDL);
+        gSPDisplayList(POLY_OPA_DISP++, &gDoraChainDL);
     }
 
     CLOSE_DISPS(play->state.gfxCtx);