Fix testData in compiler: add collections and ranges package to fq-names.

2015-11-28 01:42:20 +03:00
parent 98e2d27c77
commit f4822cd757
524 changed files with 1594 additions and 1552 deletions
@@ -1,7 +1,7 @@
-compiler/testData/cli/jvm/conflictingOverloads.kt:1:1: error: 'public fun a(): kotlin.List<kotlin.Int>' is already defined in root package
+compiler/testData/cli/jvm/conflictingOverloads.kt:1:1: error: 'public fun a(): kotlin.collections.List<kotlin.Int>' is already defined in root package
 fun a(): List<Int> = null!!
 ^
-compiler/testData/cli/jvm/conflictingOverloads.kt:2:1: error: 'public fun a(): kotlin.List<kotlin.String>' is already defined in root package
+compiler/testData/cli/jvm/conflictingOverloads.kt:2:1: error: 'public fun a(): kotlin.collections.List<kotlin.String>' is already defined in root package
 fun a(): List<String> = null!!
 ^
 COMPILATION_ERROR
@@ -1,4 +1,4 @@
 package

 public fun box(): kotlin.String
-public tailrec fun </*0*/ T, /*1*/ A> kotlin.Iterator<T>.foldl(/*0*/ acc: A, /*1*/ foldFunction: (T, A) -> A): A
+public tailrec fun </*0*/ T, /*1*/ A> kotlin.collections.Iterator<T>.foldl(/*0*/ acc: A, /*1*/ foldFunction: (T, A) -> A): A
@@ -2,7 +2,7 @@ import kotlin.test.assertEquals

 fun box(): String {
    assertEquals("kotlin.String!", J::string.returnType.toString())
-    assertEquals("kotlin.(Mutable)List<kotlin.Any!>!", J::list.returnType.toString())
+    assertEquals("kotlin.collections.(Mutable)List<kotlin.Any!>!", J::list.returnType.toString())

    return "OK"
 }
