diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml
index 25f9ab18817..d96c403f498 100644
--- a/jps/jps-plugin/jps-plugin.iml
+++ b/jps/jps-plugin/jps-plugin.iml
@@ -18,7 +18,7 @@
     <orderEntry type="module" module-name="descriptors" />
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="serialization.java" />
-    <orderEntry type="module" module-name="serialization" scope="TEST" />
+    <orderEntry type="module" module-name="serialization" />
     <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
     <orderEntry type="library" name="asm" level="project" />
   </component>
diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt
index 3987227e646..484a0b51c86 100644
--- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt
+++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt
@@ -63,7 +63,7 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC
         if (kotlinClass == null) return DO_NOTHING
 
         val fileBytes = kotlinClass.getFileContents()
-        val className = kotlinClass.getClassName()
+        val className = JvmClassName.byClassId(kotlinClass.getClassId())
         val header = kotlinClass.getClassHeader()
 
         val annotationDataEncoded = header.annotationData
diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt
index a414e46deb4..56a66dbac8c 100644
--- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt
+++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt
@@ -17,14 +17,14 @@
 package org.jetbrains.jet.jps.incremental
 
 import org.jetbrains.jet.lang.resolve.kotlin.FileBasedKotlinClass
-import org.jetbrains.jet.lang.resolve.java.JvmClassName
 import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader
+import org.jetbrains.jet.descriptors.serialization.ClassId
 import java.io.File
 
 class LocalFileKotlinClass private(
         private val file: File,
         private val fileContents: ByteArray,
-        className: JvmClassName,
+        className: ClassId,
         classHeader: KotlinClassHeader,
         innerClasses: FileBasedKotlinClass.InnerClassesInfo
 ) : FileBasedKotlinClass(className, classHeader, innerClasses) {