Add original asset names to all `object_p*` and `object_r*` files (#1519)

* Add original asset names to all `object_p*` and `object_r*` files

* Respond to review

31 files changed, 111 insertions, 111 deletions

diff --git a/assets/xml/objects/object_pamera.xml b/assets/xml/objects/object_pamera.xml
index 61dc17694..fc2da0bea 100644
--- a/assets/xml/objects/object_pamera.xml
+++ b/assets/xml/objects/object_pamera.xml
@@ -1,6 +1,6 @@
 <Root>
     <File Name="object_pamera" Segment="6">
-        <Animation Name="object_pamera_Anim_0005BC" Offset="0x5BC" />
+        <Animation Name="object_pamera_Anim_0005BC" Offset="0x5BC" /> <!-- Original name is "pam_wait" -->
 
         <DList Name="gPamelaAbdomenDL" Offset="0x2E50" />
         <DList Name="gPamelaPelvisDL" Offset="0x2FB8" />
@@ -65,17 +65,17 @@
         <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="PamelaLimb" Offset="0x8448" />
         
-        <Animation Name="object_pamera_Anim_008AE0" Offset="0x8AE0" /> <!-- Pamela Walking -->
-        <Animation Name="object_pamera_Anim_008E38" Offset="0x8E38" />
-        <Animation Name="object_pamera_Anim_009870" Offset="0x9870" />
-        <Animation Name="object_pamera_Anim_009F54" Offset="0x9F54" /> <!-- HoldBack En_Hgo -->
-        <Animation Name="object_pamera_Anim_00A844" Offset="0xA844" /> <!-- Pamela Looking down the well -->
-        <Animation Name="object_pamera_Anim_00B0C4" Offset="0xB0C4" />
-        <Animation Name="object_pamera_Anim_00B5B0" Offset="0xB5B0" /> <!-- PushBack En_Hgo -->
-        <Animation Name="object_pamera_Anim_00BCC4" Offset="0xBCC4" /> <!-- Defend En_Hgo -->
-        <Animation Name="object_pamera_Anim_00C9F4" Offset="0xC9F4" />
-        <Animation Name="object_pamera_Anim_00D0F0" Offset="0xD0F0" />
-        <Animation Name="object_pamera_Anim_00D9DC" Offset="0xD9DC" />
-        <Animation Name="object_pamera_Anim_00E16C" Offset="0xE16C" /> <!-- Hugging En_Hg -->
+        <Animation Name="object_pamera_Anim_008AE0" Offset="0x8AE0" /> <!-- Pamela Walking. Original name is "pamera_aruku" -->
+        <Animation Name="object_pamera_Anim_008E38" Offset="0x8E38" /> <!-- Original name is "pamera_hasiru" -->
+        <Animation Name="object_pamera_Anim_009870" Offset="0x9870" /> <!-- Original name is "pamera_kabau" -->
+        <Animation Name="object_pamera_Anim_009F54" Offset="0x9F54" /> <!-- HoldBack En_Hgo. Original name is "pamera_kabau_loop" -->
+        <Animation Name="object_pamera_Anim_00A844" Offset="0xA844" /> <!-- Pamela Looking down the well. Original name is "pamera_nozoku" -->
+        <Animation Name="object_pamera_Anim_00B0C4" Offset="0xB0C4" /> <!-- Original name is "pamera_odoroku" -->
+        <Animation Name="object_pamera_Anim_00B5B0" Offset="0xB5B0" /> <!-- PushBack En_Hgo. Original name is "pamera_osaeru_loop" -->
+        <Animation Name="object_pamera_Anim_00BCC4" Offset="0xBCC4" /> <!-- Defend En_Hgo. Original name is "pamera_sakebu" -->
+        <Animation Name="object_pamera_Anim_00C9F4" Offset="0xC9F4" /> <!-- Original name is "pamera_siawase" -->
+        <Animation Name="object_pamera_Anim_00D0F0" Offset="0xD0F0" /> <!-- Original name is "pamera_siawase_loop" -->
+        <Animation Name="object_pamera_Anim_00D9DC" Offset="0xD9DC" /> <!-- Original name is "pamera_tobikomu" -->
+        <Animation Name="object_pamera_Anim_00E16C" Offset="0xE16C" /> <!-- Hugging En_Hg. Original name is "pamera_tobikomu_loop" -->
     </File>
 </Root>
diff --git a/assets/xml/objects/object_ph.xml b/assets/xml/objects/object_ph.xml
index fcf03b765..3612fb2b5 100644
--- a/assets/xml/objects/object_ph.xml
+++ b/assets/xml/objects/object_ph.xml
@@ -1,9 +1,9 @@
 <Root>
     <File Name="object_ph" Segment="6">
-        <Animation Name="object_ph_Anim_000350" Offset="0x350" />
-        <Animation Name="object_ph_Anim_0005C4" Offset="0x5C4" />
-        <Animation Name="object_ph_Anim_000844" Offset="0x844" />
-        <Animation Name="object_ph_Anim_0009C4" Offset="0x9C4" />
+        <Animation Name="object_ph_Anim_000350" Offset="0x350" /> <!-- Original name is "ph_end" -->
+        <Animation Name="object_ph_Anim_0005C4" Offset="0x5C4" /> <!-- Original name is "ph_fly" -->
+        <Animation Name="object_ph_Anim_000844" Offset="0x844" /> <!-- Original name is "ph_shock" -->
+        <Animation Name="object_ph_Anim_0009C4" Offset="0x9C4" /> <!-- Original name is "ph_start" -->
         <DList Name="object_ph_DL_000ED0" Offset="0xED0" />
         <DList Name="object_ph_DL_000F60" Offset="0xF60" />
         <DList Name="object_ph_DL_000FF0" Offset="0xFF0" />
diff --git a/assets/xml/objects/object_po.xml b/assets/xml/objects/object_po.xml
index a430d178b..dcf5845a3 100644
--- a/assets/xml/objects/object_po.xml
+++ b/assets/xml/objects/object_po.xml
@@ -2,12 +2,12 @@
     <!-- Object for Poe -->
     <File Name="object_po" Segment="6">
         <!-- Animations -->
-        <Animation Name="gPoeAttackAnim" Offset="0x1A8" />
-        <Animation Name="gPoeDamagedAnim" Offset="0x4EC" />
-        <Animation Name="gPoeFleeAnim" Offset="0x6E0" />
-        <Animation Name="gPoeFloatAnim" Offset="0xA60" />
-        <Animation Name="gPoeAppearAnim" Offset="0x11C4" />
-        <Animation Name="gPoeDisappearAnim" Offset="0x15B0" />
+        <Animation Name="gPoeAttackAnim" Offset="0x1A8" /> <!-- Original name is "po_atack" -->
+        <Animation Name="gPoeDamagedAnim" Offset="0x4EC" /> <!-- Original name is "po_damage" -->
+        <Animation Name="gPoeFleeAnim" Offset="0x6E0" /> <!-- Original name is "po_escape" -->
+        <Animation Name="gPoeFloatAnim" Offset="0xA60" /> <!-- Original name is "po_fly" -->
+        <Animation Name="gPoeAppearAnim" Offset="0x11C4" /> <!-- Original name is "po_start" -->
+        <Animation Name="gPoeDisappearAnim" Offset="0x15B0" /> <!-- Original name is "po_wait" -->
 
         <!-- Poe Limb DisplayLists -->
         <DList Name="gPoeRightUpperArmDL" Offset="0x1620" />
@@ -23,7 +23,7 @@
 
         <!-- Poe Soul -->
         <Texture Name="gPoeSoulTex" OutName="poe_soul" Format="i8" Width="32" Height="64" Offset="0x3010" />
-        <DList Name="gPoeSoulDL" Offset="0x3850" />
+        <DList Name="gPoeSoulDL" Offset="0x3850" /> <!-- Original name is "poh_soul_modelT" -->
 
         <!-- Textures -->
         <Texture Name="gPoeArmTex" OutName="poe_arm" Format="rgba16" Width="32" Height="16" Offset="0x3910" />
diff --git a/assets/xml/objects/object_po_composer.xml b/assets/xml/objects/object_po_composer.xml
index 81042139f..51b07ac7f 100644
--- a/assets/xml/objects/object_po_composer.xml
+++ b/assets/xml/objects/object_po_composer.xml
@@ -4,19 +4,19 @@
     <!-- Assets for the composer brothers Flat and Sharp -->
     <File Name="object_po_composer" Segment="6">
         <!-- Animations -->
-        <Animation Name="gPoeComposerAttackAnim" Offset="0x20C" />
-        <Animation Name="gPoeComposerRaiseArmsAnim" Offset="0x570" />
-        <Animation Name="gPoeComposerBeginPlayAnim" Offset="0xA58" />
-        <Animation Name="gPoeComposerPlayAnim" Offset="0x1420" />
-        <Animation Name="gPoeComposerFleeAnim" Offset="0x15B8" />
-        <Animation Name="gPoeComposerIdleAnim" Offset="0x188C" />
-        <Animation Name="gPoeComposerArmsRaisedAnim" Offset="0x1F44" />
-        <Animation Name="gPoeComposerLowerArmsAnim" Offset="0x23E8" />
-        <Animation Name="gPoeComposerLookDownAnim" Offset="0x2AE0" />
-        <Animation Name="gPoeComposerBeginRollAnim" Offset="0x3024" />
-        <Animation Name="gPoeComposerRollAnim" Offset="0x334C" />
-        <Animation Name="gPoeComposerAppearDisappearAnim" Offset="0x3954" />
-        <Animation Name="gPoeComposerStillAnim" Offset="0x3DB0" />
+        <Animation Name="gPoeComposerAttackAnim" Offset="0x20C" /> <!-- Original name is "pom_atack" -->
+        <Animation Name="gPoeComposerRaiseArmsAnim" Offset="0x570" /> <!-- Original name is "pom_damage" -->
+        <Animation Name="gPoeComposerBeginPlayAnim" Offset="0xA58" /> <!-- Original name is "pom_ensou" -->
+        <Animation Name="gPoeComposerPlayAnim" Offset="0x1420" /> <!-- Original name is "pom_ensou_loop" -->
+        <Animation Name="gPoeComposerFleeAnim" Offset="0x15B8" /> <!-- Original name is "pom_escape" -->
+        <Animation Name="gPoeComposerIdleAnim" Offset="0x188C" /> <!-- Original name is "pom_fly" -->
+        <Animation Name="gPoeComposerArmsRaisedAnim" Offset="0x1F44" /> <!-- Original name is "pom_ikari" -->
+        <Animation Name="gPoeComposerLowerArmsAnim" Offset="0x23E8" /> <!-- Original name is "pom_katari" -->
+        <Animation Name="gPoeComposerLookDownAnim" Offset="0x2AE0" /> <!-- Original name is "pom_katari_loop" -->
+        <Animation Name="gPoeComposerBeginRollAnim" Offset="0x3024" /> <!-- Original name is "pom_kurusimu" -->
+        <Animation Name="gPoeComposerRollAnim" Offset="0x334C" /> <!-- Original name is "pom_kurusimu_loop" -->
+        <Animation Name="gPoeComposerAppearDisappearAnim" Offset="0x3954" /> <!-- Original name is "pom_start" -->
+        <Animation Name="gPoeComposerStillAnim" Offset="0x3DB0" /> <!-- Original name is "pom_wait" -->
 
         <!-- Texture -->
         <Texture Name="gPoeComposerSoulTex" OutName="composer_soul" Format="i8" Width="32" Height="64" Offset="0x3DC0" />
diff --git a/assets/xml/objects/object_po_fusen.xml b/assets/xml/objects/object_po_fusen.xml
index 23bfbe075..04336224d 100644
--- a/assets/xml/objects/object_po_fusen.xml
+++ b/assets/xml/objects/object_po_fusen.xml
@@ -2,7 +2,7 @@
     <!-- Assets for Poe Balloon archery target in Romani Ranch. -->
     <File Name="object_po_fusen" Segment="6">
         <!-- Empty: PoFusen is animated directly from its code. -->
-        <Animation Name="gPoeBalloonEmptyAnim" Offset="0x40" />
+        <Animation Name="gPoeBalloonEmptyAnim" Offset="0x40" /> <!-- Original name is "bal_kihon" -->
 
         <DList Name="gPoeBalloonChainAndLanternDL" Offset="0x8C0" />
         <DList Name="gPoeBalloonLeftHandDL" Offset="0xAF8" />
diff --git a/assets/xml/objects/object_po_sisters.xml b/assets/xml/objects/object_po_sisters.xml
index 6b0755905..df96831f2 100644
--- a/assets/xml/objects/object_po_sisters.xml
+++ b/assets/xml/objects/object_po_sisters.xml
@@ -3,13 +3,13 @@
     <!-- Joelle is red, Beth is blue, Ami is green, and Meg is purple -->
     <File Name="object_po_sisters" Segment="6">
         <!-- PoSister Animations -->
-        <Animation Name="gPoeSistersAttackAnim" Offset="0x114" />
-        <Animation Name="gPoeSistersMegCryAnim" Offset="0x680" />
-        <Animation Name="gPoeSistersDamagedAnim" Offset="0x8C0" />
-        <Animation Name="gPoeSistersFleeAnim" Offset="0xA54" />
-        <Animation Name="gPoeSistersFloatAnim" Offset="0xD40" />
-        <Animation Name="gPoeSistersAppearDisappearAnim" Offset="0x119C" />
-        <Animation Name="gPoeSistersSwayAnim" Offset="0x14CC" />
+        <Animation Name="gPoeSistersAttackAnim" Offset="0x114" /> <!-- Original name is "pob_atack" -->
+        <Animation Name="gPoeSistersMegCryAnim" Offset="0x680" /> <!-- Original name is "pob_cry" -->
+        <Animation Name="gPoeSistersDamagedAnim" Offset="0x8C0" /> <!-- Original name is "pob_damage" -->
+        <Animation Name="gPoeSistersFleeAnim" Offset="0xA54" /> <!-- Original name is "pob_escape" -->
+        <Animation Name="gPoeSistersFloatAnim" Offset="0xD40" /> <!-- Original name is "pob_fly" -->
+        <Animation Name="gPoeSistersAppearDisappearAnim" Offset="0x119C" /> <!-- Original name is "pob_start" -->
+        <Animation Name="gPoeSistersSwayAnim" Offset="0x14CC" /> <!-- Original name is "pob_wait" -->
 
         <!-- PoSister DisplayLists -->
         <DList Name="gPoeSistersMegFaceDL" Offset="0x1CB0" />
diff --git a/assets/xml/objects/object_posthouse_obj.xml b/assets/xml/objects/object_posthouse_obj.xml
index 8a324672b..f22da2e98 100644
--- a/assets/xml/objects/object_posthouse_obj.xml
+++ b/assets/xml/objects/object_posthouse_obj.xml
@@ -1,11 +1,11 @@
 <Root>
     <File Name="object_posthouse_obj" Segment="6">
-        <DList Name="object_posthouse_obj_DL_000A50" Offset="0xA50" />
+        <DList Name="object_posthouse_obj_DL_000A50" Offset="0xA50" /> <!-- Original name is "z2_post_cap_model" -->
         <Texture Name="object_posthouse_obj_Tex_000DA8" OutName="tex_000DA8" Format="rgba16" Width="8" Height="8" Offset="0xDA8" />
         <Texture Name="object_posthouse_obj_Tex_000E28" OutName="tex_000E28" Format="rgba16" Width="16" Height="16" Offset="0xE28" />
         <Texture Name="object_posthouse_obj_Tex_001028" OutName="tex_001028" Format="rgba16" Width="32" Height="32" Offset="0x1028" />
-        <DList Name="object_posthouse_obj_DL_001870" Offset="0x1870" />
+        <DList Name="object_posthouse_obj_DL_001870" Offset="0x1870" /> <!-- Original name is "z2_post_cloth_model" -->
         <Texture Name="object_posthouse_obj_Tex_001900" OutName="tex_001900" Format="rgba16" Width="64" Height="32" Offset="0x1900" />
-        <Collision Name="object_posthouse_obj_Colheader_002948" Offset="0x2948" />
+        <Collision Name="object_posthouse_obj_Colheader_002948" Offset="0x2948" /> <!-- Original name is "z2_post_cloth_bgdatainfo" -->
     </File>
 </Root>
diff --git a/assets/xml/objects/object_pr.xml b/assets/xml/objects/object_pr.xml
index 52429cb18..b4f743fde 100644
--- a/assets/xml/objects/object_pr.xml
+++ b/assets/xml/objects/object_pr.xml
@@ -1,7 +1,7 @@
 <Root>
     <File Name="object_pr" Segment="6">
-        <Animation Name="object_pr_Anim_000268" Offset="0x268" />
-        <Animation Name="object_pr_Anim_000740" Offset="0x740" />
+        <Animation Name="object_pr_Anim_000268" Offset="0x268" /> <!-- Original name is "pr_damage" -->
+        <Animation Name="object_pr_Anim_000740" Offset="0x740" /> <!-- Original name is "pr_gattuku" -->
         <DList Name="object_pr_DL_000F30" Offset="0xF30" />
         <DList Name="object_pr_DL_001130" Offset="0x1130" />
         <DList Name="object_pr_DL_0011C8" Offset="0x11C8" />
@@ -16,8 +16,8 @@
         <Texture Name="object_pr_Tex_001B08" OutName="tex_001B08" Format="rgba16" Width="16" Height="16" Offset="0x1B08" />
         <Texture Name="object_pr_Tex_001D08" OutName="tex_001D08" Format="rgba16" Width="8" Height="8" Offset="0x1D08" />
         <TextureAnimation Name="object_pr_Matanimheader_001DB0" Offset="0x1DB0" />
-        <Animation Name="object_pr_Anim_001E10" Offset="0x1E10" />
-        <Animation Name="object_pr_Anim_0021E8" Offset="0x21E8" />
+        <Animation Name="object_pr_Anim_001E10" Offset="0x1E10" /> <!-- Original name is "pr_stop" -->
+        <Animation Name="object_pr_Anim_0021E8" Offset="0x21E8" /> <!-- Original name is "pr_swim" -->
         <DList Name="object_pr_DL_0029E0" Offset="0x29E0" />
         <DList Name="object_pr_DL_002BD0" Offset="0x2BD0" />
         <DList Name="object_pr_DL_002C68" Offset="0x2C68" />
@@ -41,7 +41,7 @@
         <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="ObjectPr1Limb" Offset="0x38B8" />
-        <Animation Name="object_pr_Anim_003904" Offset="0x3904" />
+        <Animation Name="object_pr_Anim_003904" Offset="0x3904" /> <!-- Original name might be "prz_dead" -->
         <DList Name="object_pr_DL_003AB0" Offset="0x3AB0" />
         <DList Name="object_pr_DL_003B50" Offset="0x3B50" />
         <DList Name="object_pr_DL_003C08" Offset="0x3C08" />
@@ -56,7 +56,7 @@
         <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="ObjectPr2Limb" Offset="0x4188" />
-        <Animation Name="object_pr_Anim_004274" Offset="0x4274" />
-        <Animation Name="object_pr_Anim_004340" Offset="0x4340" />
+        <Animation Name="object_pr_Anim_004274" Offset="0x4274" /> <!-- Original name is "prz_gattuku" -->
+        <Animation Name="object_pr_Anim_004340" Offset="0x4340" /> <!-- Original name is "prz_swim" -->
     </File>
 </Root>
diff --git a/assets/xml/objects/object_ps.xml b/assets/xml/objects/object_ps.xml
index 689d78fb5..41ab3323b 100644
--- a/assets/xml/objects/object_ps.xml
+++ b/assets/xml/objects/object_ps.xml
@@ -1,6 +1,6 @@
 <Root>
     <File Name="object_ps" Segment="6">
-        <Animation Name="object_ps_Anim_00049C" Offset="0x49C" />
+        <Animation Name="object_ps_Anim_00049C" Offset="0x49C" /> <!-- Original name is "ps_matsu" -->
         <DList Name="object_ps_DL_001B30" Offset="0x1B30" />
         <DList Name="object_ps_DL_001B38" Offset="0x1B38" />
         <DList Name="object_ps_DL_001F38" Offset="0x1F38" />
@@ -34,7 +34,7 @@
         <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="ObjectPsLimb" Offset="0x7230" />
-        <Collision Name="object_ps_Colheader_0072E0" Offset="0x72E0" />
-        <Animation Name="object_ps_Anim_0078FC" Offset="0x78FC" />
+        <Collision Name="object_ps_Colheader_0072E0" Offset="0x72E0" /> <!-- Original name is "ps_set_bgdatainfo" -->
+        <Animation Name="object_ps_Anim_0078FC" Offset="0x78FC" /> <!-- Original name is "ps_tataku" -->
     </File>
 </Root>
diff --git a/assets/xml/objects/object_pst.xml b/assets/xml/objects/object_pst.xml
index 82fe6315e..f82bfffe0 100644
--- a/assets/xml/objects/object_pst.xml
+++ b/assets/xml/objects/object_pst.xml
@@ -1,7 +1,7 @@
 <Root>
     <!-- This is the object for the Postbox Prop -->
     <File Name="object_pst" Segment="6">
-        <Animation Name="gPostboxIdleAnim" Offset="0x18" />
+        <Animation Name="gPostboxIdleAnim" Offset="0x18" /> <!-- Original name might be "pst_model" -->
         <DList Name="gPostboxFrameDL" Offset="0x4A0" />
         <DList Name="gPostboxMailSlotDL" Offset="0x638" />
         <Texture Name="gPostboxWoodRoofTex" OutName="postbox_wood_roof" Format="rgba16" Width="32" Height="32" Offset="0x760" />
diff --git a/assets/xml/objects/object_racetsubo.xml b/assets/xml/objects/object_racetsubo.xml
index 08a17d00a..33c5b1e09 100644
--- a/assets/xml/objects/object_racetsubo.xml
+++ b/assets/xml/objects/object_racetsubo.xml
@@ -2,10 +2,10 @@
     <!-- Object for green magic pot -->
     <File Name="object_racetsubo" Segment="6">
         <DList Name="gMagicPotEmpty1DL" Offset="0x270" />
-        <DList Name="gMagicPotDL" Offset="0x278" />
+        <DList Name="gMagicPotDL" Offset="0x278" /> <!-- Original name is "z2_tubo_model" -->
         <Texture Name="gMagicPotWallTex" OutName="magic_pot_wall" Format="rgba16" Width="32" Height="64" Offset="0x3E0" />
         <Texture Name="gMagicPotRimTex" OutName="magic_pot_rim" Format="rgba16" Width="16" Height="16" Offset="0x13E0" />
-        <DList Name="gMagicPotShardDL" Offset="0x1610" />
+        <DList Name="gMagicPotShardDL" Offset="0x1610" /> <!-- Original name is "z2_tubo_hahen_model" -->
         <DList Name="gMagicPotEmpty2DL" Offset="0x1698" />
         <Texture Name="gMagicPotShardTex" OutName="magic_pot_shard" Format="rgba16" Width="16" Height="16" Offset="0x16A0" />
     </File>
diff --git a/assets/xml/objects/object_raf.xml b/assets/xml/objects/object_raf.xml
index 2322740d5..f6cb937b7 100644
--- a/assets/xml/objects/object_raf.xml
+++ b/assets/xml/objects/object_raf.xml
@@ -2,7 +2,7 @@
     <!-- Assets for the Carnivorous Lily Pad-->
     <File Name="object_raf" Segment="6">
         <!-- Carnivorous Lily Pad Collision -->
-        <Collision Name="gCarnivorousLilyPadCol" Offset="0x108" />
+        <Collision Name="gCarnivorousLilyPadCol" Offset="0x108" /> <!-- Original name is "raf_atari_bgdatainfo" -->
 
         <!-- Unused Textureless Platform DisplayList. Maybe used for testing collision? -->
         <DList Name="gCarnivorousLilyPadTexturelessPlatformDL" Offset="0x1C0" />
diff --git a/assets/xml/objects/object_raillift.xml b/assets/xml/objects/object_raillift.xml
index 241a7346b..f97792d13 100644
--- a/assets/xml/objects/object_raillift.xml
+++ b/assets/xml/objects/object_raillift.xml
@@ -1,25 +1,25 @@
 <Root>
     <File Name="object_raillift" Segment="6">
-        <DList Name="object_raillift_DL_000200" Offset="0x200" />
-        <DList Name="object_raillift_DL_000208" Offset="0x208" />
+        <DList Name="object_raillift_DL_000200" Offset="0x200" /> <!-- Original name is "m2_ALL_MoguSima_modelT" -->
+        <DList Name="object_raillift_DL_000208" Offset="0x208" /> <!-- Original name is "m2_ALL_MoguSima_model" -->
         <Texture Name="object_raillift_Tex_000370" OutName="tex_000370" Format="rgba16" Width="32" Height="32" Offset="0x370" />
         <Texture Name="object_raillift_Tex_000B70" OutName="tex_000B70" Format="rgba16" Width="32" Height="32" Offset="0xB70" />
         <Texture Name="object_raillift_Tex_001370" OutName="tex_001370" Format="rgba16" Width="32" Height="32" Offset="0x1370" />
-        <DList Name="object_raillift_DL_001DB0" Offset="0x1DB0" />
-        <DList Name="object_raillift_DL_001E40" Offset="0x1E40" />
+        <DList Name="object_raillift_DL_001DB0" Offset="0x1DB0" /> <!-- Original name is "m2_OcarinaLift_modelT" -->
+        <DList Name="object_raillift_DL_001E40" Offset="0x1E40" /> <!-- Original name is "m2_OcarinaLift_model" -->
         <Texture Name="object_raillift_Tex_001FC8" OutName="tex_001FC8" Format="rgba16" Width="32" Height="32" Offset="0x1FC8" />
         <Texture Name="object_raillift_Tex_0027C8" OutName="tex_0027C8" Format="rgba16" Width="32" Height="32" Offset="0x27C8" />
         <Texture Name="object_raillift_Tex_002FC8" OutName="tex_002FC8" Format="rgba16" Width="32" Height="32" Offset="0x2FC8" />
         <Texture Name="object_raillift_Tex_0037C8" OutName="tex_0037C8" Format="ia16" Width="32" Height="64" Offset="0x37C8" />
-        <Collision Name="object_raillift_Colheader_0048D0" Offset="0x48D0" />
+        <Collision Name="object_raillift_Colheader_0048D0" Offset="0x48D0" /> <!-- Original name is "m2_OcarinaLift_bgdatainfo" -->
         <DList Name="object_raillift_DL_004BF0" Offset="0x4BF0" />
         <Collision Name="object_raillift_Colheader_004FF8" Offset="0x4FF8" />
         <Texture Name="object_raillift_Tex_005030" OutName="tex_005030" Format="rgba16" Width="32" Height="32" Offset="0x5030" />
         <Texture Name="object_raillift_Tex_005830" OutName="tex_005830" Format="rgba16" Width="32" Height="32" Offset="0x5830" />
         <Texture Name="object_raillift_Tex_006030" OutName="tex_006030" Format="rgba16" Width="32" Height="32" Offset="0x6030" />
         <Texture Name="object_raillift_Tex_006830" OutName="tex_006830" Format="i4" Width="64" Height="64" Offset="0x6830" />
-        <DList Name="object_raillift_DL_0071B0" Offset="0x71B0" />
-        <DList Name="object_raillift_DL_0071B8" Offset="0x71B8" />
+        <DList Name="object_raillift_DL_0071B0" Offset="0x71B0" /> <!-- Original name is "z2_22_lift_modelT" -->
+        <DList Name="object_raillift_DL_0071B8" Offset="0x71B8" /> <!-- Original name is "z2_22_lift_model" -->
         <Texture Name="object_raillift_Tex_0072B0" OutName="tex_0072B0" Format="rgba16" Width="32" Height="32" Offset="0x72B0" />
         <Texture Name="object_raillift_Tex_007AB0" OutName="tex_007AB0" Format="rgba16" Width="32" Height="16" Offset="0x7AB0" />
     </File>
diff --git a/assets/xml/objects/object_random_obj.xml b/assets/xml/objects/object_random_obj.xml
index 509ed86c7..a4197db75 100644
--- a/assets/xml/objects/object_random_obj.xml
+++ b/assets/xml/objects/object_random_obj.xml
@@ -1,7 +1,7 @@
 <Root>
     <!-- Object for Secret Shrine Sliding Door -->
     <File Name="object_random_obj" Segment="6">
-        <DList Name="gSecretShrineSlidingDoorDL" Offset="0x190" />
+        <DList Name="gSecretShrineSlidingDoorDL" Offset="0x190" /> <!-- Original name is "m2_RN_shutter_model" -->
         <Texture Name="gSecretShrineSlidingDoorTex" OutName="secret_shrine_sliding_door" Format="rgba16" Width="32" Height="64" Offset="0x2F0" />
     </File>
 </Root>
diff --git a/assets/xml/objects/object_rb.xml b/assets/xml/objects/object_rb.xml
index cd0e9c274..f82725d0c 100644
--- a/assets/xml/objects/object_rb.xml
+++ b/assets/xml/objects/object_rb.xml
@@ -1,7 +1,7 @@
 <Root>
     <!-- Object for Leevers -->
     <File Name="object_rb" Segment="6">
-        <Animation Name="gLeeverSpinAnim" Offset="0x1E4" />
+        <Animation Name="gLeeverSpinAnim" Offset="0x1E4" /> <!-- Original name is "reeba_rb_move" -->
 
         <!-- DLs for visible limbs -->
         <DList Name="gLeeverBottomHalfDL" Offset="0x200" />
diff --git a/assets/xml/objects/object_redead_obj.xml b/assets/xml/objects/object_redead_obj.xml
index 8460579b3..9bd976f2a 100644
--- a/assets/xml/objects/object_redead_obj.xml
+++ b/assets/xml/objects/object_redead_obj.xml
@@ -1,7 +1,7 @@
 <Root>
     <!-- Object for the Beneath the Well's Sliding Door  -->
     <File Name="object_redead_obj" Segment="6">
-        <DList Name="gBeneathTheWellSlidingDoorDL" Offset="0x1A0" />
+        <DList Name="gBeneathTheWellSlidingDoorDL" Offset="0x1A0" /> <!-- Original name is "i2_R_shutter1_model" -->
         <Texture Name="gBeneathTheWellSlidingDoorTLUT" OutName="beneath_the_well_sliding_door_tlut" Format="rgba16" Width="4" Height="4" Offset="0x390" />
         <Texture Name="gBeneathTheWellSlidingDoorTex" OutName="beneath_the_well_sliding_door" Format="ci4" Width="64" Height="64" Offset="0x3B0" />
     </File>
diff --git a/assets/xml/objects/object_rotlift.xml b/assets/xml/objects/object_rotlift.xml
index c2acf0540..4c9090083 100644
--- a/assets/xml/objects/object_rotlift.xml
+++ b/assets/xml/objects/object_rotlift.xml
@@ -2,19 +2,19 @@
     <!-- Assets for the rotating platforms/spikes in the Deku Moon Dungeon -->
     <File Name="object_rotlift" Segment="6">
         <!-- Rotating Platforms -->
-        <DList Name="gDekuMoonDungeonRotatingPlatformsDL" Offset="0x400" />
+        <DList Name="gDekuMoonDungeonRotatingPlatformsDL" Offset="0x400" /> <!-- Original name is "i2_last02a1_model" -->
         <Texture Name="gDekuMoonDungeonRotatingPlatformsWoodBarkTLUT" OutName="deku_moon_dungeon_rotating_platforms_wood_bark_tlut" Format="rgba16" Width="16" Height="16" Offset="0x590" />
         <Texture Name="gDekuMoonDungeonRotatingPlatformsWoodBarkTex" OutName="deku_moon_dungeon_rotating_platforms_wood_bark" Format="ci8" Width="32" Height="64" Offset="0x790" />
         <Texture Name="gDekuMoonDungeonRotatingPlatformsWoodTex" OutName="deku_moon_dungeon_rotating_platforms_wood" Format="rgba16" Width="32" Height="64" Offset="0xF90" />
         <TextureAnimation Name="gDekuMoonDungeonRotatingPlatformsUnusedTexAnim" Offset="0x1F98" />
-        <Collision Name="gDekuMoonDungeonRotatingPlatformsCol" Offset="0x2190" />
+        <Collision Name="gDekuMoonDungeonRotatingPlatformsCol" Offset="0x2190" /> <!-- Original name is "i2_last02a1_bgdatainfo" -->
 
         <!-- Rotating Spikes -->
-        <DList Name="gDekuMoonDungeonRotatingSpikesDL" Offset="0x2CE0" />
+        <DList Name="gDekuMoonDungeonRotatingSpikesDL" Offset="0x2CE0" /> <!-- Original name is "i2_last02b1_model" -->
         <Texture Name="gDekuMoonDungeonRotatingSpikesWoodBarkTLUT" OutName="deku_moon_dungeon_rotating_spikes_wood_bark_tlut" Format="rgba16" Width="16" Height="16" Offset="0x2FF8" />
         <Texture Name="gDekuMoonDungeonRotatingSpikesWoodBarkTex" OutName="deku_moon_dungeon_rotating_spikes_wood_bark" Format="ci8" Width="32" Height="64" Offset="0x31F8" />
         <Texture Name="gDekuMoonDungeonRotatingSpikesWoodTex" OutName="deku_moon_dungeon_rotating_spikes_wood" Format="rgba16" Width="32" Height="64" Offset="0x39F8" />
         <TextureAnimation Name="gDekuMoonDungeonRotatingSpikesUnusedTexAnim" Offset="0x4A08" />
-        <Collision Name="gDekuMoonDungeonRotatingSpikesCol" Offset="0x4DF0" />
+        <Collision Name="gDekuMoonDungeonRotatingSpikesCol" Offset="0x4DF0" /> <!-- Original name is "i2_last02b1_bgdatainfo" -->
     </File>
 </Root>
diff --git a/assets/xml/objects/object_rs.xml b/assets/xml/objects/object_rsn.xml
index 5334f4fb8..1a33a0a93 100644
--- a/assets/xml/objects/object_rs.xml
+++ b/assets/xml/objects/object_rsn.xml
@@ -1,6 +1,6 @@
 <Root>
     <!-- Object for Bomb Shopkeeper-->
-    <File Name="object_rs" Segment="6">
+    <File Name="object_rsn" Segment="6">
         <!-- Bomb -->
         <DList Name="gBombShopkeeperBombDL" Offset="0x970" />
         <Texture Name="gBombShopkeeperBombFuseTex" OutName="bomb_shopkeeper_bomb_fuse" Format="i8" Width="32" Height="32" Offset="0xC08" />
@@ -37,10 +37,10 @@
         <Texture Name="gBombShopkeeperWristBandTex" OutName="bomb_shopkeeper_wrist_band" Format="ci8" Width="32" Height="32" Offset="0x69D8" />
 
         <!-- Animations -->
-        <Animation Name="gBombShopkeeperSwayAnim" Offset="0x788C" />
-        <Animation Name="gBombShopkeeperSitAtCounterStartAnim" Offset="0x8268" />
-        <Animation Name="gBombShopkeeperSitAtCounterLoopAnim" Offset="0x87BC" />
-        <Animation Name="gBombShopkeeperWalkAnim" Offset="0x9120" />
+        <Animation Name="gBombShopkeeperSwayAnim" Offset="0x788C" /> <!-- Original name is "rsn_ending" -->
+        <Animation Name="gBombShopkeeperSitAtCounterStartAnim" Offset="0x8268" /> <!-- Original name is "rsn_suwaru" -->
+        <Animation Name="gBombShopkeeperSitAtCounterLoopAnim" Offset="0x87BC" /> <!-- Original name is "rsn_wait" -->
+        <Animation Name="gBombShopkeeperWalkAnim" Offset="0x9120" /> <!-- Original name is "rsn_walk" -->
 
         <!-- Skeleton -->
         <Limb Name="gBombShopkeeperPelvisLimb" Type="Standard" EnumName="BOMB_SHOPKEEPER_LIMB_PELVIS" Offset="0x9130" />
diff --git a/assets/xml/objects/object_ru2.xml b/assets/xml/objects/object_ru2.xml
index 7d5823a50..9164d7b0f 100644
--- a/assets/xml/objects/object_ru2.xml
+++ b/assets/xml/objects/object_ru2.xml
@@ -4,12 +4,12 @@
     <File Name="object_ru2" Segment="6">
         <!-- Adult Ruto Animations -->
         <!-- gAdultRutoCrossingArmsAnim: Used in OoT when the sages seal ganon in the Evil Realm. -->
-        <Animation Name="gAdultRutoCrossingArmsAnim" Offset="0x04CC"/>
-        <Animation Name="gAdultRutoIdleAnim" Offset="0xDE8"/>
+        <Animation Name="gAdultRutoCrossingArmsAnim" Offset="0x04CC"/> <!-- Original name is "km_luto" -->
+        <Animation Name="gAdultRutoIdleAnim" Offset="0xDE8"/> <!-- Original name is "ru2_matsu" -->
 
         <!-- Adult Ruto Palettes -->
-        <Texture Name="gAdultRutoTLUT1" OutName="adult_ruto_tlut_1" Format="rgba16" Width="144" Height="1" Offset="0xE00"/>
-        <Texture Name="gAdultRutoTLUT2" OutName="adult_ruto_tlut_2" Format="rgba16" Width="16" Height="16" Offset="0x43C0"/>
+        <Texture Name="gAdultRuto1TLUT" OutName="adult_ruto_1_tlut" Format="rgba16" Width="144" Height="1" Offset="0xE00"/>
+        <Texture Name="gAdultRuto2TLUT" OutName="adult_ruto_2_tlut" Format="rgba16" Width="16" Height="16" Offset="0x43C0"/>
 
         <!-- Adult Ruto Eye Textures -->
         <Texture Name="gAdultRutoEyeOpenTex" OutName="adult_ruto_eye_open" Format="rgba16" Width="32" Height="32" Offset="0xF20"/>
@@ -86,13 +86,13 @@
         <Skeleton Name="gAdultRutoSkel" Type="Flex" LimbType="Standard" LimbNone="RU2_LIMB_NONE" LimbMax="RU2_LIMB_MAX" EnumName="Ru2Limb" Offset="0xC700" />
 
         <!-- (More) Adult Ruto Animations -->
-        <Animation Name="gAdultRutoRaisingArmsUpAnim" Offset="0xD3DC"/>
+        <Animation Name="gAdultRutoRaisingArmsUpAnim" Offset="0xD3DC"/> <!-- Original name is "ruto_banzai" -->
         <!-- HeadTurnDownLeft is intro to gAdultRutoLookingDownLeftAnim, used in OoT Credits scene -->
         <!--   Looking down at Nabooru with the other sages on Death Mountain after the party -->
-        <Animation Name="gAdultRutoHeadTurnDownLeftAnim" Offset="0xDCAC"/>
-        <Animation Name="gAdultRutoIdleHandsOnHipsAnim" Offset="0xE630"/>
-        <Animation Name="gAdultRutoLookingDownLeftAnim" Offset="0xF03C"/>
-        <Animation Name="gAdultRutoSwimmingUpAnim" Offset="0xF8B8"/>
+        <Animation Name="gAdultRutoHeadTurnDownLeftAnim" Offset="0xDCAC"/> <!-- Original name is "ruto_end_furimuki" -->
+        <Animation Name="gAdultRutoIdleHandsOnHipsAnim" Offset="0xE630"/> <!-- Original name is "ruto_end_wait" -->
+        <Animation Name="gAdultRutoLookingDownLeftAnim" Offset="0xF03C"/> <!-- Original name is "ruto_furimuki_wait" -->
+        <Animation Name="gAdultRutoSwimmingUpAnim" Offset="0xF8B8"/> <!-- Original name is "ruto_swim_up" -->
 
     </File>
 </Root>
diff --git a/assets/xml/objects/object_rz.xml b/assets/xml/objects/object_rz.xml
index 9bf8961a9..d1c30a5f5 100644
--- a/assets/xml/objects/object_rz.xml
+++ b/assets/xml/objects/object_rz.xml
@@ -1,13 +1,13 @@
 <Root>
     <File Name="object_rz" Segment="6">
-        <Animation Name="gRosaSistersApplaudingAnim" Offset="0x59C" />
-        <Animation Name="gRosaSistersOnKneesAnim" Offset="0xDE8" />
-        <Animation Name="gRosaSistersDancingAnim" Offset="0x28D4" />
-        <Animation Name="gRosaSistersSittingAnim" Offset="0x3098" />
-        <Animation Name="gRosaSistersStandingAnim" Offset="0x3A20" />
-        <Animation Name="gRosaSistersThinkingAnim" Offset="0x457C" />
-        <Animation Name="gRosaSistersWalkingAnim" Offset="0x5390" />
-        <Animation Name="gRosaSistersWalkingWhileThinkingAnim" Offset="0x5E50" />
+        <Animation Name="gRosaSistersApplaudingAnim" Offset="0x59C" /> <!-- Original name is "rz_kakkoii_loop" -->
+        <Animation Name="gRosaSistersOnKneesAnim" Offset="0xDE8" /> <!-- Original name is "rz_onegai_loop" -->
+        <Animation Name="gRosaSistersDancingAnim" Offset="0x28D4" /> <!-- Original name is "rz_rensyu_loop" -->
+        <Animation Name="gRosaSistersSittingAnim" Offset="0x3098" /> <!-- Original name is "rz_suwaru" -->
+        <Animation Name="gRosaSistersStandingAnim" Offset="0x3A20" /> <!-- Original name is "rz_waitA" -->
+        <Animation Name="gRosaSistersThinkingAnim" Offset="0x457C" /> <!-- Original name is "rz_waitB" -->
+        <Animation Name="gRosaSistersWalkingAnim" Offset="0x5390" /> <!-- Original name is "rz_walkA" -->
+        <Animation Name="gRosaSistersWalkingWhileThinkingAnim" Offset="0x5E50" /> <!-- Original name is "rz_walkB" -->
         <DList Name="object_rz_DL_0092B0" Offset="0x92B0" />
         <DList Name="object_rz_DL_0094C8" Offset="0x94C8" />
         <DList Name="object_rz_DL_009620" Offset="0x9620" />
diff --git a/include/tables/object_table.h b/include/tables/object_table.h
index 61175c118..6ee5b8adc 100644
--- a/include/tables/object_table.h
+++ b/include/tables/object_table.h
@@ -314,7 +314,7 @@
 /* 0x129 */ DEFINE_OBJECT(object_bg, OBJECT_BG)
 /* 0x12A */ DEFINE_OBJECT(object_bombiwa, OBJECT_BOMBIWA)
 /* 0x12B */ DEFINE_OBJECT(object_hintnuts, OBJECT_HINTNUTS)
-/* 0x12C */ DEFINE_OBJECT(object_rs, OBJECT_RS)
+/* 0x12C */ DEFINE_OBJECT(object_rsn, OBJECT_RSN)
 /* 0x12D */ DEFINE_OBJECT_UNSET(OBJECT_UNSET_12D)
 /* 0x12E */ DEFINE_OBJECT(object_gla, OBJECT_GLA)
 /* 0x12F */ DEFINE_OBJECT_UNSET(OBJECT_UNSET_12F)
diff --git a/spec b/spec
index fc733befb..c9b48c7e1 100644
--- a/spec
+++ b/spec
@@ -6313,11 +6313,11 @@ beginseg
 endseg
 
 beginseg
-    name "object_rs"
+    name "object_rsn"
     compress
     romalign 0x1000
     number 6
-    include "build/assets/objects/object_rs/object_rs.o"
+    include "build/assets/objects/object_rsn/object_rsn.o"
 endseg
 
 beginseg
diff --git a/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c b/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c
index 9abc1deef..f7e345d65 100644
--- a/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c
+++ b/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c
@@ -5,7 +5,7 @@
  */
 
 #include "z_en_rsn.h"
-#include "objects/object_rs/object_rs.h"
+#include "objects/object_rsn/object_rsn.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_2000000)
 
@@ -22,7 +22,7 @@ ActorInit En_Rsn_InitVars = {
     /**/ ACTOR_EN_RSN,
     /**/ ACTORCAT_NPC,
     /**/ FLAGS,
-    /**/ OBJECT_RS,
+    /**/ OBJECT_RSN,
     /**/ sizeof(EnRsn),
     /**/ EnRsn_Init,
     /**/ EnRsn_Destroy,
diff --git a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c
index fcc00d039..b0d7a2f8e 100644
--- a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c
+++ b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c
@@ -79,7 +79,7 @@ ActorInit En_Sob1_InitVars = {
 static s16 sObjectIds[][3] = {
     { OBJECT_ZO, OBJECT_ID_MAX, OBJECT_MASTERZOORA },
     { OBJECT_OF1D_MAP, OBJECT_ID_MAX, OBJECT_MASTERGOLON },
-    { OBJECT_RS, OBJECT_ID_MAX, OBJECT_ID_MAX },
+    { OBJECT_RSN, OBJECT_ID_MAX, OBJECT_ID_MAX },
     { OBJECT_OF1D_MAP, OBJECT_ID_MAX, OBJECT_MASTERGOLON },
 };
 
diff --git a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.h b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.h
index 2ae018ce4..0d23aaf7c 100644
--- a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.h
+++ b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.h
@@ -3,7 +3,7 @@
 
 #include "global.h"
 #include "overlays/actors/ovl_En_GirlA/z_en_girla.h"
-#include "objects/object_rs/object_rs.h"
+#include "objects/object_rsn/object_rsn.h"
 #include "objects/object_zo/object_zo.h"
 #include "objects/object_oF1d_map/object_oF1d_map.h"
 
diff --git a/tools/ZAPDConfigs/MM/ObjectList_MM.txt b/tools/ZAPDConfigs/MM/ObjectList_MM.txt
index 93c17e298..c6ca47a3e 100644
--- a/tools/ZAPDConfigs/MM/ObjectList_MM.txt
+++ b/tools/ZAPDConfigs/MM/ObjectList_MM.txt
@@ -298,7 +298,7 @@ OBJECT_BIGSLIME
 OBJECT_BG
 OBJECT_BOMBIWA
 OBJECT_HINTNUTS
-OBJECT_RS
+OBJECT_RSN
 OBJECT_UNSET_12D
 OBJECT_GLA
 OBJECT_UNSET_12F
diff --git a/tools/disasm/dma_filenames.txt b/tools/disasm/dma_filenames.txt
index 798a8b366..190f0cb36 100644
--- a/tools/disasm/dma_filenames.txt
+++ b/tools/disasm/dma_filenames.txt
@@ -814,7 +814,7 @@
     'object_bg',
     'object_bombiwa',
     'object_hintnuts',
-    'object_rs',
+    'object_rsn',
     'object_gla',
     'object_geldb',
     'object_dog',
diff --git a/tools/extract_baserom.py b/tools/extract_baserom.py
index c631a6392..a467c5b39 100755
--- a/tools/extract_baserom.py
+++ b/tools/extract_baserom.py
@@ -821,7 +821,7 @@ FILE_NAMES = [
     'object_bg',
     'object_bombiwa',
     'object_hintnuts',
-    'object_rs',
+    'object_rsn',
     'object_gla',
     'object_geldb',
     'object_dog',
diff --git a/tools/filelists/mm.us.rev1/all.csv b/tools/filelists/mm.us.rev1/all.csv
index 7c98a7cf3..568749e01 100644
--- a/tools/filelists/mm.us.rev1/all.csv
+++ b/tools/filelists/mm.us.rev1/all.csv
@@ -812,7 +812,7 @@
 811,object_bg
 812,object_bombiwa
 813,object_hintnuts
-814,object_rs
+814,object_rsn
 815,object_gla
 816,object_geldb
 817,object_dog
diff --git a/tools/filelists/mm.us.rev1/objects.csv b/tools/filelists/mm.us.rev1/objects.csv
index 2e572503e..0472ca039 100644
--- a/tools/filelists/mm.us.rev1/objects.csv
+++ b/tools/filelists/mm.us.rev1/objects.csv
@@ -162,7 +162,7 @@
 811,object_bg
 812,object_bombiwa
 813,object_hintnuts
-814,object_rs
+814,object_rsn
 815,object_gla
 816,object_geldb
 817,object_dog
diff --git a/tools/gitable.py b/tools/gitable.py
index c5b8bc9ec..432ed3ea3 100755
--- a/tools/gitable.py
+++ b/tools/gitable.py
@@ -760,7 +760,7 @@ objectId_names = {
     0x129: "OBJECT_BG",
     0x12A: "OBJECT_BOMBIWA",
     0x12B: "OBJECT_HINTNUTS",
-    0x12C: "OBJECT_RS",
+    0x12C: "OBJECT_RSN",
     0x12D: "OBJECT_UNSET_12D",
     0x12E: "OBJECT_GLA",
     0x12F: "OBJECT_UNSET_12F",