diff --git a/Makefile b/Makefile
index df276683f..895c3d058 100644
--- a/Makefile
+++ b/Makefile
@@ -325,7 +325,7 @@ ifeq ($(COMPILER), ido)
         src/lib/ultra/io/pfsinitpak2.c
 
     MIPS3_C_FILES := \
-        src/lib/rng.c \
+        src/lib/rng_c.c \
         src/lib/ultra/libc/ll.c \
         src/lib/ultra/libc/llcvt.c
 
@@ -751,7 +751,7 @@ $(B_DIR)/rsp/%.o: $(B_DIR)/rsp/%.bin
 	TOOLCHAIN=$(TOOLCHAIN) ROMID=$(ROMID) tools/mkrawobject $< $@
 
 ifeq ($(COMPILER), ido)
-$(B_DIR)/lib/rng.o: src/lib/rng.c $(ASSETMGR_O_FILES) $(RECOMP_FILES)
+$(B_DIR)/lib/rng_c.o: src/lib/rng_c.c $(ASSETMGR_O_FILES) $(RECOMP_FILES)
 	@mkdir -p $(dir $@)
 	$(CC) -c $(CFLAGS) $(OPT_LVL) -o $@ $<
 	tools/patchmips3 $@ || rm $@
diff --git a/ld/gamefiles.jpn-final.inc b/ld/gamefiles.jpn-final.inc
index 5bf8333cd..c0b12641d 100644
--- a/ld/gamefiles.jpn-final.inc
+++ b/ld/gamefiles.jpn-final.inc
@@ -168,7 +168,7 @@
 	build/ROMID/game/sky.o (section); \
 	build/ROMID/game/playermgr.o (section); \
 	build/ROMID/game/crc.o (section); \
-	build/ROMID/game/rng2asm.o (section); \
+	build/ROMID/game/rng2.o (section); \
 	build/ROMID/game/vtxstore.o (section); \
 	build/ROMID/game/explosions.o (section); \
 	build/ROMID/game/smoke.o (section); \
@@ -189,7 +189,7 @@
 	build/ROMID/game/collisionutils.o (section); \
 	build/ROMID/game/bg.o (section); \
 	build/ROMID/game/bgbss.o (section); \
-	build/ROMID/game/portalconvasm.o (section); \
+	build/ROMID/game/portalconv.o (section); \
 	build/ROMID/game/stagetable.o (section); \
 	build/ROMID/game/gfxreplace.o (section); \
 	build/ROMID/game/env.o (section); \
diff --git a/ld/gamefiles.ntsc-beta.inc b/ld/gamefiles.ntsc-beta.inc
index 1a1491163..2872e5fe6 100644
--- a/ld/gamefiles.ntsc-beta.inc
+++ b/ld/gamefiles.ntsc-beta.inc
@@ -169,7 +169,7 @@
 	build/ROMID/game/sky.o (section); \
 	build/ROMID/game/playermgr.o (section); \
 	build/ROMID/game/crc.o (section); \
-	build/ROMID/game/rng2asm.o (section); \
+	build/ROMID/game/rng2.o (section); \
 	build/ROMID/game/vtxstore.o (section); \
 	build/ROMID/game/explosions.o (section); \
 	build/ROMID/game/smoke.o (section); \
@@ -190,7 +190,7 @@
 	build/ROMID/game/collisionutils.o (section); \
 	build/ROMID/game/bg.o (section); \
 	build/ROMID/game/bgbss.o (section); \
-	build/ROMID/game/portalconvasm.o (section); \
+	build/ROMID/game/portalconv.o (section); \
 	build/ROMID/game/stagetable.o (section); \
 	build/ROMID/game/gfxreplace.o (section); \
 	build/ROMID/game/env.o (section); \
diff --git a/ld/gamefiles.ntsc-final.inc b/ld/gamefiles.ntsc-final.inc
index 5bf8333cd..c0b12641d 100644
--- a/ld/gamefiles.ntsc-final.inc
+++ b/ld/gamefiles.ntsc-final.inc
@@ -168,7 +168,7 @@
 	build/ROMID/game/sky.o (section); \
 	build/ROMID/game/playermgr.o (section); \
 	build/ROMID/game/crc.o (section); \
