diff --git a/Core/HLE/HLE.cpp b/Core/HLE/HLE.cpp
index 6639026f0c..1f07eab94a 100644
--- a/Core/HLE/HLE.cpp
+++ b/Core/HLE/HLE.cpp
@@ -192,7 +192,8 @@ DisableHLEFlags AlwaysDisableHLEFlags() {
 	// This will hide the checkbox in Developer Settings, too.
 	//
 	// PSMF testing issue: #20200
-	return DisableHLEFlags::scePsmf | DisableHLEFlags::scePsmfPlayer;
+	// sceCcc is simply a character conversion library, zero deps. If available we just load it.
+	return DisableHLEFlags::scePsmf | DisableHLEFlags::scePsmfPlayer | DisableHLEFlags::sceCcc;
 }
 
 // Process compat flags.
diff --git a/Core/HLE/sceKernelModule.cpp b/Core/HLE/sceKernelModule.cpp
index ca2af1391e..f7f2954088 100644
--- a/Core/HLE/sceKernelModule.cpp
+++ b/Core/HLE/sceKernelModule.cpp
@@ -1180,9 +1180,15 @@ static PSPModule *__KernelLoadELFFromPtr(const u8 *ptr, size_t elfSize, u32 load
 
 			// If we've made it this far, it should be safe to dump.
 			// Copy the name to ensure it's null terminated.
-			char name[32]{};
-			strncpy(name, head->modname, ARRAY_SIZE(head->modname));
-			DumpFileIfEnabled(ptr, (u32)elfSize, name, DumpFileType::EBOOT);
+			// TODO: How do we determine if it's the eboot?
+			if (endsWith(filename, "BOOT.BIN")) {
+				DumpFileIfEnabled(ptr, (u32)elfSize, "EBOOT.BIN", DumpFileType::EBOOT);
+			} else {
+				char name[32]{};
+				strncpy(name, head->modname, ARRAY_SIZE(head->modname));
+
+				DumpFileIfEnabled(ptr, (u32)elfSize, name, DumpFileType::PRX);
+			}
 		}
 	}