diff --git a/assets/xml/objects/object_f40_switch.xml b/assets/xml/objects/object_f40_switch.xml
index 7e7fb5b1cf..6be5a5bd5e 100644
--- a/assets/xml/objects/object_f40_switch.xml
+++ b/assets/xml/objects/object_f40_switch.xml
@@ -1,9 +1,10 @@
 <Root>
+    <!-- Object for Stone Tower Switch -->
     <File Name="object_f40_switch" Segment="6">
-        <Collision Name="object_f40_switch_Colheader_000118" Offset="0x118" /> <!-- Original name is "f40_switch_1_bgdatainfo" -->
-        <DList Name="object_f40_switch_DL_000390" Offset="0x390" /> <!-- Original name is "z2_switch_lb_modelT" -->
-        <DList Name="object_f40_switch_DL_000438" Offset="0x438" /> <!-- Original name is "z2_switch_lb_model" -->
-        <Texture Name="object_f40_switch_Tex_0004E8" OutName="tex_0004E8" Format="rgba16" Width="16" Height="64" Offset="0x4E8" />
-        <Texture Name="object_f40_switch_Tex_000CE8" OutName="tex_000CE8" Format="ia8" Width="16" Height="16" Offset="0xCE8" />
+        <Collision Name="gStoneTowerFloorSwitchCol" Offset="0x118" /> <!-- Original name is "f40_switch_1_bgdatainfo" -->
+        <DList Name="gStoneTowerFloorSwitchOutlineDL" Offset="0x390" /> <!-- Original name is "z2_switch_lb_modelT" -->
+        <DList Name="gStoneTowerFloorSwitchDL" Offset="0x438" /> <!-- Original name is "z2_switch_lb_model" -->
+        <Texture Name="gStoneTowerFloorSwitchOutlineTex" OutName="stone_tower_switch_outline" Format="rgba16" Width="16" Height="64" Offset="0x4E8" />
+        <Texture Name="gStoneTowerFloorSwitchTex" OutName="stone_tower_switch" Format="ia8" Width="16" Height="16" Offset="0xCE8" />
     </File>
 </Root>
diff --git a/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c b/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c
index 9e4f9a5903..18063efce9 100644
--- a/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c
+++ b/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c
@@ -1,7 +1,7 @@
 /*
  * File: z_bg_f40_switch.c
  * Overlay: ovl_Bg_F40_Switch
- * Description: Stone Tower Switch
+ * Description: Stone Tower FloorSwitch
  */
 
 #include "z_bg_f40_switch.h"
@@ -113,7 +113,7 @@ void BgF40Switch_Init(Actor* thisx, PlayState* play) {
     this->actionFunc = BgF40Switch_IdleUnpressed;
     this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y + 1.0f;
     DynaPolyActor_Init(&this->dyna, DYNA_TRANSFORM_POS);
-    DynaPolyActor_LoadMesh(play, &this->dyna, &object_f40_switch_Colheader_000118);
+    DynaPolyActor_LoadMesh(play, &this->dyna, &gStoneTowerFloorSwitchCol);
     if (!sBgF40SwitchGlobalsInitialized) {
         sBgF40SwitchLastUpdateFrame = play->gameplayFrames;
         sBgF40SwitchGlobalsInitialized = true;
@@ -189,6 +189,6 @@ void BgF40Switch_Update(Actor* thisx, PlayState* play) {
 void BgF40Switch_Draw(Actor* thisx, PlayState* play) {
     BgF40Switch* this = THIS;
 
-    Gfx_DrawDListOpa(play, object_f40_switch_DL_000438);
-    Gfx_DrawDListOpa(play, object_f40_switch_DL_000390);
+    Gfx_DrawDListOpa(play, gStoneTowerFloorSwitchDL);
+    Gfx_DrawDListOpa(play, gStoneTowerFloorSwitchOutlineDL);
 }