diff --git a/ld/gamefiles.inc b/ld/gamefiles.inc
index 0e6a68989..ab44c176e 100644
--- a/ld/gamefiles.inc
+++ b/ld/gamefiles.inc
@@ -83,8 +83,8 @@
 	src/game/game_0969d0.o (section); \
 	src/game/game_096b20.o (section); \
 	src/game/game_096ca0.o (section); \
-	src/game/game_097890.o (section); \
-	src/game/game_097970.o (section); \
+	src/game/floor.o (section); \
+	src/game/ceil.o (section); \
 	src/game/game_097a50.o (section); \
 	src/game/game_097aa0.o (section); \
 	src/game/game_097ba0.o (section); \
diff --git a/src/game/game_097970.c b/src/game/ceil.c
similarity index 100%
rename from src/game/game_097970.c
rename to src/game/ceil.c
diff --git a/src/game/game_097890.c b/src/game/floor.c
similarity index 100%
rename from src/game/game_097890.c
rename to src/game/floor.c
diff --git a/src/game/game_000130.c b/src/game/game_000130.c
index 907b1361f..1695be465 100644
--- a/src/game/game_000130.c
+++ b/src/game/game_000130.c
@@ -8,7 +8,7 @@
 #include "game/data/data_020df0.h"
 #include "game/data/data_02da90.h"
 #include "game/game_000130.h"
-#include "game/game_097890.h"
+#include "game/floor.h"
 #include "gvars/gvars.h"
 #include "lib/lib_233c0.h"
 #include "types.h"
diff --git a/src/game/game_0601b0.c b/src/game/game_0601b0.c
index d62230d26..b90629a54 100644
--- a/src/game/game_0601b0.c
+++ b/src/game/game_0601b0.c
@@ -15,8 +15,8 @@
 #include "game/game_0601b0.h"
 #include "game/game_092610.h"
 #include "game/game_095320.h"
-#include "game/game_097890.h"
-#include "game/game_097970.h"
+#include "game/floor.h"
+#include "game/ceil.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b0420.h"
 #include "game/game_0b3350.h"
diff --git a/src/game/game_157db0.c b/src/game/game_157db0.c
index 23d1362f2..92cbe77f3 100644
--- a/src/game/game_157db0.c
+++ b/src/game/game_157db0.c
@@ -13,7 +13,7 @@
 #include "game/game_013ee0.h"
 #include "game/game_01e250.h"
 #include "game/game_0601b0.h"
-#include "game/game_097970.h"
+#include "game/ceil.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b3350.h"
 #include "game/game_0b63b0.h"
diff --git a/src/game/game_197600.c b/src/game/game_197600.c
index c77c4ada3..d4033127f 100644
--- a/src/game/game_197600.c
+++ b/src/game/game_197600.c
@@ -10,7 +10,7 @@
 #include "game/data/data_02da90.h"
 #include "game/debug.h"
 #include "game/game_01e250.h"
-#include "game/game_097970.h"
+#include "game/ceil.h"
 #include "game/game_0b0420.h"
 #include "game/game_0fd660.h"
 #include "game/game_127910.h"
diff --git a/src/game/game_1a3340.c b/src/game/game_1a3340.c
index 06e0fe331..29179d41b 100644
--- a/src/game/game_1a3340.c
+++ b/src/game/game_1a3340.c
@@ -8,7 +8,7 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/data/data_02da90.h"
-#include "game/game_097970.h"
+#include "game/ceil.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b0420.h"
 #include "game/game_0b3350.h"
diff --git a/src/game/propobj.c b/src/game/propobj.c
index 859d26485..11eb1218d 100644
--- a/src/game/propobj.c
+++ b/src/game/propobj.c
@@ -25,8 +25,8 @@
 #include "game/game_096750.h"
 #include "game/game_0969d0.h"
 #include "game/game_096ca0.h"
-#include "game/game_097890.h"
-#include "game/game_097970.h"
+#include "game/floor.h"
+#include "game/ceil.h"
 #include "game/game_097ba0.h"
 #include "game/game_0abe70.h"
 #include "game/game_0b0420.h"
diff --git a/src/include/game/game_097970.h b/src/include/game/ceil.h
similarity index 60%
rename from src/include/game/game_097970.h
rename to src/include/game/ceil.h
index cf309c15c..c16a99fcc 100644
--- a/src/include/game/game_097970.h
+++ b/src/include/game/ceil.h
@@ -1,5 +1,5 @@
-#ifndef IN_GAME_GAME_097970_H
-#define IN_GAME_GAME_097970_H
+#ifndef IN_GAME_CEIL_H
+#define IN_GAME_CEIL_H
 #include <ultra64.h>
 #include "types.h"
 
diff --git a/src/include/game/game_097890.h b/src/include/game/floor.h
similarity index 61%
rename from src/include/game/game_097890.h
rename to src/include/game/floor.h
index c0b22f3df..88dadbe6f 100644
--- a/src/include/game/game_097890.h
+++ b/src/include/game/floor.h
@@ -1,5 +1,5 @@
-#ifndef IN_GAME_GAME_097890_H
-#define IN_GAME_GAME_097890_H
+#ifndef IN_GAME_FLOOR_H
+#define IN_GAME_FLOOR_H
 #include <ultra64.h>
 #include "types.h"
 
diff --git a/src/lib/lib_1a500.c b/src/lib/lib_1a500.c
index 19ea94d64..cab981765 100644
--- a/src/lib/lib_1a500.c
+++ b/src/lib/lib_1a500.c
@@ -10,8 +10,8 @@
 #include "game/game_096700.h"
 #include "game/game_0969d0.h"
 #include "game/game_096ca0.h"
-#include "game/game_097890.h"
-#include "game/game_097970.h"
+#include "game/floor.h"
+#include "game/ceil.h"
 #include "game/game_0b3350.h"
 #include "game/game_157db0.h"
 #include "game/game_166e40.h"