diff --git a/compose-destinations-codegen/src/main/java/com/ramcosta/composedestinations/codegen/writers/ModuleRegistryWriter.kt b/compose-destinations-codegen/src/main/java/com/ramcosta/composedestinations/codegen/writers/ModuleRegistryWriter.kt
index 4527c1bd..4609373e 100644
--- a/compose-destinations-codegen/src/main/java/com/ramcosta/composedestinations/codegen/writers/ModuleRegistryWriter.kt
+++ b/compose-destinations-codegen/src/main/java/com/ramcosta/composedestinations/codegen/writers/ModuleRegistryWriter.kt
@@ -46,7 +46,7 @@ internal class ModuleRegistryWriter(
             )
         )
         codeGenerator.makeFile(
-            "_ModuleRegistry",
+            "_ModuleRegistry_$registryId",
             "_generated._ramcosta._composedestinations._moduleregistry"
         ).writeSourceFile(
             packageStatement = "package _generated._ramcosta._composedestinations._moduleregistry",
@@ -109,7 +109,7 @@ internal class ModuleRegistryWriter(
             moduleRegistryId: String
         ) {
             codeGenerator.makeFile(
-                "_PathInfo_ModuleRegistry",
+                "_PathInfo_ModuleRegistry_$moduleRegistryId",
                 "_generated._ramcosta._composedestinations._moduleregistry"
             ).use {
                 it += """
diff --git a/compose-destinations-ksp/src/main/kotlin/com/ramcosta/composedestinations/ksp/processors/Processor.kt b/compose-destinations-ksp/src/main/kotlin/com/ramcosta/composedestinations/ksp/processors/Processor.kt
index 388f6ca5..38663820 100644
--- a/compose-destinations-ksp/src/main/kotlin/com/ramcosta/composedestinations/ksp/processors/Processor.kt
+++ b/compose-destinations-ksp/src/main/kotlin/com/ramcosta/composedestinations/ksp/processors/Processor.kt
@@ -95,7 +95,7 @@ class Processor(
 
     private fun generateModuleRegistryPathInfo(resolver: Resolver) {
         val moduleRegistryFile: KSFile = resolver.getNewFiles()
-            .firstOrNull { it.fileName == "_ModuleRegistry.kt" }
+            .firstOrNull { it.fileName.startsWith("_ModuleRegistry_") }
             ?: return
         val moduleRegistryId = moduleRegistryFile
             .declarations.first {