diff --git a/asm/exi/EXIBios_800285f0.s b/asm/exi/EXIBios.s
similarity index 99%
rename from asm/exi/EXIBios_800285f0.s
rename to asm/exi/EXIBios.s
index acc0de97..85be8060 100644
--- a/asm/exi/EXIBios_800285f0.s
+++ b/asm/exi/EXIBios.s
@@ -1879,3 +1879,47 @@ lbl_80029ED0:
 /* 80029EE4 00025D24  4E 80 00 20 */	blr
 /* 80029EE8 00025D28  00 00 00 00 */	.4byte 0x00000000
 /* 80029EEC 00025D2C  00 00 00 00 */	.4byte 0x00000000
+.include "macros.inc"
+
+.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
+.global "@1_8042FB40"
+"@1_8042FB40":
+
+	.4byte 0x3C3C2052
+	.4byte 0x564C5F53
+	.4byte 0x444B202D
+	.4byte 0x20455849
+	.4byte 0x20097265
+	.4byte 0x6C656173
+	.4byte 0x65206275
+	.4byte 0x696C643A
+	.4byte 0x20417567
+	.4byte 0x20323320
+	.4byte 0x32303130
+	.4byte 0x2031373A
+	.4byte 0x33303A30
+	.4byte 0x38202830
+	.4byte 0x78343330
+	.4byte 0x325F3134
+	.4byte 0x3529203E
+	.4byte 0x3E000000
+.include "macros.inc"
+
+.section .bss, "", @nobits  # 0x80496700 - 0x80556420 ; 0x000BFD20
+.global Ecb
+Ecb:
+	.skip 0xC0
+.include "macros.inc"
+
+.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
+.global __EXIVersion
+__EXIVersion:
+
+	.4byte "@1_8042FB40"
+	.4byte 0
+.include "macros.inc"
+
+.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
+.global IDSerialPort1
+IDSerialPort1:
+	.skip 0x8
diff --git a/asm/exi/EXIBios_8042fb40.s b/asm/exi/EXIBios_8042fb40.s
deleted file mode 100644
index ad5ae1ce..00000000
--- a/asm/exi/EXIBios_8042fb40.s
+++ /dev/null
@@ -1,24 +0,0 @@
-.include "macros.inc"
-
-.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
-.global "@1_8042FB40"
-"@1_8042FB40":
-
-	.4byte 0x3C3C2052
-	.4byte 0x564C5F53
-	.4byte 0x444B202D
-	.4byte 0x20455849
-	.4byte 0x20097265
-	.4byte 0x6C656173
-	.4byte 0x65206275
-	.4byte 0x696C643A
-	.4byte 0x20417567
-	.4byte 0x20323320
-	.4byte 0x32303130
-	.4byte 0x2031373A
-	.4byte 0x33303A30
-	.4byte 0x38202830
-	.4byte 0x78343330
-	.4byte 0x325F3134
-	.4byte 0x3529203E
-	.4byte 0x3E000000
diff --git a/asm/exi/EXIBios_8049a290.s b/asm/exi/EXIBios_8049a290.s
deleted file mode 100644
index 1052f8db..00000000
--- a/asm/exi/EXIBios_8049a290.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macros.inc"
-
-.section .bss, "", @nobits  # 0x80496700 - 0x80556420 ; 0x000BFD20
-.global Ecb
-Ecb:
-	.skip 0xC0
diff --git a/asm/exi/EXIBios_80556518.s b/asm/exi/EXIBios_80556518.s
deleted file mode 100644
index cce851f5..00000000
--- a/asm/exi/EXIBios_80556518.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.include "macros.inc"
-
-.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
-.global __EXIVersion
-__EXIVersion:
-
-	.4byte "@1_8042FB40"
-	.4byte 0
diff --git a/asm/exi/EXIBios_8055c8c8.s b/asm/exi/EXIBios_8055c8c8.s
deleted file mode 100644
index 5a3a9964..00000000
--- a/asm/exi/EXIBios_8055c8c8.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macros.inc"
-
-.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
-.global IDSerialPort1
-IDSerialPort1:
-	.skip 0x8
diff --git a/asm/exi/EXICommon_8002a230.s b/asm/exi/EXICommon.s
similarity index 97%
rename from asm/exi/EXICommon_8002a230.s
rename to asm/exi/EXICommon.s
index efda55e3..aca7beab 100644
--- a/asm/exi/EXICommon_8002a230.s
+++ b/asm/exi/EXICommon.s
@@ -117,3 +117,11 @@ lbl_8002A39C:
 /* 8002A3B4 000261F4  4E 80 00 20 */	blr
 /* 8002A3B8 000261F8  00 00 00 00 */	.4byte 0x00000000
 /* 8002A3BC 000261FC  00 00 00 00 */	.4byte 0x00000000
