diff --git a/java/compiler/impl/compiler-impl.iml b/java/compiler/impl/compiler-impl.iml
index 754be519e05f..26ea2a40b195 100644
--- a/java/compiler/impl/compiler-impl.iml
+++ b/java/compiler/impl/compiler-impl.iml
@@ -15,7 +15,7 @@
     <orderEntry type="module" module-name="openapi" />
     <orderEntry type="library" name="Trove4j" level="project" />
     <orderEntry type="module" module-name="java-runtime" />
-    <orderEntry type="module" module-name="NotNull" />
+    <orderEntry type="module" module-name="notNull" />
     <orderEntry type="library" name="asm" level="project" />
     <orderEntry type="library" name="Eclipse" level="project" />
     <orderEntry type="module" module-name="platform-api" />
diff --git a/java/compiler/notNull/notNull.iml b/java/compiler/notNull/notNull.iml
new file mode 100644
index 000000000000..1b09002e2fff
--- /dev/null
+++ b/java/compiler/notNull/notNull.iml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="asm" level="project" />
+  </component>
+</module>
+
diff --git a/NotNull/src/com/intellij/compiler/notNullVerification/NotNullVerifyingInstrumenter.java b/java/compiler/notNull/src/com/intellij/compiler/notNullVerification/NotNullVerifyingInstrumenter.java
similarity index 100%
rename from NotNull/src/com/intellij/compiler/notNullVerification/NotNullVerifyingInstrumenter.java
rename to java/compiler/notNull/src/com/intellij/compiler/notNullVerification/NotNullVerifyingInstrumenter.java
diff --git a/javac2/javac2.iml b/javac2/javac2.iml
index 7e0ccf6f6033..4e6761b5ac93 100644
--- a/javac2/javac2.iml
+++ b/javac2/javac2.iml
@@ -11,7 +11,7 @@
     <orderEntry type="module" module-name="UIDesignerCore" />
     <orderEntry type="module" module-name="forms_rt" />
     <orderEntry type="library" name="asm" level="project" />
-    <orderEntry type="module" module-name="NotNull" />
+    <orderEntry type="module" module-name="notNull" />
   </component>
   <component name="copyright">
     <Base>