diff --git a/build-tools/core/src/org/jetbrains/jet/buildtools/core/BytecodeCompiler.java b/build-tools/core/src/org/jetbrains/jet/buildtools/core/BytecodeCompiler.java
index a22bee7fbeb..a759731711a 100644
--- a/build-tools/core/src/org/jetbrains/jet/buildtools/core/BytecodeCompiler.java
+++ b/build-tools/core/src/org/jetbrains/jet/buildtools/core/BytecodeCompiler.java
@@ -66,8 +66,8 @@ public class BytecodeCompiler {
             }
         }
         CompilerConfiguration configuration = new CompilerConfiguration();
-        configuration.putUserData(JVMConfigurationKeys.CLASSPATH_KEY, classpathItems.toArray(new File[classpathItems.size()]));
-        configuration.putUserData(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY, new File[] {PathUtil.getJdkAnnotationsPath()});
+        configuration.put(JVMConfigurationKeys.CLASSPATH_KEY, classpathItems.toArray(new File[classpathItems.size()]));
+        configuration.put(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY, new File[] {PathUtil.getJdkAnnotationsPath()});
 
         JetCoreEnvironment environment = new JetCoreEnvironment(CompileEnvironmentUtil.createMockDisposable(), configuration
         );
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java
index 33384744b37..3ff5626de74 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java
@@ -163,8 +163,8 @@ public class K2JVMCompiler extends CLICompiler<K2JVMCompilerArguments, K2JVMComp
     @NotNull
     private static CompilerConfiguration createCompilerConfiguration(@NotNull K2JVMCompilerArguments arguments) {
         CompilerConfiguration configuration = new CompilerConfiguration();
-        configuration.putUserData(JVMConfigurationKeys.CLASSPATH_KEY, getClasspath(arguments).toArray(new File[0]));
-        configuration.putUserData(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY, getAnnotationsPath(arguments).toArray(new File[0]));
+        configuration.put(JVMConfigurationKeys.CLASSPATH_KEY, getClasspath(arguments).toArray(new File[0]));
+        configuration.put(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY, getAnnotationsPath(arguments).toArray(new File[0]));
         return configuration;
     }
 
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
index 4d16ce98d06..55b4959512d 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
@@ -142,11 +142,11 @@ public class CompileEnvironmentUtil {
             }
         };
         CompilerConfiguration configuration = new CompilerConfiguration();
