diff --git a/src/org/jetbrains/jet/j2k/Converter.java b/src/org/jetbrains/jet/j2k/Converter.java
index 3fc4c362783..a38dda7620e 100644
--- a/src/org/jetbrains/jet/j2k/Converter.java
+++ b/src/org/jetbrains/jet/j2k/Converter.java
@@ -15,6 +15,7 @@ import org.jetbrains.jet.j2k.visitors.TypeVisitor;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 
 /**
  * @author ignatov
@@ -67,7 +68,7 @@ public class Converter {
   }
 
   private static Field fieldToField(PsiField field) {
-    HashSet<String> modifiers = modifiersListToModifiersSet(field.getModifierList());
+    Set<String> modifiers = modifiersListToModifiersSet(field.getModifierList());
     if (field instanceof PsiEnumConstant) // TODO: remove instanceof
       return new EnumConstant(
         new IdentifierImpl(field.getName()), // TODO
@@ -95,7 +96,7 @@ public class Converter {
   @NotNull
   private static Function methodToFunction(PsiMethod method, boolean notEmpty) {
     final IdentifierImpl identifier = new IdentifierImpl(method.getName());
-    final HashSet<String> modifiers = modifiersListToModifiersSet(method.getModifierList());
+    final Set<String> modifiers = modifiersListToModifiersSet(method.getModifierList());
     final Type type = typeToType(method.getReturnType());
     final Block body = blockToBlock(method.getBody(), notEmpty);
     final Element params = elementToElement(method.getParameterList());
@@ -262,7 +263,7 @@ public class Converter {
     return new IdentifierImpl(identifier.getText());
   }
 
-  public static HashSet<String> modifiersListToModifiersSet(PsiModifierList modifierList) {
+  public static Set<String> modifiersListToModifiersSet(PsiModifierList modifierList) {
     HashSet<String> modifiersSet = new HashSet<String>();
     if (modifierList != null) {
       if (modifierList.hasModifierProperty(PsiModifier.FINAL)) modifiersSet.add(Modifier.FINAL);
diff --git a/src/org/jetbrains/jet/j2k/ast/EnumConstant.java b/src/org/jetbrains/jet/j2k/ast/EnumConstant.java
index 489bfc390cf..a55a1d09abe 100644
--- a/src/org/jetbrains/jet/j2k/ast/EnumConstant.java
+++ b/src/org/jetbrains/jet/j2k/ast/EnumConstant.java
@@ -2,13 +2,13 @@ package org.jetbrains.jet.j2k.ast;
 
 import org.jetbrains.annotations.NotNull;
 
-import java.util.HashSet;
+import java.util.Set;
 
 /**
  * @author ignatov
  */
 public class EnumConstant extends Field {
-  public EnumConstant(Identifier identifier, HashSet<String> modifiers, Type type, Element params) {
+  public EnumConstant(Identifier identifier, Set<String> modifiers, Type type, Element params) {
     super(identifier, modifiers, type, params);
   }
 
diff --git a/src/org/jetbrains/jet/j2k/ast/Field.java b/src/org/jetbrains/jet/j2k/ast/Field.java
index dca82068988..2b733e401e2 100644
--- a/src/org/jetbrains/jet/j2k/ast/Field.java
+++ b/src/org/jetbrains/jet/j2k/ast/Field.java
@@ -2,18 +2,18 @@ package org.jetbrains.jet.j2k.ast;
 
 import org.jetbrains.annotations.NotNull;
 
-import java.util.HashSet;
+import java.util.Set;
 
 /**
  * @author ignatov
  */
 public class Field extends Node {
   final Identifier myIdentifier;
-  private HashSet<String> myModifiers;
+  private Set<String> myModifiers;
   private final Type myType;
   final Element myInitializer;
 
-  public Field(Identifier identifier, HashSet<String> modifiers, Type type, Element initializer) {
+  public Field(Identifier identifier, Set<String> modifiers, Type type, Element initializer) {
     myIdentifier = identifier;
     myModifiers = modifiers;
     myType = type;
diff --git a/src/org/jetbrains/jet/j2k/ast/LocalVariable.java b/src/org/jetbrains/jet/j2k/ast/LocalVariable.java
index 84b0516b92d..69d3b23e17e 100644
--- a/src/org/jetbrains/jet/j2k/ast/LocalVariable.java
+++ b/src/org/jetbrains/jet/j2k/ast/LocalVariable.java
@@ -2,18 +2,18 @@ package org.jetbrains.jet.j2k.ast;
 
 import org.jetbrains.annotations.NotNull;
 
-import java.util.HashSet;
+import java.util.Set;
 
 /**
  * @author ignatov
  */
 public class LocalVariable extends Expression {
   private final Identifier myIdentifier;
-  private HashSet<String> myModifiersSet;
+  private Set<String> myModifiersSet;
   private final Type myType;
   private final Expression myInitializer;
 
-  public LocalVariable(Identifier identifier, HashSet<String> modifiersSet, Type type, Expression initializer) {
+  public LocalVariable(Identifier identifier, Set<String> modifiersSet, Type type, Expression initializer) {
     myIdentifier = identifier;
     myModifiersSet = modifiersSet;
     myType = type;