-	build/ROMID/game/rng2asm.o (section); \
+	build/ROMID/game/rng2.o (section); \
 	build/ROMID/game/vtxstore.o (section); \
 	build/ROMID/game/explosions.o (section); \
 	build/ROMID/game/smoke.o (section); \
@@ -189,7 +189,7 @@
 	build/ROMID/game/collisionutils.o (section); \
 	build/ROMID/game/bg.o (section); \
 	build/ROMID/game/bgbss.o (section); \
-	build/ROMID/game/portalconvasm.o (section); \
+	build/ROMID/game/portalconv.o (section); \
 	build/ROMID/game/stagetable.o (section); \
 	build/ROMID/game/gfxreplace.o (section); \
 	build/ROMID/game/env.o (section); \
diff --git a/ld/gamefiles.pal-beta.inc b/ld/gamefiles.pal-beta.inc
index 6c0f092a0..261fe950f 100644
--- a/ld/gamefiles.pal-beta.inc
+++ b/ld/gamefiles.pal-beta.inc
@@ -169,7 +169,7 @@
 	build/ROMID/game/sky.o (section); \
 	build/ROMID/game/playermgr.o (section); \
 	build/ROMID/game/crc.o (section); \
-	build/ROMID/game/rng2asm.o (section); \
+	build/ROMID/game/rng2.o (section); \
 	build/ROMID/game/vtxstore.o (section); \
 	build/ROMID/game/explosions.o (section); \
 	build/ROMID/game/smoke.o (section); \
@@ -190,7 +190,7 @@
 	build/ROMID/game/collisionutils.o (section); \
 	build/ROMID/game/bg.o (section); \
 	build/ROMID/game/bgbss.o (section); \
-	build/ROMID/game/portalconvasm.o (section); \
+	build/ROMID/game/portalconv.o (section); \
 	build/ROMID/game/stagetable.o (section); \
 	build/ROMID/game/gfxreplace.o (section); \
 	build/ROMID/game/env.o (section); \
diff --git a/ld/gamefiles.pal-final.inc b/ld/gamefiles.pal-final.inc
index 5bf8333cd..c0b12641d 100644
--- a/ld/gamefiles.pal-final.inc
+++ b/ld/gamefiles.pal-final.inc
@@ -168,7 +168,7 @@
 	build/ROMID/game/sky.o (section); \
 	build/ROMID/game/playermgr.o (section); \
 	build/ROMID/game/crc.o (section); \
-	build/ROMID/game/rng2asm.o (section); \
+	build/ROMID/game/rng2.o (section); \
 	build/ROMID/game/vtxstore.o (section); \
 	build/ROMID/game/explosions.o (section); \
 	build/ROMID/game/smoke.o (section); \
@@ -189,7 +189,7 @@
 	build/ROMID/game/collisionutils.o (section); \
 	build/ROMID/game/bg.o (section); \
 	build/ROMID/game/bgbss.o (section); \
-	build/ROMID/game/portalconvasm.o (section); \
+	build/ROMID/game/portalconv.o (section); \
 	build/ROMID/game/stagetable.o (section); \
 	build/ROMID/game/gfxreplace.o (section); \
 	build/ROMID/game/env.o (section); \
diff --git a/ld/libfiles.jpn-final.inc b/ld/libfiles.jpn-final.inc
index cfdceda97..2a3b003fd 100644
--- a/ld/libfiles.jpn-final.inc
+++ b/ld/libfiles.jpn-final.inc
@@ -40,7 +40,7 @@
 	build/ROMID/lib/music.o (section); \
 	build/ROMID/lib/memp.o (section); \
 	build/ROMID/lib/mema.o (section); \
-	build/ROMID/lib/rngasm.o (section); \
+	build/ROMID/lib/rng.o (section); \
 	build/ROMID/lib/args.o (section); \
 	build/ROMID/lib/str.o (section); \
 	build/ROMID/lib/ultra/libc/sprintf.o (section); \
