diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleDependenciesImportingTest.java b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleDependenciesImportingTest.java
index 6a1f918fd8a8..d3d65eaaf91e 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleDependenciesImportingTest.java
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleDependenciesImportingTest.java
@@ -892,19 +892,19 @@ public class GradleDependenciesImportingTest extends GradleImportingTestCase {
                            .withJavaPlugin()
                            .addPostfix(
                              "configurations {",
-                             "  parentCfg",
-                             "  compile.extendsFrom parentCfg",
+                             "  aParentCfg",
+                             "  compile.extendsFrom aParentCfg",
                              "}",
                              "sourceSets {",
-                             "  parentSrc { java.srcDirs = ['src/parent/java'] }",
-                             "  main { java { compileClasspath += parentSrc.output } }",
+                             "  aParentSrc { java.srcDirs = ['src/aParent/java'] }",
+                             "  main { java { compileClasspath += aParentSrc.output } }",
                              "}",
-                             "task parentSrcJar(type:Jar) {",
+                             "task aParentSrcJar(type:Jar) {",
                              "    appendix 'parent'",
-                             "    from sourceSets.parentSrc.output",
+                             "    from sourceSets.aParentSrc.output",
                              "}",
                              "artifacts {",
-                             "  parentCfg parentSrcJar",
+                             "  aParentCfg aParentSrcJar",
                              "}"
                            )
                            .generate()
@@ -920,10 +920,10 @@ public class GradleDependenciesImportingTest extends GradleImportingTestCase {
     importProject("");
 
     assertModules("project",
-                  "project.project1", "project.project1.main", "project.project1.test", "project.project1.parentSrc",
+                  "project.project1", "project.project1.main", "project.project1.test", "project.project1.aParentSrc",
                   "project.project2", "project.project2.main", "project.project2.test");
 
-    assertModuleModuleDeps("project.project2.main", "project.project1.main", "project.project1.parentSrc");
+    assertModuleModuleDeps("project.project2.main", "project.project1.main", "project.project1.aParentSrc");
   }
 
 
diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ExternalProjectBuilderImpl.groovy b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ExternalProjectBuilderImpl.groovy
index 02f1556abd66..0c9a6dca8071 100644
--- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ExternalProjectBuilderImpl.groovy
+++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ExternalProjectBuilderImpl.groovy
@@ -129,7 +129,7 @@ class ExternalProjectBuilderImpl implements ModelBuilderService {
     def configurationsByName = project.getConfigurations().getAsMap()
     Map<String, Set<File>> artifactsByConfiguration = new HashMap<String, Set<File>>()
     for (Map.Entry<String, Configuration> configurationEntry : configurationsByName.entrySet()) {
-      Set<File> files = configurationEntry.getValue().getAllArtifacts().getFiles().getFiles()
+      Set<File> files = configurationEntry.getValue().getArtifacts().getFiles().getFiles()
       artifactsByConfiguration.put(configurationEntry.getKey(), new LinkedHashSet<>(files))
     }
     externalProject.setArtifactsByConfiguration(artifactsByConfiguration)