diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
index 573c954a002..6d1e13490e8 100644
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -16,7 +16,7 @@
           <element id="module-output" name="frontend.java" />
           <element id="module-output" name="descriptor.loader.java" />
           <element id="module-output" name="idea" />
-          <element id="module-output" name="jet.as.java.psi" />
+          <element id="module-output" name="light-classes" />
           <element id="module-output" name="util" />
           <element id="module-output" name="util.runtime" />
           <element id="module-output" name="j2k" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 1ab9c8b3ebc..f6776a7987c 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -29,7 +29,6 @@
       <module fileurl="file://$PROJECT_DIR$/generators/injector-generator/injector-generator.iml" filepath="$PROJECT_DIR$/generators/injector-generator/injector-generator.iml" group="infrastructure" />
       <module fileurl="file://$PROJECT_DIR$/compiler/preloader/instrumentation/instrumentation.iml" filepath="$PROJECT_DIR$/compiler/preloader/instrumentation/instrumentation.iml" group="compiler/cli" />
       <module fileurl="file://$PROJECT_DIR$/j2k/j2k.iml" filepath="$PROJECT_DIR$/j2k/j2k.iml" group="j2k" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/jet.as.java.psi/jet.as.java.psi.iml" filepath="$PROJECT_DIR$/compiler/jet.as.java.psi/jet.as.java.psi.iml" group="compiler/java" />
       <module fileurl="file://$PROJECT_DIR$/jps-plugin/jps-plugin.iml" filepath="$PROJECT_DIR$/jps-plugin/jps-plugin.iml" group="ide/jps" />
       <module fileurl="file://$PROJECT_DIR$/js/js.dart-ast/js.dart-ast.iml" filepath="$PROJECT_DIR$/js/js.dart-ast/js.dart-ast.iml" group="compiler/js" />
       <module fileurl="file://$PROJECT_DIR$/js/js.frontend/js.frontend.iml" filepath="$PROJECT_DIR$/js/js.frontend/js.frontend.iml" group="compiler/js" />
@@ -39,6 +38,7 @@
       <module fileurl="file://$PROJECT_DIR$/js/js.translator/js.translator.iml" filepath="$PROJECT_DIR$/js/js.translator/js.translator.iml" group="compiler/js" />
       <module fileurl="file://$PROJECT_DIR$/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml" filepath="$PROJECT_DIR$/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml" group="ide/jps" />
       <module fileurl="file://$PROJECT_DIR$/idea/kotlin-android-plugin/kotlin-android-plugin.iml" filepath="$PROJECT_DIR$/idea/kotlin-android-plugin/kotlin-android-plugin.iml" group="ide" />
+      <module fileurl="file://$PROJECT_DIR$/compiler/light-classes/light-classes.iml" filepath="$PROJECT_DIR$/compiler/light-classes/light-classes.iml" group="compiler/java" />
       <module fileurl="file://$PROJECT_DIR$/compiler/preloader/preloader.iml" filepath="$PROJECT_DIR$/compiler/preloader/preloader.iml" group="compiler/cli" />
       <module fileurl="file://$PROJECT_DIR$/core/reflection/reflection.iml" filepath="$PROJECT_DIR$/core/reflection/reflection.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/core/reflection.jvm/reflection.jvm.iml" filepath="$PROJECT_DIR$/core/reflection.jvm/reflection.jvm.iml" group="core" />
diff --git a/build.xml b/build.xml
index 12e23eaf97e..1fb47cda677 100644
--- a/build.xml
+++ b/build.xml
@@ -98,7 +98,7 @@
         <include name="compiler/cli/src"/>
         <include name="compiler/cli/cli-common/src"/>
         <include name="compiler/util/src"/>
-        <include name="compiler/jet.as.java.psi/src"/>
+        <include name="compiler/light-classes/src"/>
         <include name="compiler/builtins-serializer/src"/>
         <include name="js/js.dart-ast/src"/>
         <include name="js/js.translator/src"/>
@@ -121,7 +121,7 @@
         <include name="cli-common/**"/>
         <include name="util/**"/>
         <include name="util.runtime/**"/>
-        <include name="jet.as.java.psi/**"/>
+        <include name="light-classes/**"/>
         <include name="builtins-serializer/**"/>
         <include name="js.dart-ast/**"/>
         <include name="js.translator/**"/>
@@ -187,7 +187,7 @@
             <fileset dir="compiler/cli/src"/>
             <fileset dir="compiler/cli/cli-common/src"/>
             <fileset dir="compiler/util/src"/>
