diff --git a/asm/ipc/ipcMain_8004e730.s b/asm/ipc/ipcMain.s
similarity index 91%
rename from asm/ipc/ipcMain_8004e730.s
rename to asm/ipc/ipcMain.s
index 936c2c3c..a60480d0 100644
--- a/asm/ipc/ipcMain_8004e730.s
+++ b/asm/ipc/ipcMain.s
@@ -77,3 +77,25 @@ IPCSetBufferLo:
 /* 8004E814 0004A654  4E 80 00 20 */	blr
 /* 8004E818 0004A658  00 00 00 00 */	.4byte 0x00000000
 /* 8004E81C 0004A65C  00 00 00 00 */	.4byte 0x00000000
+.include "macros.inc"
+
+.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
+.global Initialized_8055CD18
+Initialized_8055CD18:
+	.skip 0x4
+
+.global IPCCurrentBufferLo
+IPCCurrentBufferLo:
+	.skip 0x4
+
+.global IPCCurrentBufferHi
+IPCCurrentBufferHi:
+	.skip 0x4
+
+.global IPCBufferLo
+IPCBufferLo:
+	.skip 0x4
+
+.global IPCBufferHi
+IPCBufferHi:
+	.skip 0x8
diff --git a/asm/ipc/ipcMain_8055cd18.s b/asm/ipc/ipcMain_8055cd18.s
deleted file mode 100644
index ad8bb0ab..00000000
--- a/asm/ipc/ipcMain_8055cd18.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.include "macros.inc"
-
-.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
-.global Initialized_8055CD18
-Initialized_8055CD18:
-	.skip 0x4
-
-.global IPCCurrentBufferLo
-IPCCurrentBufferLo:
-	.skip 0x4
-
-.global IPCCurrentBufferHi
-IPCCurrentBufferHi:
-	.skip 0x4
-
-.global IPCBufferLo
-IPCBufferLo:
-	.skip 0x4
-
-.global IPCBufferHi
-IPCBufferHi:
-	.skip 0x8
diff --git a/asm/ipc/ipcProfile_800507b0.s b/asm/ipc/ipcProfile.s
similarity index 95%
rename from asm/ipc/ipcProfile_800507b0.s
rename to asm/ipc/ipcProfile.s
index 374e6d77..d51fb4a3 100644
--- a/asm/ipc/ipcProfile_800507b0.s
+++ b/asm/ipc/ipcProfile.s
@@ -293,3 +293,47 @@ lbl_80050BA4:
 /* 80050BB4 0004C9F4  38 21 00 30 */	addi r1, r1, 0x30
 /* 80050BB8 0004C9F8  4E 80 00 20 */	blr
 /* 80050BBC 0004C9FC  00 00 00 00 */	.4byte 0x00000000
