diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java
index f0f51b74793..d08b1ef5919 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java
@@ -84,7 +84,10 @@ public class ClassFileFactory implements OutputFileCollection {
     }
 
     private void writeModuleMappings(Collection<PackageCodegen> values) {
-        String outputFilePath = "META-INF/module.mapping";
+        String moduleName = state.getModule().getName().asString();
+        moduleName = moduleName.replaceAll(">", "").replaceAll("<", "");
+        moduleName = moduleName.substring(moduleName.lastIndexOf(" ") + 1);
+        String outputFilePath = "META-INF/" + moduleName + ".kotlin_module";
         final StringWriter moduleMapping = new StringWriter(1024);
         for (PackageCodegen codegen : values) {
             codegen.getFacades().serialize(moduleMapping);