+.include "macros.inc"
+
+.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
+.global __EXIFreq
+__EXIFreq:
+
+	.4byte 0x00000004
+	.4byte 0
diff --git a/asm/exi/EXICommon_8055e528.s b/asm/exi/EXICommon_8055e528.s
deleted file mode 100644
index dcfee212..00000000
--- a/asm/exi/EXICommon_8055e528.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.include "macros.inc"
-
-.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
-.global __EXIFreq
-__EXIFreq:
-
-	.4byte 0x00000004
-	.4byte 0
diff --git a/asm/exi/EXIUart_80029ef0.s b/asm/exi/EXIUart.s
similarity index 97%
rename from asm/exi/EXIUart_80029ef0.s
rename to asm/exi/EXIUart.s
index bc53c65c..f5bddd7b 100644
--- a/asm/exi/EXIUart_80029ef0.s
+++ b/asm/exi/EXIUart.s
@@ -243,3 +243,21 @@ lbl_8002A214:
 /* 8002A224 00026064  38 21 00 20 */	addi r1, r1, 0x20
 /* 8002A228 00026068  4E 80 00 20 */	blr
 /* 8002A22C 0002606C  00 00 00 00 */	.4byte 0x00000000
+.include "macros.inc"
+
+.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
+.global Enabled_8055C8D0
+Enabled_8055C8D0:
+	.skip 0x4
+
+.global BarnacleEnabled
+BarnacleEnabled:
+	.skip 0x4
+
+.global Dev
+Dev:
+	.skip 0x4
+
+.global Chan
+Chan:
+	.skip 0x4
diff --git a/asm/exi/EXIUart_8055c8d0.s b/asm/exi/EXIUart_8055c8d0.s
deleted file mode 100644
index d8ca5a81..00000000
--- a/asm/exi/EXIUart_8055c8d0.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.include "macros.inc"
-
-.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
-.global Enabled_8055C8D0
-Enabled_8055C8D0:
-	.skip 0x4
-
-.global BarnacleEnabled
-BarnacleEnabled:
-	.skip 0x4
-
-.global Dev
-Dev:
-	.skip 0x4
-
-.global Chan
-Chan:
-	.skip 0x4
diff --git a/obj_files.mk b/obj_files.mk
index 2f69dda6..b0006a53 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -145,11 +145,12 @@ $(BUILD_DIR)/asm/os/OSCrc.o \
 $(BUILD_DIR)/asm/os/OSLaunch.o \
 $(BUILD_DIR)/asm/os/__ppc_eabi_init.o \
 \
+$(BUILD_DIR)/asm/exi/EXIBios.o \
+$(BUILD_DIR)/asm/exi/EXIUart.o \
+$(BUILD_DIR)/asm/exi/EXICommon.o \
+\
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \
-$(BUILD_DIR)/asm/exi/EXIBios_800285f0.o \
-$(BUILD_DIR)/asm/exi/EXIUart_80029ef0.o \
-$(BUILD_DIR)/asm/exi/EXICommon_8002a230.o \
 $(BUILD_DIR)/asm/si/SIBios_8002a3c0.o \
 $(BUILD_DIR)/asm/si/SISamplingRate_8002b9c0.o \
 $(BUILD_DIR)/asm/db/db_8002bab0.o \
