diff --git a/java/java-impl/src/com/intellij/javadoc/JavadocConfiguration.java b/java/java-impl/src/com/intellij/javadoc/JavadocConfiguration.java
index eecf8f0a6e58..d203f7aa8d85 100644
--- a/java/java-impl/src/com/intellij/javadoc/JavadocConfiguration.java
+++ b/java/java-impl/src/com/intellij/javadoc/JavadocConfiguration.java
@@ -224,11 +224,11 @@ public class JavadocConfiguration implements ModuleRunProfile, JDOMExternalizabl
 
       final PathsList classPath;
       if (jdk.getSdkType() instanceof JavaSdk) {
-        classPath = OrderEnumerator.orderEntries(myProject).withoutSdk().withoutThisModuleContent().getPathsList();
+        classPath = OrderEnumerator.orderEntries(myProject).withoutSdk().withoutModuleSourceEntries().getPathsList();
       }
       else {
         //libraries are included into jdk
-        classPath = OrderEnumerator.orderEntries(myProject).withoutThisModuleContent().getPathsList();
+        classPath = OrderEnumerator.orderEntries(myProject).withoutModuleSourceEntries().getPathsList();
       }
       final String classPathString = classPath.getPathsString();
       if (classPathString.length() > 0) {
diff --git a/java/java-tests/testSrc/com/intellij/roots/ProjectRootsTraversingTest.java b/java/java-tests/testSrc/com/intellij/roots/ProjectRootsTraversingTest.java
index a1ba267832dd..c4fa6ba1dc12 100644
--- a/java/java-tests/testSrc/com/intellij/roots/ProjectRootsTraversingTest.java
+++ b/java/java-tests/testSrc/com/intellij/roots/ProjectRootsTraversingTest.java
@@ -55,13 +55,13 @@ public class ProjectRootsTraversingTest extends ModuleRootManagerTestCase {
 
   private PathsList collectByOrderEnumerator(ProjectRootsTraversing.RootTraversePolicy policy) {
     if (policy == ProjectRootsTraversing.LIBRARIES_AND_JDK) {
-      return OrderEnumerator.orderEntries(myModule).withoutDepModules().withoutThisModuleContent().getPathsList();
+      return OrderEnumerator.orderEntries(myModule).withoutDepModules().withoutModuleSourceEntries().getPathsList();
     }
     if (policy == ProjectRootsTraversing.PROJECT_SOURCES) {
       return OrderEnumerator.orderEntries(myModule).withoutSdk().withoutLibraries().withoutDepModules().getSourcePathsList();
     }
     if (policy == ProjectRootsTraversing.PROJECT_LIBRARIES) {
-      return OrderEnumerator.orderEntries(myModule).withoutSdk().withoutThisModuleContent().recursively().getPathsList();
+      return OrderEnumerator.orderEntries(myModule).withoutSdk().withoutModuleSourceEntries().recursively().getPathsList();
     }
     throw new AssertionError(policy);
   }