diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/FSOperations.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/FSOperations.java
index a935d4a5b3c1..d9f1bc63ce16 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/FSOperations.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/FSOperations.java
@@ -142,7 +142,7 @@ public class FSOperations {
     final ModuleRootsIndex rootsIndex = context.getProjectDescriptor().rootsIndex;
     final Set<File> excludes = new HashSet<File>(rootsIndex.getModuleExcludes(target.getModule()));
     final Collection<RootDescriptor> roots = new ArrayList<RootDescriptor>();
-    for (RootDescriptor rd : rootsIndex.getModuleRoots(context, target.getModuleName())) {
+    for (RootDescriptor rd : rootsIndex.getModuleRoots(context, target.getModule())) {
       roots.add(rd);
     }
     for (RootDescriptor rd : roots) {
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
index 966d20996ac4..3217f4fe1882 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
@@ -892,7 +892,7 @@ public class IncProjectBuilder {
           fsState.markInitialScanPerformed(target);
         }
         final Timestamps timestamps = pd.timestamps.getStorage();
-        final List<RootDescriptor> roots = pd.rootsIndex.getModuleRoots(context, target.getModuleName());
+        final List<RootDescriptor> roots = pd.rootsIndex.getModuleRoots(context, target.getModule());
         for (RootDescriptor rd : roots) {
           if (target.isTests() ? rd.isTestRoot : !rd.isTestRoot) {
             marked |= fsState.markAllUpToDate(context.getScope(), rd, timestamps, context.getCompilationStartStamp());
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/ModuleLevelBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/ModuleLevelBuilder.java
index c3a8d86884b4..07533d20e517 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/ModuleLevelBuilder.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/ModuleLevelBuilder.java
@@ -274,7 +274,7 @@ public abstract class ModuleLevelBuilder extends Builder {
       if (rd == null) {
         return true;
       }
-      final JpsModule moduleOfFile = myContext.getProjectDescriptor().rootsIndex.getModuleByName(rd.module);
+      final JpsModule moduleOfFile = rd.target.getModule();
       if (myChunkModules.contains(moduleOfFile)) {
         return true;
       }
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/ModuleRootsIndex.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/ModuleRootsIndex.java
index fb7b283e49cb..67a3ab8b63ea 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/ModuleRootsIndex.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/ModuleRootsIndex.java
@@ -118,15 +118,6 @@ public class ModuleRootsIndex {
     return myNameToModuleMap.get(module);
   }
 
-  @NotNull
-  public List<RootDescriptor> getModuleRoots(@Nullable CompileContext context, String moduleName) {
-    final JpsModule module = getModuleByName(moduleName);
-    if (module == null) {
-      return Collections.emptyList();
-    }
-    return getModuleRoots(context, module);
-  }
-
   @NotNull
   public List<RootDescriptor> getModuleRoots(@Nullable CompileContext context, JpsModule module) {
     List<RootDescriptor> descriptors = myModuleToRootsMap.get(module);
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
index 43acf52556d3..1d54153602bc 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
@@ -195,7 +195,7 @@ public class JavaBuilder extends ModuleLevelBuilder {
           if (descriptor == null) {
             continue;
           }
-          for (RootDescriptor rd : context.getProjectDescriptor().rootsIndex.getModuleRoots(context, descriptor.module)) {
+          for (RootDescriptor rd : context.getProjectDescriptor().rootsIndex.getModuleRoots(context, descriptor.target.getModule())) {
             final File boundSource = getBoundSource(rd.root, form);
             if (boundSource == null) {
               continue;
diff --git a/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovyBuilder.java b/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovyBuilder.java
index a99ae0d3965b..b0c9805b003e 100644
--- a/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovyBuilder.java
+++ b/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovyBuilder.java
@@ -201,8 +201,8 @@ public class GroovyBuilder extends ModuleLevelBuilder {
       final ModuleRootsIndex rootsIndex = context.getProjectDescriptor().rootsIndex;
       RootDescriptor descriptor = rootsIndex.getModuleAndRoot(context, new File(item.sourcePath));
       if (descriptor != null) {
-        JpsModule srcModule = rootsIndex.getModuleByName(descriptor.module);
-        if (srcModule != null && srcModule != chunk.representativeModule()) {
+        JpsModule srcModule = descriptor.target.getModule();
+        if (srcModule != chunk.representativeModule()) {
           File output = new File(item.outputPath);
 
           //todo honor package prefixes
@@ -263,9 +263,9 @@ public class GroovyBuilder extends ModuleLevelBuilder {
         final String outputPath = FileUtil.toSystemIndependentName(item.outputPath);
         final RootDescriptor moduleAndRoot = context.getProjectDescriptor().rootsIndex.getModuleAndRoot(context, new File(sourcePath));
         if (moduleAndRoot != null) {
-          final String moduleName = moduleAndRoot.module;
+          final JpsModule module = moduleAndRoot.target.getModule();
           context.getProjectDescriptor().dataManager.getSourceToOutputMap(moduleAndRoot.target).appendData(sourcePath, outputPath);
-          String moduleOutputPath = generationOutputs.get(context.getProjectDescriptor().rootsIndex.getModuleByName(moduleName));
+          String moduleOutputPath = generationOutputs.get(module);
           generatedEvent.add(moduleOutputPath, FileUtil.getRelativePath(moduleOutputPath, outputPath, '/'));
         }
         callback.associate(outputPath, sourcePath, new ClassReader(FileUtil.loadFileBytes(new File(outputPath))));