diff --git a/ld/libfiles.ntsc-beta.inc b/ld/libfiles.ntsc-beta.inc
index 9cb456e32..a33cfbd31 100644
--- a/ld/libfiles.ntsc-beta.inc
+++ b/ld/libfiles.ntsc-beta.inc
@@ -42,7 +42,7 @@
 	build/ROMID/lib/music.o (section); \
 	build/ROMID/lib/memp.o (section); \
 	build/ROMID/lib/mema.o (section); \
-	build/ROMID/lib/rngasm.o (section); \
+	build/ROMID/lib/rng.o (section); \
 	build/ROMID/lib/args.o (section); \
 	build/ROMID/lib/str.o (section); \
 	build/ROMID/lib/ultra/libc/sprintf.o (section); \
diff --git a/ld/libfiles.ntsc-final.inc b/ld/libfiles.ntsc-final.inc
index 5d2863913..0d14cee3a 100644
--- a/ld/libfiles.ntsc-final.inc
+++ b/ld/libfiles.ntsc-final.inc
@@ -40,7 +40,7 @@
 	build/ROMID/lib/music.o (section); \
 	build/ROMID/lib/memp.o (section); \
 	build/ROMID/lib/mema.o (section); \
-	build/ROMID/lib/rngasm.o (section); \
+	build/ROMID/lib/rng.o (section); \
 	build/ROMID/lib/args.o (section); \
 	build/ROMID/lib/str.o (section); \
 	build/ROMID/lib/ultra/libc/sprintf.o (section); \
diff --git a/ld/libfiles.pal-beta.inc b/ld/libfiles.pal-beta.inc
index cfdceda97..2a3b003fd 100644
--- a/ld/libfiles.pal-beta.inc
+++ b/ld/libfiles.pal-beta.inc
@@ -40,7 +40,7 @@
 	build/ROMID/lib/music.o (section); \
 	build/ROMID/lib/memp.o (section); \
 	build/ROMID/lib/mema.o (section); \
-	build/ROMID/lib/rngasm.o (section); \
+	build/ROMID/lib/rng.o (section); \
 	build/ROMID/lib/args.o (section); \
 	build/ROMID/lib/str.o (section); \
 	build/ROMID/lib/ultra/libc/sprintf.o (section); \
diff --git a/ld/libfiles.pal-final.inc b/ld/libfiles.pal-final.inc
index cfdceda97..2a3b003fd 100644
--- a/ld/libfiles.pal-final.inc
+++ b/ld/libfiles.pal-final.inc
@@ -40,7 +40,7 @@
 	build/ROMID/lib/music.o (section); \
 	build/ROMID/lib/memp.o (section); \
 	build/ROMID/lib/mema.o (section); \
-	build/ROMID/lib/rngasm.o (section); \
+	build/ROMID/lib/rng.o (section); \
 	build/ROMID/lib/args.o (section); \
 	build/ROMID/lib/str.o (section); \
 	build/ROMID/lib/ultra/libc/sprintf.o (section); \
diff --git a/src/game/mtxf2lbulk.c b/src/game/mtxf2lbulkasm_c.c
similarity index 100%
rename from src/game/mtxf2lbulk.c
rename to src/game/mtxf2lbulkasm_c.c
diff --git a/src/game/portalconvasm.s b/src/game/portalconv.s
similarity index 100%
rename from src/game/portalconvasm.s
rename to src/game/portalconv.s
diff --git a/src/game/portalconv.c b/src/game/portalconv_c.c
similarity index 100%
rename from src/game/portalconv.c
rename to src/game/portalconv_c.c
diff --git a/src/game/rng2asm.s b/src/game/rng2.s
similarity index 100%
rename from src/game/rng2asm.s
rename to src/game/rng2.s
diff --git a/src/game/rng2.c b/src/game/rng2_c.c
similarity index 100%
rename from src/game/rng2.c
rename to src/game/rng2_c.c
diff --git a/src/lib/mtxc.c b/src/lib/mtx_c.c
similarity index 100%
rename from src/lib/mtxc.c
rename to src/lib/mtx_c.c
diff --git a/src/lib/rngasm.s b/src/lib/rng.s
similarity index 100%
rename from src/lib/rngasm.s
rename to src/lib/rng.s
diff --git a/src/lib/rng.c b/src/lib/rng_c.c
similarity index 100%
rename from src/lib/rng.c
rename to src/lib/rng_c.c