-            <fileset dir="compiler/jet.as.java.psi/src"/>
+            <fileset dir="compiler/light-classes/src"/>
             <fileset dir="compiler/builtins-serializer"/>
             <fileset dir="js/js.dart-ast/src"/>
             <fileset dir="js/js.translator/src"/>
diff --git a/compiler/cli/cli.iml b/compiler/cli/cli.iml
index 17b776f14e7..538d9373f1f 100644
--- a/compiler/cli/cli.iml
+++ b/compiler/cli/cli.iml
@@ -10,7 +10,7 @@
     <orderEntry type="module" module-name="backend" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="jet.as.java.psi" />
+    <orderEntry type="module" module-name="light-classes" />
     <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="js.translator" />
     <orderEntry type="library" name="jline" level="project" />
@@ -20,5 +20,4 @@
     <orderEntry type="module" module-name="serialization" />
     <orderEntry type="module" module-name="serialization.java" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/compiler/jet.as.java.psi/jet.as.java.psi.iml b/compiler/light-classes/light-classes.iml
similarity index 100%
rename from compiler/jet.as.java.psi/jet.as.java.psi.iml
rename to compiler/light-classes/light-classes.iml
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/ClsWrapperStubPsiFactory.java b/compiler/light-classes/src/org/jetbrains/jet/asJava/ClsWrapperStubPsiFactory.java
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/ClsWrapperStubPsiFactory.java
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/ClsWrapperStubPsiFactory.java
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/FakeLightClassForFileOfPackage.java b/compiler/light-classes/src/org/jetbrains/jet/asJava/FakeLightClassForFileOfPackage.java
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/FakeLightClassForFileOfPackage.java
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/FakeLightClassForFileOfPackage.java
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java b/compiler/light-classes/src/org/jetbrains/jet/asJava/JavaElementFinder.java
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/JavaElementFinder.java
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetLightPackage.java b/compiler/light-classes/src/org/jetbrains/jet/asJava/JetLightPackage.java
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetLightPackage.java
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/JetLightPackage.java
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinCodeBlockModificationListener.kt b/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinCodeBlockModificationListener.kt
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinCodeBlockModificationListener.kt
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinCodeBlockModificationListener.kt
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinJavaFileStubProvider.java b/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinJavaFileStubProvider.java
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinJavaFileStubProvider.java
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinJavaFileStubProvider.java
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClass.kt b/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightClass.kt
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClass.kt
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightClass.kt
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassBuilderFactory.java b/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightClassBuilderFactory.java
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassBuilderFactory.java
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightClassBuilderFactory.java
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForAnonymousDeclaration.java b/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightClassForAnonymousDeclaration.java
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForAnonymousDeclaration.java
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightClassForAnonymousDeclaration.java
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForEnumEntry.kt b/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightClassForEnumEntry.kt
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForEnumEntry.kt
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightClassForEnumEntry.kt
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java b/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForPackage.java b/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightClassForPackage.java
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForPackage.java
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightClassForPackage.java
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightElement.kt b/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightElement.kt
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightElement.kt
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightElement.kt
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightEnumConstant.kt b/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightEnumConstant.kt
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightEnumConstant.kt
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightEnumConstant.kt
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightField.java b/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightField.java
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightField.java
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightField.java
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightFieldForDeclaration.kt b/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightFieldForDeclaration.kt
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightFieldForDeclaration.kt
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightFieldForDeclaration.kt
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightMethod.kt b/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightMethod.kt
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightMethod.kt
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightMethod.kt
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightMethodForDeclaration.kt b/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightMethodForDeclaration.kt
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightMethodForDeclaration.kt
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightMethodForDeclaration.kt
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightMethodForTraitFakeOverride.kt b/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightMethodForTraitFakeOverride.kt
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightMethodForTraitFakeOverride.kt
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightMethodForTraitFakeOverride.kt
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightModifierList.java b/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightModifierList.java
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightModifierList.java
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightModifierList.java
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightParameter.java b/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightParameter.java
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightParameter.java
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightParameter.java
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightTypeParameter.java b/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightTypeParameter.java
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightTypeParameter.java
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightTypeParameter.java
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightTypeParameterListBuilder.kt b/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightTypeParameterListBuilder.kt
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightTypeParameterListBuilder.kt
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightTypeParameterListBuilder.kt
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinWrappingLightClass.java b/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinWrappingLightClass.java
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinWrappingLightClass.java
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinWrappingLightClass.java
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassConstructionContext.java b/compiler/light-classes/src/org/jetbrains/jet/asJava/LightClassConstructionContext.java
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassConstructionContext.java
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/LightClassConstructionContext.java
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassGenerationSupport.java b/compiler/light-classes/src/org/jetbrains/jet/asJava/LightClassGenerationSupport.java
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassGenerationSupport.java
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/LightClassGenerationSupport.java
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassStubWithData.kt b/compiler/light-classes/src/org/jetbrains/jet/asJava/LightClassStubWithData.kt
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassStubWithData.kt
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/LightClassStubWithData.kt
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassUtil.java b/compiler/light-classes/src/org/jetbrains/jet/asJava/LightClassUtil.java
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassUtil.java
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/LightClassUtil.java
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightParameter.java b/compiler/light-classes/src/org/jetbrains/jet/asJava/LightParameter.java
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightParameter.java
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/LightParameter.java
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightParameterListBuilder.java b/compiler/light-classes/src/org/jetbrains/jet/asJava/LightParameterListBuilder.java
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightParameterListBuilder.java
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/LightParameterListBuilder.java
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightVariableBuilder.java b/compiler/light-classes/src/org/jetbrains/jet/asJava/LightVariableBuilder.java
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightVariableBuilder.java
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/LightVariableBuilder.java
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/StubClassBuilder.java b/compiler/light-classes/src/org/jetbrains/jet/asJava/StubClassBuilder.java
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/StubClassBuilder.java
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/StubClassBuilder.java
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/duplicateJvmSignatureUtil.kt b/compiler/light-classes/src/org/jetbrains/jet/asJava/duplicateJvmSignatureUtil.kt
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/duplicateJvmSignatureUtil.kt
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/duplicateJvmSignatureUtil.kt
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/lightClassUtils.kt b/compiler/light-classes/src/org/jetbrains/jet/asJava/lightClassUtils.kt
similarity index 100%
rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/lightClassUtils.kt
rename to compiler/light-classes/src/org/jetbrains/jet/asJava/lightClassUtils.kt
diff --git a/compiler/tests/compiler-tests.iml b/compiler/tests/compiler-tests.iml
index a246fb93f9e..19d6cacf19e 100644
--- a/compiler/tests/compiler-tests.iml
+++ b/compiler/tests/compiler-tests.iml
@@ -12,7 +12,7 @@
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="cli" />
-    <orderEntry type="module" module-name="jet.as.java.psi" />
+    <orderEntry type="module" module-name="light-classes" />
     <orderEntry type="library" name="idea-full" level="project" />
     <orderEntry type="library" name="dx-android" level="project" />
     <orderEntry type="module" module-name="serialization" />
