diff --git a/src/39210_len_aa0.c b/src/npc_follow.c
similarity index 100%
rename from src/39210_len_aa0.c
rename to src/npc_follow.c
diff --git a/src/891b0_len_fb0.c b/src/surfaces.c
similarity index 100%
rename from src/891b0_len_fb0.c
rename to src/surfaces.c
diff --git a/ver/ique/splat.yaml b/ver/ique/splat.yaml
index 67d6a1e006a..4da9c848ebf 100644
--- a/ver/ique/splat.yaml
+++ b/ver/ique/splat.yaml
@@ -101,7 +101,7 @@ segments:
     - [auto, c, world/world]
     - [auto, c, collision]
     - [auto, c, 38F00]
-    - [auto, c, 39210_len_aa0]
+    - [auto, c, npc_follow]
     - [auto, c, os/nusys/nuboot]
     - [auto, c, os/nusys/nusched]
     - [auto, c, os/nusys/nugfxfuncset]
@@ -349,7 +349,7 @@ segments:
     - [auto, c, world/actions]
     - [auto, c, world/partners]
     - [auto, c, global_hud_scripts]
-    - [auto, c, 891b0_len_fb0]
+    - [auto, c, surfaces]
     - [auto, c, status_star_shimmer]
     - [auto, c, 8a860_len_3f30]
     - [auto, c, draw_box]
diff --git a/ver/jp/splat.yaml b/ver/jp/splat.yaml
index ea98d9e70ae..ccae1df2f14 100644
--- a/ver/jp/splat.yaml
+++ b/ver/jp/splat.yaml
@@ -108,7 +108,7 @@ segments:
     - [auto, c, world/world]
     - [auto, c, collision]
     - [auto, c, 38F00]
-    - [auto, c, 39210_len_aa0]
+    - [auto, c, npc_follow]
 
     - [auto, c, os/nusys/nuboot]
     - [auto, c, os/nusys/nusched]
@@ -354,7 +354,7 @@ segments:
     - [auto, c, world/actions] # DUMMY ROM
     - [auto, c, world/partners]
     - [auto, c, global_hud_scripts]
-    - [auto, c, 891b0_len_fb0]
+    - [auto, c, surfaces]
     - [auto, c, status_star_shimmer]
     - [auto, c, 8a860_len_3f30]
     - [auto, c, draw_box]
diff --git a/ver/pal/splat.yaml b/ver/pal/splat.yaml
index ed6308846dc..874c784b6de 100644
--- a/ver/pal/splat.yaml
+++ b/ver/pal/splat.yaml
@@ -52,7 +52,7 @@ segments:
     - [auto, c, world/actions] # DUMMY ROM
     - [auto, c, world/partners]
     - [auto, c, global_hud_scripts]
-    - [auto, c, 891b0_len_fb0]
+    - [auto, c, surfaces]
     - [auto, c, status_star_shimmer]
     - [auto, c, 8a860_len_3f30]
     - [auto, c, draw_box]
diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml
index 72e35161053..29183f22995 100644
--- a/ver/us/splat.yaml
+++ b/ver/us/splat.yaml
@@ -150,7 +150,7 @@ segments:
     - [auto, c, world/world]
     - [auto, c, collision]
     - [auto, c, 38F00]
-    - [auto, c, 39210_len_aa0]
+    - [auto, c, npc_follow]
     - [auto, c, os/nusys/nuboot]
     - [auto, c, os/nusys/nusched]
     - [auto, c, os/nusys/nugfxfuncset]
@@ -396,7 +396,7 @@ segments:
     - [auto, c, world/actions] # DUMMY ROM
     - [auto, c, world/partners]
     - [auto, c, global_hud_scripts]
-    - [auto, c, 891b0_len_fb0]
+    - [auto, c, surfaces]
     - [auto, c, status_star_shimmer]
     - [auto, c, 8a860_len_3f30]
     - [auto, c, draw_box]