diff --git a/assets/objects/gameplay_keep/eff_fire.c b/assets/objects/gameplay_keep/eff_fire.c
index 7d95baaae4..7527371410 100644
--- a/assets/objects/gameplay_keep/eff_fire.c
+++ b/assets/objects/gameplay_keep/eff_fire.c
@@ -13,10 +13,10 @@ Gfx gEffFire2DL[24] = {
 #include "assets/objects/gameplay_keep/gEffFire2DL.inc.c"
 };
 
-u64 gDecorativeFlameMaskTex[TEX_LEN(u64, gDecorativeFlameMaskTex_WIDTH, gDecorativeFlameMaskTex_HEIGHT, 4)] = {
-#include "assets/objects/gameplay_keep/gDecorativeFlameMaskTex.i4.inc.c"
+u64 gEffFire1Tex[TEX_LEN(u64, gEffFire1Tex_WIDTH, gEffFire1Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gEffFire1Tex.i4.inc.c"
 };
 
-u64 gDecorativeFlameTex[TEX_LEN(u64, gDecorativeFlameTex_WIDTH, gDecorativeFlameTex_HEIGHT, 8)] = {
-#include "assets/objects/gameplay_keep/gDecorativeFlameTex.i8.inc.c"
+u64 gEffFire2Tex[TEX_LEN(u64, gEffFire2Tex_WIDTH, gEffFire2Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffFire2Tex.i8.inc.c"
 };
diff --git a/assets/objects/gameplay_keep/eff_fire.h b/assets/objects/gameplay_keep/eff_fire.h
index cf3aee7eb5..df53344fc1 100644
--- a/assets/objects/gameplay_keep/eff_fire.h
+++ b/assets/objects/gameplay_keep/eff_fire.h
@@ -7,11 +7,11 @@
 extern Vtx gEffFireVtx[];
 extern Gfx gEffFire1DL[24];
 extern Gfx gEffFire2DL[24];
-#define gDecorativeFlameMaskTex_WIDTH 32
-#define gDecorativeFlameMaskTex_HEIGHT 128
-extern u64 gDecorativeFlameMaskTex[TEX_LEN(u64, gDecorativeFlameMaskTex_WIDTH, gDecorativeFlameMaskTex_HEIGHT, 4)];
-#define gDecorativeFlameTex_WIDTH 32
-#define gDecorativeFlameTex_HEIGHT 64
-extern u64 gDecorativeFlameTex[TEX_LEN(u64, gDecorativeFlameTex_WIDTH, gDecorativeFlameTex_HEIGHT, 8)];
+#define gEffFire1Tex_WIDTH 32
+#define gEffFire1Tex_HEIGHT 128
+extern u64 gEffFire1Tex[TEX_LEN(u64, gEffFire1Tex_WIDTH, gEffFire1Tex_HEIGHT, 4)];
+#define gEffFire2Tex_WIDTH 32
+#define gEffFire2Tex_HEIGHT 64
+extern u64 gEffFire2Tex[TEX_LEN(u64, gEffFire2Tex_WIDTH, gEffFire2Tex_HEIGHT, 8)];
 
 #endif
diff --git a/assets/objects/gameplay_keep/gFishInAirAnim.c b/assets/objects/gameplay_keep/gFishInAirAnim.c
new file mode 100644
index 0000000000..edd8b8084f
--- /dev/null
+++ b/assets/objects/gameplay_keep/gFishInAirAnim.c
@@ -0,0 +1,13 @@
+#include "gFishInAirAnim.h"
+
+s16 gFishInAirFrameData[] = {
+#include "assets/objects/gameplay_keep/gFishInAirFrameData.inc.c"
+};
+
+JointIndex gFishInAirJointIndices[] = {
+#include "assets/objects/gameplay_keep/gFishInAirJointIndices.inc.c"
+};
+
+AnimationHeader gFishInAirAnim = {
+#include "assets/objects/gameplay_keep/gFishInAirAnim.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gFishInAirAnim.h b/assets/objects/gameplay_keep/gFishInAirAnim.h
new file mode 100644
index 0000000000..da6c526f1c
--- /dev/null
+++ b/assets/objects/gameplay_keep/gFishInAirAnim.h
@@ -0,0 +1,10 @@
+#ifndef GAMEPLAY_KEEP_GFISHINAIRANIM_H
+#define GAMEPLAY_KEEP_GFISHINAIRANIM_H
+
+#include "animation.h"
+
+extern s16 gFishInAirFrameData[];
+extern JointIndex gFishInAirJointIndices[];
+extern AnimationHeader gFishInAirAnim;
+
+#endif
diff --git a/assets/objects/gameplay_keep/gFishOutOfWaterAnim.c b/assets/objects/gameplay_keep/gFishOutOfWaterAnim.c
deleted file mode 100644
index 7579f0ca93..0000000000
--- a/assets/objects/gameplay_keep/gFishOutOfWaterAnim.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "gFishOutOfWaterAnim.h"
-
-s16 gFishOutOfWaterFrameData[] = {
-#include "assets/objects/gameplay_keep/gFishOutOfWaterFrameData.inc.c"
-};
-
-JointIndex gFishOutOfWaterJointIndices[] = {
-#include "assets/objects/gameplay_keep/gFishOutOfWaterJointIndices.inc.c"
-};
-
-AnimationHeader gFishOutOfWaterAnim = {
-#include "assets/objects/gameplay_keep/gFishOutOfWaterAnim.inc.c"
-};
diff --git a/assets/objects/gameplay_keep/gFishOutOfWaterAnim.h b/assets/objects/gameplay_keep/gFishOutOfWaterAnim.h
deleted file mode 100644
index e96f710391..0000000000
--- a/assets/objects/gameplay_keep/gFishOutOfWaterAnim.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef GAMEPLAY_KEEP_GFISHOUTOFWATERANIM_H
-#define GAMEPLAY_KEEP_GFISHOUTOFWATERANIM_H
-
-#include "animation.h"
-
-extern s16 gFishOutOfWaterFrameData[];
-extern JointIndex gFishOutOfWaterJointIndices[];
-extern AnimationHeader gFishOutOfWaterAnim;
-
-#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep.h b/assets/objects/gameplay_keep/gameplay_keep.h
index 3419f25678..b9abeab522 100644
--- a/assets/objects/gameplay_keep/gameplay_keep.h
+++ b/assets/objects/gameplay_keep/gameplay_keep.h
@@ -44,7 +44,7 @@
 #include "gameplay_keep_0x16A50.h"
 #include "hilite4_tex.h"
 #include "gameplay_keep_0x173D0.h"
-#include "gFishOutOfWaterAnim.h"
+#include "gFishInAirAnim.h"
 #include "gameplay_keep_0x18610.h"
 #include "gFishInWaterAnim.h"
 #include "eff_shockwave.h"
diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml
index ee175c5053..17b456b1b4 100644
--- a/assets/xml/objects/gameplay_keep.xml
+++ b/assets/xml/objects/gameplay_keep.xml
@@ -847,7 +847,7 @@
             <Vtx/>
         </Array>
         <DList Name="gEffFireCircleDL" Length="30"/>
-        <Animation Name="gFishOutOfWaterAnim" Offset=".+0x5C"/>
+        <Animation Name="gFishInAirAnim" Offset=".+0x5C"/>
         <Array Name="gameplay_keep_Vtx_018610" Count="4" Offset=".+0x4">
             <Vtx/>
         </Array>
@@ -1351,8 +1351,8 @@
         </Array>
         <DList Name="gEffFire1DL" Length="24"/>
         <DList Name="gEffFire2DL" Length="24"/>
-        <Texture Name="gDecorativeFlameMaskTex" Format="i4" Width="32" Height="128"/>
-        <Texture Name="gDecorativeFlameTex" Format="i8" Width="32" Height="64"/>
+        <Texture Name="gEffFire1Tex" Format="i4" Width="32" Height="128"/>
+        <Texture Name="gEffFire2Tex" Format="i8" Width="32" Height="64"/>
         <Array Name="gUnusedUnknownShape1Vtx" Count="197">
             <Vtx/>
         </Array>
diff --git a/spec/objects.inc b/spec/objects.inc
index ea3c29d4b3..3f3d3790ac 100644
--- a/spec/objects.inc
+++ b/spec/objects.inc
@@ -44,7 +44,7 @@ beginseg
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x16A50.o"
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/hilite4_tex.o"
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x173D0.o"
-    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gFishOutOfWaterAnim.o"
+    include "$(BUILD_DIR)/assets/objects/gameplay_keep/gFishInAirAnim.o"
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x18610.o"
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/gFishInWaterAnim.o"
     include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_shockwave.o"
diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/src/overlays/actors/ovl_En_Fish/z_en_fish.c
index f207e8a612..f1efbfa080 100644
--- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c
+++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c
@@ -21,7 +21,7 @@
 #include "player.h"
 
 #include "assets/objects/gameplay_keep/gFishInWaterAnim.h"
-#include "assets/objects/gameplay_keep/gFishOutOfWaterAnim.h"
+#include "assets/objects/gameplay_keep/gFishInAirAnim.h"
 #include "assets/objects/gameplay_keep/gameplay_keep_0x18610.h"
 
 #define FLAGS 0
@@ -109,7 +109,7 @@ void EnFish_SetInWaterAnimation(EnFish* this) {
 }
 
 void EnFish_SetOutOfWaterAnimation(EnFish* this) {
-    Animation_Change(&this->skelAnime, &gFishOutOfWaterAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gFishOutOfWaterAnim),
+    Animation_Change(&this->skelAnime, &gFishInAirAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gFishInAirAnim),
                      ANIMMODE_LOOP_INTERP, 2.0f);
 }
 
diff --git a/tools/assets/extract/extase_oot64/dlist_resources.py b/tools/assets/extract/extase_oot64/dlist_resources.py
index 5bda06879b..fc3af6f20d 100644
--- a/tools/assets/extract/extase_oot64/dlist_resources.py
+++ b/tools/assets/extract/extase_oot64/dlist_resources.py
@@ -1459,7 +1459,7 @@ class DListResource(Resource, can_size_be_unknown=True):
                     "gHilite2Tex",  # used as both rgba16 16x16 and rgba16 32x32
                     "gUnknownCircle4Tex",  # used as both i8 16x16 and rgba16 32x32
                     "gLinkChildLowerBootTex",  # used as both ci8 32x32 and ci8 16x16
-                    "gDecorativeFlameMaskTex",  # used as both i4 32x128 and i4 32x64
+                    "gEffFire1Tex",  # used as both i4 32x128 and i4 32x64
                 }
                 if (
                     arg_num == width_arg_i