diff --git a/include/z64malloc.h b/include/zelda_arena.h
similarity index 91%
rename from include/z64malloc.h
rename to include/zelda_arena.h
index b679d39844..c5b87b20b8 100644
--- a/include/z64malloc.h
+++ b/include/zelda_arena.h
@@ -1,5 +1,5 @@
-#ifndef Z64MALLOC_H
-#define Z64MALLOC_H
+#ifndef ZELDA_ARENA_H
+#define ZELDA_ARENA_H
 
 #include "ultra64.h"
 
diff --git a/src/code/speed_meter.c b/src/code/speed_meter.c
index df477db775..1d57fd74c9 100644
--- a/src/code/speed_meter.c
+++ b/src/code/speed_meter.c
@@ -6,7 +6,7 @@
 #include "regs.h"
 #include "sys_cfb.h"
 #include "z64game.h"
-#include "z64malloc.h"
+#include "zelda_arena.h"
 #include "z64view.h"
 
 /**
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index 8ca7284359..428404ae7e 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -34,7 +34,7 @@ struct Actor* D_801ED920; // 2 funcs. 1 out of z_actor
 #include "z64door.h"
 #include "z64circle_tex.h"
 #include "z64horse.h"
-#include "z64malloc.h"
+#include "zelda_arena.h"
 #include "z64quake.h"
 #include "z64rumble.h"
 
diff --git a/src/code/z_camera.c b/src/code/z_camera.c
index 58f57cd935..143a003db2 100644
--- a/src/code/z_camera.c
+++ b/src/code/z_camera.c
@@ -48,7 +48,7 @@
 #include "global.h"
 #include "string.h"
 
-#include "z64malloc.h"
+#include "zelda_arena.h"
 #include "z64olib.h"
 #include "z64quake.h"
 #include "z64shrink_window.h"
diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c
index 255a9d5a60..bf63e6912e 100644
--- a/src/code/z_collision_check.c
+++ b/src/code/z_collision_check.c
@@ -9,7 +9,7 @@
 #include "z64actor.h"
 #include "z64effect.h"
 #include "z64frameadvance.h"
-#include "z64malloc.h"
+#include "zelda_arena.h"
 #include "z64math.h"
 
 typedef s32 (*ColChkResetFunc)(struct PlayState*, Collider*);
diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c
index e76942d4a9..4ff5c72d68 100644
--- a/src/code/z_effect_soft_sprite.c
+++ b/src/code/z_effect_soft_sprite.c
@@ -2,7 +2,7 @@
 
 #include "tha.h"
 #include "loadfragment.h"
-#include "z64malloc.h"
+#include "zelda_arena.h"
 #include "global.h"
 
 void EffectSS_ResetEntry(EffectSs* particle);
diff --git a/src/code/z_fcurve_data_skelanime.c b/src/code/z_fcurve_data_skelanime.c
index 2cc9532465..148d8b1f6a 100644
--- a/src/code/z_fcurve_data_skelanime.c
+++ b/src/code/z_fcurve_data_skelanime.c
@@ -31,7 +31,7 @@
 #include "z64actor.h"
 #include "z64animation.h"
 #include "z64curve.h"
-#include "z64malloc.h"
+#include "zelda_arena.h"
 #include "z64.h"
 
 void SkelCurve_Clear(SkelCurve* skelCurve) {
diff --git a/src/code/z_malloc.c b/src/code/z_malloc.c
index 815af19431..508eb1ed93 100644
--- a/src/code/z_malloc.c
+++ b/src/code/z_malloc.c
@@ -1,4 +1,4 @@
-#include "z64malloc.h"
+#include "zelda_arena.h"
 
 #include "libc64/os_malloc.h"
 
diff --git a/src/code/z_overlay.c b/src/code/z_overlay.c
index dd20a6b3c3..a72a979ceb 100644
--- a/src/code/z_overlay.c
+++ b/src/code/z_overlay.c
@@ -8,7 +8,7 @@
 
 #include "loadfragment.h"
 #include "z64lib.h"
-#include "z64malloc.h"
+#include "zelda_arena.h"
 
 void* TransitionOverlay_VramToRam(TransitionOverlay* overlayEntry, void* vramAddr) {
     void* loadedRamAddr = Lib_PhysicalToVirtual(overlayEntry->loadInfo.addr);
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c
index dcb3fb1dd9..328378b480 100644
--- a/src/code/z_parameter.c
+++ b/src/code/z_parameter.c
@@ -4,7 +4,7 @@
 #include "sys_cmpdma.h"
 #include "sys_ucode.h"
 #include "z64lifemeter.h"
-#include "z64malloc.h"
+#include "zelda_arena.h"
 #include "z64snap.h"
 #include "z64view.h"
 #include "z64voice.h"
diff --git a/src/code/z_play.c b/src/code/z_play.c
index 4cd7301487..df8f267cfc 100644
--- a/src/code/z_play.c
+++ b/src/code/z_play.c
@@ -23,7 +23,7 @@ u8 sMotionBlurStatus;
 
 #include "z64bombers_notebook.h"
 #include "z64debug_display.h"
-#include "z64malloc.h"
+#include "zelda_arena.h"
 #include "z64quake.h"
 #include "z64rumble.h"
 #include "z64shrink_window.h"
diff --git a/src/code/z_play_hireso.c b/src/code/z_play_hireso.c
index eb8e4831c8..c91d43605c 100644
--- a/src/code/z_play_hireso.c
+++ b/src/code/z_play_hireso.c
@@ -2,7 +2,7 @@
 #include "sys_cfb.h"
 #include "sys_cmpdma.h"
 #include "z64bombers_notebook.h"
-#include "z64malloc.h"
+#include "zelda_arena.h"
 
 #include "assets/interface/schedule_static/schedule_static.h"
 #include "assets/archives/schedule_dma_static/schedule_dma_static_yar.h"
diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c
index 2dfde03947..6409a6a412 100644
--- a/src/code/z_skelanime.c
+++ b/src/code/z_skelanime.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "z64malloc.h"
+#include "zelda_arena.h"
 
 #define ANIM_INTERP 1
 
diff --git a/src/code/z_skin_awb.c b/src/code/z_skin_awb.c
index cd753fc8b3..3039b2ea80 100644
--- a/src/code/z_skin_awb.c
+++ b/src/code/z_skin_awb.c
@@ -1,7 +1,7 @@
 #include "z64skin.h"
 
 #include "global.h"
-#include "z64malloc.h"
+#include "zelda_arena.h"
 
 void Skin_Setup(Skin* skin) {
     skin->skeletonHeader = NULL;
diff --git a/src/overlays/actors/ovl_En_Test3/z_en_test3.c b/src/overlays/actors/ovl_En_Test3/z_en_test3.c
index 3112dddb89..839709195f 100644
--- a/src/overlays/actors/ovl_En_Test3/z_en_test3.c
+++ b/src/overlays/actors/ovl_En_Test3/z_en_test3.c
@@ -6,7 +6,7 @@
 
 #include "z_en_test3.h"
 
-#include "z64malloc.h"
+#include "zelda_arena.h"
 
 #include "assets/objects/object_test3/object_test3.h"
 #include "overlays/actors/ovl_En_Door/z_en_door.h"
diff --git a/src/overlays/actors/ovl_En_Test6/z_en_test6.c b/src/overlays/actors/ovl_En_Test6/z_en_test6.c
index 971f3596ec..162d15c9f6 100644
--- a/src/overlays/actors/ovl_En_Test6/z_en_test6.c
+++ b/src/overlays/actors/ovl_En_Test6/z_en_test6.c
@@ -7,7 +7,7 @@
 #include "z_en_test6.h"
 
 #include "z64cutscene_commands.h"
-#include "z64malloc.h"
+#include "zelda_arena.h"
 #include "z64quake.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c
index cc47c7c6f4..9538545836 100644
--- a/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/src/overlays/actors/ovl_player_actor/z_player.c
@@ -9,7 +9,7 @@
 #include "global.h"
 #include "z64horse.h"
 #include "z64lifemeter.h"
-#include "z64malloc.h"
+#include "zelda_arena.h"
 #include "z64quake.h"
 #include "z64rumble.h"
 #include "z64shrink_window.h"