diff --git a/idea/idea-analysis/idea-analysis.iml b/idea/idea-analysis/idea-analysis.iml
index be0c00381fa..36d78e44244 100644
--- a/idea/idea-analysis/idea-analysis.iml
+++ b/idea/idea-analysis/idea-analysis.iml
@@ -10,7 +10,7 @@
     <orderEntry type="module" module-name="backend" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="jet.as.java.psi" />
+    <orderEntry type="module" module-name="light-classes" />
     <orderEntry type="library" scope="PROVIDED" name="properties" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="java-i18n" level="project" />
     <orderEntry type="library" name="kotlin-runtime" level="project" />
diff --git a/idea/idea.iml b/idea/idea.iml
index ea77e4c848e..fd93a3176e1 100644
--- a/idea/idea.iml
+++ b/idea/idea.iml
@@ -22,7 +22,7 @@
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
-    <orderEntry type="module" module-name="jet.as.java.psi" />
+    <orderEntry type="module" module-name="light-classes" />
     <orderEntry type="library" name="idea-full" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="intellilang-plugin" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="junit-plugin" level="project" />
diff --git a/j2k/j2k.iml b/j2k/j2k.iml
index c51c5fc1a9e..1e19d9b038d 100644
--- a/j2k/j2k.iml
+++ b/j2k/j2k.iml
@@ -12,7 +12,7 @@
     <orderEntry type="module" module-name="util" />
     <orderEntry type="library" name="idea-full" level="project" />
     <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="jet.as.java.psi" />
+    <orderEntry type="module" module-name="light-classes" />
     <orderEntry type="module" module-name="idea" scope="TEST" />
     <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
   </component>