+.include "macros.inc"
+
+.section .bss, "", @nobits  # 0x80496700 - 0x80556420 ; 0x000BFD20
+.global IpcReqArray
+IpcReqArray:
+	.skip 0x2130
+
+.global lbl_804C0010
+lbl_804C0010:
+	.skip 0x10
+
+.global lbl_804C0020
+lbl_804C0020:
+	.skip 0x10
+
+.global lbl_804C0030
+lbl_804C0030:
+	.skip 0x10
+
+.global lbl_804C0040
+lbl_804C0040:
+	.skip 0x10
+
+.global lbl_804C0050
+lbl_804C0050:
+	.skip 0x10
+
+.global lbl_804C0060
+lbl_804C0060:
+	.skip 0x10
+
+.global lbl_804C0070
+lbl_804C0070:
+	.skip 0x18F0
+.include "macros.inc"
+
+.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
+.global IpcNumPendingReqs
+IpcNumPendingReqs:
+	.skip 0x4
+
+.global IpcNumUnIssuedReqs
+IpcNumUnIssuedReqs:
+	.skip 0x4
diff --git a/asm/ipc/ipcProfile_804bdee0.s b/asm/ipc/ipcProfile_804bdee0.s
deleted file mode 100644
index 43246358..00000000
--- a/asm/ipc/ipcProfile_804bdee0.s
+++ /dev/null
@@ -1,34 +0,0 @@
-.include "macros.inc"
-
-.section .bss, "", @nobits  # 0x80496700 - 0x80556420 ; 0x000BFD20
-.global IpcReqArray
-IpcReqArray:
-	.skip 0x2130
-
-.global lbl_804C0010
-lbl_804C0010:
-	.skip 0x10
-
-.global lbl_804C0020
-lbl_804C0020:
-	.skip 0x10
-
-.global lbl_804C0030
-lbl_804C0030:
-	.skip 0x10
-
-.global lbl_804C0040
-lbl_804C0040:
-	.skip 0x10
-
-.global lbl_804C0050
-lbl_804C0050:
-	.skip 0x10
-
-.global lbl_804C0060
-lbl_804C0060:
-	.skip 0x10
-
-.global lbl_804C0070
-lbl_804C0070:
-	.skip 0x18F0
diff --git a/asm/ipc/ipcProfile_8055cd40.s b/asm/ipc/ipcProfile_8055cd40.s
deleted file mode 100644
index 2695f064..00000000
--- a/asm/ipc/ipcProfile_8055cd40.s
+++ /dev/null
@@ -1,10 +0,0 @@
-.include "macros.inc"
-
-.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
-.global IpcNumPendingReqs
-IpcNumPendingReqs:
-	.skip 0x4
-
-.global IpcNumUnIssuedReqs
-IpcNumUnIssuedReqs:
-	.skip 0x4
diff --git a/asm/ipc/ipcclt_8004e820.s b/asm/ipc/ipcclt.s
similarity index 99%
rename from asm/ipc/ipcclt_8004e820.s
rename to asm/ipc/ipcclt.s
index 527af3ab..ad533a6e 100644
--- a/asm/ipc/ipcclt_8004e820.s
+++ b/asm/ipc/ipcclt.s
@@ -2075,3 +2075,47 @@ lbl_80050258:
 /* 80050274 0004C0B4  00 00 00 00 */	.4byte 0x00000000
 /* 80050278 0004C0B8  00 00 00 00 */	.4byte 0x00000000
 /* 8005027C 0004C0BC  00 00 00 00 */	.4byte 0x00000000
+.include "macros.inc"
+
+.section .bss, "", @nobits  # 0x80496700 - 0x80556420 ; 0x000BFD20
+.global __responses
+__responses:
+	.skip 0xD0
+
+.global __timeout_alarm
+__timeout_alarm:
+	.skip 0x30
+
+.global __rpcBuf
+__rpcBuf:
+	.skip 0x40
+.include "macros.inc"
+
+.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
+.global __mailboxAck
+__mailboxAck:
+
+	.4byte 0x00000001
+
+.global hid
+hid:
+
+	.4byte 0xFFFFFFFF
+.include "macros.inc"
+
+.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
+.global __relnchFl
+__relnchFl:
+	.skip 0x4
+
+.global __relnchRpc
+__relnchRpc:
+	.skip 0x4
+
+.global __relnchRpcSave
+__relnchRpcSave:
+	.skip 0x4
+
+.global "@LOCAL@IPCCltInit__Fv@initialized"
+"@LOCAL@IPCCltInit__Fv@initialized":
+	.skip 0x4
diff --git a/asm/ipc/ipcclt_804bdd20.s b/asm/ipc/ipcclt_804bdd20.s
deleted file mode 100644
index 83213845..00000000
--- a/asm/ipc/ipcclt_804bdd20.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.include "macros.inc"
-
-.section .bss, "", @nobits  # 0x80496700 - 0x80556420 ; 0x000BFD20
-.global __responses
-__responses:
-	.skip 0xD0
-
-.global __timeout_alarm
-__timeout_alarm:
-	.skip 0x30
-
-.global __rpcBuf
-__rpcBuf:
-	.skip 0x40
diff --git a/asm/ipc/ipcclt_805567a8.s b/asm/ipc/ipcclt_805567a8.s
deleted file mode 100644
index b2f8935f..00000000
--- a/asm/ipc/ipcclt_805567a8.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.include "macros.inc"
-
-.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
-.global __mailboxAck
-__mailboxAck:
-
-	.4byte 0x00000001
-
-.global hid
-hid:
-
-	.4byte 0xFFFFFFFF
diff --git a/asm/ipc/ipcclt_8055cd30.s b/asm/ipc/ipcclt_8055cd30.s
deleted file mode 100644
index 1e5f0d82..00000000
--- a/asm/ipc/ipcclt_8055cd30.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.include "macros.inc"
-
-.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
-.global __relnchFl
-__relnchFl:
-	.skip 0x4
-
-.global __relnchRpc
-__relnchRpc:
-	.skip 0x4
-
-.global __relnchRpcSave
-__relnchRpcSave:
-	.skip 0x4
-
-.global "@LOCAL@IPCCltInit__Fv@initialized"
-"@LOCAL@IPCCltInit__Fv@initialized":
-	.skip 0x4
diff --git a/asm/ipc/memory_80050280.s b/asm/ipc/memory.s
similarity index 99%
rename from asm/ipc/memory_80050280.s
rename to asm/ipc/memory.s
index f6269dc5..cc906384 100644
--- a/asm/ipc/memory_80050280.s
+++ b/asm/ipc/memory.s
@@ -403,3 +403,9 @@ lbl_80050784:
 /* 800507A4 0004C5E4  4E 80 00 20 */	blr
 /* 800507A8 0004C5E8  00 00 00 00 */	.4byte 0x00000000
 /* 800507AC 0004C5EC  00 00 00 00 */	.4byte 0x00000000
