diff --git a/compiler/frontend/src/jet/Arrays.jet b/compiler/frontend/src/jet/Arrays.jet
index dc02070a140..1d98819bfbd 100644
--- a/compiler/frontend/src/jet/Arrays.jet
+++ b/compiler/frontend/src/jet/Arrays.jet
@@ -2,7 +2,7 @@ package jet
 
 public fun arrayOfNulls<T>(public val size : Int) : Array<T?>
 
-public class Array<T>(public val size : Int, init : (Int) -> T) {
+public class Array<reified T>(public val size : Int, init : (Int) -> T) {
   public fun get(index : Int) : T
   public fun set(index : Int, value : T) : Unit
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
index ca3f4ac14be..9b4dc25ed58 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
@@ -82,7 +82,7 @@ public class DescriptorResolver {
             TypeParameterDescriptor typeParameterDescriptor = TypeParameterDescriptorImpl.createForFurtherModification(
                     descriptor,
                     annotationResolver.createAnnotationStubs(typeParameter.getModifierList(), trace),
-                    !typeParameter.hasModifier(JetTokens.ERASED_KEYWORD),
+                    typeParameter.hasModifier(JetTokens.REIFIED_KEYWORD),
                     typeParameter.getVariance(),
                     JetPsiUtil.safeName(typeParameter.getName()),
                     index
@@ -335,7 +335,7 @@ public class DescriptorResolver {
         TypeParameterDescriptorImpl typeParameterDescriptor = TypeParameterDescriptorImpl.createForFurtherModification(
                 containingDescriptor,
                 annotationResolver.createAnnotationStubs(typeParameter.getModifierList(), trace),
-                !typeParameter.hasModifier(JetTokens.ERASED_KEYWORD),
+                typeParameter.hasModifier(JetTokens.REIFIED_KEYWORD),
                 typeParameter.getVariance(),
                 JetPsiUtil.safeName(typeParameter.getName()),
                 index
diff --git a/compiler/frontend/src/org/jetbrains/jet/lexer/JetTokens.java b/compiler/frontend/src/org/jetbrains/jet/lexer/JetTokens.java
index b5bdb031bdf..8fe4fb451d5 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lexer/JetTokens.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lexer/JetTokens.java
@@ -157,7 +157,7 @@ public interface JetTokens {
     JetKeywordToken OUT_KEYWORD       = JetKeywordToken.softKeyword("out");
     JetKeywordToken VARARG_KEYWORD       = JetKeywordToken.softKeyword("vararg");
     JetKeywordToken INLINE_KEYWORD       = JetKeywordToken.softKeyword("inline");
-    JetKeywordToken ERASED_KEYWORD       = JetKeywordToken.softKeyword("erased");
+    JetKeywordToken REIFIED_KEYWORD = JetKeywordToken.softKeyword("reified");
 
     JetKeywordToken FINALLY_KEYWORD   = JetKeywordToken.softKeyword("finally");
     JetKeywordToken FINAL_KEYWORD   = JetKeywordToken.softKeyword("final");
@@ -174,12 +174,12 @@ public interface JetTokens {
     TokenSet SOFT_KEYWORDS = TokenSet.create(IMPORT_KEYWORD, WHERE_KEYWORD, BY_KEYWORD, GET_KEYWORD,
             SET_KEYWORD, ABSTRACT_KEYWORD, ENUM_KEYWORD, OPEN_KEYWORD, ANNOTATION_KEYWORD,
             OVERRIDE_KEYWORD, PRIVATE_KEYWORD, PUBLIC_KEYWORD, INTERNAL_KEYWORD, PROTECTED_KEYWORD,
-            CATCH_KEYWORD, FINALLY_KEYWORD, OUT_KEYWORD, FINAL_KEYWORD, VARARG_KEYWORD, INLINE_KEYWORD, ERASED_KEYWORD
+            CATCH_KEYWORD, FINALLY_KEYWORD, OUT_KEYWORD, FINAL_KEYWORD, VARARG_KEYWORD, INLINE_KEYWORD, REIFIED_KEYWORD
     );
 
     TokenSet MODIFIER_KEYWORDS = TokenSet.create(ABSTRACT_KEYWORD, ENUM_KEYWORD,
             OPEN_KEYWORD, ANNOTATION_KEYWORD, OVERRIDE_KEYWORD, PRIVATE_KEYWORD, PUBLIC_KEYWORD, INTERNAL_KEYWORD,
-            PROTECTED_KEYWORD, OUT_KEYWORD, IN_KEYWORD, FINAL_KEYWORD, VARARG_KEYWORD, INLINE_KEYWORD, ERASED_KEYWORD
+            PROTECTED_KEYWORD, OUT_KEYWORD, IN_KEYWORD, FINAL_KEYWORD, VARARG_KEYWORD, INLINE_KEYWORD, REIFIED_KEYWORD
     );
     TokenSet WHITE_SPACE_OR_COMMENT_BIT_SET = TokenSet.create(WHITE_SPACE, BLOCK_COMMENT, EOL_COMMENT, DOC_COMMENT, SHEBANG_COMMENT);
     TokenSet WHITESPACES = TokenSet.create(TokenType.WHITE_SPACE);
diff --git a/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java b/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java
index 085f93c07a2..dd3e2063d0c 100644
--- a/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java
+++ b/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java
@@ -553,14 +553,14 @@ public class DescriptorRenderer implements Renderer<DeclarationDescriptor> {
         }
 
         protected void renderTypeParameter(TypeParameterDescriptor descriptor, StringBuilder builder, boolean topLevel) {
-            if (descriptor.isReified()) {
+            if (!descriptor.isReified()) {
                 String variance = descriptor.getVariance().toString();
                 if (!variance.isEmpty()) {
                     builder.append(renderKeyword(variance)).append(" ");
                 }
             }
             else {
-                builder.append(renderKeyword("erased")).append(" ");
+                builder.append(renderKeyword("reified")).append(" ");
             }
             renderName(descriptor, builder);
             if (descriptor.getUpperBounds().size() == 1) {
diff --git a/compiler/testData/codegen/regressions/kt1199.kt b/compiler/testData/codegen/regressions/kt1199.kt
index 6c35ccc26d2..0d854f0c959 100644
--- a/compiler/testData/codegen/regressions/kt1199.kt
+++ b/compiler/testData/codegen/regressions/kt1199.kt
@@ -1,4 +1,4 @@
-fun <erased T : Any> T?.iterator() = object {
+fun <T : Any> T?.iterator() = object {
     var hasNext = this@iterator != null
       private set
 
diff --git a/compiler/testData/codegen/regressions/kt602.jet b/compiler/testData/codegen/regressions/kt602.jet
index 002cf675b6b..dcc72b3108a 100644
--- a/compiler/testData/codegen/regressions/kt602.jet
+++ b/compiler/testData/codegen/regressions/kt602.jet
@@ -1 +1,2 @@
 fun box() = if(arrayOfNulls<Int>(10) is Array<java.lang.Integer>) "OK" else "fail"
+
diff --git a/compiler/testData/codegen/typeInfo/primitiveTypeInfo.jet b/compiler/testData/codegen/typeInfo/primitiveTypeInfo.jet
index fa7f1356aba..ff67d156b7d 100644
--- a/compiler/testData/codegen/typeInfo/primitiveTypeInfo.jet
+++ b/compiler/testData/codegen/typeInfo/primitiveTypeInfo.jet
@@ -3,7 +3,7 @@ class Box<T>(t: T) {
 }
 
 fun isIntBox(box: Box<out Any?>): Boolean {
-    return box is Box<Int>;
+    return box is Box<*>;
 }
 
 
diff --git a/compiler/testData/diagnostics/tests/cast/IsReified.jet b/compiler/testData/diagnostics/tests/cast/IsReified.jet
index 247196d6e84..12b1132dadc 100644
--- a/compiler/testData/diagnostics/tests/cast/IsReified.jet
+++ b/compiler/testData/diagnostics/tests/cast/IsReified.jet
@@ -1,3 +1,3 @@
 class MyList<T>
 
-fun ff(a: Any) = a is MyList<String>
+fun ff(a: Any) = a is <!CANNOT_CHECK_FOR_ERASED!>MyList<String><!>
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1189.jet b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1189.jet
index 0e8b922a052..09138e4301c 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1189.jet
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1189.jet
@@ -2,7 +2,7 @@
 package kt1189
 import java.util.concurrent.locks.ReentrantReadWriteLock
 
-inline fun <erased T> ReentrantReadWriteLock.write(action: ()->T) : T {
+inline fun <T> ReentrantReadWriteLock.write(action: ()->T) : T {
     val rl = readLock().sure()
     var readCount = 0
     val writeCount = getWriteHoldCount()
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1191.jet b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1191.jet
index 97a32cf86dd..9f6f690387b 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1191.jet
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1191.jet
@@ -7,7 +7,7 @@ trait FunctionalList<T> {
     val tail: FunctionalList<T>
 }
 
-fun <erased T> FunctionalList<T>.plus(element: T) : FunctionalList<T> = object: FunctionalList<T> {
+fun <T> FunctionalList<T>.plus(element: T) : FunctionalList<T> = object: FunctionalList<T> {
     override val size: Int
     get() = 1 + this@plus.size
     override val tail: FunctionalList<T>
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypeP.kt b/compiler/testData/readJavaBinaryClass/ClassWithTypeP.kt
index 4f369bcdfed..d946164581e 100644
--- a/compiler/testData/readJavaBinaryClass/ClassWithTypeP.kt
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypeP.kt
@@ -1,4 +1,4 @@
 package test
 
-class ClassWithTypeParameter<erased P>() : java.lang.Object() {
+class ClassWithTypeParameter<P>() : java.lang.Object() {
 }
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.kt b/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.kt
index be4d105bc30..4c4b5ed2abd 100644
--- a/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.kt
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.kt
@@ -1,4 +1,4 @@
 package test
 
-abstract class ClassTypeTypePRefSuper<erased P>() : java.lang.Iterable<P> {
+abstract class ClassTypeTypePRefSuper<P>() : java.lang.Iterable<P> {
 }
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePP.kt b/compiler/testData/readJavaBinaryClass/ClassWithTypePP.kt
index c3899003821..ddd26e43e70 100644
--- a/compiler/testData/readJavaBinaryClass/ClassWithTypePP.kt
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypePP.kt
@@ -1,4 +1,4 @@
 package test
 
-class ClassWithTypeParameter<erased P, erased Q : P>() : java.lang.Object() {
+class ClassWithTypeParameter<P, Q : P>() : java.lang.Object() {
 }
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.kt b/compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.kt
index 8e117e7b6ab..ffe9e5d4f66 100644
--- a/compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.kt
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.kt
@@ -1,5 +1,5 @@
 package test
 
-trait Foo<erased Q> : java.lang.Object
+trait Foo<Q> : java.lang.Object
 
-open class ClassWithTypePRefNext<erased R : Foo<P>?, erased P>() : java.lang.Object()
+open class ClassWithTypePRefNext<R : Foo<P>?, P>() : java.lang.Object()
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.kt b/compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.kt
index d1a1e889d3d..9c1bf463829 100644
--- a/compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.kt
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.kt
@@ -1,4 +1,4 @@
 package test
 
-class ClassWithTypePRefSelf<erased P : java.lang.Enum<P>?>() : java.lang.Object() {
+class ClassWithTypePRefSelf<P : java.lang.Enum<P>?>() : java.lang.Object() {
 }
diff --git a/compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.kt b/compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.kt
index 48086967e19..fc64e600026 100644
--- a/compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.kt
+++ b/compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.kt
@@ -1,5 +1,5 @@
 package test
 
-open class Outer<erased P>() : java.lang.Object() {
-    open class Inner<erased Q : P>() : java.lang.Object()
+open class Outer<P>() : java.lang.Object() {
+    open class Inner<Q : P>() : java.lang.Object()
 }
diff --git a/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.kt b/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.kt
index 9e9f9b3ce1f..168bcd712e1 100644
--- a/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.kt
+++ b/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.kt
@@ -1,8 +1,8 @@
 package test
 
-trait Trait<erased P> : java.lang.Object
+trait Trait<P> : java.lang.Object
 
-open class Outer<erased P, erased Q>() : java.lang.Object() {
+open class Outer<P, Q>() : java.lang.Object() {
     open class Inner() : java.lang.Object() {
     }
     
diff --git a/compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.kt b/compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.kt
index 9bd04bb6227..bc43d5f3fce 100644
--- a/compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.kt
+++ b/compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.kt
@@ -1,7 +1,7 @@
 package test
 
-class Outer<erased P>() : java.lang.Object() {
+class Outer<P>() : java.lang.Object() {
     class Inner() : java.lang.Object() {
-        fun f<erased Q : P>() {}
+        fun f<Q : P>() {}
     }
 }
diff --git a/compiler/testData/readJavaBinaryClass/MethodTypePOneUpperBound.kt b/compiler/testData/readJavaBinaryClass/MethodTypePOneUpperBound.kt
index c97120384de..4554cb65218 100644
--- a/compiler/testData/readJavaBinaryClass/MethodTypePOneUpperBound.kt
+++ b/compiler/testData/readJavaBinaryClass/MethodTypePOneUpperBound.kt
@@ -3,5 +3,5 @@ package test
 trait Foo : java.lang.Object
 
 open class MethodTypePOneUpperBound() : java.lang.Object() {
-    open fun <erased T : Foo?> bar() = #()
+    open fun <T : Foo?> bar() = #()
 }
diff --git a/compiler/testData/readJavaBinaryClass/MethodTypePTwoUpperBounds.kt b/compiler/testData/readJavaBinaryClass/MethodTypePTwoUpperBounds.kt
index 82b931e6692..972ca675fea 100644
--- a/compiler/testData/readJavaBinaryClass/MethodTypePTwoUpperBounds.kt
+++ b/compiler/testData/readJavaBinaryClass/MethodTypePTwoUpperBounds.kt
@@ -4,7 +4,7 @@ trait Foo : java.lang.Object
 trait Bar : java.lang.Object
 
 open class MethodTypePTwoUpperBounds() : java.lang.Object() {
-    open fun <erased T> foo(): Unit
+    open fun <T> foo(): Unit
         where T : Foo?, T : Bar?
     {}
 }
diff --git a/compiler/testData/readJavaBinaryClass/MethodWithTypeP.kt b/compiler/testData/readJavaBinaryClass/MethodWithTypeP.kt
index 39cd1042cb5..8dbc6c7175c 100644
--- a/compiler/testData/readJavaBinaryClass/MethodWithTypeP.kt
+++ b/compiler/testData/readJavaBinaryClass/MethodWithTypeP.kt
@@ -1,5 +1,5 @@
 package test
 
 class MethodWithTypeP() : java.lang.Object() {
-    fun <erased P> f() = #()
+    fun <P> f() = #()
 }
diff --git a/compiler/testData/readJavaBinaryClass/MethodWithTypePP.kt b/compiler/testData/readJavaBinaryClass/MethodWithTypePP.kt
index a9f745e0b26..11db3264d9c 100644
--- a/compiler/testData/readJavaBinaryClass/MethodWithTypePP.kt
+++ b/compiler/testData/readJavaBinaryClass/MethodWithTypePP.kt
@@ -1,5 +1,5 @@
 package test
 
 class MethodWithTypePP() : java.lang.Object() {
-    fun <erased P, erased Q : P> f() = #()
+    fun <P, Q : P> f() = #()
 }
diff --git a/compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.kt b/compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.kt
index 625245c0311..c9b1c38b9e0 100644
--- a/compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.kt
+++ b/compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.kt
@@ -1,5 +1,5 @@
 package test
 
-open class MethodWithTypePRefClassP<erased P>() : java.lang.Object() {
-    fun <erased Q : P> f() = #()
+open class MethodWithTypePRefClassP<P>() : java.lang.Object() {
+    fun <Q : P> f() = #()
 }
diff --git a/compiler/testData/readJavaBinaryClass/MethosWithPRefTP.kt b/compiler/testData/readJavaBinaryClass/MethosWithPRefTP.kt
index 187918005a8..903134692e1 100644
--- a/compiler/testData/readJavaBinaryClass/MethosWithPRefTP.kt
+++ b/compiler/testData/readJavaBinaryClass/MethosWithPRefTP.kt
@@ -1,5 +1,5 @@
 package test
 
 final class MethosWithPRefTP() : java.lang.Object() {
-    fun <erased P> f(p0: P?) = #()
+    fun <P> f(p0: P?) = #()
 }
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.kt b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.kt
index 3e8a9cc13d3..49ed1c04f04 100644
--- a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.kt
+++ b/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.kt
@@ -2,7 +2,7 @@ package test
 
 import java.util.ArrayList
 
-open class JavaBeanVarOfGenericType<erased P>() : java.lang.Object() {
+open class JavaBeanVarOfGenericType<P>() : java.lang.Object() {
     open fun getCharacters(): ArrayList<P>? = null
     open fun setCharacters(p0: ArrayList<P>?) { }
     //var characters: ArrayList<P>? = null
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassInParam.txt b/compiler/testData/readKotlinBinaryClass/class/ClassInParam.txt
index 10627790a4c..e6b90f47024 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassInParam.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassInParam.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.Wine</*0,r*/ in T : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ in T : jet.Any?><init>(): test.Wine<T>
+final class test.Wine</*0*/ in T : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ in T : jet.Any?><init>(): test.Wine<T>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassOutParam.txt b/compiler/testData/readKotlinBinaryClass/class/ClassOutParam.txt
index 9e3b37fb7b0..33cd57d3606 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassOutParam.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassOutParam.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.Juice</*0,r*/ in T : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ in T : jet.Any?><init>(): test.Juice<T>
+final class test.Juice</*0*/ in T : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ in T : jet.Any?><init>(): test.Juice<T>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParam.txt b/compiler/testData/readKotlinBinaryClass/class/ClassParam.txt
index 74070a4dcc3..fad9d240eb7 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassParam.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParam.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.Beer</*0,r*/ T : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ T : jet.Any?><init>(): test.Beer<T>
+final class test.Beer</*0*/ T : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.Beer<T>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam.txt b/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam.txt
index a1eaafe670f..5b2c5a5739d 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.ClassParamReferencesParam</*0,r*/ A : jet.Any?, /*1,r*/ B : A> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ A : jet.Any?, /*1,r*/ B : A><init>(): test.ClassParamReferencesParam<A, B>
+final class test.ClassParamReferencesParam</*0*/ A : jet.Any?, /*1*/ B : A> : jet.Any {
+    final /*constructor*/ fun </*0*/ A : jet.Any?, /*1*/ B : A><init>(): test.ClassParamReferencesParam<A, B>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam2.txt b/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam2.txt
index 36d215de552..c03bf1612a8 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam2.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam2.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.ClassParamReferencesParam</*0,r*/ A : jet.Any?, /*1,r*/ in B : A> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ A : jet.Any?, /*1,r*/ in B : A><init>(): test.ClassParamReferencesParam<A, B>
+final class test.ClassParamReferencesParam</*0*/ A : jet.Any?, /*1*/ in B : A> : jet.Any {
+    final /*constructor*/ fun </*0*/ A : jet.Any?, /*1*/ in B : A><init>(): test.ClassParamReferencesParam<A, B>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesSelf.txt b/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesSelf.txt
index 970840a57c1..0341bc2d14d 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesSelf.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesSelf.txt
@@ -1,7 +1,7 @@
 namespace test
 
-final class test.ClassParamReferencesSelf</*0,r*/ A : test.TraitWithP<A>> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ A : test.TraitWithP<A>><init>(): test.ClassParamReferencesSelf<A>
+final class test.ClassParamReferencesSelf</*0*/ A : test.TraitWithP<A>> : jet.Any {
+    final /*constructor*/ fun </*0*/ A : test.TraitWithP<A>><init>(): test.ClassParamReferencesSelf<A>
 }
-abstract trait test.TraitWithP</*0,r*/ P : jet.Any?> : jet.Any {
+abstract trait test.TraitWithP</*0*/ P : jet.Any?> : jet.Any {
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassBound.txt b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassBound.txt
index 2d510acbce4..823c4625a52 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassBound.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassBound.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.Clock</*0,r*/ A : java.lang.Number> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ A : java.lang.Number><init>(): test.Clock<A>
+final class test.Clock</*0*/ A : java.lang.Number> : jet.Any {
+    final /*constructor*/ fun </*0*/ A : java.lang.Number><init>(): test.Clock<A>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassInterfaceBound.txt b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassInterfaceBound.txt
index d5303d9f25e..8f912e55096 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassInterfaceBound.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassInterfaceBound.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.Clock</*0,r*/ A : java.io.Serializable & java.lang.Number> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ A : java.io.Serializable & java.lang.Number><init>(): test.Clock<A>
+final class test.Clock</*0*/ A : java.io.Serializable & java.lang.Number> : jet.Any {
+    final /*constructor*/ fun </*0*/ A : java.io.Serializable & java.lang.Number><init>(): test.Clock<A>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceBound.txt b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceBound.txt
index 5bec0b29a21..28b9ee31096 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceBound.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceBound.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.Clock</*0,r*/ A : java.io.Serializable> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ A : java.io.Serializable><init>(): test.Clock<A>
+final class test.Clock</*0*/ A : java.io.Serializable> : jet.Any {
+    final /*constructor*/ fun </*0*/ A : java.io.Serializable><init>(): test.Clock<A>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceClassBound.txt b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceClassBound.txt
index d5303d9f25e..8f912e55096 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceClassBound.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceClassBound.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.Clock</*0,r*/ A : java.io.Serializable & java.lang.Number> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ A : java.io.Serializable & java.lang.Number><init>(): test.Clock<A>
+final class test.Clock</*0*/ A : java.io.Serializable & java.lang.Number> : jet.Any {
+    final /*constructor*/ fun </*0*/ A : java.io.Serializable & java.lang.Number><init>(): test.Clock<A>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams.txt b/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams.txt
index 20cca2bc513..703352d6f10 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.ClassTwoParams</*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?><init>(): test.ClassTwoParams<P, Q>
+final class test.ClassTwoParams</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(): test.ClassTwoParams<P, Q>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams2.txt b/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams2.txt
index 31025206da0..768ac304ecc 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams2.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams2.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.ClassTwoParams</*0,r*/ out P : jet.Any?, /*1,r*/ Q : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ out P : jet.Any?, /*1,r*/ Q : jet.Any?><init>(): test.ClassTwoParams<P, Q>
+final class test.ClassTwoParams</*0*/ out P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ out P : jet.Any?, /*1*/ Q : jet.Any?><init>(): test.ClassTwoParams<P, Q>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/class/InheritClassWithParam.txt b/compiler/testData/readKotlinBinaryClass/class/InheritClassWithParam.txt
index a3f5859557f..49ef7be6755 100644
--- a/compiler/testData/readKotlinBinaryClass/class/InheritClassWithParam.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/InheritClassWithParam.txt
@@ -1,7 +1,7 @@
 namespace test
 
-abstract class test.Aaa</*0,r*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?><init>(): test.Aaa<P>
+abstract class test.Aaa</*0*/ P : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.Aaa<P>
 }
 final class test.Bbb : test.Aaa<java.util.Random> {
     final /*constructor*/ fun <init>(): test.Bbb
diff --git a/compiler/testData/readKotlinBinaryClass/class/InheritTraitWithParam.txt b/compiler/testData/readKotlinBinaryClass/class/InheritTraitWithParam.txt
index 9a9c58882c7..75482d35622 100644
--- a/compiler/testData/readKotlinBinaryClass/class/InheritTraitWithParam.txt
+++ b/compiler/testData/readKotlinBinaryClass/class/InheritTraitWithParam.txt
@@ -1,6 +1,6 @@
 namespace test
 
-abstract trait test.Aaa</*0,r*/ P : jet.Any?> : jet.Any {
+abstract trait test.Aaa</*0*/ P : jet.Any?> : jet.Any {
 }
 final class test.Bbb : test.Aaa<java.util.Random> {
     final /*constructor*/ fun <init>(): test.Bbb
diff --git a/compiler/testData/readKotlinBinaryClass/classFun/ClassInParamUsedInFun.txt b/compiler/testData/readKotlinBinaryClass/classFun/ClassInParamUsedInFun.txt
index e50215a6338..f0fb0bace37 100644
--- a/compiler/testData/readKotlinBinaryClass/classFun/ClassInParamUsedInFun.txt
+++ b/compiler/testData/readKotlinBinaryClass/classFun/ClassInParamUsedInFun.txt
@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ClassParamUsedInFun</*0,r*/ in T : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ in T : jet.Any?><init>(): test.ClassParamUsedInFun<T>
+final class test.ClassParamUsedInFun</*0*/ in T : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ in T : jet.Any?><init>(): test.ClassParamUsedInFun<T>
     final fun f(/*0*/ t: T): jet.Int
 }
diff --git a/compiler/testData/readKotlinBinaryClass/classFun/ClassParamUsedInFun.txt b/compiler/testData/readKotlinBinaryClass/classFun/ClassParamUsedInFun.txt
index e2d3f4eb7f7..cff20f35b58 100644
--- a/compiler/testData/readKotlinBinaryClass/classFun/ClassParamUsedInFun.txt
+++ b/compiler/testData/readKotlinBinaryClass/classFun/ClassParamUsedInFun.txt
@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ClassParamUsedInFun</*0,r*/ T : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ T : jet.Any?><init>(): test.ClassParamUsedInFun<T>
+final class test.ClassParamUsedInFun</*0*/ T : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.ClassParamUsedInFun<T>
     final fun f(/*0*/ t: T): jet.Int
 }
diff --git a/compiler/testData/readKotlinBinaryClass/classFun/FunInParamSuper.txt b/compiler/testData/readKotlinBinaryClass/classFun/FunInParamSuper.txt
index 5ae2b100411..50d7dc79c8f 100644
--- a/compiler/testData/readKotlinBinaryClass/classFun/FunInParamSuper.txt
+++ b/compiler/testData/readKotlinBinaryClass/classFun/FunInParamSuper.txt
@@ -1,7 +1,7 @@
 namespace test
 
-open class test.Base</*0,r*/ T : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ T : jet.Any?><init>(): test.Base<T>
+open class test.Base</*0*/ T : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.Base<T>
     final fun foo(): T
 }
 final class test.Inh : test.Base<jet.String> {
diff --git a/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectExtendsTraitWithTP.txt b/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectExtendsTraitWithTP.txt
index c4a9b1bffd2..d9387b9b112 100644
--- a/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectExtendsTraitWithTP.txt
+++ b/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectExtendsTraitWithTP.txt
@@ -1,6 +1,6 @@
 namespace test
 
-abstract trait test.Bbb</*0,r*/ P : jet.Any?> : jet.Any {
+abstract trait test.Bbb</*0*/ P : jet.Any?> : jet.Any {
 }
 final class test.ClassObjectExtendsTraitWithTP : jet.Any {
     final /*constructor*/ fun <init>(): test.ClassObjectExtendsTraitWithTP
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParameters.txt b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParameters.txt
index ae6ca429b09..4fcd2c361c6 100644
--- a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParameters.txt
+++ b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParameters.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.ClassWithConstructorAndTypeParameter</*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?><init>(): test.ClassWithConstructorAndTypeParameter<P, Q>
+final class test.ClassWithConstructorAndTypeParameter</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(): test.ClassWithConstructorAndTypeParameter<P, Q>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt
index 07cf90c07c7..ee30c5099ae 100644
--- a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt
+++ b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.ClassWithConstructorAndTypeParameter</*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?><init>(/*0*/ q: jet.Int): test.ClassWithConstructorAndTypeParameter<P, Q>
+final class test.ClassWithConstructorAndTypeParameter</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(/*0*/ q: jet.Int): test.ClassWithConstructorAndTypeParameter<P, Q>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt
index 4465d8b18fa..03715bc4e99 100644
--- a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt
+++ b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.ClassWithConstructorAndTypeParameter</*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?><init>(/*0*/ q: Q): test.ClassWithConstructorAndTypeParameter<P, Q>
+final class test.ClassWithConstructorAndTypeParameter</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(/*0*/ q: Q): test.ClassWithConstructorAndTypeParameter<P, Q>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParameter.txt b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParameter.txt
index 9d28aaae785..25b3ae7a0b5 100644
--- a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParameter.txt
+++ b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParameter.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.ClassWithConstructorAndTypeParameter</*0,r*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?><init>(): test.ClassWithConstructorAndTypeParameter<P>
+final class test.ClassWithConstructorAndTypeParameter</*0*/ P : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ClassWithConstructorAndTypeParameter<P>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.kt b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.kt
index 67e920489b6..193d19e30ef 100644
--- a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.kt
+++ b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.kt
@@ -1,3 +1,3 @@
 package test
 
-class OneTypeParameterErased<P, erased Q>(q: Q)
+class OneTypeParameterErased<P, Q>(q: Q)
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt
index cb08f2cd59b..d2e41078f2d 100644
--- a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt
+++ b/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt
@@ -1,5 +1,5 @@
 namespace test
 
-final class test.OneTypeParameterErased</*0,r*/ P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(/*0*/ q: Q): test.OneTypeParameterErased<P, Q>
+final class test.OneTypeParameterErased</*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?><init>(/*0*/ q: Q): test.OneTypeParameterErased<P, Q>
 }
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunGenericParam.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunGenericParam.txt
index 28d8d3fbcb8..28e3b2af629 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunGenericParam.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunGenericParam.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0,r*/ T : jet.Any?>f(): jet.Int
+final fun </*0*/ T : jet.Any?>f(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunInParam.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunInParam.txt
index 064541d3ed7..e216cd7c078 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunInParam.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunInParam.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0,r*/ in T : jet.Any?>f(): jet.Int
+final fun </*0*/ in T : jet.Any?>f(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunOutParam.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunOutParam.txt
index 02e1cdaef8a..c9cadf02a74 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunOutParam.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunOutParam.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0,r*/ out T : jet.Any?>f(): jet.Int
+final fun </*0*/ out T : jet.Any?>f(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParam.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParam.txt
index 57455bd84ae..20b314054f4 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParam.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParam.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0,r*/ P : jet.Any?>funParamParam(/*0*/ a: jet.Int, /*1*/ b: P): jet.Int
+final fun </*0*/ P : jet.Any?>funParamParam(/*0*/ a: jet.Int, /*1*/ b: P): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParamErased.kt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParamErased.kt
index fe10f80b20c..a696c85f92c 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParamErased.kt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParamErased.kt
@@ -1,3 +1,3 @@
 package test
 
-fun <erased P> funParamParam(a: Int, b: P) = 1
+fun <P> funParamParam(a: Int, b: P) = 1
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam.txt
index 5503cb1f6ac..4528babe000 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0,r*/ P : jet.Any?, /*1,r*/ Q : P>funParamReferencesParam(): jet.Int
+final fun </*0*/ P : jet.Any?, /*1*/ Q : P>funParamReferencesParam(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam2.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam2.txt
index 8c222f71a29..e1976eec789 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam2.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam2.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0,r*/ in P : jet.Any?, /*1,r*/ Q : P>funParamReferencesParam(): jet.Int
+final fun </*0*/ in P : jet.Any?, /*1*/ Q : P>funParamReferencesParam(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt
index fb3fc4697df..18a25f21997 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt
@@ -4,4 +4,4 @@ abstract trait test.Bar : jet.Any {
 }
 abstract trait test.Foo : jet.Any {
 }
-final fun </*0,r*/ T : test.Bar & test.Foo>foo(): jet.Tuple0
+final fun </*0*/ T : test.Bar & test.Foo>foo(): jet.Tuple0
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassBound.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassBound.txt
index 0b94a70881c..35aacfd371b 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassBound.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassBound.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0,r*/ A : java.lang.Number>uno(): jet.Int
+final fun </*0*/ A : java.lang.Number>uno(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt
index 49cd19332e0..42c040ae7bc 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0,r*/ A : java.io.Serializable & java.lang.Number>tres(): jet.Int
+final fun </*0*/ A : java.io.Serializable & java.lang.Number>tres(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt
index d744a1c098c..0048367b908 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0,r*/ A : java.io.Serializable>dos(): jet.Int
+final fun </*0*/ A : java.io.Serializable>dos(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.txt
index 13b23e030a4..5a5346c4082 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0,r*/ A : java.io.Serializable & java.lang.Number>cuatro(): jet.Int
+final fun </*0*/ A : java.io.Serializable & java.lang.Number>cuatro(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamVaragParam.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamVaragParam.txt
index 5c78758960e..9eec690e2fc 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamVaragParam.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamVaragParam.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0,r*/ P : jet.Any?>funParamVarargParam(/*0*/ a: jet.Int, /*1*/ vararg b: P /*jet.Array<P>*/): jet.Int
+final fun </*0*/ P : jet.Any?>funParamVarargParam(/*0*/ a: jet.Int, /*1*/ vararg b: P /*jet.Array<P>*/): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams.txt
index e06f5f48e62..6ebac903e39 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?>funTwoTypeParams(): jet.Int
+final fun </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?>funTwoTypeParams(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams2.txt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams2.txt
index 2183232bb5c..464e9502aa4 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams2.txt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams2.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final fun </*0,r*/ P : jet.Any?, /*1,r*/ in Q : jet.Any?>funTwoTypeParams(): jet.Int
+final fun </*0*/ P : jet.Any?, /*1*/ in Q : jet.Any?>funTwoTypeParams(): jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtValClass.txt
index 54d4bc45468..552ccb57732 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtValClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtValClass.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final val  </*0,r*/ P : jet.Any?> P.anotherJavaClass: java.lang.Class<P>
+final val  </*0*/ P : jet.Any?> P.anotherJavaClass: java.lang.Class<P>
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTInClass.txt
index 302bcb6e5e4..03038b2a6ab 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTInClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTInClass.txt
@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ExtValInClass</*0,r*/ T : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ T : jet.Any?><init>(): test.ExtValInClass<T>
+final class test.ExtValInClass</*0*/ T : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.ExtValInClass<T>
     final val jet.Int.asas: T
 }
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTQInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTQInClass.txt
index c5dee1e351f..a92f1404550 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTQInClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTQInClass.txt
@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ExtValInClass</*0,r*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?><init>(): test.ExtValInClass<P>
+final class test.ExtValInClass</*0*/ P : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValInClass<P>
     final val jet.Int.asas: P?
 }
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValTIntInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtValTIntInClass.txt
index 9f9c0b26840..a375126ce7b 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtValTIntInClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtValTIntInClass.txt
@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ExtValPIntInClass</*0,r*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?><init>(): test.ExtValPIntInClass<P>
+final class test.ExtValPIntInClass</*0*/ P : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValPIntInClass<P>
     final val P.asas: jet.Int
 }
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarClass.txt
index c405827637a..a4092845e49 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtVarClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtVarClass.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final var  </*0,r*/ P : jet.Any?> P.anotherJavaClass: java.lang.Class<P>
+final var  </*0*/ P : jet.Any?> P.anotherJavaClass: java.lang.Class<P>
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTInClass.txt
index 1f251498a10..d19ade078af 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTInClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTInClass.txt
@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ExtValInClass</*0,r*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?><init>(): test.ExtValInClass<P>
+final class test.ExtValInClass</*0*/ P : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValInClass<P>
     final var jet.Int.asas: P
 }
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTQInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTQInClass.txt
index 359026c08f5..c298102461b 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTQInClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTQInClass.txt
@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ExtValInClass</*0,r*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?><init>(): test.ExtValInClass<P>
+final class test.ExtValInClass</*0*/ P : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValInClass<P>
     final var jet.Int.asas: P?
 }
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarMapPQInt.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarMapPQInt.txt
index 268fcb85b5a..90403d1fa37 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtVarMapPQInt.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtVarMapPQInt.txt
@@ -1,3 +1,3 @@
 namespace test
 
-final var  </*0,r*/ P : jet.Any?, /*1,r*/ Q : jet.Any?> java.util.Map<P, Q>.asas: jet.Int
+final var  </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> java.util.Map<P, Q>.asas: jet.Int
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarTIntInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarTIntInClass.txt
index 1755a95d6cb..2cf2fc92f92 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtVarTIntInClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtVarTIntInClass.txt
@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ExtValPIntInClass</*0,r*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?><init>(): test.ExtValPIntInClass<P>
+final class test.ExtValPIntInClass</*0*/ P : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValPIntInClass<P>
     final var P.asas: jet.Int
 }
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarTQIntInClass.txt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarTQIntInClass.txt
index 5c724414ea0..81d318a0a8e 100644
--- a/compiler/testData/readKotlinBinaryClass/prop/ExtVarTQIntInClass.txt
+++ b/compiler/testData/readKotlinBinaryClass/prop/ExtVarTQIntInClass.txt
@@ -1,6 +1,6 @@
 namespace test
 
-final class test.ExtValPIntInClass</*0,r*/ P : jet.Any?> : jet.Any {
-    final /*constructor*/ fun </*0,r*/ P : jet.Any?><init>(): test.ExtValPIntInClass<P>
+final class test.ExtValPIntInClass</*0*/ P : jet.Any?> : jet.Any {
+    final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValPIntInClass<P>
     final var P?.asas: jet.Int
 }
diff --git a/compiler/testData/writeSignature/VarargGeneric.kt b/compiler/testData/writeSignature/VarargGeneric.kt
index 0b3d69ae22c..91385ae11e9 100644
--- a/compiler/testData/writeSignature/VarargGeneric.kt
+++ b/compiler/testData/writeSignature/VarargGeneric.kt
@@ -3,6 +3,6 @@ fun <P> foo(vararg tail: P) = 1
 // method: namespace::foo
 // jvm signature:     ([Ljava/lang/Object;)I
 // generic signature: <P:Ljava/lang/Object;>([TP;)I
-// kotlin signature:  <P:?Ljava/lang/Object;>([TP;)I
+// kotlin signature:  <erased P:?Ljava/lang/Object;>([TP;)I
 // TODO: skip kotlin signature
 // TODO: properly serialize typeinfo
diff --git a/jdk-headers/src/java/lang/Iterable.kt b/jdk-headers/src/java/lang/Iterable.kt
index cd19f19e5d3..31fd05650cb 100644
--- a/jdk-headers/src/java/lang/Iterable.kt
+++ b/jdk-headers/src/java/lang/Iterable.kt
@@ -1,5 +1,5 @@
 package java.lang
 
-public trait Iterable<erased T> {
+public trait Iterable<T> {
     fun iterator() : java.util.Iterator<T>
 }
\ No newline at end of file
diff --git a/jdk-headers/src/java/util/AbstractCollection.kt b/jdk-headers/src/java/util/AbstractCollection.kt
index fdfe933496d..122b83aa99f 100644
--- a/jdk-headers/src/java/util/AbstractCollection.kt
+++ b/jdk-headers/src/java/util/AbstractCollection.kt
@@ -1,11 +1,11 @@
 package java.util
-public abstract class AbstractCollection<erased E> protected () : java.lang.Object(), java.util.Collection<E> {
+public abstract class AbstractCollection<E> protected () : java.lang.Object(), java.util.Collection<E> {
     public abstract override fun iterator() : java.util.Iterator<E>
     public abstract override fun size() : Int
     public override fun isEmpty() : Boolean {}
     public override fun contains(o : Any?) : Boolean {}
     public override fun toArray() : Array<Any?> {}
-    public override fun toArray<erased T>(a : Array<out T>) : Array<T> {}
+    public override fun toArray<T>(a : Array<out T>) : Array<T> {}
     public override fun add(e : E) : Boolean {}
     public override fun remove(o : Any?) : Boolean {}
     public override fun containsAll(c : java.util.Collection<*>) : Boolean {}
diff --git a/jdk-headers/src/java/util/AbstractList.kt b/jdk-headers/src/java/util/AbstractList.kt
index 277f733c791..764fc0ccc91 100644
--- a/jdk-headers/src/java/util/AbstractList.kt
+++ b/jdk-headers/src/java/util/AbstractList.kt
@@ -1,5 +1,5 @@
 package java.util
-public abstract class AbstractList<erased E> protected () : java.util.AbstractCollection<E>(), java.util.List<E> {
+public abstract class AbstractList<E> protected () : java.util.AbstractCollection<E>(), java.util.List<E> {
     public override fun add(e : E) : Boolean {}
     public abstract override fun get(index : Int) : E
     public override fun set(index : Int, element : E) : E {}
diff --git a/jdk-headers/src/java/util/AbstractMap.kt b/jdk-headers/src/java/util/AbstractMap.kt
index ca06c1afa2b..12135c05a90 100644
--- a/jdk-headers/src/java/util/AbstractMap.kt
+++ b/jdk-headers/src/java/util/AbstractMap.kt
@@ -2,7 +2,7 @@ package java.util
 
 import java.util.Map.Entry
 
-public abstract class AbstractMap<erased K, erased V> protected () : java.lang.Object(), java.util.Map<K, V> {
+public abstract class AbstractMap<K, V> protected () : java.lang.Object(), java.util.Map<K, V> {
     public override fun size() : Int {}
     public override fun isEmpty() : Boolean {}
     public override fun containsValue(value : Any?) : Boolean {}
diff --git a/jdk-headers/src/java/util/AbstractSequentialList.kt b/jdk-headers/src/java/util/AbstractSequentialList.kt
index 9fa0afdb716..673433ef4a6 100644
--- a/jdk-headers/src/java/util/AbstractSequentialList.kt
+++ b/jdk-headers/src/java/util/AbstractSequentialList.kt
@@ -1,5 +1,5 @@
 package java.util
-public abstract class AbstractSequentialList<erased E> protected () : java.util.AbstractList<E>() {
+public abstract class AbstractSequentialList<E> protected () : java.util.AbstractList<E>() {
     public override fun get(index : Int) : E {}
     public override fun set(index : Int, element : E) : E {}
     public override fun add(index : Int, element : E) : Unit {}
diff --git a/jdk-headers/src/java/util/AbstractSet.kt b/jdk-headers/src/java/util/AbstractSet.kt
index 397fb5164da..30e6784b243 100644
--- a/jdk-headers/src/java/util/AbstractSet.kt
+++ b/jdk-headers/src/java/util/AbstractSet.kt
@@ -1,5 +1,5 @@
 package java.util
-public abstract class AbstractSet<erased E> protected () : java.util.AbstractCollection<E>(), java.util.Set<E> {
+public abstract class AbstractSet<E> protected () : java.util.AbstractCollection<E>(), java.util.Set<E> {
 //    public override fun equals(o : Any?) : Boolean
 //    public override fun hashCode() : Int
     public override fun removeAll(c : java.util.Collection<*>) : Boolean {}
diff --git a/jdk-headers/src/java/util/ArrayList.kt b/jdk-headers/src/java/util/ArrayList.kt
index 2df62623df8..c0e6b495407 100644
--- a/jdk-headers/src/java/util/ArrayList.kt
+++ b/jdk-headers/src/java/util/ArrayList.kt
@@ -1,5 +1,5 @@
 package java.util
-public open class ArrayList<erased E>(c : java.util.Collection<out E>) : java.util.AbstractList<E>(),
+public open class ArrayList<E>(c : java.util.Collection<out E>) : java.util.AbstractList<E>(),
                                                         java.util.List<E>,
                                                         java.util.RandomAccess,
                                                         java.lang.Cloneable,
@@ -15,7 +15,7 @@ public open class ArrayList<erased E>(c : java.util.Collection<out E>) : java.ut
     public override fun lastIndexOf(o : Any?) : Int {}
     public override fun clone() : java.lang.Object {}
     public override fun toArray() : Array<Any?> {}
-    public override fun toArray<erased T>(a : Array<out T>) : Array<T> {}
+    public override fun toArray<T>(a : Array<out T>) : Array<T> {}
     public override fun get(index : Int) : E {}
     public override fun set(index : Int, element : E) : E {}
     public override fun add(e : E) : Boolean {}
diff --git a/jdk-headers/src/java/util/Collection.kt b/jdk-headers/src/java/util/Collection.kt
index c852e48f1fd..596c41baaee 100644
--- a/jdk-headers/src/java/util/Collection.kt
+++ b/jdk-headers/src/java/util/Collection.kt
@@ -1,12 +1,12 @@
 package java.util
-public trait Collection<erased E> : java.lang.Iterable<E> {
+public trait Collection<E> : java.lang.Iterable<E> {
     open fun size() : Int
     open fun isEmpty() : Boolean
     open fun contains(o : Any?) : Boolean
     override fun iterator() : java.util.Iterator<E>
     open fun toArray() : Array<Any?>
     // a : Array<out T> to emulate Java's array covariance
-    open fun toArray<erased T>(a : Array<out T>) : Array<T>
+    open fun toArray<T>(a : Array<out T>) : Array<T>
     open fun add(e : E) : Boolean
     open fun remove(o : Any?) : Boolean
     open fun containsAll(c : java.util.Collection<*>) : Boolean
diff --git a/jdk-headers/src/java/util/Deque.kt b/jdk-headers/src/java/util/Deque.kt
index 105f8f66eb0..db283c19848 100644
--- a/jdk-headers/src/java/util/Deque.kt
+++ b/jdk-headers/src/java/util/Deque.kt
@@ -1,5 +1,5 @@
 package java.util
-public trait Deque<erased E> : java.util.Queue<E> {
+public trait Deque<E> : java.util.Queue<E> {
     open fun addFirst(e : E) : Unit
     open fun addLast(e : E) : Unit
     open fun offerFirst(e : E) : Boolean
diff --git a/jdk-headers/src/java/util/Enumeration.kt b/jdk-headers/src/java/util/Enumeration.kt
index 127a4b69ca9..ace7c2c1331 100644
--- a/jdk-headers/src/java/util/Enumeration.kt
+++ b/jdk-headers/src/java/util/Enumeration.kt
@@ -1,5 +1,5 @@
 package java.util
-public trait Enumeration<erased E> {
+public trait Enumeration<E> {
     open fun hasMoreElements() : Boolean
     open fun nextElement() : E
 }
\ No newline at end of file
diff --git a/jdk-headers/src/java/util/HashMap.kt b/jdk-headers/src/java/util/HashMap.kt
index 0a27a8a3649..ac60ccb3762 100644
--- a/jdk-headers/src/java/util/HashMap.kt
+++ b/jdk-headers/src/java/util/HashMap.kt
@@ -1,7 +1,7 @@
 package java.util
 import java.io.*
 import java.util.Map.Entry
-public open class HashMap<erased K, erased V>(m : java.util.Map<out K, out V>) : java.util.AbstractMap<K, V>(),
+public open class HashMap<K, V>(m : java.util.Map<out K, out V>) : java.util.AbstractMap<K, V>(),
                                                                                  java.util.Map<K, V>,
                                                                                  java.lang.Cloneable,
                                                                                  java.io.Serializable {
diff --git a/jdk-headers/src/java/util/HashSet.kt b/jdk-headers/src/java/util/HashSet.kt
index 4b1bdd7d8a5..bbdc9725d16 100644
--- a/jdk-headers/src/java/util/HashSet.kt
+++ b/jdk-headers/src/java/util/HashSet.kt
@@ -1,5 +1,5 @@
 package java.util
-public open class HashSet<erased E>(c : java.util.Collection<out E>) : java.util.AbstractSet<E>(),
+public open class HashSet<E>(c : java.util.Collection<out E>) : java.util.AbstractSet<E>(),
                                                                        java.util.Set<E>,
                                                                        java.lang.Cloneable,
                                                                        java.io.Serializable {
diff --git a/jdk-headers/src/java/util/Iterator.kt b/jdk-headers/src/java/util/Iterator.kt
index 935228ebd73..b40ba621fd4 100644
--- a/jdk-headers/src/java/util/Iterator.kt
+++ b/jdk-headers/src/java/util/Iterator.kt
@@ -1,6 +1,6 @@
 package java.util
 
-public trait Iterator<erased E> {
+public trait Iterator<E> {
     fun hasNext() : Boolean
     fun next() : E
     fun remove() : Unit
diff --git a/jdk-headers/src/java/util/LinkedHashMap.kt b/jdk-headers/src/java/util/LinkedHashMap.kt
index 06b7af131ef..1bdc7da4659 100644
--- a/jdk-headers/src/java/util/LinkedHashMap.kt
+++ b/jdk-headers/src/java/util/LinkedHashMap.kt
@@ -2,7 +2,7 @@ package java.util
 
 import java.util.Map.Entry
 
-public open class LinkedHashMap<erased K, erased V>(m : java.util.Map<out K, out V>) : java.util.HashMap<K, V>(), java.util.Map<K, V> {
+public open class LinkedHashMap<K, V>(m : java.util.Map<out K, out V>) : java.util.HashMap<K, V>(), java.util.Map<K, V> {
     public this(initialCapacity : Int, loadFactor : Float) {}
     public this(initialCapacity : Int) {}
     public this() {}
diff --git a/jdk-headers/src/java/util/LinkedHashSet.kt b/jdk-headers/src/java/util/LinkedHashSet.kt
index 51a1cca5bb1..b8cd618c82f 100644
--- a/jdk-headers/src/java/util/LinkedHashSet.kt
+++ b/jdk-headers/src/java/util/LinkedHashSet.kt
@@ -1,5 +1,5 @@
 package java.util
-public open class LinkedHashSet<erased E>(c : java.util.Collection<out E>) : java.util.HashSet<E>(c),
+public open class LinkedHashSet<E>(c : java.util.Collection<out E>) : java.util.HashSet<E>(c),
                                                                              java.util.Set<E>,
                                                                              java.lang.Cloneable,
                                                                              java.io.Serializable {
diff --git a/jdk-headers/src/java/util/LinkedList.kt b/jdk-headers/src/java/util/LinkedList.kt
index 583b0bf8ebf..95655163694 100644
--- a/jdk-headers/src/java/util/LinkedList.kt
+++ b/jdk-headers/src/java/util/LinkedList.kt
@@ -1,5 +1,5 @@
 package java.util
-public open class LinkedList<erased E>(c : java.util.Collection<out E>) : java.util.AbstractSequentialList<E>(),
+public open class LinkedList<E>(c : java.util.Collection<out E>) : java.util.AbstractSequentialList<E>(),
                                     java.util.List<E>,
                                     java.util.Deque<E>,
                                     java.lang.Cloneable,
@@ -44,7 +44,7 @@ public open class LinkedList<erased E>(c : java.util.Collection<out E>) : java.u
     public override fun descendingIterator() : java.util.Iterator<E> {}
     public override fun clone() : Any? {}
     public override fun toArray() : Array<Any?> {}
-    public override fun toArray<erased T>(a : Array<out T>) : Array<T> {}
+    public override fun toArray<T>(a : Array<out T>) : Array<T> {}
 //class object {
 //open public fun init<E>(c : java.util.Collection<out E?>?) : LinkedList<E> {
 //return __
diff --git a/jdk-headers/src/java/util/List.kt b/jdk-headers/src/java/util/List.kt
index 741ea472522..5c3cf6093f4 100644
--- a/jdk-headers/src/java/util/List.kt
+++ b/jdk-headers/src/java/util/List.kt
@@ -1,12 +1,12 @@
 package java.util
-public trait List<erased E> : java.util.Collection<E> {
+public trait List<E> : java.util.Collection<E> {
     override fun size() : Int
     override fun isEmpty() : Boolean
     override fun contains(o : Any?) : Boolean
     override fun iterator() : java.util.Iterator<E>
     override fun toArray() : Array<Any?>
     // Simulate Java's array covariance
-    override fun toArray<erased T>(a : Array<out T>) : Array<T>
+    override fun toArray<T>(a : Array<out T>) : Array<T>
     override fun add(e : E) : Boolean
     override fun remove(o : Any?) : Boolean
     override fun containsAll(c : java.util.Collection<*>) : Boolean
diff --git a/jdk-headers/src/java/util/Map.kt b/jdk-headers/src/java/util/Map.kt
index 13d7e09bcaa..a9d09d93321 100644
--- a/jdk-headers/src/java/util/Map.kt
+++ b/jdk-headers/src/java/util/Map.kt
@@ -1,6 +1,6 @@
 package java.util
 
-public trait Map<erased K, erased V> {
+public trait Map<K, V> {
     open fun size() : Int
     open fun isEmpty() : Boolean
     open fun containsKey(key : Any?) : Boolean
diff --git a/jdk-headers/src/java/util/Queue.kt b/jdk-headers/src/java/util/Queue.kt
index 0a4eb0ecbfb..36bf1af6372 100644
--- a/jdk-headers/src/java/util/Queue.kt
+++ b/jdk-headers/src/java/util/Queue.kt
@@ -1,5 +1,5 @@
 package java.util
-public trait Queue<erased E> : java.util.Collection<E> {
+public trait Queue<E> : java.util.Collection<E> {
     override fun add(e : E) : Boolean
     open fun offer(e : E) : Boolean
     open fun remove() : E
diff --git a/jdk-headers/src/java/util/Set.kt b/jdk-headers/src/java/util/Set.kt
index f1c70a6436d..890e4541e12 100644
--- a/jdk-headers/src/java/util/Set.kt
+++ b/jdk-headers/src/java/util/Set.kt
@@ -1,5 +1,5 @@
 package java.util
-public trait Set<erased E> : java.util.Collection<E> {
+public trait Set<E> : java.util.Collection<E> {
     override fun size() : Int
     override fun isEmpty() : Boolean
     override fun contains(o : Any?) : Boolean
@@ -7,7 +7,7 @@ public trait Set<erased E> : java.util.Collection<E> {
     override fun toArray() : Array<Any?>
 
     // Simulate Java's array covariance
-    override fun toArray<erased T>(a : Array<out T>) : Array<T>
+    override fun toArray<T>(a : Array<out T>) : Array<T>
     override fun add(e : E) : Boolean
     override fun remove(o : Any?) : Boolean
     override fun containsAll(c : java.util.Collection<*>) : Boolean
diff --git a/js/js.libraries/src/core/javautil.kt b/js/js.libraries/src/core/javautil.kt
index 0e00c6df9a9..a57259f64d9 100644
--- a/js/js.libraries/src/core/javautil.kt
+++ b/js/js.libraries/src/core/javautil.kt
@@ -29,7 +29,7 @@ val Collections = object {
 }
 
 library
-public open class ArrayList<erased E>() : java.util.List<E> {
+public open class ArrayList<E>() : java.util.List<E> {
     public override fun size() : Int = js.noImpl
     public override fun isEmpty() : Boolean = js.noImpl
     public override fun contains(o : Any?) : Boolean = js.noImpl
@@ -37,7 +37,7 @@ public open class ArrayList<erased E>() : java.util.List<E> {
    // public override fun indexOf(o : Any?) : Int = js.noImpl
   //  public override fun lastIndexOf(o : Any?) : Int = js.noImpl
   //  public override fun toArray() : Array<Any?> = js.noImpl
-  //  public override fun toArray<erased T>(a : Array<out T>) : Array<T> = js.noImpl
+  //  public override fun toArray<T>(a : Array<out T>) : Array<T> = js.noImpl
     public override fun get(index : Int) : E = js.noImpl
     public override fun set(index : Int, element : E) : E = js.noImpl
     public override fun add(e : E) : Boolean = js.noImpl
@@ -51,13 +51,13 @@ public open class ArrayList<erased E>() : java.util.List<E> {
 }
 
 library
-public trait Collection<erased E> : java.lang.Iterable<E> {
+public trait Collection<E> : java.lang.Iterable<E> {
     open fun size() : Int
     open fun isEmpty() : Boolean
     open fun contains(o : Any?) : Boolean
     override fun iterator() : java.util.Iterator<E>
    // open fun toArray() : Array<Any?>
-   // open fun toArray<erased T>(a : Array<out T>) : Array<T>
+   // open fun toArray<T>(a : Array<out T>) : Array<T>
     open fun add(e : E) : Boolean
     open fun remove(o : Any?) : Boolean
     //open fun containsAll(c : java.util.Collection<*>) : Boolean
@@ -68,18 +68,18 @@ public trait Collection<erased E> : java.lang.Iterable<E> {
 }
 
 library
-public abstract open class AbstractCollection<erased E>() : Collection<E> {
+public abstract open class AbstractCollection<E>() : Collection<E> {
 }
 
 library
-public abstract open class AbstractList<erased E>() : AbstractCollection<E>(), List<E> {
+public abstract open class AbstractList<E>() : AbstractCollection<E>(), List<E> {
     public override fun isEmpty() : Boolean = js.noImpl
     public override fun contains(o : Any?) : Boolean = js.noImpl
     public override fun iterator() : Iterator<E> = js.noImpl
    // public override fun indexOf(o : Any?) : Int = js.noImpl
   //  public override fun lastIndexOf(o : Any?) : Int = js.noImpl
   //  public override fun toArray() : Array<Any?> = js.noImpl
-  //  public override fun toArray<erased T>(a : Array<out T>) : Array<T> = js.noImpl
+  //  public override fun toArray<T>(a : Array<out T>) : Array<T> = js.noImpl
     public override fun set(index : Int, element : E) : E = js.noImpl
     public override fun add(e : E) : Boolean = js.noImpl
     public override fun add(index : Int, element : E) : Unit = js.noImpl
@@ -92,14 +92,14 @@ public abstract open class AbstractList<erased E>() : AbstractCollection<E>(), L
 }
 
 library
-public trait List<erased E> : Collection<E> {
+public trait List<E> : Collection<E> {
     override fun size() : Int
     override fun isEmpty() : Boolean
     override fun contains(o : Any?) : Boolean
     override fun iterator() : java.util.Iterator<E>
   //  override fun toArray() : Array<Any?>
     // Simulate Java's array covariance
- //   override fun toArray<erased T>(a : Array<out T>) : Array<T>
+ //   override fun toArray<T>(a : Array<out T>) : Array<T>
     override fun add(e : E) : Boolean
     override fun remove(o : Any?) : Boolean
   //  override fun containsAll(c : java.util.Collection<*>) : Boolean
@@ -117,13 +117,13 @@ public trait List<erased E> : Collection<E> {
 }
 
 library
-public trait Set<erased E> : Collection<E> {
+public trait Set<E> : Collection<E> {
     override fun size() : Int
     override fun isEmpty() : Boolean
     override fun contains(o : Any?) : Boolean
     override fun iterator() : java.util.Iterator<E>
   //  override fun toArray() : Array<Any?>
-  //  override fun toArray<erased T>(a : Array<out T>) : Array<T>
+  //  override fun toArray<T>(a : Array<out T>) : Array<T>
     override fun add(e : E) : Boolean
     override fun remove(o : Any?) : Boolean
     //override fun containsAll(c : java.util.Collection<*>) : Boolean
@@ -134,7 +134,7 @@ public trait Set<erased E> : Collection<E> {
 }
 
 library
-public open class HashSet<erased E>() : java.util.Set<E> {
+public open class HashSet<E>() : java.util.Set<E> {
     public override fun iterator() : java.util.Iterator<E> = js.noImpl
     public override fun size() : Int = js.noImpl
     public override fun isEmpty() : Boolean = js.noImpl
@@ -146,7 +146,7 @@ public open class HashSet<erased E>() : java.util.Set<E> {
 }
 
 library
-public trait Map<erased K, erased V> {
+public trait Map<K, V> {
     open fun size() : Int
     open fun isEmpty() : Boolean
     open fun containsKey(key : Any?) : Boolean
@@ -161,7 +161,7 @@ public trait Map<erased K, erased V> {
 }
 
 library
-public open class HashMap<erased K, erased V>() : java.util.Map<K, V> {
+public open class HashMap<K, V>() : java.util.Map<K, V> {
     public override fun size() : Int = js.noImpl
     public override fun isEmpty() : Boolean = js.noImpl
     public override fun get(key : Any?) : V = js.noImpl
@@ -176,7 +176,7 @@ public open class HashMap<erased K, erased V>() : java.util.Map<K, V> {
 }
 
 library
-public open class LinkedList<erased E>() : List<E> {
+public open class LinkedList<E>() : List<E> {
     public override fun iterator() : java.util.Iterator<E> = js.noImpl
     public override fun isEmpty() : Boolean = js.noImpl
     public override fun contains(o : Any?) : Boolean = js.noImpl
diff --git a/libraries/stdlib/src/kotlin/Standard.kt b/libraries/stdlib/src/kotlin/Standard.kt
index 30ae28c12e0..d2f1613ecf1 100644
--- a/libraries/stdlib/src/kotlin/Standard.kt
+++ b/libraries/stdlib/src/kotlin/Standard.kt
@@ -24,7 +24,7 @@ public inline fun <T> java.util.Iterator<T>.iterator() : java.util.Iterator<T> =
 /**
 Helper to make java.util.Enumeration usable in for
 */
-public fun <erased T> java.util.Enumeration<T>.iterator(): Iterator<T> = object: Iterator<T> {
+public fun <T> java.util.Enumeration<T>.iterator(): Iterator<T> = object: Iterator<T> {
     override val hasNext: Boolean
     get() = hasMoreElements()
 
diff --git a/libraries/stdlib/src/kotlin/concurrent/Locks.kt b/libraries/stdlib/src/kotlin/concurrent/Locks.kt
index dbfc0789060..4f57d3ec09d 100644
--- a/libraries/stdlib/src/kotlin/concurrent/Locks.kt
+++ b/libraries/stdlib/src/kotlin/concurrent/Locks.kt
@@ -9,7 +9,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock
 Executes given calculation under lock
 Returns result of the calculation
 */
-public inline fun <erased T> Lock.withLock(action: ()->T) : T {
+public inline fun <T> Lock.withLock(action: ()->T) : T {
     lock()
     try {
         return action()
@@ -23,7 +23,7 @@ public inline fun <erased T> Lock.withLock(action: ()->T) : T {
 Executes given calculation under read lock
 Returns result of the calculation
 */
-public inline fun <erased T> ReentrantReadWriteLock.read(action: ()->T) : T {
+public inline fun <T> ReentrantReadWriteLock.read(action: ()->T) : T {
     val rl = readLock().sure()
     rl.lock()
     try {
@@ -40,7 +40,7 @@ The method does upgrade from read to write lock if needed
 If such write has been initiated by checking some condition, the condition must be rechecked inside the action to avoid possible races
 Returns result of the calculation
 */
-public inline fun <erased T> ReentrantReadWriteLock.write(action: ()->T) : T {
+public inline fun <T> ReentrantReadWriteLock.write(action: ()->T) : T {
     val rl = readLock().sure()
 
     val readCount = if (getWriteHoldCount() == 0) getReadHoldCount() else 0