@@ -14,7 +14,7 @@ fun box(): String {
    assertEquals("kotlin.Int", Int::class.qualifiedName)
    assertEquals("kotlin.Int.Companion", Int.Companion::class.qualifiedName)
    assertEquals("kotlin.IntArray", IntArray::class.qualifiedName)
-    assertEquals("kotlin.List", List::class.qualifiedName)
+    assertEquals("kotlin.collections.List", List::class.qualifiedName)
    assertEquals("kotlin.String", String::class.qualifiedName)
    assertEquals("kotlin.String", java.lang.String::class.qualifiedName)

@@ -79,8 +79,8 @@ fun box(): String {
    check("kotlin.Array<kotlin.Array<kotlin.String>>", Array<Array<String>>::a3)
    check("kotlin.Array<kotlin.BooleanArray>", Array<BooleanArray>::a4)

-    check("kotlin.Map<kotlin.String, java.lang.Runnable>", Map<String, Runnable>::m)
-    check("kotlin.List<kotlin.MutableSet<kotlin.Array<kotlin.CharSequence>>>", List<MutableSet<Array<CharSequence>>>::l)
+    check("kotlin.collections.Map<kotlin.String, java.lang.Runnable>", Map<String, Runnable>::m)
+    check("kotlin.collections.List<kotlin.collections.MutableSet<kotlin.Array<kotlin.CharSequence>>>", List<MutableSet<Array<CharSequence>>>::l)

    return "OK"
 }
@@ -18,7 +18,7 @@ fun assertToString(s: String, x: Any) {
 fun box(): String {
    assertToString("fun top(): kotlin.Int", ::top)
    assertToString("fun kotlin.String.ext(): kotlin.Int", String::ext)
-    assertToString("fun kotlin.IntRange?.ext2(): kotlin.Array<kotlin.Int?>", IntRange::ext2)
+    assertToString("fun kotlin.ranges.IntRange?.ext2(): kotlin.Array<kotlin.Int?>", IntRange::ext2)
    assertToString("fun test.A.mem(): kotlin.String", A::mem)
    return "OK"
 }
@@ -19,7 +19,7 @@ fun box(): String {
    assertToString("val top: kotlin.Int", ::top)
    assertToString("var top2: kotlin.Int", ::top2)
    assertToString("val kotlin.String.ext: kotlin.Int", String::ext)
-    assertToString("var kotlin.IntRange?.ext2: kotlin.Int", IntRange::ext2)
+    assertToString("var kotlin.ranges.IntRange?.ext2: kotlin.Int", IntRange::ext2)
    assertToString("val test.A.mem: kotlin.String", A::mem)
    assertToString("var test.B.mem: kotlin.String", B::mem)
    return "OK"
@@ -15,7 +15,7 @@ fun box(): String {
                    "kotlin.Int",
                    "kotlin.Array<kotlin.Int>",
                    "kotlin.IntArray",
-                    "kotlin.List<kotlin.Map<kotlin.Any, A<*>>>"
+                    "kotlin.collections.List<kotlin.collections.Map<kotlin.Any, A<*>>>"
            ),
            String?::foo.parameters.map { it.type.toString() }
    )
@@ -10,27 +10,27 @@ public abstract class Mine</*0*/ T> : java.util.AbstractList<T> {
    public abstract /*fake_override*/ val size: kotlin.Int
    public open /*fake_override*/ fun add(/*0*/ T!): kotlin.Boolean
    public open /*fake_override*/ fun add(/*0*/ kotlin.Int, /*1*/ T!): kotlin.Unit
-    public open /*fake_override*/ fun addAll(/*0*/ kotlin.Collection<T!>): kotlin.Boolean
-    public open /*fake_override*/ fun addAll(/*0*/ kotlin.Int, /*1*/ kotlin.Collection<T!>): kotlin.Boolean
+    public open /*fake_override*/ fun addAll(/*0*/ kotlin.Int, /*1*/ kotlin.collections.Collection<T!>): kotlin.Boolean
+    public open /*fake_override*/ fun addAll(/*0*/ kotlin.collections.Collection<T!>): kotlin.Boolean
    public open /*fake_override*/ fun clear(): kotlin.Unit
    public open /*fake_override*/ fun contains(/*0*/ T!): kotlin.Boolean
-    public open /*fake_override*/ fun containsAll(/*0*/ kotlin.Collection<T!>): kotlin.Boolean
+    public open /*fake_override*/ fun containsAll(/*0*/ kotlin.collections.Collection<T!>): kotlin.Boolean
    public abstract /*fake_override*/ fun get(/*0*/ kotlin.Int): T!
    public open /*fake_override*/ fun indexOf(/*0*/ T!): kotlin.Int
    public open /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public open /*fake_override*/ fun iterator(): kotlin.MutableIterator<T!>
+    public open /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<T!>
    public open /*fake_override*/ fun lastIndexOf(/*0*/ T!): kotlin.Int
-    public open /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<T!>
-    public open /*fake_override*/ fun listIterator(/*0*/ kotlin.Int): kotlin.MutableListIterator<T!>
+    public open /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<T!>
+    public open /*fake_override*/ fun listIterator(/*0*/ kotlin.Int): kotlin.collections.MutableListIterator<T!>
    invisible_fake open /*fake_override*/ fun outOfBoundsMsg(/*0*/ kotlin.Int): kotlin.String!
    invisible_fake open /*fake_override*/ fun rangeCheckForAdd(/*0*/ kotlin.Int): kotlin.Unit
    public open /*fake_override*/ fun remove(/*0*/ T!): kotlin.Boolean
-    public open /*fake_override*/ fun removeAll(/*0*/ kotlin.Collection<T!>): kotlin.Boolean
+    public open /*fake_override*/ fun removeAll(/*0*/ kotlin.collections.Collection<T!>): kotlin.Boolean
    public open /*fake_override*/ fun removeAt(/*0*/ kotlin.Int): T!
    protected/*protected and package*/ open /*fake_override*/ fun removeRange(/*0*/ kotlin.Int, /*1*/ kotlin.Int): kotlin.Unit
-    public open /*fake_override*/ fun retainAll(/*0*/ kotlin.Collection<T!>): kotlin.Boolean
+    public open /*fake_override*/ fun retainAll(/*0*/ kotlin.collections.Collection<T!>): kotlin.Boolean
    public open /*fake_override*/ fun set(/*0*/ kotlin.Int, /*1*/ T!): T!
-    public open /*fake_override*/ fun subList(/*0*/ kotlin.Int, /*1*/ kotlin.Int): kotlin.MutableList<T!>
+    public open /*fake_override*/ fun subList(/*0*/ kotlin.Int, /*1*/ kotlin.Int): kotlin.collections.MutableList<T!>
    public open /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
    public open /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
 }
@@ -5,24 +5,24 @@ public abstract class Mine : java.util.List<kotlin.String> {
    public abstract /*fake_override*/ val size: kotlin.Int
    public abstract /*fake_override*/ fun add(/*0*/ kotlin.Int, /*1*/ kotlin.String!): kotlin.Unit
    public abstract /*fake_override*/ fun add(/*0*/ kotlin.String!): kotlin.Boolean
-    public abstract /*fake_override*/ fun addAll(/*0*/ kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    public abstract /*fake_override*/ fun addAll(/*0*/ kotlin.Int, /*1*/ (kotlin.MutableCollection<out kotlin.String!>..kotlin.Collection<kotlin.String!>?)): kotlin.Boolean
+    public abstract /*fake_override*/ fun addAll(/*0*/ kotlin.Int, /*1*/ (kotlin.collections.MutableCollection<out kotlin.String!>..kotlin.collections.Collection<kotlin.String!>?)): kotlin.Boolean
+    public abstract /*fake_override*/ fun addAll(/*0*/ kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
    public abstract /*fake_override*/ fun clear(): kotlin.Unit
    public abstract /*fake_override*/ fun contains(/*0*/ kotlin.String!): kotlin.Boolean
-    public abstract /*fake_override*/ fun containsAll(/*0*/ kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract /*fake_override*/ fun containsAll(/*0*/ kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
    public abstract /*fake_override*/ fun get(/*0*/ kotlin.Int): kotlin.String!
    public abstract /*fake_override*/ fun indexOf(/*0*/ kotlin.Any!): kotlin.Int
    public abstract /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public abstract /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String!>
+    public abstract /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String!>
    public abstract /*fake_override*/ fun lastIndexOf(/*0*/ kotlin.Any!): kotlin.Int
-    public abstract /*fake_override*/ fun listIterator(): kotlin.(Mutable)ListIterator<kotlin.String!>!
-    public abstract /*fake_override*/ fun listIterator(/*0*/ kotlin.Int): kotlin.(Mutable)ListIterator<kotlin.String!>!
+    public abstract /*fake_override*/ fun listIterator(): kotlin.collections.(Mutable)ListIterator<kotlin.String!>!
+    public abstract /*fake_override*/ fun listIterator(/*0*/ kotlin.Int): kotlin.collections.(Mutable)ListIterator<kotlin.String!>!
    public abstract /*fake_override*/ fun remove(/*0*/ kotlin.Int): kotlin.String!
    public abstract /*fake_override*/ fun remove(/*0*/ kotlin.String!): kotlin.Boolean
-    public abstract /*fake_override*/ fun removeAll(/*0*/ kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    public abstract /*fake_override*/ fun retainAll(/*0*/ kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract /*fake_override*/ fun removeAll(/*0*/ kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract /*fake_override*/ fun retainAll(/*0*/ kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
    public abstract /*fake_override*/ fun set(/*0*/ kotlin.Int, /*1*/ kotlin.String!): kotlin.String!
-    public abstract /*fake_override*/ fun subList(/*0*/ kotlin.Int, /*1*/ kotlin.Int): kotlin.(Mutable)List<kotlin.String!>!
+    public abstract /*fake_override*/ fun subList(/*0*/ kotlin.Int, /*1*/ kotlin.Int): kotlin.collections.(Mutable)List<kotlin.String!>!
    public abstract /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
    public abstract /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
 }
@@ -9,13 +9,13 @@ public abstract class Mine</*0*/ P1, /*1*/ P2> : java.util.Map<P2, P1> {
    public abstract /*fake_override*/ fun clear(): kotlin.Unit
    public abstract /*fake_override*/ fun containsKey(/*0*/ kotlin.Any!): kotlin.Boolean
    public abstract /*fake_override*/ fun containsValue(/*0*/ kotlin.Any!): kotlin.Boolean
-    public abstract /*fake_override*/ fun entrySet(): kotlin.(Mutable)Set<kotlin.(Mutable)Map.(Mutable)Entry<P2!, P1!>!>!
+    public abstract /*fake_override*/ fun entrySet(): kotlin.collections.(Mutable)Set<kotlin.collections.(Mutable)Map.(Mutable)Entry<P2!, P1!>!>!
    public abstract /*fake_override*/ fun get(/*0*/ kotlin.Any!): P1!
    public abstract /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public abstract /*fake_override*/ fun keySet(): kotlin.(Mutable)Set<P2!>!
+    public abstract /*fake_override*/ fun keySet(): kotlin.collections.(Mutable)Set<P2!>!
    public abstract /*fake_override*/ fun put(/*0*/ P2!, /*1*/ P1!): P1!
-    public abstract /*fake_override*/ fun putAll(/*0*/ (kotlin.MutableMap<out P2!, out P1!>..kotlin.Map<out P2!, P1!>?)): kotlin.Unit
+    public abstract /*fake_override*/ fun putAll(/*0*/ (kotlin.collections.MutableMap<out P2!, out P1!>..kotlin.collections.Map<out P2!, P1!>?)): kotlin.Unit
    public abstract /*fake_override*/ fun remove(/*0*/ kotlin.Any!): P1!
    public abstract /*fake_override*/ fun size(): kotlin.Int
-    public abstract /*fake_override*/ fun values(): kotlin.(Mutable)Collection<P1!>!
+    public abstract /*fake_override*/ fun values(): kotlin.collections.(Mutable)Collection<P1!>!
 }
@@ -11,7 +11,7 @@ public final class Outer {
    public constructor Outer()

    public final inner class InnerGeneric {
-        public constructor InnerGeneric(/*0*/ kotlin.List<kotlin.String>)
+        public constructor InnerGeneric(/*0*/ kotlin.collections.List<kotlin.String>)
    }

    public final inner class InnerPrimitive {
@@ -11,7 +11,7 @@ public final class Outer</*0*/ T> {
    public constructor Outer</*0*/ T>()

    public final inner class Inner /*captured type parameters: /*0*/ T*/ {
-        public constructor Inner(/*0*/ kotlin.List<T>)
+        public constructor Inner(/*0*/ kotlin.collections.List<T>)
    }

    public final inner class InnerSimple /*captured type parameters: /*0*/ T*/ {
@@ -7,7 +7,7 @@ public open class AccessorGenericSignature {

 public final class BadClass {
    public constructor BadClass()
-    private final fun </*0*/ D> bar(/*0*/ kotlin.List<D>): kotlin.Unit
-    private final fun </*0*/ E : kotlin.Number, /*1*/ F : kotlin.MutableList<E>> baz(/*0*/ kotlin.List<F>): kotlin.Unit
+    private final fun </*0*/ D> bar(/*0*/ kotlin.collections.List<D>): kotlin.Unit
+    private final fun </*0*/ E : kotlin.Number, /*1*/ F : kotlin.collections.MutableList<E>> baz(/*0*/ kotlin.collections.List<F>): kotlin.Unit
    public final fun foo(): kotlin.Unit
 }
@@ -2,11 +2,11 @@ package test

 public open class ClashingSignaturesWithoutReturnType {
    public constructor ClashingSignaturesWithoutReturnType()
-    public/*package*/ open fun test(/*0*/ kotlin.(Mutable)List<kotlin.String!>!, /*1*/ kotlin.(Mutable)List<kotlin.Int!>!): kotlin.Unit
+    public/*package*/ open fun test(/*0*/ kotlin.collections.(Mutable)List<kotlin.String!>!, /*1*/ kotlin.collections.(Mutable)List<kotlin.Int!>!): kotlin.Unit
 }

 public final class K {
    public constructor K()
-    public final fun foo(/*0*/ kotlin.List<kotlin.Int>): kotlin.Int
-    public final fun foo(/*0*/ kotlin.List<kotlin.String>): kotlin.String
+    public final fun foo(/*0*/ kotlin.collections.List<kotlin.Int>): kotlin.Int
+    public final fun foo(/*0*/ kotlin.collections.List<kotlin.String>): kotlin.String
 }
@@ -1,6 +1,6 @@
 package test

-public fun ggg(/*0*/ kotlin.List<kotlin.Int>): kotlin.List<kotlin.Int>
+public fun ggg(/*0*/ kotlin.collections.List<kotlin.Int>): kotlin.collections.List<kotlin.Int>

 public/*package*/ open class ListOfInt {
    public/*package*/ constructor ListOfInt()
@@ -1,6 +1,6 @@
 package test

-public fun ff(/*0*/ kotlin.List<kotlin.String>): kotlin.Int
+public fun ff(/*0*/ kotlin.collections.List<kotlin.String>): kotlin.Int

 public/*package*/ open class ListString {
    public/*package*/ constructor ListString()
@@ -1,6 +1,6 @@
 package test

-public fun </*0*/ P> listOfT(/*0*/ kotlin.List<P>): kotlin.List<P>
+public fun </*0*/ P> listOfT(/*0*/ kotlin.collections.List<P>): kotlin.collections.List<P>

 public/*package*/ open class ListOfT {
    public/*package*/ constructor ListOfT()
@@ -1,6 +1,6 @@
 package test

-public fun </*0*/ K> fff(/*0*/ kotlin.Map<K, kotlin.String>): kotlin.Map<K, kotlin.String>
+public fun </*0*/ K> fff(/*0*/ kotlin.collections.Map<K, kotlin.String>): kotlin.collections.Map<K, kotlin.String>

 public/*package*/ open class MapOfKString {
    public/*package*/ constructor MapOfKString()
@@ -1,6 +1,6 @@
 package test

-public fun fff(/*0*/ kotlin.Map<kotlin.String, kotlin.Int?>): kotlin.Map<kotlin.String, kotlin.Int?>
+public fun fff(/*0*/ kotlin.collections.Map<kotlin.String, kotlin.Int?>): kotlin.collections.Map<kotlin.String, kotlin.Int?>

 public/*package*/ open class MapOfKString {
    public/*package*/ constructor MapOfKString()
@@ -1,6 +1,6 @@
 package test

-public fun </*0*/ P1 : kotlin.List<kotlin.String>> id(/*0*/ P1): P1
+public fun </*0*/ P1 : kotlin.collections.List<kotlin.String>> id(/*0*/ P1): P1

 public/*package*/ open class Question {
    public/*package*/ constructor Question()
@@ -1,12 +1,12 @@
 package test

 public interface Trait {
-    public open fun generic(/*0*/ kotlin.List<kotlin.String>): kotlin.Unit
+    public open fun generic(/*0*/ kotlin.collections.List<kotlin.String>): kotlin.Unit
    public open fun simple(): kotlin.Unit
 }

 public/*package*/ abstract class TraitImpl : test.Trait {
    public/*package*/ constructor TraitImpl()
-    public open /*fake_override*/ fun generic(/*0*/ kotlin.List<kotlin.String>): kotlin.Unit
+    public open /*fake_override*/ fun generic(/*0*/ kotlin.collections.List<kotlin.String>): kotlin.Unit
    public open /*fake_override*/ fun simple(): kotlin.Unit
 }
@@ -1,6 +1,6 @@
 package test

-public fun gg(/*0*/ kotlin.List<kotlin.String>, /*1*/ vararg kotlin.Int /*kotlin.IntArray*/): kotlin.List<kotlin.String>
+public fun gg(/*0*/ kotlin.collections.List<kotlin.String>, /*1*/ vararg kotlin.Int /*kotlin.IntArray*/): kotlin.collections.List<kotlin.String>

 public/*package*/ open class Vararg {
    public/*package*/ constructor Vararg()
@@ -1,6 +1,6 @@
 package test

-public val </*0*/ K, /*1*/ V> kotlin.Map<K, V>.test: kotlin.Map<V, K>
+public val </*0*/ K, /*1*/ V> kotlin.collections.Map<K, V>.test: kotlin.collections.Map<V, K>

 public/*package*/ open class GenericProperty {
    public/*package*/ constructor GenericProperty()
@@ -2,4 +2,4 @@ package

 public fun fn(): kotlin.Unit
 public fun getArray(): kotlin.Array<kotlin.Int>
-public fun getList(): kotlin.MutableList<kotlin.Int>
+public fun getList(): kotlin.collections.MutableList<kotlin.Int>
@@ -5,7 +5,7 @@ package html {
    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
    public fun print(/*0*/ message: kotlin.Any?): kotlin.Unit
    public fun println(/*0*/ message: kotlin.Any?): kotlin.Unit
-    public operator fun </*0*/ K, /*1*/ V> kotlin.MutableMap<K, V>.set(/*0*/ key: K, /*1*/ value: V): V?
+    public operator fun </*0*/ K, /*1*/ V> kotlin.collections.MutableMap<K, V>.set(/*0*/ key: K, /*1*/ value: V): V?

    public final class A : html.BodyTag {
        public constructor A()
@@ -3,7 +3,7 @@ package
 public interface A</*0*/ H> {
    public abstract val a: kotlin.Int
    public abstract val a1: kotlin.Int
-    public abstract val g: kotlin.Iterator<H>
+    public abstract val g: kotlin.collections.Iterator<H>
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
    public open fun foo(): kotlin.Int
    public open fun foo1(): kotlin.Int
@@ -18,13 +18,13 @@ public abstract class B</*0*/ H> : A<H> {
    public constructor B</*0*/ H>()
    public open override /*1*/ val a: kotlin.Double = 1.0.toDouble()
    public open override /*1*/ val a1: kotlin.Double = 1.0.toDouble()
-    public abstract override /*1*/ val g: kotlin.Iterator<kotlin.Int>
+    public abstract override /*1*/ val g: kotlin.collections.Iterator<kotlin.Int>
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
    public open override /*1*/ fun foo(): kotlin.Unit
    public open override /*1*/ /*fake_override*/ fun foo1(): kotlin.Int
    public open override /*1*/ fun foo2(): kotlin.Unit
    public abstract override /*1*/ fun </*0*/ X> g(): kotlin.Int
-    public abstract override /*1*/ fun </*0*/ X> g1(): kotlin.List<X>
+    public abstract override /*1*/ fun </*0*/ X> g1(): kotlin.collections.List<X>
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -139,6 +139,6 @@ public abstract class Range1 {
    public constructor Range1()
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public abstract operator fun iterator(): kotlin.Iterator<kotlin.Int>
+    public abstract operator fun iterator(): kotlin.collections.Iterator<kotlin.Int>
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -3,15 +3,15 @@ package
 package foobar {
    public val x1: [ERROR : <ERROR PROPERTY TYPE>]
    public val x2: java.util.List<kotlin.Int>? = null
-    public val y1: kotlin.List<kotlin.Int>? = null
+    public val y1: kotlin.collections.List<kotlin.Int>? = null
    public fun </*0*/ O> done(/*0*/ result: O): foobar.Iteratee<kotlin.Any?, O>

-    public abstract class Collection</*0*/ E> : kotlin.Iterable<E> {
+    public abstract class Collection</*0*/ E> : kotlin.collections.Iterable<E> {
        public constructor Collection</*0*/ E>()
        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
        public final fun </*0*/ O> iterate(/*0*/ iteratee: foobar.Iteratee<E, O>): O
-        public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.Iterator<E>
+        public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.Iterator<E>
        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
    }

@@ -61,7 +61,7 @@ package foobar {
        public val a: java.util.List<kotlin.Int>? = null
        public val a2: [ERROR : util.List<Int>]<kotlin.Int>?
        public val a3: [ERROR : ArrayList<Int>]<kotlin.Int>?
-        public val b: kotlin.List<kotlin.Int>? = null
+        public val b: kotlin.collections.List<kotlin.Int>? = null
        public val b1: [ERROR : util.List<Int>]<kotlin.Int>?
    }
 }
@@ -1,13 +1,13 @@
 package

-public final class MyIterable</*0*/ T> : kotlin.Iterable<T> {
+public final class MyIterable</*0*/ T> : kotlin.collections.Iterable<T> {
    public constructor MyIterable</*0*/ T>()
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ fun iterator(): kotlin.Iterator<T>
+    public open override /*1*/ fun iterator(): kotlin.collections.Iterator<T>
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String

-    public final inner class MyIterator /*captured type parameters: /*0*/ T*/ : kotlin.Iterator<T> {
+    public final inner class MyIterator /*captured type parameters: /*0*/ T*/ : kotlin.collections.Iterator<T> {
        public constructor MyIterator()
        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
        public open override /*1*/ fun hasNext(): kotlin.Boolean
@@ -1,6 +1,6 @@
 package

 package qualified_expressions {
-    public fun test(/*0*/ s: kotlin.IntRange?): kotlin.Unit
+    public fun test(/*0*/ s: kotlin.ranges.IntRange?): kotlin.Unit
    public fun kotlin.String.startsWith(/*0*/ s: kotlin.String): kotlin.Boolean
 }
@@ -1,6 +1,6 @@
 package

-public val l: kotlin.MutableList<in kotlin.Int>
+public val l: kotlin.collections.MutableList<in kotlin.Int>
 public fun test(/*0*/ l: java.util.List<kotlin.Int>): kotlin.Unit

 package xxx {
@@ -2,12 +2,12 @@ package

 public fun testArrays(/*0*/ ia: kotlin.IntArray, /*1*/ ai: kotlin.Array<kotlin.Int>, /*2*/ an: kotlin.Array<N>, /*3*/ a: kotlin.Array<S>): kotlin.Unit
 public fun testEnums(/*0*/ a: kotlin.Enum<*>): kotlin.Unit
-public fun testLists(/*0*/ a: kotlin.List<kotlin.Int>): kotlin.Unit
+public fun testLists(/*0*/ a: kotlin.collections.List<kotlin.Int>): kotlin.Unit
 public fun testLiterals(): kotlin.Unit
-public fun testNotSerializable(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
+public fun testNotSerializable(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
 public fun testPrimitives(/*0*/ b: kotlin.Byte, /*1*/ ss: kotlin.Short, /*2*/ i: kotlin.Int, /*3*/ l: kotlin.Long, /*4*/ d: kotlin.Double, /*5*/ s: kotlin.String, /*6*/ f: kotlin.Float, /*7*/ bool: kotlin.Boolean): kotlin.Unit
 public fun use(/*0*/ s: java.io.Serializable): kotlin.Unit
-public fun useList(/*0*/ s: kotlin.List<java.io.Serializable>): kotlin.Unit
+public fun useList(/*0*/ s: kotlin.collections.List<java.io.Serializable>): kotlin.Unit

 public final enum class C : kotlin.Enum<C> {
    enum entry E
@@ -26,13 +26,13 @@ public final class Foo1 : java.util.ArrayList<kotlin.Int> {
    public open override /*1*/ /*fake_override*/ val size: kotlin.Int
    public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.Int): kotlin.Boolean
    public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.Int>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.Int>): kotlin.Boolean
-    invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ p0: kotlin.(Mutable)Collection<*>!, /*1*/ p1: kotlin.Boolean): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<kotlin.Int>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.Int>): kotlin.Boolean
+    invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ p0: kotlin.collections.(Mutable)Collection<*>!, /*1*/ p1: kotlin.Boolean): kotlin.Boolean
    public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
    public open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.Int): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.Int>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.Int>): kotlin.Boolean
    invisible_fake open override /*1*/ /*fake_override*/ fun elementData(/*0*/ p0: kotlin.Int): kotlin.Int!
    public open override /*1*/ /*fake_override*/ fun ensureCapacity(/*0*/ p0: kotlin.Int): kotlin.Unit
    invisible_fake open override /*1*/ /*fake_override*/ fun ensureCapacityInternal(/*0*/ p0: kotlin.Int): kotlin.Unit
@@ -43,21 +43,21 @@ public final class Foo1 : java.util.ArrayList<kotlin.Int> {
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.Int): kotlin.Int
    public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.Int>
+    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.Int>
    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.Int): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.Int>
-    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.Int>
+    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<kotlin.Int>
+    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<kotlin.Int>
    invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
    invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheck(/*0*/ p0: kotlin.Int): kotlin.Unit
    invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
    invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream!): kotlin.Unit
    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.Int): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.Int>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.Int>): kotlin.Boolean
    public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): kotlin.Int
    protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.Int>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.Int>): kotlin.Boolean
    public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.Int): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.Int>
+    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<kotlin.Int>
    public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
    public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -5,13 +5,13 @@ public val baz1: @b(i = 1) kotlin.Int? = 1
 public val baz2: @a() @b(i = 1) kotlin.Int? = 1
 public val baz3: @c() kotlin.Int? = 1
 public fun foo(/*0*/ i: @a() kotlin.Int?): kotlin.Unit
-public fun foo(/*0*/ l: kotlin.List<@a() kotlin.Int?>): kotlin.Unit
+public fun foo(/*0*/ l: kotlin.collections.List<@a() kotlin.Int?>): kotlin.Unit
 public fun foo1(/*0*/ i: @b(i = 1) kotlin.Int?): kotlin.Unit
-public fun foo1(/*0*/ l: kotlin.List<@b(i = 1) kotlin.Int?>): kotlin.Unit
+public fun foo1(/*0*/ l: kotlin.collections.List<@b(i = 1) kotlin.Int?>): kotlin.Unit
 public fun foo2(/*0*/ i: @a() @b(i = 1) kotlin.Int?): kotlin.Unit
-public fun foo2(/*0*/ l: kotlin.List<@a() @b(i = 1) kotlin.Int?>): kotlin.Unit
+public fun foo2(/*0*/ l: kotlin.collections.List<@a() @b(i = 1) kotlin.Int?>): kotlin.Unit
 public fun foo3(/*0*/ i: @c() kotlin.Int?): kotlin.Unit
-public fun foo3(/*0*/ l: kotlin.List<@c() kotlin.Int?>): kotlin.Unit
+public fun foo3(/*0*/ l: kotlin.collections.List<@c() kotlin.Int?>): kotlin.Unit
 public fun @a() kotlin.Int?.bar(): kotlin.Unit
 public fun @b(i = 1) kotlin.Int?.bar1(): kotlin.Unit
 public fun @a() @b(i = 1) kotlin.Int?.bar2(): kotlin.Unit
@@ -1,8 +1,8 @@
 package

-public val x: kotlin.List<@base() kotlin.String>? = null
-public val y: kotlin.List<@base() kotlin.String>? = null
-public fun foo(/*0*/ list: kotlin.List<@typeAnn() kotlin.Int>): kotlin.List<@typeAnn() kotlin.Int>
+public val x: kotlin.collections.List<@base() kotlin.String>? = null
+public val y: kotlin.collections.List<@base() kotlin.String>? = null
+public fun foo(/*0*/ list: kotlin.collections.List<@typeAnn() kotlin.Int>): kotlin.collections.List<@typeAnn() kotlin.Int>

 public final annotation class base : kotlin.Annotation {
    public constructor base()
@@ -1,9 +1,9 @@
 package

-public val </*0*/ T> @x() kotlin.List<@x() T>.f: kotlin.Int
-public fun </*0*/ T, /*1*/ U : T> kotlin.List<@x() T>.firstTyped(): U
+public val </*0*/ T> @x() kotlin.collections.List<@x() T>.f: kotlin.Int
+public fun </*0*/ T, /*1*/ U : T> kotlin.collections.List<@x() T>.firstTyped(): U
 public fun @x() A.foo(/*0*/ a: @x() kotlin.Int): kotlin.Unit
-public fun </*0*/ T> @x() kotlin.List<@x() T>.foo(/*0*/ l: kotlin.List<@x() T>): @x() kotlin.List<@x() T>
+public fun </*0*/ T> @x() kotlin.collections.List<@x() T>.foo(/*0*/ l: kotlin.collections.List<@x() T>): @x() kotlin.collections.List<@x() T>

 public final class A {
    public constructor A()
@@ -1,3 +1,3 @@
 package

-public fun ff(/*0*/ c: kotlin.MutableCollection<kotlin.String>): kotlin.MutableList<kotlin.Int>
+public fun ff(/*0*/ c: kotlin.collections.MutableCollection<kotlin.String>): kotlin.collections.MutableList<kotlin.Int>
@@ -1,3 +1,3 @@
 package

-public fun ff(/*0*/ c: kotlin.MutableCollection<kotlin.String>): kotlin.MutableList<kotlin.String>
+public fun ff(/*0*/ c: kotlin.collections.MutableCollection<kotlin.String>): kotlin.collections.MutableList<kotlin.String>
@@ -1,3 +1,3 @@
 package

-public fun ff(/*0*/ l: kotlin.Any): kotlin.MutableList<*>
+public fun ff(/*0*/ l: kotlin.Any): kotlin.collections.MutableList<*>
@@ -1,3 +1,3 @@
 package

-public fun ff(/*0*/ a: kotlin.Any): kotlin.MutableList<kotlin.String>
+public fun ff(/*0*/ a: kotlin.Any): kotlin.collections.MutableList<kotlin.String>
@@ -1,3 +1,3 @@
 package

-public fun f(/*0*/ a: kotlin.MutableList<out kotlin.Number>): kotlin.Boolean
+public fun f(/*0*/ a: kotlin.collections.MutableList<out kotlin.Number>): kotlin.Boolean
@@ -1,3 +1,3 @@
 package

-public fun f(/*0*/ a: kotlin.MutableList<kotlin.String>): kotlin.Boolean
+public fun f(/*0*/ a: kotlin.collections.MutableList<kotlin.String>): kotlin.Boolean
@@ -1,3 +1,3 @@
 package

-public fun f(/*0*/ a: kotlin.List<kotlin.Number>): kotlin.Boolean
+public fun f(/*0*/ a: kotlin.collections.List<kotlin.Number>): kotlin.Boolean
@@ -1,6 +1,6 @@
 package

-public fun ff(/*0*/ l: kotlin.MutableCollection<B>): kotlin.Boolean
+public fun ff(/*0*/ l: kotlin.collections.MutableCollection<B>): kotlin.Boolean

 public open class A {
    public constructor A()
@@ -1,3 +1,3 @@
 package

-public fun ff(/*0*/ l: kotlin.MutableCollection<kotlin.String>): kotlin.Boolean
+public fun ff(/*0*/ l: kotlin.collections.MutableCollection<kotlin.String>): kotlin.Boolean
@@ -1,3 +1,3 @@
 package

-public fun </*0*/ T> ff(/*0*/ l: kotlin.MutableCollection<T>): kotlin.Boolean
+public fun </*0*/ T> ff(/*0*/ l: kotlin.collections.MutableCollection<T>): kotlin.Boolean
@@ -1,3 +1,3 @@
 package

-public fun f(/*0*/ a: kotlin.MutableList<kotlin.String>): kotlin.Boolean
+public fun f(/*0*/ a: kotlin.collections.MutableList<kotlin.String>): kotlin.Boolean
@@ -1,3 +1,3 @@
 package

-public fun f(/*0*/ a: kotlin.MutableList<in kotlin.String>): kotlin.Boolean
+public fun f(/*0*/ a: kotlin.collections.MutableList<in kotlin.String>): kotlin.Boolean
@@ -1,3 +1,3 @@
 package

-public fun f(/*0*/ a: kotlin.MutableList<out kotlin.Any>): kotlin.Boolean
+public fun f(/*0*/ a: kotlin.collections.MutableList<out kotlin.Any>): kotlin.Boolean
@@ -1,3 +1,3 @@
 package

-public fun f(/*0*/ a: kotlin.List<kotlin.Any>): kotlin.Boolean
+public fun f(/*0*/ a: kotlin.collections.List<kotlin.Any>): kotlin.Boolean
@@ -1,3 +1,3 @@
 package

-public fun f(/*0*/ a: kotlin.Collection<*>): kotlin.Boolean
+public fun f(/*0*/ a: kotlin.collections.Collection<*>): kotlin.Boolean
@@ -9,9 +9,9 @@ public val b2: kotlin.reflect.KClass<kotlin.Nothing>
 public val i1: kotlin.reflect.KClass<A<*>.Inner<*>>
 public val i2: [ERROR : Unresolved class]
 public val i3: [ERROR : Unresolved class]
-public val m1: kotlin.reflect.KClass<kotlin.Map<*, *>>
+public val m1: kotlin.reflect.KClass<kotlin.collections.Map<*, *>>
 public val m2: [ERROR : Unresolved class]
-public val m3: kotlin.reflect.KClass<kotlin.Map.Entry<*, *>>
+public val m3: kotlin.reflect.KClass<kotlin.collections.Map.Entry<*, *>>
 public val n1: kotlin.reflect.KClass<A.Nested<*>>
 public val n2: [ERROR : Unresolved class]

@@ -1,7 +1,7 @@
 package

 package a {
-    public val a: kotlin.MutableSet<kotlin.String>? = null
+    public val a: kotlin.collections.MutableSet<kotlin.String>? = null

    public final class R {
        public constructor R()
@@ -2,7 +2,7 @@ package

 package kt1027 {
    public fun doSmth(): kotlin.Unit
-    public fun foo(/*0*/ c: kotlin.List<kotlin.Int>): kotlin.Unit
+    public fun foo(/*0*/ c: kotlin.collections.List<kotlin.Int>): kotlin.Unit
    public fun t1(): kotlin.Unit
    public fun t2(): kotlin.Unit
    public fun t3(): kotlin.Unit
@@ -1,7 +1,7 @@
 package

 package kt1066 {
-    public fun foo(/*0*/ excluded: kotlin.Set<kotlin.Char>): kotlin.Unit
+    public fun foo(/*0*/ excluded: kotlin.collections.Set<kotlin.Char>): kotlin.Unit
    public fun randomDigit(): kotlin.Char
    public fun test(): kotlin.Unit
 }
@@ -2,6 +2,6 @@ package

 package kt1219 {
    public fun foo(): kotlin.Unit
-    public fun </*0*/ T, /*1*/ R> kotlin.Iterable<T>.fold(/*0*/ a: R, /*1*/ op: (T, R) -> R): R
-    public fun </*0*/ T> kotlin.Iterable<T>.foreach(/*0*/ operation: (T) -> kotlin.Unit): kotlin.Unit
+    public fun </*0*/ T, /*1*/ R> kotlin.collections.Iterable<T>.fold(/*0*/ a: R, /*1*/ op: (T, R) -> R): R
+    public fun </*0*/ T> kotlin.collections.Iterable<T>.foreach(/*0*/ operation: (T) -> kotlin.Unit): kotlin.Unit
 }
@@ -1,4 +1,4 @@
 package

-public fun foo(/*0*/ numbers: kotlin.Collection<kotlin.Int>): kotlin.Unit
+public fun foo(/*0*/ numbers: kotlin.collections.Collection<kotlin.Int>): kotlin.Unit
 public fun use(/*0*/ vararg a: kotlin.Any? /*kotlin.Array<out kotlin.Any?>*/): kotlin.Array<out kotlin.Any?>
@@ -1,4 +1,4 @@
 package

-public fun foo(/*0*/ x: kotlin.Int, /*1*/ list: kotlin.List<kotlin.Int>?): kotlin.Unit
-public fun whenWithoutSubject(/*0*/ x: kotlin.Int, /*1*/ list: kotlin.List<kotlin.Int>?): kotlin.Unit
+public fun foo(/*0*/ x: kotlin.Int, /*1*/ list: kotlin.collections.List<kotlin.Int>?): kotlin.Unit
+public fun whenWithoutSubject(/*0*/ x: kotlin.Int, /*1*/ list: kotlin.collections.List<kotlin.Int>?): kotlin.Unit
@@ -1,7 +1,7 @@
 package

 package d {
-    public fun foo(/*0*/ list: kotlin.List<d.A>): kotlin.Unit
+    public fun foo(/*0*/ list: kotlin.collections.List<d.A>): kotlin.Unit

    public final class A {
        public constructor A()
@@ -48,7 +48,7 @@ public interface B1</*0*/ T : B0<*>> {
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

-public interface BB</*0*/ S : kotlin.List<AA<*>>> {
+public interface BB</*0*/ S : kotlin.collections.List<AA<*>>> {
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -15,6 +15,6 @@ public final class C {
    public constructor C()
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final operator fun iterator(): kotlin.Iterator<A>
+    public final operator fun iterator(): kotlin.collections.Iterator<A>
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -15,6 +15,6 @@ public final class C {
    public constructor C()
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final operator fun iterator(): kotlin.Iterator<A>
+    public final operator fun iterator(): kotlin.collections.Iterator<A>
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -16,6 +16,6 @@ public final class C {
    public constructor C()
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final operator fun iterator(): kotlin.Iterator<A>
+    public final operator fun iterator(): kotlin.collections.Iterator<A>
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -14,6 +14,6 @@ public final class C {
    public constructor C()
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final operator fun iterator(): kotlin.Iterator<A>
+    public final operator fun iterator(): kotlin.collections.Iterator<A>
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -15,6 +15,6 @@ public final class C {
    public constructor C()
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final operator fun iterator(): kotlin.Iterator<A>
+    public final operator fun iterator(): kotlin.collections.Iterator<A>
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -15,6 +15,6 @@ public final class C {
    public constructor C()
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final operator fun iterator(): kotlin.Iterator<A>
+    public final operator fun iterator(): kotlin.collections.Iterator<A>
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -15,6 +15,6 @@ public final class C {
    public constructor C()
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final operator fun iterator(): kotlin.Iterator<A>
+    public final operator fun iterator(): kotlin.collections.Iterator<A>
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -14,6 +14,6 @@ public final class C {
    public constructor C()
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final operator fun iterator(): kotlin.Iterator<A>
+    public final operator fun iterator(): kotlin.collections.Iterator<A>
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -3,7 +3,7 @@ package
 public open class B {
    public constructor B()
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
+    public final fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -11,8 +11,8 @@ public open class B {
 public final class C : B {
    public constructor C()
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
-    public final override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
+    public final fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
+    public final override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -1,4 +1,4 @@
 package

-public fun foo(/*0*/ s: kotlin.List<kotlin.String>): kotlin.Unit
-public fun foo(/*0*/ s: kotlin.MutableList<kotlin.String>): kotlin.Unit
+public fun foo(/*0*/ s: kotlin.collections.List<kotlin.String>): kotlin.Unit
+public fun foo(/*0*/ s: kotlin.collections.MutableList<kotlin.String>): kotlin.Unit
@@ -2,7 +2,7 @@ package

 public interface Bar</*0*/ T> {
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
+    public abstract fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -10,15 +10,15 @@ public interface Bar</*0*/ T> {
 public final class Baz : Foo<kotlin.String>, Bar<kotlin.Int> {
    public constructor Baz(/*0*/ f: Foo<kotlin.String>, /*1*/ b: Bar<kotlin.Int>)
    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
-    public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
+    public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
+    public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }

 public interface Foo</*0*/ T> {
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
+    public abstract fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -3,15 +3,15 @@ package
 public final class Bar : Foo<kotlin.String> {
    public constructor Bar(/*0*/ f: Foo<kotlin.String>)
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
-    public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
+    public final fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
+    public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

 public interface Foo</*0*/ T> {
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
+    public abstract fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -3,8 +3,8 @@ package
 public final class Bar : Foo<kotlin.String> {
    public constructor Bar(/*0*/ f: Foo<kotlin.String>)
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
-    public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
+    public final fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
+    public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -12,14 +12,14 @@ public final class Bar : Foo<kotlin.String> {
 public final class BarOther : Foo<kotlin.String> {
    public constructor BarOther(/*0*/ f: Foo<kotlin.String>)
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
+    public open override /*1*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

 public interface Foo</*0*/ T> {
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
+    public open fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -2,7 +2,7 @@ package

 public interface Bar</*0*/ T> {
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
+    public open fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -10,15 +10,15 @@ public interface Bar</*0*/ T> {
 public final class Baz : Foo<kotlin.String>, Bar<kotlin.Int> {
    public constructor Baz()
    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }

 public interface Foo</*0*/ T> {
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
+    public open fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -1,4 +1,4 @@
 package

 public fun foo(/*0*/ s: java.util.List<kotlin.String>): kotlin.Unit
-public fun foo(/*0*/ s: kotlin.List<kotlin.String>): kotlin.Unit
+public fun foo(/*0*/ s: kotlin.collections.List<kotlin.String>): kotlin.Unit
@@ -2,14 +2,14 @@ package

 public interface A</*0*/ T> {
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
+    public abstract fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

 public interface B {
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
+    public open fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -17,8 +17,8 @@ public interface B {
 public final class C : A<kotlin.String>, B {
    public constructor C(/*0*/ f: A<kotlin.String>)
    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
-    public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
+    public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -26,7 +26,7 @@ public final class C : A<kotlin.String>, B {
 public final class D : A<kotlin.Int>, B {
    public constructor D(/*0*/ f: A<kotlin.Int>)
    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*2*/ /*delegation*/ fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
+    public open override /*2*/ /*delegation*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -2,7 +2,7 @@ package

 public interface Bar</*0*/ T> {
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
+    public open fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -10,16 +10,16 @@ public interface Bar</*0*/ T> {
 public final class Baz : Foo<kotlin.String>, Bar<kotlin.Int> {
    public constructor Baz()
    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
-    public final fun foo(/*0*/ l: kotlin.List<kotlin.Long>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
+    public final fun foo(/*0*/ l: kotlin.collections.List<kotlin.Long>): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }

 public interface Foo</*0*/ T> {
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
+    public open fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -6,20 +6,20 @@ public interface Generic</*0*/ E : My> {
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

-public interface His : kotlin.List<My> {
+public interface His : kotlin.collections.List<My> {
    public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
    public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ element: My): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<My>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<My>): kotlin.Boolean
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
    public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): My
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
    public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: My): kotlin.Int
    public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.Iterator<My>
+    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.Iterator<My>
    public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: My): kotlin.Int
-    public abstract override /*1*/ /*fake_override*/ fun listIterator(): kotlin.ListIterator<My>
-    public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.ListIterator<My>
-    public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.List<My>
+    public abstract override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.ListIterator<My>
+    public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.ListIterator<My>
+    public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.List<My>
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

@@ -40,7 +40,7 @@ public interface Our {
 public abstract class Your {
    public constructor Your()
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun give(): kotlin.List<My>
+    public abstract fun give(): kotlin.collections.List<My>
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -2,7 +2,7 @@ package

 public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
 public operator fun </*0*/ T : kotlin.Any> T?.iterator(): MyIterator<T>
-public fun </*0*/ T> java.util.Enumeration<T>.iterator(): kotlin.Iterator<T>
+public fun </*0*/ T> java.util.Enumeration<T>.iterator(): kotlin.collections.Iterator<T>

 public interface MyIterator</*0*/ T> {
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -1,4 +1,4 @@
 package

 public fun a(/*0*/ e: java.util.Enumeration<kotlin.Int>): kotlin.Unit
-public operator fun </*0*/ T> java.util.Enumeration<T>.iterator(): kotlin.Iterator<T>
+public operator fun </*0*/ T> java.util.Enumeration<T>.iterator(): kotlin.collections.Iterator<T>
@@ -2,15 +2,15 @@ package

 package bar {
    public fun test1(/*0*/ i: kotlin.Int?): kotlin.Unit
-    public fun </*0*/ R> test2(/*0*/ c: kotlin.Collection<R>): kotlin.Unit
+    public fun </*0*/ R> test2(/*0*/ c: kotlin.collections.Collection<R>): kotlin.Unit
    public fun test3(/*0*/ s: kotlin.String?): kotlin.Unit
    public fun test4(): kotlin.Unit
    public fun test5(): kotlin.Unit
-    public fun </*0*/ T> test6(/*0*/ l: kotlin.List<T>?): kotlin.Unit
-    public fun test7(/*0*/ l: kotlin.List<kotlin.String?>): kotlin.Unit
-    public fun test8(/*0*/ l: kotlin.List<kotlin.Any>?): kotlin.Unit
-    public fun </*0*/ R> kotlin.List<R>.a(): kotlin.Unit
-    public fun kotlin.List<kotlin.String>.b(): kotlin.Unit
+    public fun </*0*/ T> test6(/*0*/ l: kotlin.collections.List<T>?): kotlin.Unit
+    public fun test7(/*0*/ l: kotlin.collections.List<kotlin.String?>): kotlin.Unit
+    public fun test8(/*0*/ l: kotlin.collections.List<kotlin.Any>?): kotlin.Unit
+    public fun </*0*/ R> kotlin.collections.List<R>.a(): kotlin.Unit
+    public fun kotlin.collections.List<kotlin.String>.b(): kotlin.Unit
    public fun </*0*/ T : bar.A> T.c(): kotlin.Unit
    public fun kotlin.Int.foo(): kotlin.Unit
    public fun </*0*/ R : kotlin.Any> R?.sure(): R
@@ -2,7 +2,7 @@ package

 package a {
    public fun test(/*0*/ a1: a.A, /*1*/ a2: a.A): kotlin.Unit
-    public operator fun </*0*/ T : kotlin.Comparable<T>> T.rangeTo(/*0*/ that: T): kotlin.ClosedRange<T>
+    public operator fun </*0*/ T : kotlin.Comparable<T>> T.rangeTo(/*0*/ that: T): kotlin.ranges.ClosedRange<T>

    public final class A {
        public constructor A()
@@ -1,5 +1,5 @@
 package

-public fun autolabel(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.List<kotlin.Int>
-public fun unresolvedMapLabel(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.List<kotlin.Int>
-public fun </*0*/ T, /*1*/ R> kotlin.Iterable<T>.map(/*0*/ transform: (T) -> R): kotlin.List<R>
+public fun autolabel(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.collections.List<kotlin.Int>
+public fun unresolvedMapLabel(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.collections.List<kotlin.Int>
+public fun </*0*/ T, /*1*/ R> kotlin.collections.Iterable<T>.map(/*0*/ transform: (T) -> R): kotlin.collections.List<R>
@@ -2,6 +2,6 @@ package

 public val a: (kotlin.Int) -> kotlin.Unit
 public val b: (kotlin.Int) -> kotlin.Unit
-public fun </*0*/ T> listOf(): kotlin.List<T>
+public fun </*0*/ T> listOf(): kotlin.collections.List<T>
 public fun test(/*0*/ a: (kotlin.Int) -> kotlin.Int): kotlin.Unit
-public fun test2(/*0*/ a: () -> kotlin.List<kotlin.Int>): kotlin.Unit
+public fun test2(/*0*/ a: () -> kotlin.collections.List<kotlin.Int>): kotlin.Unit
@@ -1,6 +1,6 @@
 package

-public fun </*0*/ T> listOf(/*0*/ vararg values: T /*kotlin.Array<out T>*/): kotlin.List<T>
+public fun </*0*/ T> listOf(/*0*/ vararg values: T /*kotlin.Array<out T>*/): kotlin.collections.List<T>
 public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
 public fun </*0*/ T : kotlin.Any, /*1*/ R> T.let(/*0*/ f: (T) -> R): R
-public operator fun </*0*/ T> kotlin.Iterable<T>.plus(/*0*/ element: T): kotlin.List<T>
+public operator fun </*0*/ T> kotlin.collections.Iterable<T>.plus(/*0*/ element: T): kotlin.collections.List<T>
@@ -1,6 +1,6 @@
 package

-public val a: () -> kotlin.List<kotlin.Int>
+public val a: () -> kotlin.collections.List<kotlin.Int>
 public val flag: kotlin.Boolean = true
-public fun </*0*/ T> listOf(): kotlin.List<T>
-public fun </*0*/ T> listOf(/*0*/ vararg values: T /*kotlin.Array<out T>*/): kotlin.List<T>
+public fun </*0*/ T> listOf(): kotlin.collections.List<T>
+public fun </*0*/ T> listOf(/*0*/ vararg values: T /*kotlin.Array<out T>*/): kotlin.collections.List<T>
@@ -1,6 +1,6 @@
 package

-public fun commonSystemFailed(/*0*/ a: kotlin.List<kotlin.Int>): kotlin.Unit
-public fun </*0*/ T> listOf(): kotlin.List<T>
-public fun </*0*/ T> listOf(/*0*/ vararg values: T /*kotlin.Array<out T>*/): kotlin.List<T>
-public fun </*0*/ T, /*1*/ R> kotlin.Iterable<T>.map(/*0*/ transform: (T) -> R): kotlin.List<R>
+public fun commonSystemFailed(/*0*/ a: kotlin.collections.List<kotlin.Int>): kotlin.Unit
+public fun </*0*/ T> listOf(): kotlin.collections.List<T>
+public fun </*0*/ T> listOf(/*0*/ vararg values: T /*kotlin.Array<out T>*/): kotlin.collections.List<T>
+public fun </*0*/ T, /*1*/ R> kotlin.collections.Iterable<T>.map(/*0*/ transform: (T) -> R): kotlin.collections.List<R>
@@ -1,8 +1,8 @@
 package

 package m {
-    public fun test(/*0*/ handlers: kotlin.Map<kotlin.String, m.Element.() -> kotlin.Unit>): kotlin.Unit
-    public fun </*0*/ K, /*1*/ V> kotlin.Map<K, V>.getOrElse(/*0*/ key: K, /*1*/ defaultValue: () -> V): V
+    public fun test(/*0*/ handlers: kotlin.collections.Map<kotlin.String, m.Element.() -> kotlin.Unit>): kotlin.Unit
+    public fun </*0*/ K, /*1*/ V> kotlin.collections.Map<K, V>.getOrElse(/*0*/ key: K, /*1*/ defaultValue: () -> V): V

    public interface Element {
        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -1,8 +1,8 @@
 package

 package m {
-    public fun test(/*0*/ handlers: kotlin.Map<kotlin.String, m.Element.() -> kotlin.Unit>): kotlin.Unit
-    public fun </*0*/ K, /*1*/ V> kotlin.Map<K, V>.getOrElse(/*0*/ key: K, /*1*/ defaultValue: () -> V): V
+    public fun test(/*0*/ handlers: kotlin.collections.Map<kotlin.String, m.Element.() -> kotlin.Unit>): kotlin.Unit
+    public fun </*0*/ K, /*1*/ V> kotlin.collections.Map<K, V>.getOrElse(/*0*/ key: K, /*1*/ defaultValue: () -> V): V

    public interface Element {
        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -12,37 +12,37 @@ public interface B : A {
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

-public interface ListA : kotlin.List<A> {
+public interface ListA : kotlin.collections.List<A> {
    public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
    public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ element: A): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<A>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<A>): kotlin.Boolean
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
    public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): A
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
    public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: A): kotlin.Int
    public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.Iterator<A>
+    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.Iterator<A>
    public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: A): kotlin.Int
-    public abstract override /*1*/ /*fake_override*/ fun listIterator(): kotlin.ListIterator<A>
-    public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.ListIterator<A>
-    public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.List<A>
+    public abstract override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.ListIterator<A>
+    public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.ListIterator<A>
+    public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.List<A>
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

-public interface ListB : kotlin.List<B> {
+public interface ListB : kotlin.collections.List<B> {
    public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
    public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ element: B): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<B>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<B>): kotlin.Boolean
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
    public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): B
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
    public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: B): kotlin.Int
    public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.Iterator<B>
+    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.Iterator<B>
    public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: B): kotlin.Int
-    public abstract override /*1*/ /*fake_override*/ fun listIterator(): kotlin.ListIterator<B>
-    public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.ListIterator<B>
-    public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.List<B>
+    public abstract override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.ListIterator<B>
+    public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.ListIterator<B>
+    public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.List<B>
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

@@ -6,7 +6,7 @@ package test {
    public open class Usage {
        public constructor Usage()
        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public/*package*/ open fun foo(/*0*/ c: kotlin.(Mutable)Collection<(raw) kotlin.Any?>!): kotlin.Unit
+        public/*package*/ open fun foo(/*0*/ c: kotlin.collections.(Mutable)Collection<(raw) kotlin.Any?>!): kotlin.Unit
        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
    }
@@ -14,8 +14,8 @@ public final class Outer</*0*/ out E, /*1*/ in F> {
        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
        public final fun unsafe1(/*0*/ x: E): kotlin.Unit
-        public final fun unsafe2(/*0*/ x: kotlin.Collection<E?>): kotlin.Unit
+        public final fun unsafe2(/*0*/ x: kotlin.collections.Collection<E?>): kotlin.Unit
        public final fun unsafe3(): F?
-        public final fun unsafe4(): kotlin.Collection<F>?
+        public final fun unsafe4(): kotlin.collections.Collection<F>?
    }
 }
@@ -7,22 +7,22 @@ public final class A</*0*/ T> : java.util.AbstractCollection<T> {
    public constructor A</*0*/ T>()
    public open override /*1*/ val size: kotlin.Int
    public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: T!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
    public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: T!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
    public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
    public open override /*1*/ fun iterator(): A<T>.MyIt
    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: T!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
    public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
    public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String

-    public final inner class MyIt /*captured type parameters: /*0*/ T*/ : kotlin.MutableIterator<T> {
+    public final inner class MyIt /*captured type parameters: /*0*/ T*/ : kotlin.collections.MutableIterator<T> {
        public constructor MyIt()
        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
        public open override /*1*/ fun hasNext(): kotlin.Boolean
@@ -1,11 +1,11 @@
 package

-public fun foo2(/*0*/ x: A, /*1*/ y: kotlin.MutableList<out kotlin.CharSequence>): kotlin.Unit
+public fun foo2(/*0*/ x: A, /*1*/ y: kotlin.collections.MutableList<out kotlin.CharSequence>): kotlin.Unit

 public open class A {
    public constructor A()
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun foo(): (kotlin.MutableList<out kotlin.CharSequence!>..kotlin.List<kotlin.CharSequence!>?)
+    public open fun foo(): (kotlin.collections.MutableList<out kotlin.CharSequence!>..kotlin.collections.List<kotlin.CharSequence!>?)
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -1,12 +1,12 @@
 package

 public fun test(/*0*/ clazz: Clazz<out kotlin.Any>): kotlin.Unit
-public fun </*0*/ T, /*1*/ C : kotlin.MutableCollection<in T>> kotlin.Iterable<T>.filterTo(/*0*/ destination: C, /*1*/ predicate: (T) -> kotlin.Boolean): kotlin.Unit
+public fun </*0*/ T, /*1*/ C : kotlin.collections.MutableCollection<in T>> kotlin.collections.Iterable<T>.filterTo(/*0*/ destination: C, /*1*/ predicate: (T) -> kotlin.Boolean): kotlin.Unit

 public open class Clazz</*0*/ Psi : kotlin.Any!> {
    public constructor Clazz</*0*/ Psi : kotlin.Any!>()
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun foo(): kotlin.(Mutable)Collection<Psi!>!
+    public open fun foo(): kotlin.collections.(Mutable)Collection<Psi!>!
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -4,7 +4,7 @@ package p {

    public open class Base</*0*/ T : kotlin.Any!> {
        public constructor Base</*0*/ T : kotlin.Any!>()
-        public/*package*/ open fun coll(/*0*/ r: kotlin.(Mutable)Collection<*>!): kotlin.Unit
+        public/*package*/ open fun coll(/*0*/ r: kotlin.collections.(Mutable)Collection<*>!): kotlin.Unit
        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -12,7 +12,7 @@ package p {

    public final class Derived : p.Base<kotlin.String> {
        public constructor Derived()
-        public/*package*/ open override /*1*/ /*fake_override*/ fun coll(/*0*/ r: kotlin.(Mutable)Collection<*>!): kotlin.Unit
+        public/*package*/ open override /*1*/ /*fake_override*/ fun coll(/*0*/ r: kotlin.collections.(Mutable)Collection<*>!): kotlin.Unit
        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -1,13 +1,13 @@
 package

-public fun foo(/*0*/ x: A<kotlin.String, kotlin.Any?>, /*1*/ cs: kotlin.CharSequence, /*2*/ ls: kotlin.List<kotlin.CharSequence>): kotlin.Unit
+public fun foo(/*0*/ x: A<kotlin.String, kotlin.Any?>, /*1*/ cs: kotlin.CharSequence, /*2*/ ls: kotlin.collections.List<kotlin.CharSequence>): kotlin.Unit

 public final class A</*0*/ out T, /*1*/ in E> {
    public constructor A</*0*/ out T, /*1*/ in E>()
-    public final fun bar(): kotlin.List<@kotlin.UnsafeVariance() E>
+    public final fun bar(): kotlin.collections.List<@kotlin.UnsafeVariance() E>
    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
    public final fun foo(/*0*/ x: @kotlin.UnsafeVariance() T): kotlin.Unit
-    public final fun foo(/*0*/ x: @kotlin.UnsafeVariance() T, /*1*/ y: kotlin.List<@kotlin.UnsafeVariance() T>): @kotlin.UnsafeVariance() E
+    public final fun foo(/*0*/ x: @kotlin.UnsafeVariance() T, /*1*/ y: kotlin.collections.List<@kotlin.UnsafeVariance() T>): @kotlin.UnsafeVariance() E
    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -1,6 +1,6 @@
 // ResolveSession.resolveToDescriptor used to crash on such code, so we just check that it's ok now
 import kotlin.Double
-import kotlin.List
+import kotlin.collections.List
 import kotlin.arrayOfNulls

 class List {}
@@ -1,4 +1,4 @@
 package

 public fun test1(): kotlin.Unit
-public fun test2(/*0*/ l: kotlin.List<[ERROR : AA]>): kotlin.Unit
+public fun test2(/*0*/ l: kotlin.collections.List<[ERROR : AA]>): kotlin.Unit
--- a/Show More
+++ b/Show More