diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/MemberDeserializer.java
similarity index 99%
rename from core/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java
rename to core/serialization/src/org/jetbrains/jet/descriptors/serialization/MemberDeserializer.java
index cb070f1369a..e0a4c879f93 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java
+++ b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/MemberDeserializer.java
@@ -39,11 +39,11 @@ import static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable;
 import static org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter;
 import static org.jetbrains.jet.descriptors.serialization.SerializationPackage.*;
 
-public class DescriptorDeserializer {
+public class MemberDeserializer {
 
     private final DeserializationContextWithTypes context;
 
-    public DescriptorDeserializer(@NotNull DeserializationContextWithTypes context) {
+    public MemberDeserializer(@NotNull DeserializationContextWithTypes context) {
         this.context = context;
     }
 
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/context/context.kt b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/context/context.kt
index 68e2721063c..a11647f477b 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/context/context.kt
+++ b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/context/context.kt
@@ -24,7 +24,7 @@ import org.jetbrains.jet.descriptors.serialization.NameResolver
 import org.jetbrains.jet.descriptors.serialization.descriptors.MemberFilter
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
 import org.jetbrains.jet.descriptors.serialization.TypeDeserializer
-import org.jetbrains.jet.descriptors.serialization.DescriptorDeserializer
+import org.jetbrains.jet.descriptors.serialization.MemberDeserializer
 import org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter
 import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor
 import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedTypeParameterDescriptor
@@ -83,7 +83,7 @@ class DeserializationContextWithTypes(
         val typeDeserializer: TypeDeserializer
 ) : DeserializationContext(storageManager, descriptorFinder, annotationLoader,
                            constantLoader, packageFragmentProvider, memberFilter, nameResolver) {
-    val deserializer: DescriptorDeserializer = DescriptorDeserializer(this)
+    val deserializer: MemberDeserializer = MemberDeserializer(this)
 
     public fun childContext(
             descriptor: DeclarationDescriptor,
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedSimpleFunctionDescriptor.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedSimpleFunctionDescriptor.java
index 938734db3af..604c301c7bd 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedSimpleFunctionDescriptor.java
+++ b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedSimpleFunctionDescriptor.java
@@ -87,10 +87,10 @@ public class DeserializedSimpleFunctionDescriptor extends SimpleFunctionDescript
             @NotNull AnnotationLoader annotationLoader,
             @NotNull NameResolver nameResolver
     ) {
-        Annotations annotations = DescriptorDeserializer.getAnnotations(containingDeclaration, proto, proto.getFlags(),
-                                                                        AnnotatedCallableKind.FUNCTION,
-                                                                        annotationLoader,
-                                                                        nameResolver);
+        Annotations annotations = MemberDeserializer.getAnnotations(containingDeclaration, proto, proto.getFlags(),
+                                                                    AnnotatedCallableKind.FUNCTION,
+                                                                    annotationLoader,
+                                                                    nameResolver);
         return new DeserializedSimpleFunctionDescriptor(
                 containingDeclaration,
                 null,