diff --git a/compiler/testData/codegen/controlStructures/forUserType.jet b/compiler/testData/codegen/controlStructures/forUserType.jet
index 1bb637e4a26..6e0638d9d99 100644
--- a/compiler/testData/codegen/controlStructures/forUserType.jet
+++ b/compiler/testData/codegen/controlStructures/forUserType.jet
@@ -16,7 +16,7 @@ fun box() : String {
     }
     if(sum != 15) return "c5 failed"
 
-    val c1: java.lang.Iterable<Int> = MyCollection1()
+    val c1: Iterable<Int> = MyCollection1()
     sum = 0
     for (el in c1) {
         sum = sum + el!!
@@ -77,15 +77,14 @@ fun box() : String {
     return "OK"
 }
 
-class MyCollection1(): java.lang.Iterable<Int> {
-    override fun iterator(): java.util.Iterator<Int> = MyIterator()
+class MyCollection1(): Iterable<Int> {
+    override fun iterator(): Iterator<Int> = MyIterator()
 
-    class MyIterator(): java.util.Iterator<Int> {
+    class MyIterator(): Iterator<Int> {
         var k : Int = 5
 
         override fun next() : Int = k--
         override fun hasNext() = k > 0
-        override fun remove() {}
     }
 }
 
@@ -96,8 +95,7 @@ class MyCollection2(): Iterable<Int> {
         var k : Int = 5
 
         override fun next() : Int = k--
-        override val hasNext : Boolean
-          get() = k > 0
+        override fun hasNext() : Boolean = k > 0
     }
 }
 
@@ -108,8 +106,7 @@ class MyCollection3() {
         var k : Int = 5
 
         fun next() : Int? = k--
-        val hasNext : Boolean
-            get() = k > 0
+        fun hasNext() : Boolean = k > 0
     }
 }
 
diff --git a/compiler/testData/codegen/regressions/kt528.kt b/compiler/testData/codegen/regressions/kt528.kt
index deacc7bbf1a..bc892093922 100644
--- a/compiler/testData/codegen/regressions/kt528.kt
+++ b/compiler/testData/codegen/regressions/kt528.kt
@@ -2,8 +2,6 @@ package mask
 
 import java.io.*
 import java.util.*
-import java.util.Iterator as It
-import java.lang.Iterable as Itl
 
 fun box() : String {
     val input = StringReader("/Users/abreslav/work/jet/docs/luhnybin/src/test")
diff --git a/compiler/testData/codegen/regressions/kt529.kt b/compiler/testData/codegen/regressions/kt529.kt
index 6a1ac12323f..08257e1db14 100644
--- a/compiler/testData/codegen/regressions/kt529.kt
+++ b/compiler/testData/codegen/regressions/kt529.kt
@@ -88,7 +88,7 @@ class Luhny() {
 
 // fun Char.isDigit() = Character.isDigit(this)
 
-fun java.lang.Iterable<Int>.sum(f : (index : Int, value : Int) -> Int) : Int {
+fun Iterable<Int>.sum(f : (index : Int, value : Int) -> Int) : Int {
     var sum = 0
     var i = 0
     for (d in this) {
diff --git a/compiler/testData/codegen/regressions/kt715.kt b/compiler/testData/codegen/regressions/kt715.kt
index 3d5de9a0a3e..833edf94e02 100644
--- a/compiler/testData/codegen/regressions/kt715.kt
+++ b/compiler/testData/codegen/regressions/kt715.kt
@@ -6,6 +6,6 @@ val test2 = javaClass<Iterator<Int>> ()
 
 fun box(): String {
     if(test.getCanonicalName() != "java.lang.String") return "fail"
-    if(test2.getCanonicalName() != "jet.Iterator") return "fail"
+    if(test2.getCanonicalName() != "java.util.Iterator") return "fail"
     return "OK"
 }
\ No newline at end of file
diff --git a/compiler/testData/codegen/traits/stdlib.jet b/compiler/testData/codegen/traits/stdlib.jet
index 235263a95eb..d73e18fd231 100644
--- a/compiler/testData/codegen/traits/stdlib.jet
+++ b/compiler/testData/codegen/traits/stdlib.jet
@@ -2,8 +2,8 @@ trait ISized {
     val size : Int
 }
 
-trait javaUtilIterator<T> : java.util.Iterator<T> {
-    override fun remove() : Unit {
+trait javaUtilIterator<T> : Iterator<T> {
+    fun remove() : Unit {
         throw UnsupportedOperationException()
     }
 }
@@ -16,14 +16,14 @@ class MyIterator<T>(val array : ReadOnlyArray<T>) : javaUtilIterator<T> {
     override fun next() : T = array.get(index++)
 }
 
-trait ReadOnlyArray<out T> : ISized, java.lang.Iterable<T> {
+trait ReadOnlyArray<out T> : ISized, Iterable<T> {
   fun get(index : Int) : T
 
   class Default {
     fun check(v: Any) =  v is T
   }
 
-  override fun iterator() : java.util.Iterator<T> = MyIterator<T>(this)
+  override fun iterator() : Iterator<T> = MyIterator<T>(this)
 }
 
 trait WriteOnlyArray<in T> : ISized {
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2407.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2407.kt
index 226ad6e04bb..eda5bf86014 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2407.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2407.kt
@@ -13,4 +13,4 @@ fun arrayList<T>(vararg <!UNUSED_PARAMETER!>values<!>: T) : ArrayList<T> {<!NO_R
 
 fun <T, R> Collection<T>.map(<!UNUSED_PARAMETER!>transform<!> : (T) -> R) : List<R> {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
 
-fun <T> java.lang.Iterable<T>.fold(<!UNUSED_PARAMETER!>initial<!>: T, <!UNUSED_PARAMETER!>operation<!>: (T, T) -> T): T {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
\ No newline at end of file
+fun <T> Iterable<T>.fold(<!UNUSED_PARAMETER!>initial<!>: T, <!UNUSED_PARAMETER!>operation<!>: (T, T) -> T): T {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
\ No newline at end of file
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.kt b/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.kt
index a5d3f9cb3d2..79ed65d1ec2 100644
--- a/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.kt
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.kt
@@ -1,4 +1,4 @@
 package test
 
-public abstract class ClassWithTypePExtendsIterableP<P>() : java.lang.Iterable<P> {
+public abstract class ClassWithTypePExtendsIterableP<P>() : jet.Iterable<P> {
 }
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.txt b/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.txt
index 62385ad35ee..c382350067f 100644
--- a/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.txt
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public abstract class test.ClassWithTypePExtendsIterableP</*0*/ P : jet.Any?> : java.lang.Iterable<P> {
+public abstract class test.ClassWithTypePExtendsIterableP</*0*/ P : jet.Any?> : jet.Iterable<P> {
     public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ClassWithTypePExtendsIterableP<P>
-    public abstract override /*1*/ fun iterator(): java.util.Iterator<P>?
+    public abstract override /*1*/ fun iterator(): jet.Iterator<P>
 }
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.kt b/compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.kt
index f1782800a51..f5b75f154fe 100644
--- a/compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.kt
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.kt
@@ -1,3 +1,3 @@
 package test
 
-public open class ClassWithTypePRefNext<R : java.lang.Iterable<P>?, P>() : java.lang.Object()
+public open class ClassWithTypePRefNext<R : jet.Iterable<P>?, P>() : java.lang.Object()
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.txt b/compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.txt
index 27467c8002b..257c0b4832f 100644
--- a/compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.txt
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.txt
@@ -1,5 +1,5 @@
 namespace test
 
-public open class test.ClassWithTypePRefNext</*0*/ R : java.lang.Iterable<P>?, /*1*/ P : jet.Any?> : java.lang.Object {
-    public final /*constructor*/ fun </*0*/ R : java.lang.Iterable<P>?, /*1*/ P : jet.Any?><init>(): test.ClassWithTypePRefNext<R, P>
+public open class test.ClassWithTypePRefNext</*0*/ R : jet.Iterable<P>?, /*1*/ P : jet.Any?> : java.lang.Object {
+    public final /*constructor*/ fun </*0*/ R : jet.Iterable<P>?, /*1*/ P : jet.Any?><init>(): test.ClassWithTypePRefNext<R, P>
 }
diff --git a/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.java b/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.java
index fbaf42d2628..7c49f045df8 100644
--- a/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.java
+++ b/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.java
@@ -6,7 +6,7 @@ public class InnerClassesInGeneric<P, Q> {
     public class Inner {
     }
     
-    public class Inner2 extends Inner implements Iterable<P> {
+    public class Inner2 extends Inner {
         public java.util.Iterator<P> iterator() {
             throw new UnsupportedOperationException();
         }
diff --git a/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.kt b/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.kt
index 68bedbe20b9..659635577d5 100644
--- a/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.kt
+++ b/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.kt
@@ -4,8 +4,8 @@ public open class InnerClassesInGeneric<P, Q>() : java.lang.Object() {
     public open class Inner() : java.lang.Object() {
     }
     
-    public open class Inner2() : Inner(), java.lang.Iterable<P> {
-        override fun iterator() : java.util.Iterator<P>? {
+    public open class Inner2() : Inner() {
+        public open fun iterator() : jet.Iterator<P>? {
             throw UnsupportedOperationException()
         }
     }
diff --git a/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.txt b/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.txt
index 6b6742c89e9..677c76fc7d2 100644
--- a/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.txt
+++ b/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.txt
@@ -5,8 +5,8 @@ public open class test.InnerClassesInGeneric</*0*/ P : jet.Any?, /*1*/ Q : jet.A
     public open class test.InnerClassesInGeneric.Inner : java.lang.Object {
         public final /*constructor*/ fun <init>(): test.InnerClassesInGeneric.Inner
     }
-    public open class test.InnerClassesInGeneric.Inner2 : test.InnerClassesInGeneric.Inner, java.lang.Iterable<P> {
+    public open class test.InnerClassesInGeneric.Inner2 : test.InnerClassesInGeneric.Inner {
         public final /*constructor*/ fun <init>(): test.InnerClassesInGeneric.Inner2
-        public open override /*1*/ fun iterator(): java.util.Iterator<P>?
+        public open fun iterator(): jet.Iterator<P>?
     }
 }
diff --git a/compiler/testData/readJavaBinaryClass/modality/ModalityOfFakeOverrides.txt b/compiler/testData/readJavaBinaryClass/modality/ModalityOfFakeOverrides.txt
index 76f4b8cf5c6..efec7ae1889 100644
--- a/compiler/testData/readJavaBinaryClass/modality/ModalityOfFakeOverrides.txt
+++ b/compiler/testData/readJavaBinaryClass/modality/ModalityOfFakeOverrides.txt
@@ -12,7 +12,7 @@ public open class test.ModalityOfFakeOverrides : java.util.AbstractList<jet.Stri
     public open override /*1*/ fun get(/*0*/ p0: jet.Int): jet.String?
     public open override /*1*/ fun indexOf(/*0*/ p0: jet.Any?): jet.Int
     public open override /*1*/ fun isEmpty(): jet.Boolean
-    public open override /*1*/ fun iterator(): java.util.Iterator<jet.String>?
+    public open override /*1*/ fun iterator(): jet.Iterator<jet.String>?
     public open override /*1*/ fun lastIndexOf(/*0*/ p0: jet.Any?): jet.Int
     public open override /*1*/ fun listIterator(): java.util.ListIterator<jet.String>?
     public open override /*1*/ fun listIterator(/*0*/ p0: jet.Int): java.util.ListIterator<jet.String>?