diff --git a/asm/enc/encunicode_8004d990.s b/asm/enc/encunicode.s
similarity index 100%
rename from asm/enc/encunicode_8004d990.s
rename to asm/enc/encunicode.s
diff --git a/asm/enc/encutility_8004d750.s b/asm/enc/encutility.s
similarity index 91%
rename from asm/enc/encutility_8004d750.s
rename to asm/enc/encutility.s
index f98d8c39..65b11708 100644
--- a/asm/enc/encutility_8004d750.s
+++ b/asm/enc/encutility.s
@@ -191,3 +191,41 @@ lbl_8004D974:
 /* 8004D984 000497C4  7C 08 03 A6 */	mtlr r0
 /* 8004D988 000497C8  38 21 00 20 */	addi r1, r1, 0x20
 /* 8004D98C 000497CC  4E 80 00 20 */	blr
+.include "macros.inc"
+
+.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
+.global "@669"
+"@669":
+
+	.4byte 0x3C3C2052
+	.4byte 0x564C5F53
+	.4byte 0x444B202D
+	.4byte 0x20454E43
+	.4byte 0x20097265
+	.4byte 0x6C656173
+	.4byte 0x65206275
+	.4byte 0x696C643A
+	.4byte 0x20417567
+	.4byte 0x20323320
+	.4byte 0x32303130
+	.4byte 0x2031373A
+	.4byte 0x33343A30
+	.4byte 0x37202830
+	.4byte 0x78343330
+	.4byte 0x325F3134
+	.4byte 0x3529203E
+	.4byte 0x3E000000
+.include "macros.inc"
+
+.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
+.global __ENCVersion
+__ENCVersion:
+
+	.4byte "@669"
+	.4byte 0
+.include "macros.inc"
+
+.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
+.global encRegistered
+encRegistered:
+	.skip 0x8
diff --git a/asm/enc/encutility_80438450.s b/asm/enc/encutility_80438450.s
deleted file mode 100644
index 314ef8db..00000000
--- a/asm/enc/encutility_80438450.s
+++ /dev/null
@@ -1,24 +0,0 @@
-.include "macros.inc"
-
-.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
-.global "@669"
-"@669":
-
-	.4byte 0x3C3C2052
-	.4byte 0x564C5F53
-	.4byte 0x444B202D
-	.4byte 0x20454E43
-	.4byte 0x20097265
-	.4byte 0x6C656173
-	.4byte 0x65206275
-	.4byte 0x696C643A
-	.4byte 0x20417567
-	.4byte 0x20323320
-	.4byte 0x32303130
-	.4byte 0x2031373A
-	.4byte 0x33343A30
-	.4byte 0x37202830
-	.4byte 0x78343330
-	.4byte 0x325F3134
-	.4byte 0x3529203E
-	.4byte 0x3E000000
diff --git a/asm/enc/encutility_80556798.s b/asm/enc/encutility_80556798.s
deleted file mode 100644
index 7e35c176..00000000
--- a/asm/enc/encutility_80556798.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.include "macros.inc"
-
-.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
-.global __ENCVersion
-__ENCVersion:
-
-	.4byte "@669"
-	.4byte 0
diff --git a/asm/enc/encutility_8055cd10.s b/asm/enc/encutility_8055cd10.s
deleted file mode 100644
index 2459b59b..00000000
--- a/asm/enc/encutility_8055cd10.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macros.inc"
-
-.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
-.global encRegistered
-encRegistered:
-	.skip 0x8
diff --git a/obj_files.mk b/obj_files.mk
index aa35625d..7f58122b 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -226,10 +226,11 @@ $(BUILD_DIR)/asm/sc/scapi_prdinfo.o \
 \
 $(BUILD_DIR)/asm/wenc/wenc.o \
 \
+$(BUILD_DIR)/asm/enc/encutility.o \
+$(BUILD_DIR)/asm/enc/encunicode.o \
+\
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \
-$(BUILD_DIR)/asm/enc/encutility_8004d750.o \
-$(BUILD_DIR)/asm/enc/encunicode_8004d990.o \
 $(BUILD_DIR)/asm/arc/arc_8004dd70.o \
 $(BUILD_DIR)/asm/ipc/ipcMain_8004e730.o \
 $(BUILD_DIR)/asm/ipc/ipcclt_8004e820.o \
@@ -3227,7 +3228,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/enc/encutility_80438450.o \
 $(BUILD_DIR)/asm/arc/arc_80438498.o \
 $(BUILD_DIR)/asm/fs/fs_80438508.o \
 $(BUILD_DIR)/asm/pad/Pad_80438530.o \
@@ -5142,7 +5142,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/enc/encutility_80556798.o \
 $(BUILD_DIR)/asm/arc/arc_805567a0.o \
 $(BUILD_DIR)/asm/ipc/ipcclt_805567a8.o \
 $(BUILD_DIR)/asm/fs/fs_805567b0.o \
@@ -5572,7 +5571,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/enc/encutility_8055cd10.o \
 $(BUILD_DIR)/asm/ipc/ipcMain_8055cd18.o \
 $(BUILD_DIR)/asm/ipc/ipcclt_8055cd30.o \
 $(BUILD_DIR)/asm/ipc/ipcProfile_8055cd40.o \