@@ -3218,7 +3219,6 @@ $(BUILD_DIR)/asm/src/BgManager_80420bf0.o \
 $(BUILD_DIR)/asm/src/StaffRoll_80420d08.o \
 $(BUILD_DIR)/asm/src/SoundManager_80420f28.o \
 $(BUILD_DIR)/asm/src/BackupFileData2_80420fc8.o \
-$(BUILD_DIR)/asm/exi/EXIBios_8042fb40.o \
 $(BUILD_DIR)/asm/si/SIBios_8042fb88.o \
 $(BUILD_DIR)/asm/si/SISamplingRate_8042fbf8.o \
 $(BUILD_DIR)/asm/vi/vi_8042fc90.o \
@@ -5038,7 +5038,6 @@ $(BUILD_DIR)/asm/src/WaveHandle_804966b8.o \
 $(BUILD_DIR)/asm/src/StorageUtil_804966d0.o \
 $(BUILD_DIR)/asm/src/Alarm_804966e0.o \
 $(BUILD_DIR)/asm/src/StateChanger_804966f0.o \
-$(BUILD_DIR)/asm/exi/EXIBios_8049a290.o \
 $(BUILD_DIR)/asm/si/SIBios_8049a350.o \
 $(BUILD_DIR)/asm/vi/vi_8049a570.o \
 $(BUILD_DIR)/asm/vi/vi3in1_8049a6e0.o \
@@ -5186,7 +5185,6 @@ $(BUILD_DIR)/asm/src/ScoreCoin_80554888.o \
 $(BUILD_DIR)/asm/src/EffectLocatorModelDesc_805549b8.o \
 $(BUILD_DIR)/asm/src/ModelDesc_80554a50.o \
 $(BUILD_DIR)/asm/src/Table_80556398.o \
-$(BUILD_DIR)/asm/exi/EXIBios_80556518.o \
 $(BUILD_DIR)/asm/si/SIBios_80556520.o \
 $(BUILD_DIR)/asm/vi/vi_80556528.o \
 $(BUILD_DIR)/asm/vi/i2c_80556548.o \
@@ -5641,8 +5639,6 @@ $(BUILD_DIR)/asm/src/StepMain_8055c688.o \
 $(BUILD_DIR)/asm/src/CinemaScopeModel_8055c6a0.o \
 $(BUILD_DIR)/asm/src/FullScreenModel_8055c6b8.o \
 $(BUILD_DIR)/asm/src/Wipe_8055c6c0.o \
-$(BUILD_DIR)/asm/exi/EXIBios_8055c8c8.o \
-$(BUILD_DIR)/asm/exi/EXIUart_8055c8d0.o \
 $(BUILD_DIR)/asm/si/SIBios_8055c8e0.o \
 $(BUILD_DIR)/asm/si/SISamplingRate_8055c8f0.o \
 $(BUILD_DIR)/asm/db/db_8055c8f8.o \
@@ -5877,7 +5873,6 @@ $(BUILD_DIR)/asm/src/SequenceProductRoot_8055df48.o \
 $(BUILD_DIR)/asm/src/MintSERequestor_8055df58.o \
 $(BUILD_DIR)/asm/src/SoundSystem_8055df60.o \
 $(BUILD_DIR)/asm/src/Alarm_8055df68.o \
-$(BUILD_DIR)/asm/exi/EXICommon_8055e528.o \
 $(BUILD_DIR)/asm/mtx/mtx_8055e530.o \
 $(BUILD_DIR)/asm/mtx/mtx44_8055e550.o \
 $(BUILD_DIR)/asm/mtx/vec_8055e568.o \