+.include "macros.inc"
+
+.section .bss, "", @nobits  # 0x80496700 - 0x80556420 ; 0x000BFD20
+.global __heaps
+__heaps:
+	.skip 0x80
diff --git a/asm/ipc/memory_804bde60.s b/asm/ipc/memory_804bde60.s
deleted file mode 100644
index eee6e67d..00000000
--- a/asm/ipc/memory_804bde60.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macros.inc"
-
-.section .bss, "", @nobits  # 0x80496700 - 0x80556420 ; 0x000BFD20
-.global __heaps
-__heaps:
-	.skip 0x80
diff --git a/obj_files.mk b/obj_files.mk
index 4bcbdd01..d6058cda 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -231,12 +231,13 @@ $(BUILD_DIR)/asm/enc/encunicode.o \
 \
 $(BUILD_DIR)/asm/arc/arc.o \
 \
+$(BUILD_DIR)/asm/ipc/ipcMain.o \
+$(BUILD_DIR)/asm/ipc/ipcclt.o \
+$(BUILD_DIR)/asm/ipc/memory.o \
+$(BUILD_DIR)/asm/ipc/ipcProfile.o \
+\
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \
-$(BUILD_DIR)/asm/ipc/ipcMain_8004e730.o \
-$(BUILD_DIR)/asm/ipc/ipcclt_8004e820.o \
-$(BUILD_DIR)/asm/ipc/memory_80050280.o \
-$(BUILD_DIR)/asm/ipc/ipcProfile_800507b0.o \
 $(BUILD_DIR)/asm/fs/fs_80050bc0.o \
 $(BUILD_DIR)/asm/pad/Padclamp_800522a0.o \
 $(BUILD_DIR)/asm/pad/Pad_800524c0.o \
@@ -5014,9 +5015,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/ipc/ipcclt_804bdd20.o \
-$(BUILD_DIR)/asm/ipc/memory_804bde60.o \
-$(BUILD_DIR)/asm/ipc/ipcProfile_804bdee0.o \
 $(BUILD_DIR)/asm/pad/Pad_804c1960.o \
 $(BUILD_DIR)/asm/wpad/WPAD_804c1a20.o \
 $(BUILD_DIR)/asm/wpad/WPADHIDParser_804c5a00.o \
@@ -5142,7 +5140,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/ipc/ipcclt_805567a8.o \
 $(BUILD_DIR)/asm/fs/fs_805567b0.o \
 $(BUILD_DIR)/asm/pad/Pad_805567c0.o \
 $(BUILD_DIR)/asm/wpad/WPAD_805567e0.o \
@@ -5570,9 +5567,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/ipc/ipcMain_8055cd18.o \
-$(BUILD_DIR)/asm/ipc/ipcclt_8055cd30.o \
-$(BUILD_DIR)/asm/ipc/ipcProfile_8055cd40.o \
 $(BUILD_DIR)/asm/fs/fs_8055cd48.o \
 $(BUILD_DIR)/asm/pad/Pad_8055cd60.o \
 $(BUILD_DIR)/asm/wpad/WPAD_8055cd90.o \