diff --git a/docs/libu64.md b/docs/libu64.md
index 34cc668c8c..67c1223231 100644
--- a/docs/libu64.md
+++ b/docs/libu64.md
@@ -62,7 +62,7 @@ Note `debug.c` has additional debug-only functions in gc-eu-mq-dbg, hinting that
 
 Additionally `debug.c`, `gfxprint.c` and `pad.c` all require compilation flags `-O2` (instead of `-O2 -g3`) to match, as supplementary evidence these were part of a separately compiled library.
 
-`-O2` is also required for most files between `gfxprint.c` and `pad.c` in the code segment (see spec), hinting that these other files (`loadfragment2_n64.c`, `loadfragment2_gc.c`, `mtxuty-cvt.c`, `relocation_gc.c`, `load_gc.c`, `code_800FC620.c`) are also part of libu64.
+`-O2` is also required for most files between `gfxprint.c` and `pad.c` in the code segment (see spec), hinting that these other files (`loadfragment2_n64.c`, `loadfragment2_gc.c`, `mtxuty-cvt.c`, `relocation_gc.c`, `load_gc.c`, `system_heap.c`) are also part of libu64.
 
 Files `rcp_utils.c` and `logseverity_gc.c` do not strictly require `-O2`, but they do match with `-O2`.
 
diff --git a/spec b/spec
index 4ad7a6f145..b3ac9a01af 100644
--- a/spec
+++ b/spec
@@ -581,8 +581,8 @@ beginseg
     include "$(BUILD_DIR)/src/code/z_actor.o"
     include "$(BUILD_DIR)/src/code/z_actor_dlftbls.o"
     include "$(BUILD_DIR)/src/code/z_bgcheck.o"
-    include "$(BUILD_DIR)/src/code/code_800430A0.o"
-    include "$(BUILD_DIR)/src/code/code_80043480.o"
+    include "$(BUILD_DIR)/src/code/z_bg_collect.o"
+    include "$(BUILD_DIR)/src/code/z_bg_item.o"
     include "$(BUILD_DIR)/src/code/z_camera.o"
     include "$(BUILD_DIR)/src/code/z_collision_btltbls.o"
     include "$(BUILD_DIR)/src/code/z_collision_check.o"
@@ -595,7 +595,7 @@ beginseg
     include "$(BUILD_DIR)/src/code/z_sfx_source.o"
     include "$(BUILD_DIR)/src/code/z_elf_message.o"
     include "$(BUILD_DIR)/src/code/z_face_reaction.o"
-    include "$(BUILD_DIR)/src/code/code_8006C3A0.o"
+    include "$(BUILD_DIR)/src/code/z_env_flags.o"
     include "$(BUILD_DIR)/src/code/z_fcurve_data.o"
     include "$(BUILD_DIR)/src/code/z_fcurve_data_skelanime.o"
     include "$(BUILD_DIR)/src/code/z_game_dlftbls.o"
@@ -627,7 +627,7 @@ beginseg
     include "$(BUILD_DIR)/src/code/z_rcp.o"
     include "$(BUILD_DIR)/src/code/z_room.o"
     include "$(BUILD_DIR)/src/code/z_sample.o"
-    include "$(BUILD_DIR)/src/code/code_80097A00.o"
+    include "$(BUILD_DIR)/src/code/z_inventory.o"
     include "$(BUILD_DIR)/src/code/z_scene.o"
     include "$(BUILD_DIR)/src/code/object_table.o"
     include "$(BUILD_DIR)/src/code/z_scene_table.o"
@@ -747,7 +747,7 @@ beginseg
     include "$(BUILD_DIR)/src/libu64/mtxuty-cvt.o"
 #endif
     include "$(BUILD_DIR)/src/libu64/pad.o"
-    include "$(BUILD_DIR)/src/libu64/code_800FC620.o"
+    include "$(BUILD_DIR)/src/libu64/system_heap.o"
     include "$(BUILD_DIR)/src/libu64/padsetup.o"
 #else
     include "$(BUILD_DIR)/src/libu64/logseverity_gc.o"
@@ -759,7 +759,7 @@ beginseg
 #endif
     include "$(BUILD_DIR)/src/libu64/relocation_gc.o"
     include "$(BUILD_DIR)/src/libu64/load_gc.o"
-    include "$(BUILD_DIR)/src/libu64/code_800FC620.o"
+    include "$(BUILD_DIR)/src/libu64/system_heap.o"
     include "$(BUILD_DIR)/src/libu64/pad.o"
     include "$(BUILD_DIR)/src/libu64/padsetup.o"
 #endif
diff --git a/src/code/code_800430A0.c b/src/code/z_bg_collect.c
similarity index 100%
rename from src/code/code_800430A0.c
rename to src/code/z_bg_collect.c
diff --git a/src/code/code_80043480.c b/src/code/z_bg_item.c
similarity index 100%
rename from src/code/code_80043480.c
rename to src/code/z_bg_item.c
diff --git a/src/code/code_8006C3A0.c b/src/code/z_env_flags.c
similarity index 100%
rename from src/code/code_8006C3A0.c
rename to src/code/z_env_flags.c
diff --git a/src/code/code_80097A00.c b/src/code/z_inventory.c
similarity index 100%
rename from src/code/code_80097A00.c
rename to src/code/z_inventory.c
diff --git a/src/libu64/code_800FC620.c b/src/libu64/system_heap.c
similarity index 100%
rename from src/libu64/code_800FC620.c
rename to src/libu64/system_heap.c