diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xE770.c b/assets/objects/gameplay_keep/door.c
similarity index 97%
rename from assets/objects/gameplay_keep/gameplay_keep_0xE770.c
rename to assets/objects/gameplay_keep/door.c
index baeaf9a7c0..1bcb9f0a75 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0xE770.c
+++ b/assets/objects/gameplay_keep/door.c
@@ -1,4 +1,4 @@
-#include "gameplay_keep_0xE770.h"
+#include "door.h"
 #include "array_count.h"
 #include "gfx.h"
 
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xE770.h b/assets/objects/gameplay_keep/door.h
similarity index 92%
rename from assets/objects/gameplay_keep/gameplay_keep_0xE770.h
rename to assets/objects/gameplay_keep/door.h
index 048c0b298a..7e210f7b09 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0xE770.h
+++ b/assets/objects/gameplay_keep/door.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0xE770_H
-#define GAMEPLAY_KEEP_0xE770_H
+#ifndef GAMEPLAY_KEEP_DOOR_H
+#define GAMEPLAY_KEEP_DOOR_H
 
 #include "tex_len.h"
 #include "ultra64.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xC0A0.c b/assets/objects/gameplay_keep/eff_fragments_1.c
similarity index 91%
rename from assets/objects/gameplay_keep/gameplay_keep_0xC0A0.c
rename to assets/objects/gameplay_keep/eff_fragments_1.c
index c0eecbc7c5..784e363ef9 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0xC0A0.c
+++ b/assets/objects/gameplay_keep/eff_fragments_1.c
@@ -1,4 +1,4 @@
-#include "gameplay_keep_0xC0A0.h"
+#include "eff_fragments_1.h"
 #include "gfx.h"
 
 Vtx gEffFragments1Vtx[] = {
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xC0A0.h b/assets/objects/gameplay_keep/eff_fragments_1.h
similarity index 77%
rename from assets/objects/gameplay_keep/gameplay_keep_0xC0A0.h
rename to assets/objects/gameplay_keep/eff_fragments_1.h
index a648c7e5b5..74a1e61870 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0xC0A0.h
+++ b/assets/objects/gameplay_keep/eff_fragments_1.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0xC0A0_H
-#define GAMEPLAY_KEEP_0xC0A0_H
+#ifndef GAMEPLAY_KEEP_EFF_FRAGMENTS_1_H
+#define GAMEPLAY_KEEP_EFF_FRAGMENTS_1_H
 
 #include "tex_len.h"
 #include "ultra64.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xCCC0.c b/assets/objects/gameplay_keep/eff_fragments_2_model.c
similarity index 85%
rename from assets/objects/gameplay_keep/gameplay_keep_0xCCC0.c
rename to assets/objects/gameplay_keep/eff_fragments_2_model.c
index 4f3bff7c85..f0104dbb6b 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0xCCC0.c
+++ b/assets/objects/gameplay_keep/eff_fragments_2_model.c
@@ -1,4 +1,4 @@
-#include "gameplay_keep_0xCCC0.h"
+#include "eff_fragments_2_model.h"
 #include "gfx.h"
 
 Vtx gEffFragments2Vtx[] = {
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xCCC0.h b/assets/objects/gameplay_keep/eff_fragments_2_model.h
similarity index 50%
rename from assets/objects/gameplay_keep/gameplay_keep_0xCCC0.h
rename to assets/objects/gameplay_keep/eff_fragments_2_model.h
index ea687ce12a..7ebe54340c 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0xCCC0.h
+++ b/assets/objects/gameplay_keep/eff_fragments_2_model.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0xCCC0_H
-#define GAMEPLAY_KEEP_0xCCC0_H
+#ifndef GAMEPLAY_KEEP_EFF_FRAGMENTS_2_MODEL_H
+#define GAMEPLAY_KEEP_EFF_FRAGMENTS_2_MODEL_H
 
 #include "ultra64.h"
 
diff --git a/assets/objects/gameplay_keep/gDoorAdultOpeningLeftAnim.c b/assets/objects/gameplay_keep/gDoorAdultOpeningLeftAnim.c
new file mode 100644
index 0000000000..4d5db4d36c
--- /dev/null
+++ b/assets/objects/gameplay_keep/gDoorAdultOpeningLeftAnim.c
@@ -0,0 +1,13 @@
+#include "gDoorAdultOpeningLeftAnim.h"
+
+s16 gDoorAdultOpeningLeftFrameData[] = {
+#include "assets/objects/gameplay_keep/gDoorAdultOpeningLeftFrameData.inc.c"
+};
+
+JointIndex gDoorAdultOpeningLeftJointIndices[] = {
+#include "assets/objects/gameplay_keep/gDoorAdultOpeningLeftJointIndices.inc.c"
+};
+
+AnimationHeader gDoorAdultOpeningLeftAnim = {
+#include "assets/objects/gameplay_keep/gDoorAdultOpeningLeftAnim.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gDoorAdultOpeningLeftAnim.h b/assets/objects/gameplay_keep/gDoorAdultOpeningLeftAnim.h
new file mode 100644
index 0000000000..8bab724e4e
--- /dev/null
+++ b/assets/objects/gameplay_keep/gDoorAdultOpeningLeftAnim.h
@@ -0,0 +1,10 @@
+#ifndef GAMEPLAY_KEEP_GDOORADULTOPENINGLEFTANIM_H
+#define GAMEPLAY_KEEP_GDOORADULTOPENINGLEFTANIM_H
+
+#include "animation.h"
+
+extern s16 gDoorAdultOpeningLeftFrameData[];
+extern JointIndex gDoorAdultOpeningLeftJointIndices[];
+extern AnimationHeader gDoorAdultOpeningLeftAnim;
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xFF80.c b/assets/objects/gameplay_keep/gDoorAdultOpeningRightAnim.c
similarity index 90%
rename from assets/objects/gameplay_keep/gameplay_keep_0xFF80.c
rename to assets/objects/gameplay_keep/gDoorAdultOpeningRightAnim.c
index 93d8617465..c5e171b86a 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0xFF80.c
+++ b/assets/objects/gameplay_keep/gDoorAdultOpeningRightAnim.c
@@ -1,4 +1,4 @@
-#include "gameplay_keep_0xFF80.h"
+#include "gDoorAdultOpeningRightAnim.h"
 
 s16 gDoorAdultOpeningRightFrameData[] = {
 #include "assets/objects/gameplay_keep/gDoorAdultOpeningRightFrameData.inc.c"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xFF80.h b/assets/objects/gameplay_keep/gDoorAdultOpeningRightAnim.h
similarity index 63%
rename from assets/objects/gameplay_keep/gameplay_keep_0xFF80.h
rename to assets/objects/gameplay_keep/gDoorAdultOpeningRightAnim.h
index c538156999..b444b93ff0 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0xFF80.h
+++ b/assets/objects/gameplay_keep/gDoorAdultOpeningRightAnim.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0xFF80_H
-#define GAMEPLAY_KEEP_0xFF80_H
+#ifndef GAMEPLAY_KEEP_DOOR_ADULT_OPENING_RIGHT_ANIM_H
+#define GAMEPLAY_KEEP_DOOR_ADULT_OPENING_RIGHT_ANIM_H
 
 #include "animation.h"
 
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xE4E0.c b/assets/objects/gameplay_keep/gDoorChildOpeningLeftAnim.c
similarity index 90%
rename from assets/objects/gameplay_keep/gameplay_keep_0xE4E0.c
rename to assets/objects/gameplay_keep/gDoorChildOpeningLeftAnim.c
index 98dde2a17e..e2b340858a 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0xE4E0.c
+++ b/assets/objects/gameplay_keep/gDoorChildOpeningLeftAnim.c
@@ -1,4 +1,4 @@
-#include "gameplay_keep_0xE4E0.h"
+#include "gDoorChildOpeningLeftAnim.h"
 
 s16 gDoorChildOpeningLeftFrameData[] = {
 #include "assets/objects/gameplay_keep/gDoorChildOpeningLeftFrameData.inc.c"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xE4E0.h b/assets/objects/gameplay_keep/gDoorChildOpeningLeftAnim.h
similarity index 63%
rename from assets/objects/gameplay_keep/gameplay_keep_0xE4E0.h
rename to assets/objects/gameplay_keep/gDoorChildOpeningLeftAnim.h
index 9dc1ff7c21..295b87edd1 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0xE4E0.h
+++ b/assets/objects/gameplay_keep/gDoorChildOpeningLeftAnim.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0xE4E0_H
-#define GAMEPLAY_KEEP_0xE4E0_H
+#ifndef GAMEPLAY_KEEP_DOOR_CHILD_OPENING_LEFT_ANIM_H
+#define GAMEPLAY_KEEP_DOOR_CHILD_OPENING_LEFT_ANIM_H
 
 #include "animation.h"
 
diff --git a/assets/objects/gameplay_keep/gDoorChildOpeningRightAnim.c b/assets/objects/gameplay_keep/gDoorChildOpeningRightAnim.c
new file mode 100644
index 0000000000..79af410047
--- /dev/null
+++ b/assets/objects/gameplay_keep/gDoorChildOpeningRightAnim.c
@@ -0,0 +1,13 @@
+#include "gDoorChildOpeningRightAnim.h"
+
+s16 gDoorChildOpeningRightFrameData[] = {
+#include "assets/objects/gameplay_keep/gDoorChildOpeningRightFrameData.inc.c"
+};
+
+JointIndex gDoorChildOpeningRightJointIndices[] = {
+#include "assets/objects/gameplay_keep/gDoorChildOpeningRightJointIndices.inc.c"
+};
+
+AnimationHeader gDoorChildOpeningRightAnim = {
+#include "assets/objects/gameplay_keep/gDoorChildOpeningRightAnim.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gDoorChildOpeningRightAnim.h b/assets/objects/gameplay_keep/gDoorChildOpeningRightAnim.h
new file mode 100644
index 0000000000..6476396339
--- /dev/null
+++ b/assets/objects/gameplay_keep/gDoorChildOpeningRightAnim.h
@@ -0,0 +1,10 @@
+#ifndef GAMEPLAY_KEEP_GDOORCHILDOPENINGRIGHTANIM_H
+#define GAMEPLAY_KEEP_GDOORCHILDOPENINGRIGHTANIM_H
+
+#include "animation.h"
+
+extern s16 gDoorChildOpeningRightFrameData[];
+extern JointIndex gDoorChildOpeningRightJointIndices[];
+extern AnimationHeader gDoorChildOpeningRightAnim;
+
+#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep.h b/assets/objects/gameplay_keep/gameplay_keep.h
index c7e05bde21..51e0d4bf74 100644
--- a/assets/objects/gameplay_keep/gameplay_keep.h
+++ b/assets/objects/gameplay_keep/gameplay_keep.h
@@ -13,7 +13,7 @@
 #include "bomb_cap.h"
 #include "bombchu_body.h"
 #include "eff_bomb_explosion.h"
-#include "gameplay_keep_0xC0A0.h"
+#include "eff_fragments_1.h"
 #include "boomerang.h"
 #include "compass_arrow.h"
 #if OOT_REGION != REGION_EU
@@ -21,17 +21,17 @@
 #endif
 #include "lock_on_arrow.h"
 #include "hilite3_tex.h"
-#include "gameplay_keep_0xCCC0.h"
+#include "eff_fragments_2_model.h"
 #if OOT_REGION != REGION_EU
 #include "gameplay_keep_ntsc_0xCE60.h"
 #endif
-#include "gameplay_keep_0xCDC0.h"
-#include "gameplay_keep_0xD0C0.h"
-#include "gameplay_keep_0xD4E0.h"
-#include "gameplay_keep_0xE4E0.h"
-#include "gameplay_keep_0xE5D0.h"
-#include "gameplay_keep_0xE770.h"
-#include "gameplay_keep_0xFF80.h"
+#include "shopkeeper_controls_tex.h"
+#include "rock_fragments_model.h"
+#include "rock_fragments_tex.h"
+#include "gDoorChildOpeningLeftAnim.h"
+#include "gDoorChildOpeningRightAnim.h"
+#include "door.h"
+#include "gDoorAdultOpeningRightAnim.h"
 #include "eff_dust.h"
 #include "eff_flash.h"
 #include "gameplay_keep_0x11230.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xE5D0.c b/assets/objects/gameplay_keep/gameplay_keep_0xE5D0.c
deleted file mode 100644
index 6e8fabe309..0000000000
--- a/assets/objects/gameplay_keep/gameplay_keep_0xE5D0.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "gameplay_keep_0xE5D0.h"
-
-s16 gDoorChildOpeningRightFrameData[] = {
-#include "assets/objects/gameplay_keep/gDoorChildOpeningRightFrameData.inc.c"
-};
-
-JointIndex gDoorChildOpeningRightJointIndices[] = {
-#include "assets/objects/gameplay_keep/gDoorChildOpeningRightJointIndices.inc.c"
-};
-
-AnimationHeader gDoorChildOpeningRightAnim = {
-#include "assets/objects/gameplay_keep/gDoorChildOpeningRightAnim.inc.c"
-};
-
-s16 gDoorAdultOpeningLeftFrameData[] = {
-#include "assets/objects/gameplay_keep/gDoorAdultOpeningLeftFrameData.inc.c"
-};
-
-JointIndex gDoorAdultOpeningLeftJointIndices[] = {
-#include "assets/objects/gameplay_keep/gDoorAdultOpeningLeftJointIndices.inc.c"
-};
-
-AnimationHeader gDoorAdultOpeningLeftAnim = {
-#include "assets/objects/gameplay_keep/gDoorAdultOpeningLeftAnim.inc.c"
-};
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xE5D0.h b/assets/objects/gameplay_keep/gameplay_keep_0xE5D0.h
deleted file mode 100644
index ddbefc6bc5..0000000000
--- a/assets/objects/gameplay_keep/gameplay_keep_0xE5D0.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef GAMEPLAY_KEEP_0xE5D0_H
-#define GAMEPLAY_KEEP_0xE5D0_H
-
-#include "animation.h"
-
-extern s16 gDoorChildOpeningRightFrameData[];
-extern JointIndex gDoorChildOpeningRightJointIndices[];
-extern AnimationHeader gDoorChildOpeningRightAnim;
-extern s16 gDoorAdultOpeningLeftFrameData[];
-extern JointIndex gDoorAdultOpeningLeftJointIndices[];
-extern AnimationHeader gDoorAdultOpeningLeftAnim;
-
-#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xD0C0.c b/assets/objects/gameplay_keep/rock_fragments_model.c
similarity index 86%
rename from assets/objects/gameplay_keep/gameplay_keep_0xD0C0.c
rename to assets/objects/gameplay_keep/rock_fragments_model.c
index b3b9561f08..7498e7b560 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0xD0C0.c
+++ b/assets/objects/gameplay_keep/rock_fragments_model.c
@@ -1,5 +1,5 @@
-#include "gameplay_keep_0xD0C0.h"
-#include "gameplay_keep_0xD4E0.h"
+#include "rock_fragments_model.h"
+#include "rock_fragments_tex.h"
 #include "gfx.h"
 
 Vtx gUnusedRockFragmentVtx[] = {
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xD0C0.h b/assets/objects/gameplay_keep/rock_fragments_model.h
similarity index 66%
rename from assets/objects/gameplay_keep/gameplay_keep_0xD0C0.h
rename to assets/objects/gameplay_keep/rock_fragments_model.h
index 985d260519..70e1c70df8 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0xD0C0.h
+++ b/assets/objects/gameplay_keep/rock_fragments_model.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0xD0C0_H
-#define GAMEPLAY_KEEP_0xD0C0_H
+#ifndef GAMEPLAY_KEEP_ROCK_FRAGMENTS_MODEL_H
+#define GAMEPLAY_KEEP_ROCK_FRAGMENTS_MODEL_H
 
 #include "ultra64.h"
 
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xD4E0.c b/assets/objects/gameplay_keep/rock_fragments_tex.c
similarity index 90%
rename from assets/objects/gameplay_keep/gameplay_keep_0xD4E0.c
rename to assets/objects/gameplay_keep/rock_fragments_tex.c
index aa6d252e46..c548202352 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0xD4E0.c
+++ b/assets/objects/gameplay_keep/rock_fragments_tex.c
@@ -1,4 +1,4 @@
-#include "gameplay_keep_0xD4E0.h"
+#include "rock_fragments_tex.h"
 
 u64 gRockFragment1Tex[TEX_LEN(u64, gRockFragment1Tex_WIDTH, gRockFragment1Tex_HEIGHT, 16)] = {
 #include "assets/objects/gameplay_keep/gRockFragment1Tex.rgba16.inc.c"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xD4E0.h b/assets/objects/gameplay_keep/rock_fragments_tex.h
similarity index 82%
rename from assets/objects/gameplay_keep/gameplay_keep_0xD4E0.h
rename to assets/objects/gameplay_keep/rock_fragments_tex.h
index 48cad24571..3f32acc42c 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0xD4E0.h
+++ b/assets/objects/gameplay_keep/rock_fragments_tex.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0xD4E0_H
-#define GAMEPLAY_KEEP_0xD4E0_H
+#ifndef GAMEPLAY_KEEP_ROCK_FRAGMENTS_TEX_H
+#define GAMEPLAY_KEEP_ROCK_FRAGMENTS_TEX_H
 
 #include "tex_len.h"
 #include "ultra64.h"
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xCDC0.c b/assets/objects/gameplay_keep/shopkeeper_controls_tex.c
similarity index 93%
rename from assets/objects/gameplay_keep/gameplay_keep_0xCDC0.c
rename to assets/objects/gameplay_keep/shopkeeper_controls_tex.c
index e2978a14c8..b6a072accc 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0xCDC0.c
+++ b/assets/objects/gameplay_keep/shopkeeper_controls_tex.c
@@ -1,4 +1,4 @@
-#include "gameplay_keep_0xCDC0.h"
+#include "shopkeeper_controls_tex.h"
 #include "region.h"
 
 u64 gSelectionCursorTex[TEX_LEN(u64, gSelectionCursorTex_WIDTH, gSelectionCursorTex_HEIGHT, 4)] = {
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0xCDC0.h b/assets/objects/gameplay_keep/shopkeeper_controls_tex.h
similarity index 85%
rename from assets/objects/gameplay_keep/gameplay_keep_0xCDC0.h
rename to assets/objects/gameplay_keep/shopkeeper_controls_tex.h
index f3c14722d5..65b7403588 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0xCDC0.h
+++ b/assets/objects/gameplay_keep/shopkeeper_controls_tex.h
@@ -1,5 +1,5 @@
-#ifndef GAMEPLAY_KEEP_0xCDC0_H
-#define GAMEPLAY_KEEP_0xCDC0_H
+#ifndef GAMEPLAY_KEEP_SHOPKEEPER_CONTROLS_TEX_H
+#define GAMEPLAY_KEEP_SHOPKEEPER_CONTROLS_TEX_H
 
 #include "tex_len.h"
 #include "ultra64.h"
diff --git a/spec/spec b/spec/spec
index 87d7229e45..bfd201683d 100644
--- a/spec/spec
+++ b/spec/spec
@@ -1009,7 +1009,7 @@ beginseg
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/bomb_cap.o"
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/bombchu_body.o"
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_bomb_explosion.o"
-    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0xC0A0.o"
+    include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_fragments_1.o"
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/boomerang.o"
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/compass_arrow.o"
 #if OOT_REGION != REGION_EU
@@ -1017,17 +1017,18 @@ beginseg
 #endif
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/lock_on_arrow.o"
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/hilite3_tex.o"
-    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0xCCC0.o"
+    include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_fragments_2_model.o"
 #if OOT_REGION != REGION_EU
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0xCE60.o"
 #endif
-    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0xCDC0.o"
-    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0xD0C0.o"
-    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0xD4E0.o"
-    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0xE4E0.o"
-    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0xE5D0.o"
-    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0xE770.o"
-    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0xFF80.o"
+    include "$(BUILD_DIR)/assets/objects/gameplay_keep/shopkeeper_controls_tex.o"
+    include "$(BUILD_DIR)/assets/objects/gameplay_keep/rock_fragments_model.o"
+    include "$(BUILD_DIR)/assets/objects/gameplay_keep/rock_fragments_tex.o"
+    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gDoorChildOpeningLeftAnim.o"
+    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gDoorChildOpeningRightAnim.o"
+    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gDoorAdultOpeningLeftAnim.o"
+    include "$(BUILD_DIR)/assets/objects/gameplay_keep/door.o"
+    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gDoorAdultOpeningRightAnim.o"
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_dust.o"
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_flash.o"
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x11230.o"
diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c
index f51a388ae1..20c019335e 100644
--- a/src/code/z_en_a_keep.c
+++ b/src/code/z_en_a_keep.c
@@ -17,7 +17,7 @@
 #include "assets/objects/gameplay_keep/tree_stump_model.h"
 #include "assets/objects/gameplay_keep/rectangular_sign_model.h"
 #include "assets/objects/gameplay_keep/gameplay_keep_0x3C2E0.h"
-#include "assets/objects/gameplay_keep/gameplay_keep_0xD0C0.h"
+#include "assets/objects/gameplay_keep/rock_fragments_model.h"
 #include "assets/objects/object_d_hsblock/object_d_hsblock.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
diff --git a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c
index 7b92a74806..1d2cfd63f1 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c
+++ b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c
@@ -17,7 +17,7 @@
 #include "effect.h"
 #include "play_state.h"
 
-#include "assets/objects/gameplay_keep/gameplay_keep_0xCCC0.h"
+#include "assets/objects/gameplay_keep/eff_fragments_2_model.h"
 #include "assets/objects/gameplay_keep/gameplay_keep_0x173D0.h"
 #include "assets/objects/object_haka_objects/object_haka_objects.h"
 
diff --git a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c
index 7010fc24f7..447cbcb14f 100644
--- a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c
+++ b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c
@@ -17,7 +17,7 @@
 #include "play_state.h"
 #include "player.h"
 
-#include "assets/objects/gameplay_keep/gameplay_keep_0xE770.h"
+#include "assets/objects/gameplay_keep/door.h"
 #include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 #include "assets/objects/object_mizu_objects/object_mizu_objects.h"
 #include "assets/objects/object_haka_door/object_haka_door.h"
diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.c b/src/overlays/actors/ovl_En_Door/z_en_door.c
index 5d70adc24a..1ee57f687f 100644
--- a/src/overlays/actors/ovl_En_Door/z_en_door.c
+++ b/src/overlays/actors/ovl_En_Door/z_en_door.c
@@ -18,10 +18,11 @@
 #include "player.h"
 #include "save.h"
 
-#include "assets/objects/gameplay_keep/gameplay_keep_0xE5D0.h"
-#include "assets/objects/gameplay_keep/gameplay_keep_0xE4E0.h"
-#include "assets/objects/gameplay_keep/gameplay_keep_0xFF80.h"
-#include "assets/objects/gameplay_keep/gameplay_keep_0xE770.h"
+#include "assets/objects/gameplay_keep/gDoorChildOpeningRightAnim.h"
+#include "assets/objects/gameplay_keep/gDoorChildOpeningLeftAnim.h"
+#include "assets/objects/gameplay_keep/gDoorAdultOpeningRightAnim.h"
+#include "assets/objects/gameplay_keep/gDoorAdultOpeningLeftAnim.h"
+#include "assets/objects/gameplay_keep/door.h"
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
 #include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 #include "assets/objects/object_mizu_objects/object_mizu_objects.h"
diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
index b028dd2ec6..e5a63a4676 100644
--- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
+++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
@@ -23,7 +23,7 @@
 #include "play_state.h"
 #include "player.h"
 
-#include "assets/objects/gameplay_keep/gameplay_keep_0xD0C0.h"
+#include "assets/objects/gameplay_keep/rock_fragments_model.h"
 #include "assets/objects/object_goroiwa/object_goroiwa.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
index 4f055f1012..0a42d8ae71 100644
--- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
+++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
@@ -19,7 +19,7 @@
 #include "player.h"
 #include "save.h"
 
-#include "assets/objects/gameplay_keep/gameplay_keep_0xCDC0.h"
+#include "assets/objects/gameplay_keep/shopkeeper_controls_tex.h"
 #include "assets/objects/object_ossan/object_ossan.h"
 #include "assets/objects/object_oF1d_map/object_oF1d_map.h"
 #include "assets/objects/object_os/object_os.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c
index 5bcdc45023..278f2693f0 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c
@@ -15,8 +15,8 @@
 #include "play_state.h"
 #include "player.h"
 
-#include "assets/objects/gameplay_keep/gameplay_keep_0xC0A0.h"
-#include "assets/objects/gameplay_keep/gameplay_keep_0xCCC0.h"
+#include "assets/objects/gameplay_keep/eff_fragments_1.h"
+#include "assets/objects/gameplay_keep/eff_fragments_2_model.h"
 
 #define rPitch regs[0]
 #define rYaw regs[1]