diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java
index cab663680b4..5fed10262e5 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java
@@ -28,8 +28,8 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collections;
 
-import static org.jetbrains.jet.jvm.compiler.LoadDescriptorUtil.analyzeKotlinAndExtractTestNamespace;
-import static org.jetbrains.jet.jvm.compiler.LoadDescriptorUtil.compileJavaAndExtractTestNamespaceFromBinary;
+import static org.jetbrains.jet.jvm.compiler.LoadDescriptorUtil.analyzeKotlinAndLoadTestNamespace;
+import static org.jetbrains.jet.jvm.compiler.LoadDescriptorUtil.compileJavaAndLoadTestNamespaceFromBinary;
 import static org.jetbrains.jet.test.util.NamespaceComparator.DONT_INCLUDE_METHODS_OF_OBJECT;
 import static org.jetbrains.jet.test.util.NamespaceComparator.compareNamespaces;
 
@@ -46,9 +46,9 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir {
         File javaFile = new File(javaFileName);
         File ktFile = new File(javaFile.getPath().replaceFirst("\\.java$", ".kt"));
         File txtFile = new File(javaFile.getPath().replaceFirst("\\.java$", ".txt"));
-        NamespaceDescriptor nsa = analyzeKotlinAndExtractTestNamespace(ktFile, myTestRootDisposable);
-        NamespaceDescriptor nsb = compileJavaAndExtractTestNamespaceFromBinary(Collections.singletonList(javaFile),
-                                                                               tmpdir, myTestRootDisposable);
+        NamespaceDescriptor nsa = analyzeKotlinAndLoadTestNamespace(ktFile, myTestRootDisposable);
+        NamespaceDescriptor nsb = compileJavaAndLoadTestNamespaceFromBinary(Collections.singletonList(javaFile),
+                                                                            tmpdir, myTestRootDisposable);
         compareNamespaces(nsa, nsb, DONT_INCLUDE_METHODS_OF_OBJECT, txtFile);
     }
 
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinCustomTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinCustomTest.java
index 8cf000a7a30..3989db895f3 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinCustomTest.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinCustomTest.java
@@ -22,7 +22,7 @@ import org.jetbrains.jet.test.TestCaseWithTmpdir;
 
 import java.io.File;
 
-import static org.jetbrains.jet.jvm.compiler.LoadDescriptorUtil.compileKotlinAndExtractTestNamespaceDescriptorFromBinary;
+import static org.jetbrains.jet.jvm.compiler.LoadDescriptorUtil.compileKotlinAndLoadTestNamespaceDescriptorFromBinary;
 import static org.jetbrains.jet.test.util.NamespaceComparator.DONT_INCLUDE_METHODS_OF_OBJECT;
 import static org.jetbrains.jet.test.util.NamespaceComparator.compareNamespaces;
 
@@ -39,7 +39,7 @@ public final class LoadCompiledKotlinCustomTest extends TestCaseWithTmpdir {
 
     private void doTest(@NotNull String expectedFileName, @NotNull String kotlinFileName) throws Exception {
         NamespaceDescriptor namespaceFromClass =
-                compileKotlinAndExtractTestNamespaceDescriptorFromBinary(new File(kotlinFileName), tmpdir, myTestRootDisposable);
+                compileKotlinAndLoadTestNamespaceDescriptorFromBinary(new File(kotlinFileName), tmpdir, myTestRootDisposable);
 
         compareNamespaces(namespaceFromClass, namespaceFromClass, DONT_INCLUDE_METHODS_OF_OBJECT, new File(expectedFileName));
     }
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTest.java
index 78739a14171..292429fb9b7 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTest.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTest.java
@@ -60,7 +60,7 @@ public final class LoadCompiledKotlinTest extends TestCaseWithTmpdir {
                                                                                   TEST_PACKAGE_FQNAME);
         assert namespaceFromSource != null;
         Assert.assertEquals("test", namespaceFromSource.getName().getName());
-        NamespaceDescriptor namespaceFromClass = LoadDescriptorUtil.extractTestNamespaceFromBinaries(tmpdir, getTestRootDisposable());
+        NamespaceDescriptor namespaceFromClass = LoadDescriptorUtil.loadTestNamespaceFromBinaries(tmpdir, getTestRootDisposable());
         compareNamespaces(namespaceFromSource, namespaceFromClass, NamespaceComparator.DONT_INCLUDE_METHODS_OF_OBJECT, txtFile);
     }
 
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java
index 99923361497..849562caa9e 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java
@@ -66,14 +66,14 @@ public final class LoadDescriptorUtil {
     }
 
     @NotNull
