diff --git a/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.kt b/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.kt
index 8e83c1cc092..074afc64146 100644
--- a/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.kt
+++ b/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.kt
@@ -79,6 +79,10 @@ public open class TypeVisitor(private val myConverter : Converter) : PsiTypeVisi
                 if (qualifiedName.equals(CommonClassNames.JAVA_UTIL_ITERATOR)) {
                     return Identifier(CommonClassNames.JAVA_UTIL_ITERATOR)
                 }
+
+                if (qualifiedName.equals(CommonClassNames.JAVA_UTIL_LIST)) {
+                    return Identifier("MutableList")
+                }
             }
         }
 
diff --git a/tests/testData/ast/list/file/Lists.jav b/tests/testData/ast/list/file/Lists.jav
new file mode 100644
index 00000000000..2f4b336f360
--- /dev/null
+++ b/tests/testData/ast/list/file/Lists.jav
@@ -0,0 +1,14 @@
+import java.util.*;
+
+public class Lists {
+    public void test() {
+        List<Object> xs = new ArrayList<Object>();
+        List<Object> ys = new LinkedList<Object>();
+        ArrayList<Object> zs = new ArrayList<Object>();
+        xs.add(null);
+        ys.add(null);
+        xs.clear();
+        ys.clear();
+        zs.add(null);
+    }
+}
\ No newline at end of file
diff --git a/tests/testData/ast/list/file/Lists.kt b/tests/testData/ast/list/file/Lists.kt
new file mode 100644
index 00000000000..6958d3bea8b
--- /dev/null
+++ b/tests/testData/ast/list/file/Lists.kt
@@ -0,0 +1,13 @@
+import java.util.*
+public open class Lists() {
+public open fun test() : Unit {
+var xs : MutableList<Any?>? = ArrayList<Any?>()
+var ys : MutableList<Any?>? = LinkedList<Any?>()
+var zs : ArrayList<Any?>? = ArrayList<Any?>()
+xs?.add(null)
+ys?.add(null)
+xs?.clear()
+ys?.clear()
+zs?.add(null)
+}
+}
\ No newline at end of file
diff --git a/tests/testData/ast/newClassExpression/file/fullQualifiedName.kt b/tests/testData/ast/newClassExpression/file/fullQualifiedName.kt
index 411b1eb67b0..808085fdf6f 100644
--- a/tests/testData/ast/newClassExpression/file/fullQualifiedName.kt
+++ b/tests/testData/ast/newClassExpression/file/fullQualifiedName.kt
@@ -1,6 +1,6 @@
 package test
 open class User() {
 open fun main() : Unit {
-var list : List<*>? = java.util.LinkedList()
+var list : MutableList<*>? = java.util.LinkedList()
 }
 }
\ No newline at end of file
diff --git a/tests/testData/ast/newClassExpression/file/fullQualifiedName2.kt b/tests/testData/ast/newClassExpression/file/fullQualifiedName2.kt
index bdcb458a76f..808085fdf6f 100644
--- a/tests/testData/ast/newClassExpression/file/fullQualifiedName2.kt
+++ b/tests/testData/ast/newClassExpression/file/fullQualifiedName2.kt
@@ -1,6 +1,6 @@
 package test
 open class User() {
 open fun main() : Unit {
-var list : java.util.List<*>? = java.util.LinkedList()
+var list : MutableList<*>? = java.util.LinkedList()
 }
 }
\ No newline at end of file
diff --git a/tests/testData/ast/newClassExpression/file/genericClassInvocation.kt b/tests/testData/ast/newClassExpression/file/genericClassInvocation.kt
index e6b8fa1387f..d110bb30c16 100644
--- a/tests/testData/ast/newClassExpression/file/genericClassInvocation.kt
+++ b/tests/testData/ast/newClassExpression/file/genericClassInvocation.kt
@@ -1,6 +1,6 @@
 import java.util.LinkedList
 open class User() {
 open fun main() : Unit {
-var list : List<String?>? = LinkedList<String?>()
+var list : MutableList<String?>? = LinkedList<String?>()
 }
 }
\ No newline at end of file
diff --git a/tests/testData/ast/newClassExpression/file/newListAndNewMember.kt b/tests/testData/ast/newClassExpression/file/newListAndNewMember.kt
index 8965ba6cb1b..1f5699c575d 100644
--- a/tests/testData/ast/newClassExpression/file/newListAndNewMember.kt
+++ b/tests/testData/ast/newClassExpression/file/newListAndNewMember.kt
@@ -4,7 +4,7 @@ open class Member() {
 }
 open class User() {
 open fun main() : Unit {
-var members : List<Member?>? = LinkedList<Member?>()
+var members : MutableList<Member?>? = LinkedList<Member?>()
 members?.add(Member())
 }
 }
\ No newline at end of file
diff --git a/tests/testData/ast/rawGenerics/file/kt-540.kt b/tests/testData/ast/rawGenerics/file/kt-540.kt
index 3390cdda745..428297a628a 100644
--- a/tests/testData/ast/rawGenerics/file/kt-540.kt
+++ b/tests/testData/ast/rawGenerics/file/kt-540.kt
@@ -2,8 +2,8 @@ package demo
 import java.util.LinkedList
 open class Test() {
 open fun main() : Unit {
-var common : List<String?>? = LinkedList<String?>()
-var raw : List<*>? = LinkedList<String?>()
-var superRaw : List<*>? = LinkedList()
+var common : MutableList<String?>? = LinkedList<String?>()
+var raw : MutableList<*>? = LinkedList<String?>()
+var superRaw : MutableList<*>? = LinkedList()
 }
 }
\ No newline at end of file