diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java
index 6ac59488a54..b39b28623e5 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java
@@ -36,7 +36,7 @@ import org.jetbrains.jet.lang.resolve.kotlin.DeserializedDescriptorResolver;
 import org.jetbrains.jet.lang.resolve.kotlin.DeserializationGlobalContextForJava;
 import org.jetbrains.jet.lang.resolve.kotlin.JavaClassDataFinder;
 import org.jetbrains.jet.lang.resolve.kotlin.AnnotationDescriptorLoader;
-import org.jetbrains.jet.lang.resolve.kotlin.DescriptorDeserializersStorage;
+import org.jetbrains.jet.lang.resolve.kotlin.DescriptorLoadersStorage;
 import org.jetbrains.jet.lang.resolve.kotlin.ConstantDescriptorLoader;
 import org.jetbrains.annotations.NotNull;
 import javax.annotation.PreDestroy;
@@ -65,7 +65,7 @@ public class InjectorForJavaDescriptorResolver {
     private final DeserializationGlobalContextForJava deserializationGlobalContextForJava;
     private final JavaClassDataFinder javaClassDataFinder;
     private final AnnotationDescriptorLoader annotationDescriptorLoader;
-    private final DescriptorDeserializersStorage descriptorDeserializersStorage;
+    private final DescriptorLoadersStorage descriptorLoadersStorage;
     private final ConstantDescriptorLoader constantDescriptorLoader;
     
     public InjectorForJavaDescriptorResolver(
@@ -93,7 +93,7 @@ public class InjectorForJavaDescriptorResolver {
         this.annotationDescriptorLoader = new AnnotationDescriptorLoader();
         this.constantDescriptorLoader = new ConstantDescriptorLoader();
         this.deserializationGlobalContextForJava = new DeserializationGlobalContextForJava(lockBasedStorageManager, getModule(), javaClassDataFinder, annotationDescriptorLoader, constantDescriptorLoader, lazyJavaPackageFragmentProvider);
-        this.descriptorDeserializersStorage = new DescriptorDeserializersStorage(lockBasedStorageManager);
+        this.descriptorLoadersStorage = new DescriptorLoadersStorage(lockBasedStorageManager);
 
         this.javaClassFinder.setProject(project);
 
@@ -114,14 +114,14 @@ public class InjectorForJavaDescriptorResolver {
         annotationDescriptorLoader.setErrorReporter(traceBasedErrorReporter);
         annotationDescriptorLoader.setKotlinClassFinder(virtualFileFinder);
         annotationDescriptorLoader.setModule(module);
-        annotationDescriptorLoader.setStorage(descriptorDeserializersStorage);
+        annotationDescriptorLoader.setStorage(descriptorLoadersStorage);
 
-        descriptorDeserializersStorage.setErrorReporter(traceBasedErrorReporter);
-        descriptorDeserializersStorage.setModule(module);
+        descriptorLoadersStorage.setErrorReporter(traceBasedErrorReporter);
+        descriptorLoadersStorage.setModule(module);
 
         constantDescriptorLoader.setErrorReporter(traceBasedErrorReporter);
         constantDescriptorLoader.setKotlinClassFinder(virtualFileFinder);
-        constantDescriptorLoader.setStorage(descriptorDeserializersStorage);
+        constantDescriptorLoader.setStorage(descriptorLoadersStorage);
 
         javaClassFinder.initialize();
 
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForLazyResolveWithJava.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForLazyResolveWithJava.java
index 0d67b99b347..4132871e740 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForLazyResolveWithJava.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForLazyResolveWithJava.java
@@ -58,7 +58,7 @@ import org.jetbrains.jet.lang.resolve.kotlin.DeserializedDescriptorResolver;
 import org.jetbrains.jet.lang.resolve.kotlin.DeserializationGlobalContextForJava;
 import org.jetbrains.jet.lang.resolve.kotlin.JavaClassDataFinder;
 import org.jetbrains.jet.lang.resolve.kotlin.AnnotationDescriptorLoader;
-import org.jetbrains.jet.lang.resolve.kotlin.DescriptorDeserializersStorage;
+import org.jetbrains.jet.lang.resolve.kotlin.DescriptorLoadersStorage;
 import org.jetbrains.jet.lang.resolve.kotlin.ConstantDescriptorLoader;
 import org.jetbrains.annotations.NotNull;
 import javax.annotation.PreDestroy;
@@ -109,7 +109,7 @@ public class InjectorForLazyResolveWithJava {
     private final DeserializationGlobalContextForJava deserializationGlobalContextForJava;
     private final JavaClassDataFinder javaClassDataFinder;
     private final AnnotationDescriptorLoader annotationDescriptorLoader;
-    private final DescriptorDeserializersStorage descriptorDeserializersStorage;
+    private final DescriptorLoadersStorage descriptorLoadersStorage;
     private final ConstantDescriptorLoader constantDescriptorLoader;
     
     public InjectorForLazyResolveWithJava(
@@ -161,7 +161,7 @@ public class InjectorForLazyResolveWithJava {
         this.annotationDescriptorLoader = new AnnotationDescriptorLoader();
         this.constantDescriptorLoader = new ConstantDescriptorLoader();
         this.deserializationGlobalContextForJava = new DeserializationGlobalContextForJava(lockBasedStorageManager, getModule(), javaClassDataFinder, annotationDescriptorLoader, constantDescriptorLoader, lazyJavaPackageFragmentProvider);
-        this.descriptorDeserializersStorage = new DescriptorDeserializersStorage(lockBasedStorageManager);
+        this.descriptorLoadersStorage = new DescriptorLoadersStorage(lockBasedStorageManager);
 
         this.resolveSession.setAnnotationResolve(annotationResolver);
         this.resolveSession.setDescriptorResolver(descriptorResolver);
@@ -244,14 +244,14 @@ public class InjectorForLazyResolveWithJava {
         annotationDescriptorLoader.setErrorReporter(traceBasedErrorReporter);
         annotationDescriptorLoader.setKotlinClassFinder(virtualFileFinder);
         annotationDescriptorLoader.setModule(module);
-        annotationDescriptorLoader.setStorage(descriptorDeserializersStorage);
+        annotationDescriptorLoader.setStorage(descriptorLoadersStorage);
 
-        descriptorDeserializersStorage.setErrorReporter(traceBasedErrorReporter);
-        descriptorDeserializersStorage.setModule(module);
+        descriptorLoadersStorage.setErrorReporter(traceBasedErrorReporter);
+        descriptorLoadersStorage.setModule(module);
 
         constantDescriptorLoader.setErrorReporter(traceBasedErrorReporter);
         constantDescriptorLoader.setKotlinClassFinder(virtualFileFinder);
-        constantDescriptorLoader.setStorage(descriptorDeserializersStorage);
+        constantDescriptorLoader.setStorage(descriptorLoadersStorage);
 
         javaClassFinder.initialize();
 
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java
index 672aac050fd..21932d46d8d 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java
@@ -68,7 +68,7 @@ import org.jetbrains.jet.lang.resolve.java.lazy.GlobalJavaResolverContext;
 import org.jetbrains.jet.lang.resolve.kotlin.DeserializedDescriptorResolver;
 import org.jetbrains.jet.lang.resolve.kotlin.JavaClassDataFinder;
 import org.jetbrains.jet.lang.resolve.kotlin.AnnotationDescriptorLoader;
-import org.jetbrains.jet.lang.resolve.kotlin.DescriptorDeserializersStorage;
+import org.jetbrains.jet.lang.resolve.kotlin.DescriptorLoadersStorage;
 import org.jetbrains.jet.lang.resolve.kotlin.ConstantDescriptorLoader;
 import org.jetbrains.annotations.NotNull;
 import javax.annotation.PreDestroy;
@@ -129,7 +129,7 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
     private final DeserializedDescriptorResolver deserializedDescriptorResolver;
     private final JavaClassDataFinder javaClassDataFinder;
     private final AnnotationDescriptorLoader annotationDescriptorLoader;
-    private final DescriptorDeserializersStorage descriptorDeserializersStorage;
+    private final DescriptorLoadersStorage descriptorLoadersStorage;
     private final ConstantDescriptorLoader constantDescriptorLoader;
     
     public InjectorForTopDownAnalyzerForJvm(
@@ -191,7 +191,7 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
         this.overrideResolver = new OverrideResolver();
         this.typeHierarchyResolver = new TypeHierarchyResolver();
         this.scriptHeaderResolver = new ScriptHeaderResolver();
-        this.descriptorDeserializersStorage = new DescriptorDeserializersStorage(storageManager);
+        this.descriptorLoadersStorage = new DescriptorLoadersStorage(storageManager);
 
         this.topDownAnalyzer.setBodyResolver(bodyResolver);
         this.topDownAnalyzer.setDeclarationResolver(declarationResolver);
@@ -324,14 +324,14 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
         annotationDescriptorLoader.setErrorReporter(traceBasedErrorReporter);
         annotationDescriptorLoader.setKotlinClassFinder(virtualFileFinder);
         annotationDescriptorLoader.setModule(moduleDescriptor);
-        annotationDescriptorLoader.setStorage(descriptorDeserializersStorage);
+        annotationDescriptorLoader.setStorage(descriptorLoadersStorage);
 
-        descriptorDeserializersStorage.setErrorReporter(traceBasedErrorReporter);
-        descriptorDeserializersStorage.setModule(moduleDescriptor);
+        descriptorLoadersStorage.setErrorReporter(traceBasedErrorReporter);
+        descriptorLoadersStorage.setModule(moduleDescriptor);
 
         constantDescriptorLoader.setErrorReporter(traceBasedErrorReporter);
         constantDescriptorLoader.setKotlinClassFinder(virtualFileFinder);
-        constantDescriptorLoader.setStorage(descriptorDeserializersStorage);
+        constantDescriptorLoader.setStorage(descriptorLoadersStorage);
 
         javaClassFinder.initialize();
 
diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorLoader.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorLoader.java
index 812379ec690..1b46b901edc 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorLoader.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorLoader.java
@@ -46,7 +46,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static org.jetbrains.jet.lang.resolve.kotlin.DescriptorDeserializersStorage.MemberSignature;
+import static org.jetbrains.jet.lang.resolve.kotlin.DescriptorLoadersStorage.MemberSignature;
 import static org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils.javaFqNameToKotlinFqName;
 
 public class AnnotationDescriptorLoader extends BaseDescriptorLoader implements AnnotationLoader {
@@ -60,7 +60,7 @@ public class AnnotationDescriptorLoader extends BaseDescriptorLoader implements
 
     @Inject
     @Override
-    public void setStorage(@NotNull DescriptorDeserializersStorage storage) {
+    public void setStorage(@NotNull DescriptorLoadersStorage storage) {
         this.storage = storage;
     }
 
diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/BaseDescriptorLoader.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/BaseDescriptorLoader.java
index 9b62c9b6dfb..ff41d6e1a65 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/BaseDescriptorLoader.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/BaseDescriptorLoader.java
@@ -33,7 +33,7 @@ import org.jetbrains.jet.lang.resolve.name.Name;
 
 import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isClassObject;
 import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isTrait;
-import static org.jetbrains.jet.lang.resolve.kotlin.DescriptorDeserializersStorage.MemberSignature;
+import static org.jetbrains.jet.lang.resolve.kotlin.DescriptorLoadersStorage.MemberSignature;
 import static org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils.kotlinFqNameToJavaFqName;
 import static org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils.naiveKotlinFqName;
 
@@ -41,13 +41,13 @@ public abstract class BaseDescriptorLoader {
     protected KotlinClassFinder kotlinClassFinder;
     protected ErrorReporter errorReporter;
 
-    protected DescriptorDeserializersStorage storage;
+    protected DescriptorLoadersStorage storage;
 
     public abstract void setKotlinClassFinder(@NotNull KotlinClassFinder kotlinClassFinder);
 
     public abstract void setErrorReporter(@NotNull ErrorReporter errorReporter);
 
-    public abstract void setStorage(@NotNull DescriptorDeserializersStorage storage);
+    public abstract void setStorage(@NotNull DescriptorLoadersStorage storage);
 
     @Nullable
     protected static MemberSignature getCallableSignature(
diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/ConstantDescriptorLoader.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/ConstantDescriptorLoader.java
index a69ab11d1cf..afd571ae6ff 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/ConstantDescriptorLoader.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/ConstantDescriptorLoader.java
@@ -28,12 +28,12 @@ import org.jetbrains.jet.lang.resolve.java.resolver.ErrorReporter;
 
 import javax.inject.Inject;
 
-import static org.jetbrains.jet.lang.resolve.kotlin.DescriptorDeserializersStorage.MemberSignature;
+import static org.jetbrains.jet.lang.resolve.kotlin.DescriptorLoadersStorage.MemberSignature;
 
 public class ConstantDescriptorLoader extends BaseDescriptorLoader implements ConstantLoader {
     @Inject
     @Override
-    public void setStorage(@NotNull DescriptorDeserializersStorage storage) {
+    public void setStorage(@NotNull DescriptorLoadersStorage storage) {
         this.storage = storage;
     }
 
diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DescriptorDeserializersStorage.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DescriptorLoadersStorage.java
similarity index 98%
rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DescriptorDeserializersStorage.java
rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DescriptorLoadersStorage.java
index 5dcf8ec2020..1305e8ed43d 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DescriptorDeserializersStorage.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DescriptorLoadersStorage.java
@@ -33,13 +33,13 @@ import javax.inject.Inject;
 import java.io.IOException;
 import java.util.*;
 
-public class DescriptorDeserializersStorage {
+public class DescriptorLoadersStorage {
     private ErrorReporter errorReporter;
     private ModuleDescriptor module;
 
     private final MemoizedFunctionToNotNull<KotlinJvmBinaryClass, Storage> storage;
 
-    public DescriptorDeserializersStorage(@NotNull StorageManager storageManager) {
+    public DescriptorLoadersStorage(@NotNull StorageManager storageManager) {
         this.storage = storageManager.createMemoizedFunction(
                 new Function1<KotlinJvmBinaryClass, Storage>() {
                     @NotNull
diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/SignatureDeserializer.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/SignatureDeserializer.java
index e2a339a93fd..2ef9c08eea2 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/SignatureDeserializer.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/SignatureDeserializer.java
@@ -48,8 +48,8 @@ public class SignatureDeserializer {
     }
 
     @NotNull
-    public DescriptorDeserializersStorage.MemberSignature methodSignature(@NotNull JavaProtoBuf.JavaMethodSignature signature) {
-        return DescriptorDeserializersStorage.MemberSignature.fromMethodNameAndDesc(methodSignatureString(signature));
+    public DescriptorLoadersStorage.MemberSignature methodSignature(@NotNull JavaProtoBuf.JavaMethodSignature signature) {
+        return DescriptorLoadersStorage.MemberSignature.fromMethodNameAndDesc(methodSignatureString(signature));
     }
 
     @NotNull
diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/DeserializerForDecompiler.kt b/idea/src/org/jetbrains/jet/plugin/libraries/DeserializerForDecompiler.kt
index 09415627dad..6a5f50b18ce 100644
--- a/idea/src/org/jetbrains/jet/plugin/libraries/DeserializerForDecompiler.kt
+++ b/idea/src/org/jetbrains/jet/plugin/libraries/DeserializerForDecompiler.kt
@@ -36,7 +36,7 @@ import org.jetbrains.jet.lang.resolve.java.PackageClassUtils
 import com.intellij.openapi.diagnostic.Logger
 import org.jetbrains.jet.lang.resolve.kotlin.KotlinClassFinder
 import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe
-import org.jetbrains.jet.lang.resolve.kotlin.DescriptorDeserializersStorage
+import org.jetbrains.jet.lang.resolve.kotlin.DescriptorLoadersStorage
 import org.jetbrains.jet.lang.resolve.kotlin.ConstantDescriptorLoader
 import org.jetbrains.jet.lang.resolve.java.structure.JavaClass
 import org.jetbrains.jet.descriptors.serialization.context.DeserializationGlobalContext
@@ -95,10 +95,10 @@ public class DeserializerForDecompiler(val packageDirectory: VirtualFile, val di
     }
     private val storageManager = LockBasedStorageManager.NO_LOCKS
 
-    private val deserializerStorage = DescriptorDeserializersStorage(storageManager);
+    private val loadersStorage = DescriptorLoadersStorage(storageManager);
     {
-        deserializerStorage.setModule(moduleDescriptor)
-        deserializerStorage.setErrorReporter(LOGGING_REPORTER)
+        loadersStorage.setModule(moduleDescriptor)
+        loadersStorage.setErrorReporter(LOGGING_REPORTER)
     }
 
     private val annotationLoader = AnnotationDescriptorLoader();
@@ -106,14 +106,14 @@ public class DeserializerForDecompiler(val packageDirectory: VirtualFile, val di
         annotationLoader.setModule(moduleDescriptor)
         annotationLoader.setKotlinClassFinder(localClassFinder)
         annotationLoader.setErrorReporter(LOGGING_REPORTER)
-        annotationLoader.setStorage(deserializerStorage)
+        annotationLoader.setStorage(loadersStorage)
     }
 
     private val constantLoader = ConstantDescriptorLoader();
     {
         constantLoader.setKotlinClassFinder(localClassFinder)
         constantLoader.setErrorReporter(LOGGING_REPORTER)
-        constantLoader.setStorage(deserializerStorage)
+        constantLoader.setStorage(loadersStorage)
     }
 
     private val classDataFinder = object : ClassDataFinder {