-    public static NamespaceDescriptor compileKotlinAndExtractTestNamespaceDescriptorFromBinary(
+    public static NamespaceDescriptor compileKotlinAndLoadTestNamespaceDescriptorFromBinary(
             @NotNull File kotlinFile,
             @NotNull File outDir,
             @NotNull Disposable disposable
     )
             throws IOException {
         compileKotlinToDirAndGetAnalyzeExhaust(kotlinFile, outDir, disposable);
-        return extractTestNamespaceFromBinaries(outDir, disposable);
+        return loadTestNamespaceFromBinaries(outDir, disposable);
     }
 
     @NotNull
@@ -91,7 +91,7 @@ public final class LoadDescriptorUtil {
     }
 
     @NotNull
-    public static NamespaceDescriptor extractTestNamespaceFromBinaries(@NotNull File outDir, @NotNull Disposable disposable) {
+    public static NamespaceDescriptor loadTestNamespaceFromBinaries(@NotNull File outDir, @NotNull Disposable disposable) {
         Disposer.dispose(disposable);
 
         CompilerConfiguration configuration = CompileCompilerDependenciesTest.compilerConfigurationForTests(
@@ -108,14 +108,14 @@ public final class LoadDescriptorUtil {
     }
 
     @NotNull
-    public static NamespaceDescriptor compileJavaAndExtractTestNamespaceFromBinary(
+    public static NamespaceDescriptor compileJavaAndLoadTestNamespaceFromBinary(
             @NotNull Collection<File> javaFiles,
             @NotNull File outDir,
             @NotNull Disposable disposable
     )
             throws IOException {
         compileJavaWithAnnotationsJar(javaFiles, outDir);
-        return extractTestNamespaceFromBinaries(outDir, disposable);
+        return loadTestNamespaceFromBinaries(outDir, disposable);
     }
 
     private static void compileJavaWithAnnotationsJar(@NotNull Collection<File> javaFiles, @NotNull File outDir) throws IOException {
@@ -141,7 +141,7 @@ public final class LoadDescriptorUtil {
     }
 
     @NotNull
-    public static NamespaceDescriptor analyzeKotlinAndExtractTestNamespace(@NotNull File ktFile, @NotNull Disposable disposable) throws Exception {
+    public static NamespaceDescriptor analyzeKotlinAndLoadTestNamespace(@NotNull File ktFile, @NotNull Disposable disposable) throws Exception {
         JetFileAndExhaust fileAndExhaust = JetFileAndExhaust.createJetFileAndAnalyze(ktFile, disposable);
         //noinspection ConstantConditions
         return fileAndExhaust.getExhaust().getBindingContext().get(BindingContext.FQNAME_TO_NAMESPACE_DESCRIPTOR, TEST_PACKAGE_FQNAME);
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaCustomTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaCustomTest.java
index 2c98ecac663..9bfa5391929 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaCustomTest.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaCustomTest.java
@@ -30,7 +30,7 @@ import java.io.File;
 import java.util.Arrays;
 import java.util.Collection;
 
-import static org.jetbrains.jet.jvm.compiler.LoadDescriptorUtil.compileJavaAndExtractTestNamespaceFromBinary;
+import static org.jetbrains.jet.jvm.compiler.LoadDescriptorUtil.compileJavaAndLoadTestNamespaceFromBinary;
 
 /**
  * @author Pavel Talanov
@@ -56,7 +56,7 @@ public final class LoadJavaCustomTest extends KotlinTestWithEnvironment {
         });
         File expected = new File(expectedFileName);
         File tmpDir = JetTestUtils.tmpDir(expected.getName());
-        NamespaceDescriptor javaNamespaceDescriptor = compileJavaAndExtractTestNamespaceFromBinary(files, tmpDir, getTestRootDisposable());
+        NamespaceDescriptor javaNamespaceDescriptor = compileJavaAndLoadTestNamespaceFromBinary(files, tmpDir, getTestRootDisposable());
         //NOTE: comparing namespace to file (hack)
         NamespaceComparator.compareNamespaces(javaNamespaceDescriptor, javaNamespaceDescriptor, NamespaceComparator.DONT_INCLUDE_METHODS_OF_OBJECT, expected);
     }