diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClassCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ClassCodegen.java
index be10b76e8fa..afea914079f 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ClassCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/ClassCodegen.java
@@ -22,7 +22,7 @@ import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 
 import javax.inject.Inject;
-import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author max
@@ -82,7 +82,7 @@ public class ClassCodegen {
             CodegenContext context,
             JetClassOrObject aClass,
             OwnerKind kind,
-            HashMap<DeclarationDescriptor, DeclarationDescriptor> accessors,
+            Map<DeclarationDescriptor, DeclarationDescriptor> accessors,
             ClassBuilder classBuilder
     ) {
         ClassDescriptor descriptor = state.getBindingContext().get(BindingContext.CLASS, aClass);
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java
index 1f55ea7f4e0..7f2aafde570 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java
@@ -309,7 +309,7 @@ public class ClosureCodegen extends ObjectOrClosureCodegen {
         return constructor;
     }
 
-    private boolean calculateConstructorParameters(FunctionDescriptor funDescriptor, ArrayList<Pair<String, Type>> args) {
+    private boolean calculateConstructorParameters(FunctionDescriptor funDescriptor, List<Pair<String, Type>> args) {
         if (captureThis != null) {
             final Type type = typeMapper.mapType(context.getThisDescriptor().getDefaultType(), MapTypeMode.VALUE);
             args.add(new Pair<String, Type>("this$0", type));
@@ -347,7 +347,7 @@ public class ClosureCodegen extends ObjectOrClosureCodegen {
         return putFieldForMyself;
     }
 
-    private static Type[] nameAnTypeListToTypeArray(ArrayList<Pair<String, Type>> args) {
+    private static Type[] nameAnTypeListToTypeArray(List<Pair<String, Type>> args) {
         final Type[] argTypes = new Type[args.size()];
         for (int i = 0; i != argTypes.length; ++i) {
             argTypes[i] = args.get(i).second;