diff --git a/defconv_c.inc b/th02/defconv.inc
similarity index 100%
rename from defconv_c.inc
rename to th02/defconv.inc
diff --git a/th02/math/randring_next.inc b/th02/math/randring.inc
similarity index 100%
rename from th02/math/randring_next.inc
rename to th02/math/randring.inc
diff --git a/th02/th02.inc b/th02/th02.inc
index 74edd852..c1cc19c6 100644
--- a/th02/th02.inc
+++ b/th02/th02.inc
@@ -1,8 +1,8 @@
 GAME = 2
-include defconv_c.inc
+include th02/defconv.inc
 
 include th02/hardware/input.inc
-include th02/math/randring_next.inc
+include th02/math/randring.inc
 include th02/gaiji/boldfont.inc
 include th02/hud/hud.inc
 include th02/score.inc
diff --git a/defconv_pascal.inc b/th03/defconv.inc
similarity index 100%
rename from defconv_pascal.inc
rename to th03/defconv.inc
diff --git a/th03/math/randring_next.inc b/th03/math/randring.inc
similarity index 100%
rename from th03/math/randring_next.inc
rename to th03/math/randring.inc
diff --git a/th03/th03.inc b/th03/th03.inc
index f2d8be26..fe765b82 100644
--- a/th03/th03.inc
+++ b/th03/th03.inc
@@ -1,4 +1,4 @@
 GAME = 3
-include defconv_pascal.inc
-include th03/math/randring_next.inc
+include th03/defconv.inc
+include th03/math/randring.inc
 include th03/hardware/input.inc
diff --git a/th04/math/randring_next.inc b/th04/math/randring.inc
similarity index 100%
rename from th04/math/randring_next.inc
rename to th04/math/randring.inc
diff --git a/th04/shared.inc b/th04/shared.inc
index df43e0bb..8ac8c19e 100644
--- a/th04/shared.inc
+++ b/th04/shared.inc
@@ -2,7 +2,7 @@
 ; -----
 ; Types shared between TH04 and TH05
 
-include defconv_pascal.inc
+include th03/defconv.inc
 
 ; Formats
 ; --------
@@ -30,7 +30,7 @@ BOSS_DEFEAT_INVINCIBILITY_FRAMES = 255
 include th02/hud/hud.inc
 include th04/hardware/grcg.inc
 include th04/hardware/input.inc
-include th04/math/randring_next.inc
+include th04/math/randring.inc
 include th04/math/motion.inc
 include th04/gaiji.inc
 include th04/hud/popup.inc