-        configuration.putUserData(JVMConfigurationKeys.CLASSPATH_KEY, new File[]{
+        configuration.put(JVMConfigurationKeys.CLASSPATH_KEY, new File[]{
                 PathUtil.findRtJar(),
                 PathUtil.getDefaultRuntimePath()
         });
-        configuration.putUserData(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY, new File[]{
+        configuration.put(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY, new File[]{
                 PathUtil.getJdkAnnotationsPath()
         });
         JetCoreEnvironment scriptEnvironment = JetCoreEnvironment.createCoreEnvironmentForJVM(disposable, configuration);
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java
index 410a66d18d4..952ff2466e3 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java
@@ -168,8 +168,8 @@ public class JetCoreEnvironment extends JavaCoreEnvironment {
     }
 
     public void configure(@NotNull CompilerConfiguration compilerConfiguration) {
-        File[] classpath = compilerConfiguration.getUserData(JVMConfigurationKeys.CLASSPATH_KEY);
-        File[] annotationsPath = compilerConfiguration.getUserData(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY);
+        File[] classpath = compilerConfiguration.get(JVMConfigurationKeys.CLASSPATH_KEY);
+        File[] annotationsPath = compilerConfiguration.get(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY);
         if (classpath != null) {
             for (File path : classpath) {
                 addToClasspath(path);
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java
index da83b76a76c..2374031548b 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java
@@ -105,7 +105,7 @@ public class ReplInterpreter {
 
         List<URL> classpath = Lists.newArrayList();
 
-        for (File file : configuration.getUserData(JVMConfigurationKeys.CLASSPATH_KEY)) {
+        for (File file : configuration.get(JVMConfigurationKeys.CLASSPATH_KEY)) {
             try {
                 classpath.add(file.toURI().toURL());
             }
diff --git a/compiler/frontend/src/org/jetbrains/jet/config/CompilerConfiguration.java b/compiler/frontend/src/org/jetbrains/jet/config/CompilerConfiguration.java
index f00d1410ea8..d2dd9ac62c3 100644
--- a/compiler/frontend/src/org/jetbrains/jet/config/CompilerConfiguration.java
+++ b/compiler/frontend/src/org/jetbrains/jet/config/CompilerConfiguration.java
@@ -28,11 +28,11 @@ import org.jetbrains.annotations.Nullable;
 public class CompilerConfiguration {
     private final UserDataHolderBase holder = new UserDataHolderBase();
 
-    public <T> T getUserData(@NotNull Key<T> key) {
+    public <T> T get(@NotNull Key<T> key) {
         return holder.getUserData(key);
     }
 
-    public <T> void putUserData(@NotNull Key<T> key, @Nullable T value) {
+    public <T> void put(@NotNull Key<T> key, @Nullable T value) {
         holder.putUserData(key, value);
     }
 }
diff --git a/compiler/tests/org/jetbrains/jet/CompileCompilerDependenciesTest.java b/compiler/tests/org/jetbrains/jet/CompileCompilerDependenciesTest.java
index f7df169e424..f3a8ec3b4b0 100644
--- a/compiler/tests/org/jetbrains/jet/CompileCompilerDependenciesTest.java
+++ b/compiler/tests/org/jetbrains/jet/CompileCompilerDependenciesTest.java
@@ -65,8 +65,8 @@ public class CompileCompilerDependenciesTest {
         }
 
         CompilerConfiguration configuration = new CompilerConfiguration();
-        configuration.putUserData(JVMConfigurationKeys.CLASSPATH_KEY, classpath.toArray(new File[classpath.size()]));
-        configuration.putUserData(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY, annotationsPath);
+        configuration.put(JVMConfigurationKeys.CLASSPATH_KEY, classpath.toArray(new File[classpath.size()]));
+        configuration.put(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY, annotationsPath);
         return configuration;
     }
 }
diff --git a/compiler/tests/org/jetbrains/jet/repl/ReplInterpreterTest.java b/compiler/tests/org/jetbrains/jet/repl/ReplInterpreterTest.java
index 67dd532423f..c917d784bc2 100644
--- a/compiler/tests/org/jetbrains/jet/repl/ReplInterpreterTest.java
+++ b/compiler/tests/org/jetbrains/jet/repl/ReplInterpreterTest.java
@@ -56,9 +56,9 @@ public class ReplInterpreterTest {
     private void testFile(@NotNull String relativePath) {
         CompilerConfiguration configuration =
                 CompileCompilerDependenciesTest.compilerConfigurationForTests(ConfigurationKind.JDK_ONLY, TestJdkKind.FULL_JDK);
-        File[] classpath = configuration.getUserData(JVMConfigurationKeys.CLASSPATH_KEY);
+        File[] classpath = configuration.get(JVMConfigurationKeys.CLASSPATH_KEY);
         assert classpath != null;
-        configuration.putUserData(JVMConfigurationKeys.CLASSPATH_KEY, ArrayUtil.append(classpath, new File("out/production/runtime")));
+        configuration.put(JVMConfigurationKeys.CLASSPATH_KEY, ArrayUtil.append(classpath, new File("out/production/runtime")));
         ReplInterpreter repl = new ReplInterpreter(disposable, configuration);
 
         ReplSessionTestFile file = ReplSessionTestFile.load(new File("compiler/testData/repl/" + relativePath));
diff --git a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt
index 0475f079b3b..e413a7e0da8 100644
--- a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt
+++ b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt
@@ -33,7 +33,7 @@ class PsiUtilsTest {
         System.setProperty("java.awt.headless", "true")
 
         val configuration = CompilerConfiguration()
-        configuration.putUserData(JVMConfigurationKeys.CLASSPATH_KEY, array(PathUtil.findRtJar()))
+        configuration.put(JVMConfigurationKeys.CLASSPATH_KEY, array(PathUtil.findRtJar()))
         environment = JetCoreEnvironment(rootDisposable, configuration)
     }