diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueDefault.kt b/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueDefault.kt
index 6447d401420..91e6ab264ee 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueDefault.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueDefault.kt
@@ -5,22 +5,22 @@
 
 
 fun box(): String {
-    val value1 = javaClass<MyClass1>().getAnnotation(javaClass<JavaAnn>()).value
-    if (value1.size() != 2) return "fail1: ${value1.size()}"
+    val value1 = MyClass1::class.java.getAnnotation(JavaAnn::class.java).value
+    if (value1.size != 2) return "fail1: ${value1.size}"
     if (value1[0] != "d1") return "fail2: ${value1[0]}"
     if (value1[1] != "d2") return "fail3: ${value1[1]}"
 
-    val value2 = javaClass<MyClass2>().getAnnotation(javaClass<JavaAnn>()).value
-    if (value2.size() != 2) return "fail4: ${value2.size()}"
+    val value2 = MyClass2::class.java.getAnnotation(JavaAnn::class.java).value
+    if (value2.size != 2) return "fail4: ${value2.size}"
     if (value2[0] != "d1") return "fail5: ${value2[0]}"
     if (value2[1] != "d2") return "fail6: ${value2[1]}"
 
-    val value3 = javaClass<MyClass3>().getAnnotation(javaClass<JavaAnn>()).value
-    if (value3.size() != 1) return "fail7: ${value3.size()}"
+    val value3 = MyClass3::class.java.getAnnotation(JavaAnn::class.java).value
+    if (value3.size != 1) return "fail7: ${value3.size}"
     if (value3[0] != "asd") return "fail8: ${value3[0]}"
 
-    val value4 = javaClass<MyClass4>().getAnnotation(javaClass<JavaAnn>()).value
-    if (value4.size() != 0) return "fail 9: ${value4.size()}"
+    val value4 = MyClass4::class.java.getAnnotation(JavaAnn::class.java).value
+    if (value4.size != 0) return "fail 9: ${value4.size}"
 
     return "OK"
 }
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueNoDefault.kt b/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueNoDefault.kt
index 7e68cc3fcd0..b18ecef55cf 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueNoDefault.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueNoDefault.kt
@@ -5,18 +5,18 @@
 
 
 fun box(): String {
-    val value1 = javaClass<MyClass1>().getAnnotation(javaClass<JavaAnn>()).value
-    if (value1.size() != 0) return "fail1: ${value1.size()}"
+    val value1 = MyClass1::class.java.getAnnotation(JavaAnn::class.java).value
+    if (value1.size != 0) return "fail1: ${value1.size}"
 
-    val value2 = javaClass<MyClass2>().getAnnotation(javaClass<JavaAnn>()).value
-    if (value2.size() != 0) return "fail2: ${value2.size()}"
+    val value2 = MyClass2::class.java.getAnnotation(JavaAnn::class.java).value
+    if (value2.size != 0) return "fail2: ${value2.size}"
 
-    val value3 = javaClass<MyClass3>().getAnnotation(javaClass<JavaAnn>()).value
-    if (value3.size() != 1) return "fail3: ${value3.size()}"
+    val value3 = MyClass3::class.java.getAnnotation(JavaAnn::class.java).value
+    if (value3.size != 1) return "fail3: ${value3.size}"
     if (value3[0] != "asd") return "fail4: ${value3[0]}"
 
-    val value4 = javaClass<MyClass4>().getAnnotation(javaClass<JavaAnn>()).value
-    if (value4.size() != 0) return "fail 5: ${value4.size()}"
+    val value4 = MyClass4::class.java.getAnnotation(JavaAnn::class.java).value
+    if (value4.size != 0) return "fail 5: ${value4.size}"
 
     return "OK"
 }
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationCall.kt b/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationCall.kt
index 63472a38667..381d1f183d4 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationCall.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationCall.kt
@@ -1,7 +1,7 @@
 @JavaAnn("value") class MyClass
 
 fun box(): String {
-    val ann = javaClass<MyClass>().getAnnotation(javaClass<JavaAnn>())
+    val ann = MyClass::class.java.getAnnotation(JavaAnn::class.java)
     if (ann == null) return "fail: cannot find Ann on MyClass}"
     if (ann.value != "value") return "fail: annotation parameter i should be 'value', but was ${ann.value}"
     return "OK"
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationDefault.kt b/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationDefault.kt
index 7c026047af8..9acace8116e 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationDefault.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationDefault.kt
@@ -2,11 +2,11 @@
 @JavaAnn2 class MyClass2
 
 fun box(): String {
-    val ann = javaClass<MyClass>().getAnnotation(javaClass<JavaAnn>())
+    val ann = MyClass::class.java.getAnnotation(JavaAnn::class.java)
     if (ann == null) return "fail: cannot find Ann on MyClass}"
     if (ann.value != "default") return "fail: annotation parameter i should be 'default', but was ${ann.value}"
 
-    val ann2 = javaClass<MyClass2>().getAnnotation(javaClass<JavaAnn2>())
+    val ann2 = MyClass2::class.java.getAnnotation(JavaAnn2::class.java)
     if (ann2 == null) return "fail: cannot find Ann on MyClass}"
     if (ann2.a != 1) return "fail for a: expected = 1, but was ${ann2.a}"
     if (ann2.b != 1.toByte()) return "fail for b: expected = 1, but was ${ann2.b}"
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/javaNegativePropertyAsAnnotationParameter.kt b/compiler/testData/codegen/boxAgainstJava/annotations/javaNegativePropertyAsAnnotationParameter.kt
index 3ae2f27f707..84efda39e34 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/javaNegativePropertyAsAnnotationParameter.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/javaNegativePropertyAsAnnotationParameter.kt
@@ -1,7 +1,7 @@
 @Ann(Foo.i, Foo.s, Foo.f, Foo.d, Foo.l, Foo.b) class MyClass
 
 fun box(): String {
-    val ann = javaClass<MyClass>().getAnnotation(javaClass<Ann>())
+    val ann = MyClass::class.java.getAnnotation(Ann::class.java)
     if (ann == null) return "fail: cannot find Ann on MyClass}"
     if (ann.i != -2) return "fail: annotation parameter i should be -2, but was ${ann.i}"
     if (ann.s != (-2).toShort()) return "fail: annotation parameter i should be -2, but was ${ann.i}"
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyAsAnnotationParameter.kt b/compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyAsAnnotationParameter.kt
index 37c86b356df..a9b69dda960 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyAsAnnotationParameter.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyAsAnnotationParameter.kt
@@ -1,7 +1,7 @@
 @Ann(Foo.i, Foo.s, Foo.f, Foo.d, Foo.l, Foo.b, Foo.bool, Foo.c, Foo.str, Foo.charAsInt, Foo.intAsChar) class MyClass
 
 fun box(): String {
-    val ann = javaClass<MyClass>().getAnnotation(javaClass<Ann>())
+    val ann = MyClass::class.java.getAnnotation(Ann::class.java)
     if (ann == null) return "fail: cannot find Ann on MyClass}"
     if (ann.i != 2) return "fail: annotation parameter i should be 2, but was ${ann.i}"
     if (ann.s != 2.toShort()) return "fail: annotation parameter i should be 2, but was ${ann.i}"
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyWithIntInitializer.kt b/compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyWithIntInitializer.kt
index 0b114ae6103..d94d7685b0d 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyWithIntInitializer.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyWithIntInitializer.kt
@@ -1,7 +1,7 @@
 @Ann(Foo.i, Foo.s, Foo.f, Foo.d, Foo.l, Foo.b, Foo.c) class MyClass
 
 fun box(): String {
-    val ann = javaClass<MyClass>().getAnnotation(javaClass<Ann>())
+    val ann = MyClass::class.java.getAnnotation(Ann::class.java)
     if (ann == null) return "fail: cannot find Ann on MyClass}"
     if (ann.i != 2) return "fail: annotation parameter i should be 2, but was ${ann.i}"
     if (ann.s != 2.toShort()) return "fail: annotation parameter i should be 2, but was ${ann.i}"
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameter.kt b/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameter.kt
index aedd42491a5..3b0de8bcc2f 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameter.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameter.kt
@@ -4,7 +4,7 @@ class K
 @JavaAnn(args = arrayOf(O::class, K::class)) class MyClass
 
 fun box(): String {
-    val args = javaClass<MyClass>().getAnnotation(javaClass<JavaAnn>()).args
+    val args = MyClass::class.java.getAnnotation(JavaAnn::class.java).args
     val argName1 = args[0].simpleName ?: "fail 1"
     val argName2 = args[1].simpleName ?: "fail 2"
     return argName1 + argName2
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameterOnJavaClass.kt b/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameterOnJavaClass.kt
index 4c0e38a0d14..bca4d131c5f 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameterOnJavaClass.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameterOnJavaClass.kt
@@ -1,5 +1,5 @@
 fun box(): String {
-    val args = javaClass<MyJavaClass>().getAnnotation(javaClass<JavaAnn>()).args
+    val args = MyJavaClass::class.java.getAnnotation(JavaAnn::class.java).args
     val argName1 = args[0].simpleName ?: "fail 1"
     val argName2 = args[1].simpleName ?: "fail 2"
     return argName1 + argName2
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/classParameter.kt b/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/classParameter.kt
index 2cd6bb8ec93..43905e6143e 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/classParameter.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/classParameter.kt
@@ -4,7 +4,7 @@ class OK
 @JavaAnn(OK::class) class MyClass
 
 fun box(): String {
-    val ann = javaClass<MyClass>().getAnnotation(javaClass<JavaAnn>())
+    val ann = MyClass::class.java.getAnnotation(JavaAnn::class.java)
     if (ann == null) return "fail: cannot find JavaAnn on MyClass"
     return ann.value.simpleName!!
 }
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/classParameterOnJavaClass.kt b/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/classParameterOnJavaClass.kt
index 1b94d74e2a9..2536247b788 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/classParameterOnJavaClass.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/classParameterOnJavaClass.kt
@@ -1,6 +1,6 @@
 
 fun box(): String {
-    val ann = javaClass<MyJavaClass>().getAnnotation(javaClass<JavaAnn>())
+    val ann = MyJavaClass::class.java.getAnnotation(JavaAnn::class.java)
     if (ann == null) return "fail: cannot find JavaAnn on MyClass"
     return ann.value.simpleName!!
 }
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/varargClassParameter.kt b/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/varargClassParameter.kt
index 61e852628dc..ef9dbffbafd 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/varargClassParameter.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/varargClassParameter.kt
@@ -4,7 +4,7 @@ class K
 @JavaAnn(O::class, K::class) class MyClass
 
 fun box(): String {
-    val args = javaClass<MyClass>().getAnnotation(javaClass<JavaAnn>()).value
+    val args = MyClass::class.java.getAnnotation(JavaAnn::class.java).value
     val argName1 = args[0].simpleName ?: "fail 1"
     val argName2 = args[1].simpleName ?: "fail 2"
     return argName1 + argName2
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/varargClassParameterOnJavaClass.kt b/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/varargClassParameterOnJavaClass.kt
index 7bd24354004..011fc4edd61 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/varargClassParameterOnJavaClass.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/varargClassParameterOnJavaClass.kt
@@ -2,7 +2,7 @@ class O
 class K
 
 fun box(): String {
-    val args = javaClass<MyJavaClass>().getAnnotation(javaClass<JavaAnn>()).value
+    val args = MyJavaClass::class.java.getAnnotation(JavaAnn::class.java).value
     val argName1 = args[0].simpleName ?: "fail 1"
     val argName2 = args[1].simpleName ?: "fail 2"
     return argName1 + argName2
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationArrayValueDefault.kt b/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationArrayValueDefault.kt
index 6447d401420..91e6ab264ee 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationArrayValueDefault.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationArrayValueDefault.kt
@@ -5,22 +5,22 @@
 
 
 fun box(): String {
-    val value1 = javaClass<MyClass1>().getAnnotation(javaClass<JavaAnn>()).value
-    if (value1.size() != 2) return "fail1: ${value1.size()}"
+    val value1 = MyClass1::class.java.getAnnotation(JavaAnn::class.java).value
+    if (value1.size != 2) return "fail1: ${value1.size}"
     if (value1[0] != "d1") return "fail2: ${value1[0]}"
     if (value1[1] != "d2") return "fail3: ${value1[1]}"
 
-    val value2 = javaClass<MyClass2>().getAnnotation(javaClass<JavaAnn>()).value
-    if (value2.size() != 2) return "fail4: ${value2.size()}"
+    val value2 = MyClass2::class.java.getAnnotation(JavaAnn::class.java).value
+    if (value2.size != 2) return "fail4: ${value2.size}"
     if (value2[0] != "d1") return "fail5: ${value2[0]}"
     if (value2[1] != "d2") return "fail6: ${value2[1]}"
 
-    val value3 = javaClass<MyClass3>().getAnnotation(javaClass<JavaAnn>()).value
-    if (value3.size() != 1) return "fail7: ${value3.size()}"
+    val value3 = MyClass3::class.java.getAnnotation(JavaAnn::class.java).value
+    if (value3.size != 1) return "fail7: ${value3.size}"
     if (value3[0] != "asd") return "fail8: ${value3[0]}"
 
-    val value4 = javaClass<MyClass4>().getAnnotation(javaClass<JavaAnn>()).value
-    if (value4.size() != 0) return "fail 9: ${value4.size()}"
+    val value4 = MyClass4::class.java.getAnnotation(JavaAnn::class.java).value
+    if (value4.size != 0) return "fail 9: ${value4.size}"
 
     return "OK"
 }
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationArrayValueNoDefault.kt b/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationArrayValueNoDefault.kt
index 7e68cc3fcd0..b18ecef55cf 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationArrayValueNoDefault.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationArrayValueNoDefault.kt
@@ -5,18 +5,18 @@
 
 
 fun box(): String {
-    val value1 = javaClass<MyClass1>().getAnnotation(javaClass<JavaAnn>()).value
-    if (value1.size() != 0) return "fail1: ${value1.size()}"
+    val value1 = MyClass1::class.java.getAnnotation(JavaAnn::class.java).value
+    if (value1.size != 0) return "fail1: ${value1.size}"
 
-    val value2 = javaClass<MyClass2>().getAnnotation(javaClass<JavaAnn>()).value
-    if (value2.size() != 0) return "fail2: ${value2.size()}"
+    val value2 = MyClass2::class.java.getAnnotation(JavaAnn::class.java).value
+    if (value2.size != 0) return "fail2: ${value2.size}"
 
-    val value3 = javaClass<MyClass3>().getAnnotation(javaClass<JavaAnn>()).value
-    if (value3.size() != 1) return "fail3: ${value3.size()}"
+    val value3 = MyClass3::class.java.getAnnotation(JavaAnn::class.java).value
+    if (value3.size != 1) return "fail3: ${value3.size}"
     if (value3[0] != "asd") return "fail4: ${value3[0]}"
 
-    val value4 = javaClass<MyClass4>().getAnnotation(javaClass<JavaAnn>()).value
-    if (value4.size() != 0) return "fail 5: ${value4.size()}"
+    val value4 = MyClass4::class.java.getAnnotation(JavaAnn::class.java).value
+    if (value4.size != 0) return "fail 5: ${value4.size}"
 
     return "OK"
 }
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationCall.kt b/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationCall.kt
index 63472a38667..381d1f183d4 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationCall.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationCall.kt
@@ -1,7 +1,7 @@
 @JavaAnn("value") class MyClass
 
 fun box(): String {
-    val ann = javaClass<MyClass>().getAnnotation(javaClass<JavaAnn>())
+    val ann = MyClass::class.java.getAnnotation(JavaAnn::class.java)
     if (ann == null) return "fail: cannot find Ann on MyClass}"
     if (ann.value != "value") return "fail: annotation parameter i should be 'value', but was ${ann.value}"
     return "OK"
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationDefault.kt b/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationDefault.kt
index 7c026047af8..9acace8116e 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationDefault.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationDefault.kt
@@ -2,11 +2,11 @@
 @JavaAnn2 class MyClass2
 
 fun box(): String {
-    val ann = javaClass<MyClass>().getAnnotation(javaClass<JavaAnn>())
+    val ann = MyClass::class.java.getAnnotation(JavaAnn::class.java)
     if (ann == null) return "fail: cannot find Ann on MyClass}"
     if (ann.value != "default") return "fail: annotation parameter i should be 'default', but was ${ann.value}"
 
-    val ann2 = javaClass<MyClass2>().getAnnotation(javaClass<JavaAnn2>())
+    val ann2 = MyClass2::class.java.getAnnotation(JavaAnn2::class.java)
     if (ann2 == null) return "fail: cannot find Ann on MyClass}"
     if (ann2.a != 1) return "fail for a: expected = 1, but was ${ann2.a}"
     if (ann2.b != 1.toByte()) return "fail for b: expected = 1, but was ${ann2.b}"
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/arrayClassParameter.kt b/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/arrayClassParameter.kt
index aedd42491a5..3b0de8bcc2f 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/arrayClassParameter.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/arrayClassParameter.kt
@@ -4,7 +4,7 @@ class K
 @JavaAnn(args = arrayOf(O::class, K::class)) class MyClass
 
 fun box(): String {
-    val args = javaClass<MyClass>().getAnnotation(javaClass<JavaAnn>()).args
+    val args = MyClass::class.java.getAnnotation(JavaAnn::class.java).args
     val argName1 = args[0].simpleName ?: "fail 1"
     val argName2 = args[1].simpleName ?: "fail 2"
     return argName1 + argName2
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/arrayClassParameterOnJavaClass.kt b/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/arrayClassParameterOnJavaClass.kt
index 4c0e38a0d14..bca4d131c5f 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/arrayClassParameterOnJavaClass.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/arrayClassParameterOnJavaClass.kt
@@ -1,5 +1,5 @@
 fun box(): String {
-    val args = javaClass<MyJavaClass>().getAnnotation(javaClass<JavaAnn>()).args
+    val args = MyJavaClass::class.java.getAnnotation(JavaAnn::class.java).args
     val argName1 = args[0].simpleName ?: "fail 1"
     val argName2 = args[1].simpleName ?: "fail 2"
     return argName1 + argName2
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/classParameter.kt b/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/classParameter.kt
index 2cd6bb8ec93..43905e6143e 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/classParameter.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/classParameter.kt
@@ -4,7 +4,7 @@ class OK
 @JavaAnn(OK::class) class MyClass
 
 fun box(): String {
-    val ann = javaClass<MyClass>().getAnnotation(javaClass<JavaAnn>())
+    val ann = MyClass::class.java.getAnnotation(JavaAnn::class.java)
     if (ann == null) return "fail: cannot find JavaAnn on MyClass"
     return ann.value.simpleName!!
 }
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/classParameterOnJavaClass.kt b/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/classParameterOnJavaClass.kt
index 1b94d74e2a9..2536247b788 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/classParameterOnJavaClass.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/classParameterOnJavaClass.kt
@@ -1,6 +1,6 @@
 
 fun box(): String {
-    val ann = javaClass<MyJavaClass>().getAnnotation(javaClass<JavaAnn>())
+    val ann = MyJavaClass::class.java.getAnnotation(JavaAnn::class.java)
     if (ann == null) return "fail: cannot find JavaAnn on MyClass"
     return ann.value.simpleName!!
 }
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/varargClassParameter.kt b/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/varargClassParameter.kt
index 61e852628dc..ef9dbffbafd 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/varargClassParameter.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/varargClassParameter.kt
@@ -4,7 +4,7 @@ class K
 @JavaAnn(O::class, K::class) class MyClass
 
 fun box(): String {
-    val args = javaClass<MyClass>().getAnnotation(javaClass<JavaAnn>()).value
+    val args = MyClass::class.java.getAnnotation(JavaAnn::class.java).value
     val argName1 = args[0].simpleName ?: "fail 1"
     val argName2 = args[1].simpleName ?: "fail 2"
     return argName1 + argName2
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/varargClassParameterOnJavaClass.kt b/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/varargClassParameterOnJavaClass.kt
index 7bd24354004..011fc4edd61 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/varargClassParameterOnJavaClass.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/varargClassParameterOnJavaClass.kt
@@ -2,7 +2,7 @@ class O
 class K
 
 fun box(): String {
-    val args = javaClass<MyJavaClass>().getAnnotation(javaClass<JavaAnn>()).value
+    val args = MyJavaClass::class.java.getAnnotation(JavaAnn::class.java).value
     val argName1 = args[0].simpleName ?: "fail 1"
     val argName2 = args[1].simpleName ?: "fail 2"
     return argName1 + argName2
diff --git a/compiler/testData/codegen/boxAgainstJava/enum/staticField.kt b/compiler/testData/codegen/boxAgainstJava/enum/staticField.kt
index b58b3e09b89..bbeae14aa7b 100644
--- a/compiler/testData/codegen/boxAgainstJava/enum/staticField.kt
+++ b/compiler/testData/codegen/boxAgainstJava/enum/staticField.kt
@@ -4,8 +4,8 @@ fun box(): String {
     val instances = E.INSTANCES
     if (E.foo != 42)
         return "Wrong foo ${E.foo}"
-    if (instances.size() != 1)
-        return "Wrong size ${instances.size()}"
+    if (instances.size != 1)
+        return "Wrong size ${instances.size}"
     if (E.INSTANCES.iterator().next() != E.INSTANCE)
         return "Wrong instance ${E.INSTANCES.iterator().next()}"
     return "OK"
diff --git a/compiler/testData/codegen/boxAgainstJava/notNullAssertions/Delegation.kt b/compiler/testData/codegen/boxAgainstJava/notNullAssertions/Delegation.kt
index 3dc0d38d534..bd019bf5a43 100644
--- a/compiler/testData/codegen/boxAgainstJava/notNullAssertions/Delegation.kt
+++ b/compiler/testData/codegen/boxAgainstJava/notNullAssertions/Delegation.kt
@@ -15,7 +15,7 @@ fun box(): String {
         return "Fail: should have been an exception"
     }
     catch(e: IllegalStateException) {
-        println(e.getMessage())
+        println(e.message)
         return "OK"
     }
 }
\ No newline at end of file
diff --git a/compiler/testData/codegen/boxAgainstJava/reflection/mapping/jClass2kClass.kt b/compiler/testData/codegen/boxAgainstJava/reflection/mapping/jClass2kClass.kt
index 414ae0ca5e1..290406666b1 100644
--- a/compiler/testData/codegen/boxAgainstJava/reflection/mapping/jClass2kClass.kt
+++ b/compiler/testData/codegen/boxAgainstJava/reflection/mapping/jClass2kClass.kt
@@ -4,7 +4,7 @@ import kotlin.reflect.jvm.*
 import kotlin.test.assertEquals
 
 fun box(): String {
-    val j = javaClass<J>()
+    val j = J::class.java
     assertEquals(j, j.kotlin.java)
 
     return "OK"
diff --git a/compiler/testData/codegen/boxAgainstJava/sam/adapters/implementAdapter.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/implementAdapter.kt
index 0e9d45f3f90..9bfe0b66463 100644
--- a/compiler/testData/codegen/boxAgainstJava/sam/adapters/implementAdapter.kt
+++ b/compiler/testData/codegen/boxAgainstJava/sam/adapters/implementAdapter.kt
@@ -5,8 +5,8 @@ class Impl: JavaInterface {
 }
 
 fun box(): String {
-    val fooMethods = javaClass<Impl>().getMethods().filter { it.getName() == "foo" }
-    if (fooMethods.size() != 1) return fooMethods.toString()
+    val fooMethods = Impl::class.java.getMethods().filter { it.getName() == "foo" }
+    if (fooMethods.size != 1) return fooMethods.toString()
 
     return "OK"
 }
\ No newline at end of file
diff --git a/compiler/testData/codegen/boxAgainstJava/sam/adapters/severalSamParameters.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/severalSamParameters.kt
index 72a84a91bf3..840410471fa 100644
--- a/compiler/testData/codegen/boxAgainstJava/sam/adapters/severalSamParameters.kt
+++ b/compiler/testData/codegen/boxAgainstJava/sam/adapters/severalSamParameters.kt
@@ -1,6 +1,6 @@
 fun box(): String {
     var v = "FAIL"
-    val max = JavaClass.findMaxAndInvokeCallback({ a, b -> a.length() - b.length() }, "foo", "kotlin", { v = "OK" })
+    val max = JavaClass.findMaxAndInvokeCallback({ a, b -> a.length - b.length }, "foo", "kotlin", { v = "OK" })
     if (max != "kotlin") return "Wrong max: $max"
     return v
 }
diff --git a/compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfClass.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfClass.kt
index 264c185505d..a440e7a700e 100644
--- a/compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfClass.kt
+++ b/compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfClass.kt
@@ -1,6 +1,6 @@
 fun box(): String {
     val wc = WeirdComparator<String>()
-    val result = wc.max({ a, b -> a.length() - b.length() }, "java", "kotlin")
+    val result = wc.max({ a, b -> a.length - b.length }, "java", "kotlin")
     if (result != "kotlin") return "Wrong: $result"
     return "OK"
 }
diff --git a/compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfMethod.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfMethod.kt
index da39df3e650..1f20409dcb4 100644
--- a/compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfMethod.kt
+++ b/compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfMethod.kt
@@ -1,8 +1,8 @@
 fun box(): String {
-    val result = WeirdComparator.max<String>({ a, b -> a.length() - b.length() }, "java", "kotlin")
+    val result = WeirdComparator.max<String>({ a, b -> a.length - b.length }, "java", "kotlin")
     if (result != "kotlin") return "Wrong: $result"
 
-    val result2 = WeirdComparator.max2<String>({ a, b -> a.length() - b.length() }, "java", "kotlin")
+    val result2 = WeirdComparator.max2<String>({ a, b -> a.length - b.length }, "java", "kotlin")
     if (result2 != "kotlin") return "Wrong: $result"
 
     return "OK"
diff --git a/compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfOuterClass.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfOuterClass.kt
index 780e8262ad2..4788b8b669a 100644
--- a/compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfOuterClass.kt
+++ b/compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfOuterClass.kt
@@ -1,6 +1,6 @@
 fun box(): String {
     val wc = WeirdComparator<String>().createInner()!!
-    val result = wc.max({ a, b -> a.length() - b.length() }, "java", "kotlin")
+    val result = wc.max({ a, b -> a.length - b.length }, "java", "kotlin")
     if (result != "kotlin") return "Wrong: $result"
     return "OK"
 }
diff --git a/compiler/testData/codegen/boxInline/builders/builders.2.kt b/compiler/testData/codegen/boxInline/builders/builders.2.kt
index 5675206e3ed..61301370d54 100644
--- a/compiler/testData/codegen/boxInline/builders/builders.2.kt
+++ b/compiler/testData/codegen/boxInline/builders/builders.2.kt
@@ -39,7 +39,7 @@ abstract class Tag(val name: String) : Element() {
 
     private fun renderAttributes(): String? {
         val builder = StringBuilder()
-        for (a in attributes.keySet()) {
+        for (a in attributes.keys) {
             builder.append(" $a=\"${attributes[a]}\"")
         }
         return builder.toString()
diff --git a/compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.2.kt b/compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.2.kt
index 862fbb7d8cc..61c5ea0fc12 100644
--- a/compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.2.kt
+++ b/compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.2.kt
@@ -39,7 +39,7 @@ abstract class Tag(val name: String) : Element() {
 
     private fun renderAttributes(): String? {
         val builder = StringBuilder()
-        for (a in attributes.keySet()) {
+        for (a in attributes.keys) {
             builder.append(" $a=\"${attributes[a]}\"")
         }
         return builder.toString()
diff --git a/compiler/testData/codegen/boxInline/complex/closureChain.1.kt b/compiler/testData/codegen/boxInline/complex/closureChain.1.kt
index 2c426e71557..16a625e4b24 100644
--- a/compiler/testData/codegen/boxInline/complex/closureChain.1.kt
+++ b/compiler/testData/codegen/boxInline/complex/closureChain.1.kt
@@ -1,6 +1,6 @@
 fun test1(): Int {
     val inlineX = Inline()
-    return inlineX.foo({ z: Int -> "" + z}, 25, fun String.(): Int = this.length())
+    return inlineX.foo({ z: Int -> "" + z}, 25, fun String.(): Int = this.length)
 }
 
 fun box(): String {
diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/exceptionTableSplit.2.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/exceptionTableSplit.2.kt
index 5baf07999e6..5e3f9b581fc 100644
--- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/exceptionTableSplit.2.kt
+++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/exceptionTableSplit.2.kt
@@ -3,7 +3,7 @@ package test
 public class Holder(var value: String = "") {
 
     operator fun plusAssign(s: String?) {
-        if (value.length() != 0) {
+        if (value.length != 0) {
             value += " -> "
         }
         value += s
diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/exceptionTableSplitNoReturn.2.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/exceptionTableSplitNoReturn.2.kt
index 4258123efc6..e242a722665 100644
--- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/exceptionTableSplitNoReturn.2.kt
+++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/exceptionTableSplitNoReturn.2.kt
@@ -3,7 +3,7 @@ package test
 public class Holder(var value: String = "") {
 
     operator fun plusAssign(s: String?) {
-        if (value.length() != 0) {
+        if (value.length != 0) {
             value += " -> "
         }
         value += s
diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/exceptionInFinally.1.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/exceptionInFinally.1.kt
index f63b7315953..5b3cd3d7097 100644
--- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/exceptionInFinally.1.kt
+++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/exceptionInFinally.1.kt
@@ -29,7 +29,7 @@ class Test() : MCloseable {
                 throw MyException("exception")
             }
             catch (e: MyException) {
-                status += e.getMessage()
+                status += e.message
                 return status
             }
             finally {
diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/innerAndExternal.1.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/innerAndExternal.1.kt
index b6c7a04dce6..15892ff1434 100644
--- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/innerAndExternal.1.kt
+++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/innerAndExternal.1.kt
@@ -32,8 +32,8 @@ fun test0(h: Holder): String {
         return localResult;
     }
     catch (e: RuntimeException) {
-        if (e.getMessage() != "FINALLY") {
-            return "FAIL in exception: " + e.getMessage()
+        if (e.message != "FINALLY") {
+            return "FAIL in exception: " + e.message
         }
         else {
             return "CATCHED_EXCEPTION"
diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nestedWithReturns.1.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nestedWithReturns.1.kt
index 9dca693f6ea..c7d3dcee252 100644
--- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nestedWithReturns.1.kt
+++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nestedWithReturns.1.kt
@@ -56,9 +56,9 @@ fun test0(
                 }, res)
         return localResult;
     } catch(e: Exception1) {
-        return e.getMessage()!!
+        return e.message!!
     } catch(e: Exception2) {
-        return e.getMessage()!!
+        return e.message!!
     }
 }
 
diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nestedWithReturnsSimple.1.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nestedWithReturnsSimple.1.kt
index 4287d04f853..5499d5f5138 100644
--- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nestedWithReturnsSimple.1.kt
+++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nestedWithReturnsSimple.1.kt
@@ -28,9 +28,9 @@ fun test0(
                 }, res)
         return localResult;
     } catch(e: Exception1) {
-        return e.getMessage()!!
+        return e.message!!
     } catch(e: Exception2) {
-        return e.getMessage()!!
+        return e.message!!
     }
 }
 
diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/noFinally.1.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/noFinally.1.kt
index 7f6a189f1bb..e81b706393b 100644
--- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/noFinally.1.kt
+++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/noFinally.1.kt
@@ -76,8 +76,8 @@ fun test5(h: Holder): String {
 
         return localResult;
     } catch (e: RuntimeException) {
-        if (e.getMessage() != "EXCEPTION") {
-            return "FAIL in exception: " + e.getMessage()
+        if (e.message != "EXCEPTION") {
+            return "FAIL in exception: " + e.message
         } else {
             return "CATCHED_EXCEPTION"
         }
diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/severalCatchClause.1.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/severalCatchClause.1.kt
index 87928da24d7..68d7ee9c83b 100644
--- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/severalCatchClause.1.kt
+++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/severalCatchClause.1.kt
@@ -28,8 +28,8 @@ fun test0(h: Holder): String {
         return localResult;
     }
     catch (e: RuntimeException) {
-        if (e.getMessage() != "FINALLY") {
-            return "FAIL in exception: " + e.getMessage()
+        if (e.message != "FINALLY") {
+            return "FAIL in exception: " + e.message
         }
         else {
             return "CATCHED_EXCEPTION"
@@ -108,8 +108,8 @@ fun test1(h: Holder): String {
                 }, "Fail")
     }
     catch (e: RuntimeException) {
-        if (e.getMessage() != "FINALLY") {
-            return "FAIL in exception: " + e.getMessage()
+        if (e.message != "FINALLY") {
+            return "FAIL in exception: " + e.message
         }
         else {
             return "CATCHED_EXCEPTION"
@@ -172,8 +172,8 @@ fun test3(h: Holder): String {
                 }, "Fail")
     }
     catch (e: RuntimeException) {
-        if (e.getMessage() != "FINALLY") {
-            return "FAIL in exception: " + e.getMessage()
+        if (e.message != "FINALLY") {
+            return "FAIL in exception: " + e.message
         }
         else {
             return "CATCHED_EXCEPTION"
diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/throwInFinally.1.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/throwInFinally.1.kt
index f23941a391e..478e3bf8470 100644
--- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/throwInFinally.1.kt
+++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/throwInFinally.1.kt
@@ -23,8 +23,8 @@ fun test0(h: Holder): String {
 
         return localResult;
     } catch (e: RuntimeException) {
-        if (e.getMessage() != "FINALLY") {
-            return "FAIL in exception: " + e.getMessage()
+        if (e.message != "FINALLY") {
+            return "FAIL in exception: " + e.message
         } else {
             return "CATCHED_EXCEPTION"
         }
@@ -51,8 +51,8 @@ fun test1(h: Holder): String {
                     "OK_FINALLY"
                 })
     } catch (e: RuntimeException) {
-        if (e.getMessage() != "FINALLY") {
-            return "FAIL in exception: " + e.getMessage()
+        if (e.message != "FINALLY") {
+            return "FAIL in exception: " + e.message
         } else {
             return "CATCHED_EXCEPTION"
         }
@@ -100,8 +100,8 @@ fun test3(h: Holder): String {
                     "OK_FINALLY"
                 })
     } catch (e: RuntimeException) {
-        if (e.getMessage() != "FINALLY") {
-            return "FAIL in exception: " + e.getMessage()
+        if (e.message != "FINALLY") {
+            return "FAIL in exception: " + e.message
         } else {
             return "CATCHED_EXCEPTION"
         }
@@ -128,8 +128,8 @@ fun test4(h: Holder): String {
                     "OK_FINALLY"
                 })
     } catch (e: RuntimeException) {
-        if (e.getMessage() != "EXCEPTION") {
-            return "FAIL in exception: " + e.getMessage()
+        if (e.message != "EXCEPTION") {
+            return "FAIL in exception: " + e.message
         } else {
             return "CATCHED_EXCEPTION"
         }
diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/tryCatchInFinally.1.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/tryCatchInFinally.1.kt
index 575bc1fc538..cd099ff0ead 100644
--- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/tryCatchInFinally.1.kt
+++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/tryCatchInFinally.1.kt
@@ -30,9 +30,9 @@ fun test0(
                 res)
         return localResult;
     } catch(e: Exception1) {
-        return e.getMessage()!!
+        return e.message!!
     } catch(e: Exception2) {
-        return e.getMessage()!!
+        return e.message!!
     }
 }
 
diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/tryCatchInFinally.2.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/tryCatchInFinally.2.kt
index ea1355a25b1..8c70391c0cd 100644
--- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/tryCatchInFinally.2.kt
+++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/tryCatchInFinally.2.kt
@@ -3,7 +3,7 @@ package test
 public class Holder(var value: String = "") {
 
     operator fun plusAssign(s: String?) {
-        if (value.length() != 0) {
+        if (value.length != 0) {
             value += " -> "
         }
         value += s
diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/kt6956.1.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/kt6956.1.kt
index 74cc23ecbff..1483e722451 100644
--- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/kt6956.1.kt
+++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/kt6956.1.kt
@@ -4,7 +4,7 @@ inline fun <T> bar(arg: String, action: () -> T) {
     try {
         action()
     } finally {
-        arg.length()
+        arg.length
     }
 }
 
diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/variables/kt7792.1.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/variables/kt7792.1.kt
index 986cc9cdc5e..70c93155682 100644
--- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/variables/kt7792.1.kt
+++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/variables/kt7792.1.kt
@@ -20,7 +20,7 @@ public class ClassA {
 
             result = name + name2
 
-            val length = name.length()
+            val length = name.length
         }
     }
 }
diff --git a/compiler/testData/codegen/boxInline/reified/kt6988_2.2.kt b/compiler/testData/codegen/boxInline/reified/kt6988_2.2.kt
index d0a4c8af5c1..1430bc495d1 100644
--- a/compiler/testData/codegen/boxInline/reified/kt6988_2.2.kt
+++ b/compiler/testData/codegen/boxInline/reified/kt6988_2.2.kt
@@ -4,7 +4,7 @@ package test
 public inline fun <reified T: Any> Any.inlineMeIfYouCan() : () -> Runnable = {
     object : Runnable {
         override fun run() {
-            javaClass<T>().newInstance()
+            T::class.java.newInstance()
         }
     }
 }
\ No newline at end of file
diff --git a/compiler/testData/codegen/boxInline/simple/simpleEnum.2.kt b/compiler/testData/codegen/boxInline/simple/simpleEnum.2.kt
index a65f1abc6a2..978cc0ad1c9 100644
--- a/compiler/testData/codegen/boxInline/simple/simpleEnum.2.kt
+++ b/compiler/testData/codegen/boxInline/simple/simpleEnum.2.kt
@@ -5,6 +5,6 @@ enum class MyEnum {
 
     //TODO: KT-4693
     inline fun <T> doSmth(a: T) : String {
-        return a.toString() + K.name()
+        return a.toString() + K.name
     }
 }
diff --git a/compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch.1.kt b/compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch.1.kt
index 3561bd036ad..2a99af24a43 100644
--- a/compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch.1.kt
+++ b/compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch.1.kt
@@ -40,7 +40,7 @@ fun test2() : Int {
         }
         return result
     } catch (e: RuntimeException) {
-        return e.getMessage()!!.toInt2()!!
+        return e.message!!.toInt2()!!
     }
 }
 
diff --git a/compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch2.1.kt b/compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch2.1.kt
index f9ba17ba2aa..b6be49419fe 100644
--- a/compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch2.1.kt
+++ b/compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch2.1.kt
@@ -18,7 +18,7 @@ fun test11(): Int {
                 }
             },
             { ex, thizz ->
-                if (ex.getMessage() == "2") {
+                if (ex.message == "2") {
                     thizz.value
                 } else {
                     -11111
@@ -66,7 +66,7 @@ fun test3(): Int {
                 })
         return res
     } catch (e: RuntimeException) {
-        return e.getMessage()?.toInt2()!!
+        return e.message?.toInt2()!!
     }
 }
 
@@ -81,7 +81,7 @@ fun test33(): Int {
                     }
                 },
                 { ex, thizz ->
-                    if (ex.getMessage() == "-2") {
+                    if (ex.message == "-2") {
                         throw RuntimeException("-3")
                     } else {
                         -11111
@@ -89,7 +89,7 @@ fun test33(): Int {
                 })
         return res
     } catch (e: RuntimeException) {
-        return e.getMessage()!!.toInt2()!!
+        return e.message!!.toInt2()!!
     }
 }
 
diff --git a/compiler/testData/codegen/boxInline/tryCatchFinally/tryCatchFinally.1.kt b/compiler/testData/codegen/boxInline/tryCatchFinally/tryCatchFinally.1.kt
index fa628dc3687..a9e3a17bdae 100644
--- a/compiler/testData/codegen/boxInline/tryCatchFinally/tryCatchFinally.1.kt
+++ b/compiler/testData/codegen/boxInline/tryCatchFinally/tryCatchFinally.1.kt
@@ -57,7 +57,7 @@ fun test3(): Int {
                 })
         return res
     } catch (e: RuntimeException) {
-        return e.getMessage()?.toInt()!!
+        return e.message?.toInt()!!
     }
 }
 
diff --git a/compiler/testData/codegen/boxMultiFile/kt1515/1.kt b/compiler/testData/codegen/boxMultiFile/kt1515/1.kt
index dbd4a897a1b..af3f3b52383 100644
--- a/compiler/testData/codegen/boxMultiFile/kt1515/1.kt
+++ b/compiler/testData/codegen/boxMultiFile/kt1515/1.kt
@@ -13,6 +13,6 @@ fun box(): String {
 }
 
 fun localUse(): Boolean {
-    val c = javaClass<Runnable>()
+    val c = Runnable::class.java
     return (c.getName()!! == "java.lang.Runnable")
 }
\ No newline at end of file
diff --git a/compiler/testData/codegen/boxMultiFile/kt1515/2.kt b/compiler/testData/codegen/boxMultiFile/kt1515/2.kt
index 0951030fcbb..1366861294e 100644
--- a/compiler/testData/codegen/boxMultiFile/kt1515/2.kt
+++ b/compiler/testData/codegen/boxMultiFile/kt1515/2.kt
@@ -1,6 +1,6 @@
 package otherpackage
 
 fun fromOtherPackage(): Boolean {
-    val c = javaClass<Runnable>()
+    val c = Runnable::class.java
     return (c.getName()!! == "java.lang.Runnable")
 }
\ No newline at end of file
diff --git a/compiler/testData/codegen/boxWithJava/annotatedSamFunExpression/annotatedSamFunExpression.kt b/compiler/testData/codegen/boxWithJava/annotatedSamFunExpression/annotatedSamFunExpression.kt
index 383fa532fca..1991f2e904e 100644
--- a/compiler/testData/codegen/boxWithJava/annotatedSamFunExpression/annotatedSamFunExpression.kt
+++ b/compiler/testData/codegen/boxWithJava/annotatedSamFunExpression/annotatedSamFunExpression.kt
@@ -5,7 +5,7 @@ import kotlin.test.assertEquals
 annotation class Ann(val x: String)
 
 fun testMethod(method: Method, name: String) {
-    assertEquals("OK", method.getAnnotation(javaClass<Ann>()).x, "On method of test named `$name`")
+    assertEquals("OK", method.getAnnotation(Ann::class.java).x, "On method of test named `$name`")
 
     for ((index, annotations) in method.getParameterAnnotations().withIndex()) {
         val ann = annotations.filterIsInstance<Ann>().single()
diff --git a/compiler/testData/codegen/boxWithJava/annotatedSamLambda/annotatedSamLambda.kt b/compiler/testData/codegen/boxWithJava/annotatedSamLambda/annotatedSamLambda.kt
index 3ac0b147c86..9226dc91b96 100644
--- a/compiler/testData/codegen/boxWithJava/annotatedSamLambda/annotatedSamLambda.kt
+++ b/compiler/testData/codegen/boxWithJava/annotatedSamLambda/annotatedSamLambda.kt
@@ -6,7 +6,7 @@ import kotlin.test.assertEquals
 annotation class Ann(val x: String)
 
 fun testMethod(method: Method, name: String) {
-    assertEquals("OK", method.getAnnotation(javaClass<Ann>()).x, "On method of test named `$name`")
+    assertEquals("OK", method.getAnnotation(Ann::class.java).x, "On method of test named `$name`")
 
     for ((index, annotations) in method.getParameterAnnotations().withIndex()) {
         val ann = annotations.filterIsInstance<Ann>().single()
diff --git a/compiler/testData/codegen/boxWithJava/annotationsWithKClass/array/array.kt b/compiler/testData/codegen/boxWithJava/annotationsWithKClass/array/array.kt
index d68150a96f8..7eb7511a2f4 100644
--- a/compiler/testData/codegen/boxWithJava/annotationsWithKClass/array/array.kt
+++ b/compiler/testData/codegen/boxWithJava/annotationsWithKClass/array/array.kt
@@ -4,7 +4,7 @@ import kotlin.reflect.KClass
 annotation class Ann(val args: Array<KClass<*>>)
 
 fun box(): String {
-    val args = javaClass<Test>().getAnnotation(javaClass<Ann>()).args
+    val args = Test::class.java.getAnnotation(Ann::class.java).args
     val argName1 = args[0].simpleName ?: "fail 1"
     val argName2 = args[1].simpleName ?: "fail 2"
     return argName1 + argName2
diff --git a/compiler/testData/codegen/boxWithJava/annotationsWithKClass/basic/basic.kt b/compiler/testData/codegen/boxWithJava/annotationsWithKClass/basic/basic.kt
index 22246eff3e5..4cca48f0ca4 100644
--- a/compiler/testData/codegen/boxWithJava/annotationsWithKClass/basic/basic.kt
+++ b/compiler/testData/codegen/boxWithJava/annotationsWithKClass/basic/basic.kt
@@ -4,6 +4,6 @@ import kotlin.reflect.KClass
 annotation class Ann(val arg: KClass<*>)
 
 fun box(): String {
-    val argName = javaClass<Test>().getAnnotation(javaClass<Ann>()).arg.simpleName ?: "fail 1"
+    val argName = Test::class.java.getAnnotation(Ann::class.java).arg.simpleName ?: "fail 1"
     return argName
 }
diff --git a/compiler/testData/codegen/boxWithJava/annotationsWithKClass/vararg/vararg.kt b/compiler/testData/codegen/boxWithJava/annotationsWithKClass/vararg/vararg.kt
index fd773c8c1fa..984339b52b6 100644
--- a/compiler/testData/codegen/boxWithJava/annotationsWithKClass/vararg/vararg.kt
+++ b/compiler/testData/codegen/boxWithJava/annotationsWithKClass/vararg/vararg.kt
@@ -4,7 +4,7 @@ import kotlin.reflect.KClass
 annotation class Ann(vararg val args: KClass<*>)
 
 fun box(): String {
-    val args = javaClass<Test>().getAnnotation(javaClass<Ann>()).args
+    val args = Test::class.java.getAnnotation(Ann::class.java).args
     val argName1 = args[0].simpleName ?: "fail 1"
     val argName2 = args[1].simpleName ?: "fail 2"
     return argName1 + argName2
diff --git a/compiler/testData/codegen/boxWithJava/builtinStubMethods/extendJavaCollections/extendJavaCollections.kt b/compiler/testData/codegen/boxWithJava/builtinStubMethods/extendJavaCollections/extendJavaCollections.kt
index 8332b235eda..abf425e444e 100644
--- a/compiler/testData/codegen/boxWithJava/builtinStubMethods/extendJavaCollections/extendJavaCollections.kt
+++ b/compiler/testData/codegen/boxWithJava/builtinStubMethods/extendJavaCollections/extendJavaCollections.kt
@@ -5,8 +5,8 @@ class MyMapEntry : Test.MapEntryImpl()
 fun box(): String {
 
     val b = MyMapEntry()
-    b.getKey()
-    b.getValue()
+    b.key
+    b.value
     b.setValue(null)
 
     return "OK"
diff --git a/compiler/testData/codegen/boxWithJava/reflection/callInstanceJavaMethod/K.kt b/compiler/testData/codegen/boxWithJava/reflection/callInstanceJavaMethod/K.kt
index 2e839c91830..c23aa185150 100644
--- a/compiler/testData/codegen/boxWithJava/reflection/callInstanceJavaMethod/K.kt
+++ b/compiler/testData/codegen/boxWithJava/reflection/callInstanceJavaMethod/K.kt
@@ -4,10 +4,10 @@ import kotlin.test.assertEquals
 fun box(): String {
     val f = J::foo
     assertEquals(
-            listOf(javaClass<J>(), javaClass<IntArray>(), javaClass<Array<Any>>(), javaClass<Integer>()),
+            listOf(J::class.java, IntArray::class.java, Array<Any>::class.java, Integer::class.java),
             f.parameters.map { it.type.javaType }
     )
-    assertEquals(javaClass<String>(), f.returnType.javaType)
+    assertEquals(String::class.java, f.returnType.javaType)
 
     assertEquals("01A2", f.call(J(0), intArrayOf(1), arrayOf("A"), 2))
 
diff --git a/compiler/testData/codegen/boxWithJava/reflection/callPrivateJavaMethod/K.kt b/compiler/testData/codegen/boxWithJava/reflection/callPrivateJavaMethod/K.kt
index 83ceef92239..6738678651e 100644
--- a/compiler/testData/codegen/boxWithJava/reflection/callPrivateJavaMethod/K.kt
+++ b/compiler/testData/codegen/boxWithJava/reflection/callPrivateJavaMethod/K.kt
@@ -5,7 +5,7 @@ import kotlin.test.*
 fun box(): String {
     val c = J::class.constructors.single()
     assertFalse(c.isAccessible)
-    assertFailsWith(javaClass<IllegalCallableAccessException>()) { c.call("") }
+    assertFailsWith(IllegalCallableAccessException::class.java) { c.call("") }
 
     c.isAccessible = true
     assertTrue(c.isAccessible)
@@ -13,7 +13,7 @@ fun box(): String {
 
     val m = J::class.members.single { it.name == "getResult" }
     assertFalse(m.isAccessible)
-    assertFailsWith(javaClass<IllegalCallableAccessException>()) { m.call(j)!! }
+    assertFailsWith(IllegalCallableAccessException::class.java) { m.call(j)!! }
 
     m.isAccessible = true
     return m.call(j) as String
diff --git a/compiler/testData/codegen/boxWithJava/reflection/callStaticJavaMethod/K.kt b/compiler/testData/codegen/boxWithJava/reflection/callStaticJavaMethod/K.kt
index 240885da797..dae545428f9 100644
--- a/compiler/testData/codegen/boxWithJava/reflection/callStaticJavaMethod/K.kt
+++ b/compiler/testData/codegen/boxWithJava/reflection/callStaticJavaMethod/K.kt
@@ -3,8 +3,8 @@ import kotlin.test.assertEquals
 
 fun box(): String {
     val f = J::foo
-    assertEquals(listOf(Integer.TYPE, javaClass<IntArray>(), javaClass<Array<Any>>()), f.parameters.map { it.type.javaType })
-    assertEquals(javaClass<String>(), f.returnType.javaType)
+    assertEquals(listOf(Integer.TYPE, IntArray::class.java, Array<Any>::class.java), f.parameters.map { it.type.javaType })
+    assertEquals(String::class.java, f.returnType.javaType)
 
     assertEquals("01A", f.call(0, intArrayOf(1), arrayOf("A")))
 
diff --git a/compiler/testData/codegen/boxWithJava/reflection/javaClassGetFunctions/K.kt b/compiler/testData/codegen/boxWithJava/reflection/javaClassGetFunctions/K.kt
index 363950df596..238668dd38c 100644
--- a/compiler/testData/codegen/boxWithJava/reflection/javaClassGetFunctions/K.kt
+++ b/compiler/testData/codegen/boxWithJava/reflection/javaClassGetFunctions/K.kt
@@ -6,7 +6,7 @@ fun box(): String {
     assertEquals(listOf("equals", "hashCode", "member", "staticMethod", "toString"), J::class.functions.map { it.name }.sorted())
     assertEquals(listOf("member", "staticMethod"), J::class.declaredFunctions.map { it.name }.sorted())
 
-    assertEquals(1, J::class.constructors.size())
+    assertEquals(1, J::class.constructors.size)
 
     return "OK"
 }
diff --git a/compiler/testData/codegen/boxWithJava/reflection/kotlinPropertyInheritedInJava/K.kt b/compiler/testData/codegen/boxWithJava/reflection/kotlinPropertyInheritedInJava/K.kt
index e603d122d60..ef982e72349 100644
--- a/compiler/testData/codegen/boxWithJava/reflection/kotlinPropertyInheritedInJava/K.kt
+++ b/compiler/testData/codegen/boxWithJava/reflection/kotlinPropertyInheritedInJava/K.kt
@@ -21,7 +21,7 @@ fun box(): String {
     if (prop == K::prop) return "Fail J::prop == K::prop (these are different properties)"
 
 
-    val klass = javaClass<J>().kotlin
+    val klass = J::class.java.kotlin
     if (klass.declaredMemberProperties.isNotEmpty()) return "Fail: declaredMemberProperties should be empty"
     if (klass.declaredMemberExtensionProperties.isNotEmpty()) return "Fail: declaredMemberExtensionProperties should be empty"
 
diff --git a/compiler/testData/codegen/boxWithStdlib/annotations/annotatedEnumEntry.kt b/compiler/testData/codegen/boxWithStdlib/annotations/annotatedEnumEntry.kt
index 9d63220ea8c..9c6a5124c25 100644
--- a/compiler/testData/codegen/boxWithStdlib/annotations/annotatedEnumEntry.kt
+++ b/compiler/testData/codegen/boxWithStdlib/annotations/annotatedEnumEntry.kt
@@ -17,15 +17,15 @@ enum class E {
 }
 
 fun box(): String {
-    val e = javaClass<E>()
+    val e = E::class.java
 
     val e1 = e.getDeclaredField(E.E1.toString()).getAnnotations()
-    if (e1.size() != 1) return "Fail E1 size: ${e1.toList()}"
-    if (e1[0].annotationType() != javaClass<First>()) return "Fail E1: ${e1.toList()}"
+    if (e1.size != 1) return "Fail E1 size: ${e1.toList()}"
+    if (e1[0].annotationClass.java != First::class.java) return "Fail E1: ${e1.toList()}"
 
     val e2 = e.getDeclaredField(E.E2.toString()).getAnnotations()
-    if (e2.size() != 1) return "Fail E2 size: ${e2.toList()}"
-    if (e2[0].annotationType() != javaClass<Second>()) return "Fail E2: ${e2.toList()}"
+    if (e2.size != 1) return "Fail E2 size: ${e2.toList()}"
+    if (e2[0].annotationClass.java != Second::class.java) return "Fail E2: ${e2.toList()}"
 
     return (e2[0] as Second).value
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/annotations/annotatedLambda/funExpression.kt b/compiler/testData/codegen/boxWithStdlib/annotations/annotatedLambda/funExpression.kt
index 177073ae854..a4ec1cbc96c 100644
--- a/compiler/testData/codegen/boxWithStdlib/annotations/annotatedLambda/funExpression.kt
+++ b/compiler/testData/codegen/boxWithStdlib/annotations/annotatedLambda/funExpression.kt
@@ -8,7 +8,7 @@ fun foo0(block: () -> Unit) = block.javaClass
 fun foo1(block: (String) -> Unit) = block.javaClass
 
 fun testMethod(method: Method, name: String) {
-    assertEquals("OK", method.getAnnotation(javaClass<Ann>()).x, "On method of test named `$name`")
+    assertEquals("OK", method.getAnnotation(Ann::class.java).x, "On method of test named `$name`")
 
     for ((index, annotations) in method.getParameterAnnotations().withIndex()) {
         val ann = annotations.filterIsInstance<Ann>().single()
diff --git a/compiler/testData/codegen/boxWithStdlib/annotations/annotatedLambda/lambda.kt b/compiler/testData/codegen/boxWithStdlib/annotations/annotatedLambda/lambda.kt
index d6eddf8201b..13731d81f69 100644
--- a/compiler/testData/codegen/boxWithStdlib/annotations/annotatedLambda/lambda.kt
+++ b/compiler/testData/codegen/boxWithStdlib/annotations/annotatedLambda/lambda.kt
@@ -8,7 +8,7 @@ annotation class Ann(val x: String)
 fun foo0(block: () -> Unit) = block.javaClass
 
 fun testMethod(method: Method, name: String) {
-    assertEquals("OK", method.getAnnotation(javaClass<Ann>()).x, "On method of test named `$name`")
+    assertEquals("OK", method.getAnnotation(Ann::class.java).x, "On method of test named `$name`")
 
     for ((index, annotations) in method.getParameterAnnotations().withIndex()) {
         val ann = annotations.filterIsInstance<Ann>().single()
diff --git a/compiler/testData/codegen/boxWithStdlib/annotations/annotationsOnDefault.kt b/compiler/testData/codegen/boxWithStdlib/annotations/annotationsOnDefault.kt
index 02bea707f18..05409aa4339 100644
--- a/compiler/testData/codegen/boxWithStdlib/annotations/annotationsOnDefault.kt
+++ b/compiler/testData/codegen/boxWithStdlib/annotations/annotationsOnDefault.kt
@@ -15,18 +15,18 @@ fun test(name: String, annotations: Array<out Annotation>) {
 }
 
 fun box(): String {
-    val foo = javaClass<A>().getDeclaredMethods().first { it.getName() == "foo" }
+    val foo = A::class.java.getDeclaredMethods().first { it.getName() == "foo" }
     test("foo", foo.getDeclaredAnnotations())
 
-    val fooDefault = javaClass<A>().getDeclaredMethods().first { it.getName() == "foo\$default" }
+    val fooDefault = A::class.java.getDeclaredMethods().first { it.getName() == "foo\$default" }
     test("foo", foo.getDeclaredAnnotations())
 
-    val (secondary, secondaryDefault) = javaClass<A>().getDeclaredConstructors().partition { it.getParameterTypes().size() == 3 }
+    val (secondary, secondaryDefault) = A::class.java.getDeclaredConstructors().partition { it.getParameterTypes().size == 3 }
 
     test("secondary", secondary[0].getDeclaredAnnotations())
     test("secondary\$default", secondaryDefault[0].getDeclaredAnnotations())
 
-    val (primary, primaryDefault) = javaClass<B>().getConstructors().partition { it.getParameterTypes().size() == 3 }
+    val (primary, primaryDefault) = B::class.java.getConstructors().partition { it.getParameterTypes().size == 3 }
 
     test("primary", primary[0].getDeclaredAnnotations())
     test("primary\$default", primaryDefault[0].getDeclaredAnnotations())
diff --git a/compiler/testData/codegen/boxWithStdlib/annotations/defaultParameterValues.kt b/compiler/testData/codegen/boxWithStdlib/annotations/defaultParameterValues.kt
index bddd0c9b3da..c80708d99d7 100644
--- a/compiler/testData/codegen/boxWithStdlib/annotations/defaultParameterValues.kt
+++ b/compiler/testData/codegen/boxWithStdlib/annotations/defaultParameterValues.kt
@@ -12,14 +12,14 @@ annotation class Ann(
 )
 
 fun box(): String {
-    val ann = javaClass<MyClass>().getAnnotation(javaClass<Ann>())
+    val ann = MyClass::class.java.getAnnotation(Ann::class.java)
     if (ann == null) return "fail: cannot find Ann on MyClass}"
     if (ann.i != 1) return "fail: annotation parameter i should be 1, but was ${ann.i}"
     if (ann.s != "a") return "fail: annotation parameter s should be \"a\", but was ${ann.s}"
-    val annSimpleName = ann.a.annotationType().getSimpleName()
+    val annSimpleName = ann.a.annotationClass.java.getSimpleName()
     if (annSimpleName != "Ann2") return "fail: annotation parameter a should be of class Ann2, but was $annSimpleName"
     if (ann.e != MyEnum.A) return "fail: annotation parameter e should be MyEnum.A, but was ${ann.e}"
-    if (ann.c.java != javaClass<A>()) return "fail: annotation parameter c should be of class A, but was ${ann.c}"
+    if (ann.c.java != A::class.java) return "fail: annotation parameter c should be of class A, but was ${ann.c}"
     if (ann.ia[0] != 1 || ann.ia[1] != 2) return "fail: annotation parameter ia should be [1, 2], but was ${ann.ia}"
     if (ann.sa[0] != "a" || ann.sa[1] != "b") return "fail: annotation parameter ia should be [\"a\", \"b\"], but was ${ann.sa}"
     return "OK"
diff --git a/compiler/testData/codegen/boxWithStdlib/annotations/delegatedPropertySetter.kt b/compiler/testData/codegen/boxWithStdlib/annotations/delegatedPropertySetter.kt
index 8d0ec0dc77c..b61821ab39a 100644
--- a/compiler/testData/codegen/boxWithStdlib/annotations/delegatedPropertySetter.kt
+++ b/compiler/testData/codegen/boxWithStdlib/annotations/delegatedPropertySetter.kt
@@ -17,11 +17,11 @@ class Delegate {
 }
 
 fun box(): String {
-    val e = javaClass<MyClass>()
+    val e = MyClass::class.java
 
-    val e1 = e.getDeclaredMethod("setX", javaClass<String>()).getAnnotations()
-    if (e1.size() != 1) return "Fail E1 size: ${e1.toList()}"
-    if (e1[0].annotationType() != javaClass<First>()) return "Fail: ${e1.toList()}"
+    val e1 = e.getDeclaredMethod("setX", String::class.java).getAnnotations()
+    if (e1.size != 1) return "Fail E1 size: ${e1.toList()}"
+    if (e1[0].annotationClass.java != First::class.java) return "Fail: ${e1.toList()}"
 
     return MyClass().x
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/annotations/kotlinPropertyFromClassObjectAsParameter.kt b/compiler/testData/codegen/boxWithStdlib/annotations/kotlinPropertyFromClassObjectAsParameter.kt
index 9f011149920..40ec55908f5 100644
--- a/compiler/testData/codegen/boxWithStdlib/annotations/kotlinPropertyFromClassObjectAsParameter.kt
+++ b/compiler/testData/codegen/boxWithStdlib/annotations/kotlinPropertyFromClassObjectAsParameter.kt
@@ -1,7 +1,7 @@
 @Ann(Foo.i, Foo.s, Foo.f, Foo.d, Foo.l, Foo.b, Foo.bool, Foo.c, Foo.str) class MyClass
 
 fun box(): String {
-    val ann = javaClass<MyClass>().getAnnotation(javaClass<Ann>())
+    val ann = MyClass::class.java.getAnnotation(Ann::class.java)
     if (ann == null) return "fail: cannot find Ann on MyClass}"
     if (ann.i != 2) return "fail: annotation parameter i should be 2, but was ${ann.i}"
     if (ann.s != 2.toShort()) return "fail: annotation parameter i should be 2, but was ${ann.i}"
diff --git a/compiler/testData/codegen/boxWithStdlib/annotations/kotlinTopLevelPropertyAsParameter.kt b/compiler/testData/codegen/boxWithStdlib/annotations/kotlinTopLevelPropertyAsParameter.kt
index a8b07064d45..8ca2212a0b1 100644
--- a/compiler/testData/codegen/boxWithStdlib/annotations/kotlinTopLevelPropertyAsParameter.kt
+++ b/compiler/testData/codegen/boxWithStdlib/annotations/kotlinTopLevelPropertyAsParameter.kt
@@ -1,7 +1,7 @@
 @Ann(i, s, f, d, l, b, bool, c, str) class MyClass
 
 fun box(): String {
-    val ann = javaClass<MyClass>().getAnnotation(javaClass<Ann>())
+    val ann = MyClass::class.java.getAnnotation(Ann::class.java)
     if (ann == null) return "fail: cannot find Ann on MyClass}"
     if (ann.i != 2) return "fail: annotation parameter i should be 2, but was ${ann.i}"
     if (ann.s != 2.toShort()) return "fail: annotation parameter i should be 2, but was ${ann.i}"
diff --git a/compiler/testData/codegen/boxWithStdlib/annotations/nestedClassPropertyAsParameter.kt b/compiler/testData/codegen/boxWithStdlib/annotations/nestedClassPropertyAsParameter.kt
index 718003b61ae..131c36e0ce2 100644
--- a/compiler/testData/codegen/boxWithStdlib/annotations/nestedClassPropertyAsParameter.kt
+++ b/compiler/testData/codegen/boxWithStdlib/annotations/nestedClassPropertyAsParameter.kt
@@ -1,7 +1,7 @@
 @Ann(A.B.i) class MyClass
 
 fun box(): String {
-    val ann = javaClass<MyClass>().getAnnotation(javaClass<Ann>())
+    val ann = MyClass::class.java.getAnnotation(Ann::class.java)
     if (ann == null) return "fail: cannot find Ann on MyClass}"
     if (ann.i != 1) return "fail: annotation parameter i should be 1, but was ${ann.i}"
     return "OK"
diff --git a/compiler/testData/codegen/boxWithStdlib/annotations/parameterWithPrimitiveType.kt b/compiler/testData/codegen/boxWithStdlib/annotations/parameterWithPrimitiveType.kt
index 732c3d02ac1..7bace72d726 100644
--- a/compiler/testData/codegen/boxWithStdlib/annotations/parameterWithPrimitiveType.kt
+++ b/compiler/testData/codegen/boxWithStdlib/annotations/parameterWithPrimitiveType.kt
@@ -11,7 +11,7 @@ annotation class Ann(
 )
 
 fun box(): String {
-    val ann = javaClass<MyClass>().getAnnotation(javaClass<Ann>())
+    val ann = MyClass::class.java.getAnnotation(Ann::class.java)
     if (ann == null) return "fail: cannot find Ann on MyClass}"
     if (ann.b != 1.toByte()) return "fail: annotation parameter b should be 1, but was ${ann.b}"
     if (ann.s != 1.toShort()) return "fail: annotation parameter s should be 1, but was ${ann.s}"
diff --git a/compiler/testData/codegen/boxWithStdlib/annotations/propertyWithPropertyInInitializerAsParameter.kt b/compiler/testData/codegen/boxWithStdlib/annotations/propertyWithPropertyInInitializerAsParameter.kt
index 1cb0d6cbb82..6fa352a6e27 100644
--- a/compiler/testData/codegen/boxWithStdlib/annotations/propertyWithPropertyInInitializerAsParameter.kt
+++ b/compiler/testData/codegen/boxWithStdlib/annotations/propertyWithPropertyInInitializerAsParameter.kt
@@ -1,7 +1,7 @@
 @Ann(i) class MyClass
 
 fun box(): String {
-    val ann = javaClass<MyClass>().getAnnotation(javaClass<Ann>())
+    val ann = MyClass::class.java.getAnnotation(Ann::class.java)
     if (ann == null) return "fail: cannot find Ann on MyClass}"
     if (ann.i != 1) return "fail: annotation parameter i should be 1, but was ${ann.i}"
     return "OK"
diff --git a/compiler/testData/codegen/boxWithStdlib/annotations/varargInAnnotationParameter.kt b/compiler/testData/codegen/boxWithStdlib/annotations/varargInAnnotationParameter.kt
index 44ec665afab..f315ff06420 100644
--- a/compiler/testData/codegen/boxWithStdlib/annotations/varargInAnnotationParameter.kt
+++ b/compiler/testData/codegen/boxWithStdlib/annotations/varargInAnnotationParameter.kt
@@ -16,25 +16,25 @@ annotation class Ann(vararg val p: Int)
 @Ann(p = *intArrayOf(1, 2)) class MyClass10
 
 fun box(): String {
-    test(javaClass<MyClass1>(), "")
-    test(javaClass<MyClass2>(), "1")
-    test(javaClass<MyClass3>(), "12")
+    test(MyClass1::class.java, "")
+    test(MyClass2::class.java, "1")
+    test(MyClass3::class.java, "12")
 
-    test(javaClass<MyClass4>(), "")
-    test(javaClass<MyClass5>(), "1")
-    test(javaClass<MyClass6>(), "12")
+    test(MyClass4::class.java, "")
+    test(MyClass5::class.java, "1")
+    test(MyClass6::class.java, "12")
 
-    test(javaClass<MyClass7>(), "1")
+    test(MyClass7::class.java, "1")
 
-    test(javaClass<MyClass8>(), "")
-    test(javaClass<MyClass9>(), "1")
-    test(javaClass<MyClass10>(), "12")
+    test(MyClass8::class.java, "")
+    test(MyClass9::class.java, "1")
+    test(MyClass10::class.java, "12")
 
     return "OK"
 }
 
 fun test(klass: Class<*>, expected: String) {
-    val ann = klass.getAnnotation(javaClass<Ann>())
+    val ann = klass.getAnnotation(Ann::class.java)
     if (ann == null) throw AssertionError("fail: cannot find Ann on ${klass}")
 
     var result = ""
diff --git a/compiler/testData/codegen/boxWithStdlib/arrays/inProjectionOfArray.kt b/compiler/testData/codegen/boxWithStdlib/arrays/inProjectionOfArray.kt
index e05c96dce56..87785a47aaf 100644
--- a/compiler/testData/codegen/boxWithStdlib/arrays/inProjectionOfArray.kt
+++ b/compiler/testData/codegen/boxWithStdlib/arrays/inProjectionOfArray.kt
@@ -2,7 +2,7 @@ fun box(): String {
     val x : Array<Array<*>> = arrayOf(arrayOf(1))
     val y : Array<in Array<String>> = x
 
-    if (y.size() != 1) return "fail 1"
+    if (y.size != 1) return "fail 1"
 
     y[0] = arrayOf("OK")
 
diff --git a/compiler/testData/codegen/boxWithStdlib/arrays/inProjectionOfList.kt b/compiler/testData/codegen/boxWithStdlib/arrays/inProjectionOfList.kt
index a16ca38a1c9..148aebf6ca6 100644
--- a/compiler/testData/codegen/boxWithStdlib/arrays/inProjectionOfList.kt
+++ b/compiler/testData/codegen/boxWithStdlib/arrays/inProjectionOfList.kt
@@ -2,7 +2,7 @@ fun box(): String {
     val x: Array<List<*>> = arrayOf(listOf(1))
     val y : Array<in List<String>> = x
 
-    if (y.size() != 1) return "fail 1"
+    if (y.size != 1) return "fail 1"
 
     y[0] = listOf("OK")
 
diff --git a/compiler/testData/codegen/boxWithStdlib/arrays/kt945.kt b/compiler/testData/codegen/boxWithStdlib/arrays/kt945.kt
index 3db6fcc7a68..eaf6c5e61b6 100644
--- a/compiler/testData/codegen/boxWithStdlib/arrays/kt945.kt
+++ b/compiler/testData/codegen/boxWithStdlib/arrays/kt945.kt
@@ -1,7 +1,7 @@
 fun box() : String {
     val data = Array<Array<Boolean>>(3) { Array<Boolean>(4, {false}) }
     for(d in data) {
-        if(d.size() != 4) return "fail"
+        if(d.size != 4) return "fail"
         for(b in d) if (b) return "fail"
     }
 
diff --git a/compiler/testData/codegen/boxWithStdlib/arrays/stdlib.kt b/compiler/testData/codegen/boxWithStdlib/arrays/stdlib.kt
index cd0ceb486fb..41f1090eba1 100644
--- a/compiler/testData/codegen/boxWithStdlib/arrays/stdlib.kt
+++ b/compiler/testData/codegen/boxWithStdlib/arrays/stdlib.kt
@@ -39,7 +39,7 @@ class MutableArray<T>(length: Int, init : (Int) -> T) : ReadOnlyArray<T>, WriteO
     override fun set(index : Int, value : T) : Unit { array[index] = value }
 
     override val size : Int
-        get() = array.size()
+        get() = array.size
 }
 
 fun box() : String {
diff --git a/compiler/testData/codegen/boxWithStdlib/boxingOptimization/progressions.kt b/compiler/testData/codegen/boxWithStdlib/boxingOptimization/progressions.kt
index 6cef177bbca..7083ba63844 100644
--- a/compiler/testData/codegen/boxWithStdlib/boxingOptimization/progressions.kt
+++ b/compiler/testData/codegen/boxWithStdlib/boxingOptimization/progressions.kt
@@ -4,22 +4,22 @@ import kotlin.test.assertEquals
 fun box() : String {
 
     val result1 = (1..100).count { x -> x % 2 == 0 }
-    val result2 = (1..100).filter { x -> x % 2 == 0 }.size()
+    val result2 = (1..100).filter { x -> x % 2 == 0 }.size
     assertEquals(result1, 50)
     assertEquals(result2, 50)
 
     val result3 = (1..100).map { x -> 2 * x }.count { x -> x % 2 == 0 }
-    val result4 = (1..100).map { x -> 2 * x }.filter { x -> x % 2 == 0 }.size()
+    val result4 = (1..100).map { x -> 2 * x }.filter { x -> x % 2 == 0 }.size
     assertEquals(result3, 100)
     assertEquals(result4, 100)
 
     val result5 = (1L..100L).count { x -> x % 2 == 0L }
-    val result6 = (1L..100L).filter { x -> x % 2 == 0L }.size()
+    val result6 = (1L..100L).filter { x -> x % 2 == 0L }.size
     assertEquals(result5, 50)
     assertEquals(result6, 50)
 
     val result7 = (1L..100L).map { x -> 2 * x }.count { x -> x % 2 == 0L }
-    val result8 = (1L..100L).map { x -> 2 * x }.filter { x -> x % 2 == 0L }.size()
+    val result8 = (1L..100L).map { x -> 2 * x }.filter { x -> x % 2 == 0L }.size
     assertEquals(result7, 100)
     assertEquals(result8, 100)
 
diff --git a/compiler/testData/codegen/boxWithStdlib/casts/asWithMutable.kt b/compiler/testData/codegen/boxWithStdlib/casts/asWithMutable.kt
index 12285e59f79..019c275fb73 100644
--- a/compiler/testData/codegen/boxWithStdlib/casts/asWithMutable.kt
+++ b/compiler/testData/codegen/boxWithStdlib/casts/asWithMutable.kt
@@ -118,7 +118,7 @@ fun box(): String {
     asSucceeds("mentry as MutableMap.MutableEntry") { mentry as MutableMap.MutableEntry<*, *> }
 
     hashMap[""] = ""
-    val hashMapEntry = hashMap.entrySet().first()
+    val hashMapEntry = hashMap.entries.first()
 
     asSucceeds("hashMapEntry as MutableMap.MutableEntry") { hashMapEntry as MutableMap.MutableEntry<*, *> }
 
diff --git a/compiler/testData/codegen/boxWithStdlib/casts/isWithMutable.kt b/compiler/testData/codegen/boxWithStdlib/casts/isWithMutable.kt
index b1fd027b6be..ea419f776ce 100644
--- a/compiler/testData/codegen/boxWithStdlib/casts/isWithMutable.kt
+++ b/compiler/testData/codegen/boxWithStdlib/casts/isWithMutable.kt
@@ -96,7 +96,7 @@ fun box(): String {
     val mentry = MME()
 
     hashMap[""] = ""
-    val hashMapEntry = hashMap.entrySet().first()
+    val hashMapEntry = hashMap.entries.first()
 
     assert(entry !is MutableMap.MutableEntry<*, *>) { "ME should satisfy '!is MutableMap.MutableEntry'"}
     assert(mentry is MutableMap.MutableEntry<*, *>) { "MME should satisfy 'is MutableMap.MutableEntry'"}
diff --git a/compiler/testData/codegen/boxWithStdlib/casts/reifiedAsWithMutable.kt b/compiler/testData/codegen/boxWithStdlib/casts/reifiedAsWithMutable.kt
index 75d871e2ba0..4e139c40f2e 100644
--- a/compiler/testData/codegen/boxWithStdlib/casts/reifiedAsWithMutable.kt
+++ b/compiler/testData/codegen/boxWithStdlib/casts/reifiedAsWithMutable.kt
@@ -118,7 +118,7 @@ fun box(): String {
     val mentry = MME()
 
     hashMap[""] = ""
-    val hashMapEntry = hashMap.entrySet().first()
+    val hashMapEntry = hashMap.entries.first()
 
     reifiedAsFailsWithCCE<MutableMap.MutableEntry<*, *>>(entry, "reifiedAs<MutableMap.MutableEntry<*, *>>(entry)")
     reifiedAsSucceeds<MutableMap.MutableEntry<*, *>>(mentry, "reifiedAs<MutableMap.MutableEntry<*, *>>(mentry)")
diff --git a/compiler/testData/codegen/boxWithStdlib/casts/reifiedIsWithMutable.kt b/compiler/testData/codegen/boxWithStdlib/casts/reifiedIsWithMutable.kt
index 796d747f7bc..09fc60ab169 100644
--- a/compiler/testData/codegen/boxWithStdlib/casts/reifiedIsWithMutable.kt
+++ b/compiler/testData/codegen/boxWithStdlib/casts/reifiedIsWithMutable.kt
@@ -99,7 +99,7 @@ fun box(): String {
     val mentry = MME()
 
     hashMap[""] = ""
-    val hashMapEntry = hashMap.entrySet().first()
+    val hashMapEntry = hashMap.entries.first()
 
     assert(reifiedIsNot<MutableMap.MutableEntry<*, *>>(entry)) { "reifiedIsNot<MutableMap.MutableEntry<*, *>>(entry)"}
     assert(reifiedIs<MutableMap.MutableEntry<*, *>>(mentry)) { "reifiedIs<MutableMap.MutableEntry<*, *>>(mentry)"}
diff --git a/compiler/testData/codegen/boxWithStdlib/casts/reifiedSafeAsWithMutable.kt b/compiler/testData/codegen/boxWithStdlib/casts/reifiedSafeAsWithMutable.kt
index e0fe12979c6..458d7cea01b 100644
--- a/compiler/testData/codegen/boxWithStdlib/casts/reifiedSafeAsWithMutable.kt
+++ b/compiler/testData/codegen/boxWithStdlib/casts/reifiedSafeAsWithMutable.kt
@@ -120,7 +120,7 @@ fun box(): String {
     val mentry = MME()
 
     hashMap[""] = ""
-    val hashMapEntry = hashMap.entrySet().first()
+    val hashMapEntry = hashMap.entries.first()
 
     reifiedSafeAsReturnsNull<MutableMap.MutableEntry<*, *>>(entry, "reifiedSafeAs<MutableMap.MutableEntry<*, *>>(entry)")
     reifiedSafeAsReturnsNonNull<MutableMap.MutableEntry<*, *>>(mentry, "reifiedSafeAs<MutableMap.MutableEntry<*, *>>(mentry)")
diff --git a/compiler/testData/codegen/boxWithStdlib/casts/safeAsWithMutable.kt b/compiler/testData/codegen/boxWithStdlib/casts/safeAsWithMutable.kt
index d07e286a451..641a29afb26 100644
--- a/compiler/testData/codegen/boxWithStdlib/casts/safeAsWithMutable.kt
+++ b/compiler/testData/codegen/boxWithStdlib/casts/safeAsWithMutable.kt
@@ -117,7 +117,7 @@ fun box(): String {
     safeAsReturnsNonNull("mentry as? MutableMap.MutableEntry") { mentry as? MutableMap.MutableEntry<*, *> }
 
     hashMap[""] = ""
-    val hashMapEntry = hashMap.entrySet().first()
+    val hashMapEntry = hashMap.entries.first()
 
     safeAsReturnsNonNull("hashMapEntry as? MutableMap.MutableEntry") { hashMapEntry as? MutableMap.MutableEntry<*, *> }
 
diff --git a/compiler/testData/codegen/boxWithStdlib/casts/unitAsInt.kt b/compiler/testData/codegen/boxWithStdlib/casts/unitAsInt.kt
index 39713cf804f..f702bcedd2a 100644
--- a/compiler/testData/codegen/boxWithStdlib/casts/unitAsInt.kt
+++ b/compiler/testData/codegen/boxWithStdlib/casts/unitAsInt.kt
@@ -8,7 +8,7 @@ fun box(): String {
         return "OK"
     }
     catch (e: Throwable) {
-        return "Fail: ClassCastException should have been thrown, but was instead ${e.javaClass.getName()}: ${e.getMessage()}"
+        return "Fail: ClassCastException should have been thrown, but was instead ${e.javaClass.getName()}: ${e.message}"
     }
 
     return "Fail: no exception was thrown"
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/doubleParam.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/doubleParam.kt
index a9ac39e0f24..3a97e7002a6 100644
--- a/compiler/testData/codegen/boxWithStdlib/dataClasses/doubleParam.kt
+++ b/compiler/testData/codegen/boxWithStdlib/dataClasses/doubleParam.kt
@@ -26,5 +26,5 @@ fun box(): String {
     if (A(-2.72) !in s) return "Fail: -2.72 not found"
     if (A(NAN) !in s) return "Fail: NaN not found"
 
-    return if (s.size() == 5) "OK" else "Fail $s"
+    return if (s.size == 5) "OK" else "Fail $s"
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/equals/alreadyDeclaredWrongSignature.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/equals/alreadyDeclaredWrongSignature.kt
index 33b3b7a2827..81ab7817764 100644
--- a/compiler/testData/codegen/boxWithStdlib/dataClasses/equals/alreadyDeclaredWrongSignature.kt
+++ b/compiler/testData/codegen/boxWithStdlib/dataClasses/equals/alreadyDeclaredWrongSignature.kt
@@ -16,17 +16,17 @@ data class E(val x: Int) {
 }
 
 fun box(): String {
-  javaClass<B>().getDeclaredMethod("equals", javaClass<Any>())
-  javaClass<B>().getDeclaredMethod("equals", javaClass<B>())
+  B::class.java.getDeclaredMethod("equals", Any::class.java)
+  B::class.java.getDeclaredMethod("equals", B::class.java)
 
-  javaClass<C>().getDeclaredMethod("equals", javaClass<Any>())
-  javaClass<C>().getDeclaredMethod("equals")
+  C::class.java.getDeclaredMethod("equals", Any::class.java)
+  C::class.java.getDeclaredMethod("equals")
 
-  javaClass<D>().getDeclaredMethod("equals", javaClass<Any>())
-  javaClass<D>().getDeclaredMethod("equals", javaClass<Any>(), javaClass<String>())
+  D::class.java.getDeclaredMethod("equals", Any::class.java)
+  D::class.java.getDeclaredMethod("equals", Any::class.java, String::class.java)
 
-  javaClass<E>().getDeclaredMethod("equals", javaClass<Any>())
-  javaClass<E>().getDeclaredMethod("equals", javaClass<E>())
+  E::class.java.getDeclaredMethod("equals", Any::class.java)
+  E::class.java.getDeclaredMethod("equals", E::class.java)
 
   return "OK"
 }
\ No newline at end of file
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/floatParam.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/floatParam.kt
index c694dcaedf3..5335df49f67 100644
--- a/compiler/testData/codegen/boxWithStdlib/dataClasses/floatParam.kt
+++ b/compiler/testData/codegen/boxWithStdlib/dataClasses/floatParam.kt
@@ -26,5 +26,5 @@ fun box(): String {
     if (A(-2.72f) !in s) return "Fail: -2.72 not found"
     if (A(NAN) !in s) return "Fail: NaN not found"
 
-    return if (s.size() == 5) "OK" else "Fail $s"
+    return if (s.size == 5) "OK" else "Fail $s"
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/alreadyDeclaredWrongSignature.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/alreadyDeclaredWrongSignature.kt
index 84f6757a6be..1b2fe1b0301 100644
--- a/compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/alreadyDeclaredWrongSignature.kt
+++ b/compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/alreadyDeclaredWrongSignature.kt
@@ -7,11 +7,11 @@ data class B(val x: Int) {
 }
 
 fun box(): String {
-  javaClass<A>().getDeclaredMethod("hashCode")
-  javaClass<A>().getDeclaredMethod("hashCode", javaClass<Any>())
+  A::class.java.getDeclaredMethod("hashCode")
+  A::class.java.getDeclaredMethod("hashCode", Any::class.java)
 
-  javaClass<B>().getDeclaredMethod("hashCode")
-  javaClass<B>().getDeclaredMethod("hashCode", javaClass<B>(), javaClass<Any>())
+  B::class.java.getDeclaredMethod("hashCode")
+  B::class.java.getDeclaredMethod("hashCode", B::class.java, Any::class.java)
 
   return "OK"
 }
\ No newline at end of file
diff --git a/compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/alreadyDeclaredWrongSignature.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/alreadyDeclaredWrongSignature.kt
index 248a004a10a..2a080133ee3 100644
--- a/compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/alreadyDeclaredWrongSignature.kt
+++ b/compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/alreadyDeclaredWrongSignature.kt
@@ -7,11 +7,11 @@ data class B(val x: Int) {
 }
 
 fun box(): String {
-  javaClass<A>().getDeclaredMethod("toString")
-  javaClass<A>().getDeclaredMethod("toString", javaClass<Any>())
+  A::class.java.getDeclaredMethod("toString")
+  A::class.java.getDeclaredMethod("toString", Any::class.java)
 
-  javaClass<B>().getDeclaredMethod("toString")
-  javaClass<B>().getDeclaredMethod("toString", javaClass<B>(), javaClass<Any>())
+  B::class.java.getDeclaredMethod("toString")
+  B::class.java.getDeclaredMethod("toString", B::class.java, Any::class.java)
 
   return "OK"
 }
\ No newline at end of file
diff --git a/compiler/testData/codegen/boxWithStdlib/defaultArguments/constructor/checkIfConstructorIsSynthetic.kt b/compiler/testData/codegen/boxWithStdlib/defaultArguments/constructor/checkIfConstructorIsSynthetic.kt
index 75dba0cc9d6..8c9402d7595 100644
--- a/compiler/testData/codegen/boxWithStdlib/defaultArguments/constructor/checkIfConstructorIsSynthetic.kt
+++ b/compiler/testData/codegen/boxWithStdlib/defaultArguments/constructor/checkIfConstructorIsSynthetic.kt
@@ -1,6 +1,6 @@
 class A(value: Int = 1)
 
 fun box(): String {
-    val constructors = javaClass<A>().getConstructors().filter { !it.isSynthetic() }
-    return if (constructors.size() == 2) "OK" else constructors.size().toString()
+    val constructors = A::class.java.getConstructors().filter { !it.isSynthetic() }
+    return if (constructors.size == 2) "OK" else constructors.size.toString()
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/defaultArguments/constructor/manyArgs.kt b/compiler/testData/codegen/boxWithStdlib/defaultArguments/constructor/manyArgs.kt
index 001d9e2e6c6..855e303069b 100644
--- a/compiler/testData/codegen/boxWithStdlib/defaultArguments/constructor/manyArgs.kt
+++ b/compiler/testData/codegen/boxWithStdlib/defaultArguments/constructor/manyArgs.kt
@@ -160,7 +160,7 @@ class C(val a: Int = 1,
 
 fun box(): String {
     val test1 = A(4, e = 8, f = 15, w = 16, aa = 23, ff = 42).toString()
-    val test2 = javaClass<A>().newInstance().toString()
+    val test2 = A::class.java.newInstance().toString()
     val test3 = A(32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, q = 16, r = 15, s = 14, t = 13,
                   u = 12, v = 11, w = 10, x = 9, y = 8, z = 7, aa = 6, bb = 5, cc = 4, dd = 3, ee = 2, ff = 1).toString()
     if (test1 != "4 2 3 4 8 15 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 16 24 25 26 23 28 29 30 31 42") {
@@ -174,7 +174,7 @@ fun box(): String {
     }
 
     val test4 = B(54, 217, h = 236, l = 18, q = 3216, u = 8, aa = 22, ff = 33, jj = 44, mm = 55).toString()
-    val test5 = javaClass<B>().newInstance().toString()
+    val test5 = B::class.java.newInstance().toString()
     val test6 = B(40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, u = 20, v = 19,
                   w = 18, x = 17, y = 16, z = 15, aa = 14, bb = 13, cc = 12, dd = 11, ee = 10, ff = 9, gg = 8, hh = 7, ii = 6,
                   jj = 5, kk = 4, ll = 3, mm = 2, nn = 1).toString()
@@ -189,7 +189,7 @@ fun box(): String {
     }
 
     val test7 = C(5, f = 3, w = 1, aa = 71, nn = 2, qq = 15, ww = 97, aaa = 261258, iii = 3, nnn = 8, rrr = 7).toString()
-    val test8 = javaClass<C>().newInstance().toString()
+    val test8 = C::class.java.newInstance().toString()
     val test9 = C(70, 69, 68, 67, 66, 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41,
                   40, 39, 38, 37, 36, jj = 35, kk = 34, ll = 33, mm = 32, nn = 31, oo = 30, pp = 29, qq = 28, rr = 27, ss = 26, tt = 25,
                   uu = 24, vv = 23, ww = 22, xx = 21, yy = 20, zz = 19, aaa = 18, bbb = 17, ccc = 16, ddd = 15, eee = 14, fff = 13,
diff --git a/compiler/testData/codegen/boxWithStdlib/evaluate/char.kt b/compiler/testData/codegen/boxWithStdlib/evaluate/char.kt
index b4dc73e402d..4cd9ce832c6 100644
--- a/compiler/testData/codegen/boxWithStdlib/evaluate/char.kt
+++ b/compiler/testData/codegen/boxWithStdlib/evaluate/char.kt
@@ -6,7 +6,7 @@ annotation class Ann(val c1: Int)
 @Ann('a' - 'a') class MyClass
 
 fun box(): String {
-    val annotation = javaClass<MyClass>().getAnnotation(javaClass<Ann>())!!
+    val annotation = MyClass::class.java.getAnnotation(Ann::class.java)!!
     if (annotation.c1 != 0) return "fail : expected = ${1}, actual = ${annotation.c1}"
     return "OK"
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/evaluate/divide.kt b/compiler/testData/codegen/boxWithStdlib/evaluate/divide.kt
index c40cb331a5b..9d7825ed6a8 100644
--- a/compiler/testData/codegen/boxWithStdlib/evaluate/divide.kt
+++ b/compiler/testData/codegen/boxWithStdlib/evaluate/divide.kt
@@ -9,7 +9,7 @@ annotation class Ann(
 @Ann(1 / 1, 1 / 1, 1 / 1, 1 / 1) class MyClass
 
 fun box(): String {
-    val annotation = javaClass<MyClass>().getAnnotation(javaClass<Ann>())!!
+    val annotation = MyClass::class.java.getAnnotation(Ann::class.java)!!
     if (annotation.b != 1.toByte()) return "fail 1"
     if (annotation.s != 1.toShort()) return "fail 2"
     if (annotation.i != 1) return "fail 2"
diff --git a/compiler/testData/codegen/boxWithStdlib/evaluate/intrincics.kt b/compiler/testData/codegen/boxWithStdlib/evaluate/intrincics.kt
index 1c8e2cb8614..c5384e7921b 100644
--- a/compiler/testData/codegen/boxWithStdlib/evaluate/intrincics.kt
+++ b/compiler/testData/codegen/boxWithStdlib/evaluate/intrincics.kt
@@ -18,7 +18,7 @@ val prop6: Int = 1 ushr 1
 @Ann(1 or 1, 1 and 1, 1 xor 1, 1 shl 1, 1 shr 1, 1 ushr 1) class MyClass
 
 fun box(): String {
-    val annotation = javaClass<MyClass>().getAnnotation(javaClass<Ann>())!!
+    val annotation = MyClass::class.java.getAnnotation(Ann::class.java)!!
     if (annotation.p1 != prop1) return "fail 1, expected = ${prop1}, actual = ${annotation.p1}"
     if (annotation.p2 != prop2) return "fail 2, expected = ${prop2}, actual = ${annotation.p2}"
     if (annotation.p3 != prop3) return "fail 3, expected = ${prop3}, actual = ${annotation.p3}"
diff --git a/compiler/testData/codegen/boxWithStdlib/evaluate/maxValue.kt b/compiler/testData/codegen/boxWithStdlib/evaluate/maxValue.kt
index 04dfb4572f8..5f436cfe39c 100644
--- a/compiler/testData/codegen/boxWithStdlib/evaluate/maxValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/evaluate/maxValue.kt
@@ -18,7 +18,7 @@ annotation class Ann(
 ) class MyClass
 
 fun box(): String {
-    val annotation = javaClass<MyClass>().getAnnotation(javaClass<Ann>())!!
+    val annotation = MyClass::class.java.getAnnotation(Ann::class.java)!!
     if (annotation.p1 != 128) return "fail 1, expected = ${128}, actual = ${annotation.p1}"
     if (annotation.p2 != 32768) return "fail 2, expected = ${32768}, actual = ${annotation.p2}"
     if (annotation.p3 != -2147483648) return "fail 3, expected = ${-2147483648}, actual = ${annotation.p3}"
diff --git a/compiler/testData/codegen/boxWithStdlib/evaluate/maxValueByte.kt b/compiler/testData/codegen/boxWithStdlib/evaluate/maxValueByte.kt
index e12e8efbfda..dc01187b78b 100644
--- a/compiler/testData/codegen/boxWithStdlib/evaluate/maxValueByte.kt
+++ b/compiler/testData/codegen/boxWithStdlib/evaluate/maxValueByte.kt
@@ -14,7 +14,7 @@ annotation class Ann(
 ) class MyClass
 
 fun box(): String {
-    val annotation = javaClass<MyClass>().getAnnotation(javaClass<Ann>())!!
+    val annotation = MyClass::class.java.getAnnotation(Ann::class.java)!!
     if (annotation.p1 != 128) return "fail 1, expected = ${128}, actual = ${annotation.p1}"
     if (annotation.p2 != 2.toByte()) return "fail 2, expected = ${2}, actual = ${annotation.p2}"
     if (annotation.p4 != 2) return "fail 4, expected = ${2}, actual = ${annotation.p4}"
diff --git a/compiler/testData/codegen/boxWithStdlib/evaluate/maxValueInt.kt b/compiler/testData/codegen/boxWithStdlib/evaluate/maxValueInt.kt
index bff65a8a5a5..97d23e0468b 100644
--- a/compiler/testData/codegen/boxWithStdlib/evaluate/maxValueInt.kt
+++ b/compiler/testData/codegen/boxWithStdlib/evaluate/maxValueInt.kt
@@ -14,7 +14,7 @@ annotation class Ann(
 ) class MyClass
 
 fun box(): String {
-    val annotation = javaClass<MyClass>().getAnnotation(javaClass<Ann>())!!
+    val annotation = MyClass::class.java.getAnnotation(Ann::class.java)!!
     if (annotation.p1 != -2147483648) return "fail 1, expected = ${-2147483648}, actual = ${annotation.p1}"
     if (annotation.p2 != 2) return "fail 2, expected = ${2}, actual = ${annotation.p2}"
     if (annotation.p4 != 2.toLong()) return "fail 4, expected = ${2}, actual = ${annotation.p4}"
diff --git a/compiler/testData/codegen/boxWithStdlib/evaluate/miltiply.kt b/compiler/testData/codegen/boxWithStdlib/evaluate/miltiply.kt
index dd018618bce..9dedfded966 100644
--- a/compiler/testData/codegen/boxWithStdlib/evaluate/miltiply.kt
+++ b/compiler/testData/codegen/boxWithStdlib/evaluate/miltiply.kt
@@ -18,7 +18,7 @@ val prop6: Float = 1.0.toFloat() * 1.0.toFloat()
 @Ann(1 * 1, 1 * 1, 1 * 1, 1 * 1, 1.0 * 1.0, 1.0.toFloat() * 1.0.toFloat()) class MyClass
 
 fun box(): String {
-    val annotation = javaClass<MyClass>().getAnnotation(javaClass<Ann>())!!
+    val annotation = MyClass::class.java.getAnnotation(Ann::class.java)!!
     if (annotation.p1 != prop1) return "fail 1, expected = ${prop1}, actual = ${annotation.p1}"
     if (annotation.p2 != prop2) return "fail 2, expected = ${prop2}, actual = ${annotation.p2}"
     if (annotation.p3 != prop3) return "fail 3, expected = ${prop3}, actual = ${annotation.p3}"
diff --git a/compiler/testData/codegen/boxWithStdlib/evaluate/minus.kt b/compiler/testData/codegen/boxWithStdlib/evaluate/minus.kt
index 98d65685929..8d2cbbdfd95 100644
--- a/compiler/testData/codegen/boxWithStdlib/evaluate/minus.kt
+++ b/compiler/testData/codegen/boxWithStdlib/evaluate/minus.kt
@@ -18,7 +18,7 @@ val prop6: Float = 1.0.toFloat() - 1.0.toFloat()
 @Ann(1 - 1, 1 - 1, 1 - 1, 1 - 1, 1.0 - 1.0, 1.0.toFloat() - 1.0.toFloat()) class MyClass
 
 fun box(): String {
-    val annotation = javaClass<MyClass>().getAnnotation(javaClass<Ann>())!!
+    val annotation = MyClass::class.java.getAnnotation(Ann::class.java)!!
     if (annotation.p1 != prop1) return "fail 1, expected = ${prop1}, actual = ${annotation.p1}"
     if (annotation.p2 != prop2) return "fail 2, expected = ${prop2}, actual = ${annotation.p2}"
     if (annotation.p3 != prop3) return "fail 3, expected = ${prop3}, actual = ${annotation.p3}"
diff --git a/compiler/testData/codegen/boxWithStdlib/evaluate/mod.kt b/compiler/testData/codegen/boxWithStdlib/evaluate/mod.kt
index 43b7d5a953f..e3708a625a4 100644
--- a/compiler/testData/codegen/boxWithStdlib/evaluate/mod.kt
+++ b/compiler/testData/codegen/boxWithStdlib/evaluate/mod.kt
@@ -18,7 +18,7 @@ val prop6: Float = 1.0.toFloat() % 1.0.toFloat()
 @Ann(1 % 1, 1 % 1, 1 % 1, 1 % 1, 1.0 % 1.0, 1.0.toFloat() % 1.0.toFloat()) class MyClass
 
 fun box(): String {
-    val annotation = javaClass<MyClass>().getAnnotation(javaClass<Ann>())!!
+    val annotation = MyClass::class.java.getAnnotation(Ann::class.java)!!
     if (annotation.p1 != prop1) return "fail 1, expected = ${prop1}, actual = ${annotation.p1}"
     if (annotation.p2 != prop2) return "fail 2, expected = ${prop2}, actual = ${annotation.p2}"
     if (annotation.p3 != prop3) return "fail 3, expected = ${prop3}, actual = ${annotation.p3}"
diff --git a/compiler/testData/codegen/boxWithStdlib/evaluate/paranthesized.kt b/compiler/testData/codegen/boxWithStdlib/evaluate/paranthesized.kt
index d62ca4ba32c..a06ddc82ef0 100644
--- a/compiler/testData/codegen/boxWithStdlib/evaluate/paranthesized.kt
+++ b/compiler/testData/codegen/boxWithStdlib/evaluate/paranthesized.kt
@@ -18,7 +18,7 @@ val prop6: Float = (1.toFloat() + 2) * 2
 @Ann((1 + 2) * 2, (1 + 2) * 2, (1 + 2) * 2, (1 + 2) * 2, (1.0 + 2) * 2, (1.toFloat() + 2) * 2) class MyClass
 
 fun box(): String {
-    val annotation = javaClass<MyClass>().getAnnotation(javaClass<Ann>())!!
+    val annotation = MyClass::class.java.getAnnotation(Ann::class.java)!!
     if (annotation.p1 != prop1) return "fail 1, expected = ${prop1}, actual = ${annotation.p1}"
     if (annotation.p2 != prop2) return "fail 2, expected = ${prop2}, actual = ${annotation.p2}"
     if (annotation.p3 != prop3) return "fail 3, expected = ${prop3}, actual = ${annotation.p3}"
diff --git a/compiler/testData/codegen/boxWithStdlib/evaluate/plus.kt b/compiler/testData/codegen/boxWithStdlib/evaluate/plus.kt
index 7c66cea2034..e783c6d847a 100644
--- a/compiler/testData/codegen/boxWithStdlib/evaluate/plus.kt
+++ b/compiler/testData/codegen/boxWithStdlib/evaluate/plus.kt
@@ -18,7 +18,7 @@ val prop6: Float = 1.0.toFloat() + 1.0.toFloat()
 @Ann(1 + 1, 1 + 1, 1 + 1, 1 + 1, 1.0 + 1.0, 1.0.toFloat() + 1.0.toFloat()) class MyClass
 
 fun box(): String {
-    val annotation = javaClass<MyClass>().getAnnotation(javaClass<Ann>())!!
+    val annotation = MyClass::class.java.getAnnotation(Ann::class.java)!!
     if (annotation.p1 != prop1) return "fail 1, expected = ${prop1}, actual = ${annotation.p1}"
     if (annotation.p2 != prop2) return "fail 2, expected = ${prop2}, actual = ${annotation.p2}"
     if (annotation.p3 != prop3) return "fail 3, expected = ${prop3}, actual = ${annotation.p3}"
diff --git a/compiler/testData/codegen/boxWithStdlib/evaluate/simpleCallBinary.kt b/compiler/testData/codegen/boxWithStdlib/evaluate/simpleCallBinary.kt
index f8e2fea09e4..d9543370851 100644
--- a/compiler/testData/codegen/boxWithStdlib/evaluate/simpleCallBinary.kt
+++ b/compiler/testData/codegen/boxWithStdlib/evaluate/simpleCallBinary.kt
@@ -16,7 +16,7 @@ const val prop5: Int = 1.mod(1)
 @Ann(prop1, prop2, prop3, prop4, prop5) class MyClass
 
 fun box(): String {
-    val annotation = javaClass<MyClass>().getAnnotation(javaClass<Ann>())!!
+    val annotation = MyClass::class.java.getAnnotation(Ann::class.java)!!
     if (annotation.p1 != prop1) return "fail 1, expected = ${prop1}, actual = ${annotation.p1}"
     if (annotation.p2 != prop2) return "fail 2, expected = ${prop2}, actual = ${annotation.p2}"
     if (annotation.p3 != prop3) return "fail 3, expected = ${prop3}, actual = ${annotation.p3}"
diff --git a/compiler/testData/codegen/boxWithStdlib/evaluate/unaryMinus.kt b/compiler/testData/codegen/boxWithStdlib/evaluate/unaryMinus.kt
index 7ccb19591e6..62d58fbe7b6 100644
--- a/compiler/testData/codegen/boxWithStdlib/evaluate/unaryMinus.kt
+++ b/compiler/testData/codegen/boxWithStdlib/evaluate/unaryMinus.kt
@@ -18,7 +18,7 @@ const val prop6: Float = -1.0.toFloat()
 @Ann(prop1, prop2, prop3, prop4, prop5, prop6) class MyClass
 
 fun box(): String {
-    val annotation = javaClass<MyClass>().getAnnotation(javaClass<Ann>())!!
+    val annotation = MyClass::class.java.getAnnotation(Ann::class.java)!!
     if (annotation.p1 != prop1) return "fail 1, expected = ${prop1}, actual = ${annotation.p1}"
     if (annotation.p2 != prop2) return "fail 2, expected = ${prop2}, actual = ${annotation.p2}"
     if (annotation.p3 != prop3) return "fail 3, expected = ${prop3}, actual = ${annotation.p3}"
diff --git a/compiler/testData/codegen/boxWithStdlib/evaluate/unaryPlus.kt b/compiler/testData/codegen/boxWithStdlib/evaluate/unaryPlus.kt
index a02b291a5dd..2e85ba12957 100644
--- a/compiler/testData/codegen/boxWithStdlib/evaluate/unaryPlus.kt
+++ b/compiler/testData/codegen/boxWithStdlib/evaluate/unaryPlus.kt
@@ -18,7 +18,7 @@ const val prop6: Float = +1.0.toFloat()
 @Ann(prop1, prop2, prop3, prop4, prop5, prop6) class MyClass
 
 fun box(): String {
-    val annotation = javaClass<MyClass>().getAnnotation(javaClass<Ann>())!!
+    val annotation = MyClass::class.java.getAnnotation(Ann::class.java)!!
     if (annotation.p1 != prop1) return "fail 1, expected = ${prop1}, actual = ${annotation.p1}"
     if (annotation.p2 != prop2) return "fail 2, expected = ${prop2}, actual = ${annotation.p2}"
     if (annotation.p3 != prop3) return "fail 3, expected = ${prop3}, actual = ${annotation.p3}"
diff --git a/compiler/testData/codegen/boxWithStdlib/fullJdk/genericBackingFieldSignature.kt b/compiler/testData/codegen/boxWithStdlib/fullJdk/genericBackingFieldSignature.kt
index a57a390b03d..02a26b8a3d1 100644
--- a/compiler/testData/codegen/boxWithStdlib/fullJdk/genericBackingFieldSignature.kt
+++ b/compiler/testData/codegen/boxWithStdlib/fullJdk/genericBackingFieldSignature.kt
@@ -36,7 +36,7 @@ class Test<T>(val constructorProperty: T) {
 }
 
 fun box(): String {
-    val clz = javaClass<Test<*>>()
+    val clz = Test::class.java
 
     val constructorProperty = clz.getDeclaredField("constructorProperty");
 
diff --git a/compiler/testData/codegen/boxWithStdlib/fullJdk/genericMethodSignature.kt b/compiler/testData/codegen/boxWithStdlib/fullJdk/genericMethodSignature.kt
index 9f5ce70f8d1..d55b875746b 100644
--- a/compiler/testData/codegen/boxWithStdlib/fullJdk/genericMethodSignature.kt
+++ b/compiler/testData/codegen/boxWithStdlib/fullJdk/genericMethodSignature.kt
@@ -22,14 +22,14 @@ class Test<T, X, in Y>() {
 }
 
 fun box(): String {
-    val clz = javaClass<Test<*, *, *>>()
+    val clz = Test::class.java
 
     val params = listOf(
-            Params(1, javaClass<Any>(), "T", "T"),
-            Params(2, javaClass<Z<*>>(), "Z<T>", "Z<T>"),
-            Params(3, javaClass<Z<*>>(), "Z<java.lang.String>", "Z<java.lang.String>"),
-            Params(4, javaClass<Any>(), "Zout<java.lang.String>", "X"),
-            Params(5, javaClass<Any>(), "Zin<TParam>", "Y")
+            Params(1, Any::class.java, "T", "T"),
+            Params(2, Z::class.java, "Z<T>", "Z<T>"),
+            Params(3, Z::class.java, "Z<java.lang.String>", "Z<java.lang.String>"),
+            Params(4, Any::class.java, "Zout<java.lang.String>", "X"),
+            Params(5, Any::class.java, "Zin<TParam>", "Y")
     )
 
 
diff --git a/compiler/testData/codegen/boxWithStdlib/fullJdk/jvmAnnotationFlags.kt b/compiler/testData/codegen/boxWithStdlib/fullJdk/jvmAnnotationFlags.kt
index 5d2dd7d826a..f15f9f8283b 100644
--- a/compiler/testData/codegen/boxWithStdlib/fullJdk/jvmAnnotationFlags.kt
+++ b/compiler/testData/codegen/boxWithStdlib/fullJdk/jvmAnnotationFlags.kt
@@ -15,7 +15,7 @@ class C {
 }
 
 fun box(): String {
-    val c = javaClass<C>()
+    val c = C::class.java
 
     if (c.getDeclaredField("vol").getModifiers() and Modifier.VOLATILE == 0) return "Fail: volatile"
     if (c.getDeclaredField("tra").getModifiers() and Modifier.TRANSIENT == 0) return "Fail: transient"
diff --git a/compiler/testData/codegen/boxWithStdlib/fullJdk/native/default.kt b/compiler/testData/codegen/boxWithStdlib/fullJdk/native/default.kt
index 4cbcd2859b7..85c1216adb8 100644
--- a/compiler/testData/codegen/boxWithStdlib/fullJdk/native/default.kt
+++ b/compiler/testData/codegen/boxWithStdlib/fullJdk/native/default.kt
@@ -18,7 +18,7 @@ fun box(): String {
         return "Link error expected on object"
     }
     catch (e: java.lang.UnsatisfiedLinkError) {
-        if (e.getMessage() != "foo.ObjWithNative.bar(JLjava/lang/String;)D") return "Fail 1: " + e.getMessage()
+        if (e.message != "foo.ObjWithNative.bar(JLjava/lang/String;)D") return "Fail 1: " + e.message
     }
 
     try {
@@ -26,7 +26,7 @@ fun box(): String {
         return "Link error expected on object"
     }
     catch (e: java.lang.UnsatisfiedLinkError) {
-        if (e.getMessage() != "foo.ObjWithNative.foo(I)D") return "Fail 2: " + e.getMessage()
+        if (e.message != "foo.ObjWithNative.foo(I)D") return "Fail 2: " + e.message
     }
 
     try {
@@ -34,7 +34,7 @@ fun box(): String {
         return "Link error expected on object"
     }
     catch (e: java.lang.UnsatisfiedLinkError) {
-        if (e.getMessage() != "foo.DefaultKt.topLevel(I)D") return "Fail 3: " + e.getMessage()
+        if (e.message != "foo.DefaultKt.topLevel(I)D") return "Fail 3: " + e.message
     }
     return "OK"
 }
\ No newline at end of file
diff --git a/compiler/testData/codegen/boxWithStdlib/fullJdk/native/nativePropertyAccessors.kt b/compiler/testData/codegen/boxWithStdlib/fullJdk/native/nativePropertyAccessors.kt
index 5ce4ea4ca39..a287e244fff 100644
--- a/compiler/testData/codegen/boxWithStdlib/fullJdk/native/nativePropertyAccessors.kt
+++ b/compiler/testData/codegen/boxWithStdlib/fullJdk/native/nativePropertyAccessors.kt
@@ -29,7 +29,7 @@ fun check(body: () -> Unit, signature: String): String? {
         return "Link error expected"
     }
     catch (e: java.lang.UnsatisfiedLinkError) {
-        if (e.getMessage() != signature) return "Fail $signature: " + e.getMessage()
+        if (e.message != signature) return "Fail $signature: " + e.message
     }
 
     return null
diff --git a/compiler/testData/codegen/boxWithStdlib/fullJdk/native/privateStatic.kt b/compiler/testData/codegen/boxWithStdlib/fullJdk/native/privateStatic.kt
index 0c9618c38f9..70c7c54215c 100644
--- a/compiler/testData/codegen/boxWithStdlib/fullJdk/native/privateStatic.kt
+++ b/compiler/testData/codegen/boxWithStdlib/fullJdk/native/privateStatic.kt
@@ -16,7 +16,7 @@ fun box(): String {
         return "Link error expected"
     }
     catch (e: java.lang.UnsatisfiedLinkError) {
-        if (e.getMessage() != "C.foo()V") return "Fail 1: " + e.getMessage()
+        if (e.message != "C.foo()V") return "Fail 1: " + e.message
     }
 
     return "OK"
diff --git a/compiler/testData/codegen/boxWithStdlib/fullJdk/native/staticNative.kt b/compiler/testData/codegen/boxWithStdlib/fullJdk/native/staticNative.kt
index 3785f1c3eb3..f7689b3967c 100644
--- a/compiler/testData/codegen/boxWithStdlib/fullJdk/native/staticNative.kt
+++ b/compiler/testData/codegen/boxWithStdlib/fullJdk/native/staticNative.kt
@@ -19,7 +19,7 @@ fun box(): String {
         return "Link error expected"
     }
     catch (e: java.lang.UnsatisfiedLinkError) {
-        if (e.getMessage() != "foo.WithNative.bar(JLjava/lang/String;)D") return "Fail 1: " + e.getMessage()
+        if (e.message != "foo.WithNative.bar(JLjava/lang/String;)D") return "Fail 1: " + e.message
     }
 
     try {
@@ -27,7 +27,7 @@ fun box(): String {
         return "Link error expected on object"
     }
     catch (e: java.lang.UnsatisfiedLinkError) {
-        if (e.getMessage() != "foo.ObjWithNative.bar(JLjava/lang/String;)D") return "Fail 2: " + e.getMessage()
+        if (e.message != "foo.ObjWithNative.bar(JLjava/lang/String;)D") return "Fail 2: " + e.message
     }
     return "OK"
 }
\ No newline at end of file
diff --git a/compiler/testData/codegen/boxWithStdlib/fullJdk/native/topLevel.kt b/compiler/testData/codegen/boxWithStdlib/fullJdk/native/topLevel.kt
index 9aa663c2d56..baeb07dd825 100644
--- a/compiler/testData/codegen/boxWithStdlib/fullJdk/native/topLevel.kt
+++ b/compiler/testData/codegen/boxWithStdlib/fullJdk/native/topLevel.kt
@@ -12,7 +12,7 @@ fun box(): String {
         return "Link error expected on object"
     }
     catch (e: java.lang.UnsatisfiedLinkError) {
-        if (e.getMessage() != "foo.TopLevelKt.bar(JLjava/lang/String;)D") return "Fail 1: " + e.getMessage()
+        if (e.message != "foo.TopLevelKt.bar(JLjava/lang/String;)D") return "Fail 1: " + e.message
     }
 
     return "OK"
diff --git a/compiler/testData/codegen/boxWithStdlib/fullJdk/platformTypeAssertionStackTrace.kt b/compiler/testData/codegen/boxWithStdlib/fullJdk/platformTypeAssertionStackTrace.kt
index 4ed4214a891..8d2fa367922 100644
--- a/compiler/testData/codegen/boxWithStdlib/fullJdk/platformTypeAssertionStackTrace.kt
+++ b/compiler/testData/codegen/boxWithStdlib/fullJdk/platformTypeAssertionStackTrace.kt
@@ -8,7 +8,7 @@ fun box(): String {
         return "Fail: an exception should be thrown"
     } catch (e: IllegalStateException) {
         val st = (e as java.lang.Throwable).getStackTrace()
-        if (st.size() < 5) {
+        if (st.size < 5) {
             return "Fail: very small stack trace, should at least have current function and JUnit reflective calls: ${Arrays.toString(st)}"
         }
         val top = st[0]
diff --git a/compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/collections.kt b/compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/collections.kt
index 655d55d983d..1f05c73bb40 100644
--- a/compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/collections.kt
+++ b/compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/collections.kt
@@ -6,9 +6,9 @@ import kotlin.test.assertTrue
 import java.security.KeyPair
 
 
-fun <T> testCollectionSize(c: Collection<T>) = assertEquals(0, c.size())
+fun <T> testCollectionSize(c: Collection<T>) = assertEquals(0, c.size)
 fun <T> testCollectionIsEmpty(c: Collection<T>) = assertTrue(c.isEmpty())
-fun <T> testCollectionContains(c: Collection<T>) = assertTrue(c.contains(1))
+fun <T> testCollectionContains(c: Collection<T>) = assertTrue(c.contains(1 as Any?))
 fun <T> testCollectionIterator(c: Collection<T>) {
     val it = c.iterator()
     while (it.hasNext()) {
@@ -18,12 +18,12 @@ fun <T> testCollectionIterator(c: Collection<T>) {
 fun <T> testCollectionContainsAll(c: Collection<T>) = assertTrue(c.containsAll(c))
 fun <T> testMutableCollectionAdd(c: MutableCollection<T>, t: T) {
     c.add(t)
-    assertEquals(1, c.size())
+    assertEquals(1, c.size)
     assertTrue(c.contains(t))
 }
 fun <T> testMutableCollectionRemove(c: MutableCollection<T>, t: T) {
     c.remove(t)
-    assertEquals(0, c.size())
+    assertEquals(0, c.size)
     assertFalse(c.contains(t))
 }
 fun <T> testMutableCollectionIterator(c: MutableCollection<T>, t: T) {
@@ -33,7 +33,7 @@ fun <T> testMutableCollectionIterator(c: MutableCollection<T>, t: T) {
         it.next()
         it.remove()
     }
-    assertEquals(0, c.size())
+    assertEquals(0, c.size)
 }
 fun <T> testMutableCollectionAddAll(c: MutableCollection<T>, t1: T, t2: T) {
     c.addAll(arrayListOf(t1, t2))
@@ -114,16 +114,16 @@ fun testList() {
 }
 
 fun <K, V> testMapContainsKey(map: Map<K, V>, k: K) = assertTrue(map.containsKey(k))
-fun <K, V> testMapKeys(map: Map<K, V>, k1: K, k2: K) = assertEqualCollections(hashSetOf(k1, k2), map.keySet())
-fun <K, V> testMapValues(map: Map<K, V>, v1: V, v2: V) = assertEqualCollections(hashSetOf(v1, v2), map.values())
+fun <K, V> testMapKeys(map: Map<K, V>, k1: K, k2: K) = assertEqualCollections(hashSetOf(k1, k2), map.keys)
+fun <K, V> testMapValues(map: Map<K, V>, v1: V, v2: V) = assertEqualCollections(hashSetOf(v1, v2), map.values)
 fun <K, V> testMapEntrySet(map: Map<K, V>, k : K, v: V) {
-    for (entry in map.entrySet()) {
+    for (entry in map.entries) {
         assertEquals(k, entry.key)
         assertEquals(v, entry.value)
     }
 }
 fun <K, V> testMutableMapEntry(map: MutableMap<K, V>, k1 : K, v: V) {
-    for (entry in map.entrySet()) {
+    for (entry in map.entries) {
         entry.setValue(v)
     }
     assertEquals(hashMapOf(k1 to v), map)
diff --git a/compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt528.kt b/compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt528.kt
index 4a73fad3c92..cb8c7c5b6cc 100644
--- a/compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt528.kt
+++ b/compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt528.kt
@@ -34,24 +34,24 @@ class Luhny() {
         // }
 
         if (it.isDigit()) {
-            digits.addLast(it.toInt() - '0'.toInt())
+            digits.addLast(it - '0')
         } else if (it == ' ' || it == '-') {
         } else {
             printAll()
             digits.clear()
         }
 
-        if (digits.size() > 16)
+        if (digits.size > 16)
           printOneDigit()
         check()
     }
 
     fun check() {
-        if (digits.size() < 14) return
+        if (digits.size < 14) return
         print("check")
         val sum = digits.sum { i, d ->
 //            println("$i -> $d")
-            if (i % 2 == digits.size()) {
+            if (i % 2 == digits.size) {
                 val f = d * 2 / 10
                 val s = d * 2 % 10
 //                println("$d: f = $f, s = $s")
@@ -61,7 +61,7 @@ class Luhny() {
             } else d
         }
 //        println(sum)
-        if (sum % 10 == 0) {print("s"); toBeMasked = digits.size()}
+        if (sum % 10 == 0) {print("s"); toBeMasked = digits.size}
     }
 
     fun printOneDigit() {
@@ -98,8 +98,8 @@ fun <T> T.pr(f : (T) -> Unit) : T {
 
 fun LinkedList<Int>.sum(f : (Int, Int )-> Int): Int {
     var sum = 0
-    for (i in 1..size()) {
-        val j = size() - i
+    for (i in 1..size) {
+        val j = size - i
         sum += f(j, get(j))
     }
     return sum
diff --git a/compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt529.kt b/compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt529.kt
index 6d8d29c84e5..39caa24cb9b 100644
--- a/compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt529.kt
+++ b/compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt529.kt
@@ -31,19 +31,19 @@ class Luhny() {
         // }
 
         if (it.isDigit()) {
-            digits.addLast(it.toInt() - '0'.toInt())
+            digits.addLast(it - '0')
         } else if (it == ' ' || it == '-') {
         } else {
             printAll()
         }
 
-        if (digits.size() > 16)
+        if (digits.size > 16)
           printOneDigit()
         check()
     }
 
     private fun check() {
-        val size = digits.size()
+        val size = digits.size
         if (size < 14) return
         val sum = digits.sum {i, d ->
             if (i % 2 == size % 2) double(d) else d
@@ -54,7 +54,7 @@ class Luhny() {
 //            sum += if (i % 2 == size % 2) double(d) else d
 //            i++
 //        }
-        if (sum % 10 == 0) toBeMasked = digits.size()
+        if (sum % 10 == 0) toBeMasked = digits.size
     }
 
     private fun double(d : Int) = d * 2 / 10 + d * 2 % 10
diff --git a/compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt533.kt b/compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt533.kt
index b2b9488443d..c36ac6cbcf2 100644
--- a/compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt533.kt
+++ b/compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt533.kt
@@ -35,26 +35,26 @@ class Luhny() {
         // }
 
         if (it.isDigit()) {
-            digits.push(it.toInt() - '0'.toInt())
+            digits.push(it - '0')
         } else if (it == ' ' || it == '-') {
         } else {
             printAll()
             digits.clear()
         }
 
-        if (digits.size() > 16)
+        if (digits.size > 16)
           printOneDigit()
         check()
     }
 
     fun check() {
-        if (digits.size() < 14) return
+        if (digits.size < 14) return
         val sum = digits.sum { i, d ->
             if (i % 2 != 0)
                 d * 2 / 10 +  d * 2 % 10
             else d
         }
-        if (sum % 10 == 0) toBeMasked = digits.size()
+        if (sum % 10 == 0) toBeMasked = digits.size
     }
 
     fun printOneDigit() {
@@ -97,7 +97,7 @@ fun LinkedList<Int>.sum(f : (Int, Int) -> Int) : Int {
 fun <T> List<T>.backwards() : Iterable<T> = object : Iterable<T> {
   override fun iterator() : Iterator<T> =
       object : Iterator<T> {
-          var current = size()
+          var current = size
           override fun next() : T = get(--current)
           override fun hasNext() : Boolean = current > 0
       }
diff --git a/compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/nonLocalReturn.kt b/compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/nonLocalReturn.kt
index 18f07a3bf7e..a4338b11aa1 100644
--- a/compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/nonLocalReturn.kt
+++ b/compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/nonLocalReturn.kt
@@ -56,7 +56,7 @@ class TestLocal(val name: String, val executionType: ExecutionType) : Callable<S
     fun nonLocalSimple(): String {
         synchronized(mutex) {
             underMutexFun()
-            return executionType.name()
+            return executionType.name
         }
         return "fail"
     }
@@ -65,9 +65,9 @@ class TestLocal(val name: String, val executionType: ExecutionType) : Callable<S
         synchronized(mutex) {
             try {
                 underMutexFun()
-                throw MyException(executionType.name())
+                throw MyException(executionType.name)
             } catch (e: MyException) {
-                return e.getMessage()!!
+                return e.message!!
             }
         }
         return "fail"
@@ -79,7 +79,7 @@ class TestLocal(val name: String, val executionType: ExecutionType) : Callable<S
                 underMutexFun()
                 return "fail"
             } finally {
-                return executionType.name()
+                return executionType.name
             }
         }
         return "fail"
@@ -89,9 +89,9 @@ class TestLocal(val name: String, val executionType: ExecutionType) : Callable<S
         synchronized(mutex) {
             try {
                 underMutexFun()
-                throw MyException(executionType.name())
+                throw MyException(executionType.name)
             } catch (e: MyException) {
-                return e.getMessage()!!
+                return e.message!!
             } finally {
                 "123"
             }
@@ -103,11 +103,11 @@ class TestLocal(val name: String, val executionType: ExecutionType) : Callable<S
         synchronized(mutex) {
             try {
                 underMutexFun()
-                throw MyException(executionType.name())
+                throw MyException(executionType.name)
             } catch (e: MyException) {
                 return "fail1"
             } finally {
-                return executionType.name()
+                return executionType.name
             }
         }
         return "fail"
@@ -118,11 +118,11 @@ class TestLocal(val name: String, val executionType: ExecutionType) : Callable<S
             try {
                 try {
                     underMutexFun()
-                    throw MyException(executionType.name())
+                    throw MyException(executionType.name)
                 } catch (e: MyException) {
                     return "fail1"
                 } finally {
-                    return executionType.name()
+                    return executionType.name
                 }
             } finally {
                 val p = 1 + 1
@@ -150,7 +150,7 @@ fun testTemplate(type: ExecutionType, producer: (Int) -> Callable<String>): Stri
         }
 
         for (f in futures) {
-            if (f.get() != type.name()) return "failed result ${f.get()} != ${type.name()}"
+            if (f.get() != type.name) return "failed result ${f.get()} != ${type.name}"
         }
     } finally {
 
diff --git a/compiler/testData/codegen/boxWithStdlib/jdk/arrayList.kt b/compiler/testData/codegen/boxWithStdlib/jdk/arrayList.kt
index 9dfcfc9cb24..d594b1bd20e 100644
--- a/compiler/testData/codegen/boxWithStdlib/jdk/arrayList.kt
+++ b/compiler/testData/codegen/boxWithStdlib/jdk/arrayList.kt
@@ -8,6 +8,6 @@ fun box(): String {
     val j: Int = a.get(1)
     if (i != 74) return "fail 1"
     if (j != 75) return "fail 2"
-    if (a.size() != 2) return "epic fail"
+    if (a.size != 2) return "epic fail"
     return "OK"
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/jdk/hashMap.kt b/compiler/testData/codegen/boxWithStdlib/jdk/hashMap.kt
index 03205db2598..1e586d1e4d4 100644
--- a/compiler/testData/codegen/boxWithStdlib/jdk/hashMap.kt
+++ b/compiler/testData/codegen/boxWithStdlib/jdk/hashMap.kt
@@ -7,9 +7,9 @@ fun box(): String {
     map.put("ccc", 3)
     map.put("dddd", 4)
     if (map.get("a") != 1) return "fail 1"
-    if (map.size() != 4) return "fail 2"
+    if (map.size != 4) return "fail 2"
     if (map.get("eeeee") != null) return "fail 3"
     if (!map.containsKey("bb")) return "fail 4"
-    if (map.entrySet().contains("ffffff")) return "fail 5"
+    if (map.entries.contains("ffffff" as Any)) return "fail 5"
     return "OK"
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/jdk/iteratingOverHashMap.kt b/compiler/testData/codegen/boxWithStdlib/jdk/iteratingOverHashMap.kt
index 091041e1d3d..3273fc1d2a3 100644
--- a/compiler/testData/codegen/boxWithStdlib/jdk/iteratingOverHashMap.kt
+++ b/compiler/testData/codegen/boxWithStdlib/jdk/iteratingOverHashMap.kt
@@ -9,7 +9,7 @@ fun box() : String {
 fun testIteratingOverMap1() : Boolean {
     val map = HashMap<String, Int>()
     map.put("a", 1)
-    for (entry in map.entrySet()) {
+    for (entry in map.entries) {
         entry.setValue(2)
     }
     return map.get("a") == 2
@@ -18,7 +18,7 @@ fun testIteratingOverMap1() : Boolean {
 fun testIteratingOverMap2() : Boolean {
     val map : MutableMap<String, Int> = HashMap<String, Int>()
     map.put("a", 1)
-    for (entry in map.entrySet()) {
+    for (entry in map.entries) {
         entry.setValue(2)
     }
     return map.get("a") == 2
diff --git a/compiler/testData/codegen/boxWithStdlib/jvmOverloads/companionObject.kt b/compiler/testData/codegen/boxWithStdlib/jvmOverloads/companionObject.kt
index da9754b48e7..f33f708d4be 100644
--- a/compiler/testData/codegen/boxWithStdlib/jvmOverloads/companionObject.kt
+++ b/compiler/testData/codegen/boxWithStdlib/jvmOverloads/companionObject.kt
@@ -7,6 +7,6 @@ class C {
 }
 
 fun box(): String {
-    val m = javaClass<C>().getMethod("foo", javaClass<String>())
+    val m = C::class.java.getMethod("foo", String::class.java)
     return m.invoke(null, "O") as String
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/jvmOverloads/defaultsNotAtEnd.kt b/compiler/testData/codegen/boxWithStdlib/jvmOverloads/defaultsNotAtEnd.kt
index d48faedd73f..e4e4ea7b898 100644
--- a/compiler/testData/codegen/boxWithStdlib/jvmOverloads/defaultsNotAtEnd.kt
+++ b/compiler/testData/codegen/boxWithStdlib/jvmOverloads/defaultsNotAtEnd.kt
@@ -6,6 +6,6 @@ class C {
 
 fun box(): String {
     val c = C()
-    val m = c.javaClass.getMethod("foo", javaClass<Int>(), javaClass<Int>())
+    val m = c.javaClass.getMethod("foo", Int::class.java, Int::class.java)
     return m.invoke(c, 1, 2) as String
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/jvmOverloads/doubleParameters.kt b/compiler/testData/codegen/boxWithStdlib/jvmOverloads/doubleParameters.kt
index 32ee1f4a9ec..c965a918e26 100644
--- a/compiler/testData/codegen/boxWithStdlib/jvmOverloads/doubleParameters.kt
+++ b/compiler/testData/codegen/boxWithStdlib/jvmOverloads/doubleParameters.kt
@@ -6,6 +6,6 @@ class C {
 
 fun box(): String {
     val c = C()
-    val m = c.javaClass.getMethod("foo", javaClass<Double>(), javaClass<Double>())
+    val m = c.javaClass.getMethod("foo", Double::class.java, Double::class.java)
     return m.invoke(c, 1.0, 2.0) as String
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/jvmOverloads/extensionMethod.kt b/compiler/testData/codegen/boxWithStdlib/jvmOverloads/extensionMethod.kt
index 9bf603fd70c..caf72f7ab28 100644
--- a/compiler/testData/codegen/boxWithStdlib/jvmOverloads/extensionMethod.kt
+++ b/compiler/testData/codegen/boxWithStdlib/jvmOverloads/extensionMethod.kt
@@ -6,6 +6,6 @@ class C {
 }
 
 fun box(): String {
-    val m = javaClass<C>().getClassLoader().loadClass("ExtensionMethodKt").getMethod("foo", javaClass<C>(), javaClass<String>())
+    val m = C::class.java.getClassLoader().loadClass("ExtensionMethodKt").getMethod("foo", C::class.java, String::class.java)
     return m.invoke(null, C(), "O") as String
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/jvmOverloads/nonDefaultParameter.kt b/compiler/testData/codegen/boxWithStdlib/jvmOverloads/nonDefaultParameter.kt
index 650f14ba119..f0c449920bc 100644
--- a/compiler/testData/codegen/boxWithStdlib/jvmOverloads/nonDefaultParameter.kt
+++ b/compiler/testData/codegen/boxWithStdlib/jvmOverloads/nonDefaultParameter.kt
@@ -6,6 +6,6 @@ class C {
 
 fun box(): String {
     val c = C()
-    val m = c.javaClass.getMethod("foo", javaClass<String>())
+    val m = c.javaClass.getMethod("foo", String::class.java)
     return m.invoke(c, "O") as String
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/jvmOverloads/primaryConstructor.kt b/compiler/testData/codegen/boxWithStdlib/jvmOverloads/primaryConstructor.kt
index 26c6ea2239b..c25134cce3b 100644
--- a/compiler/testData/codegen/boxWithStdlib/jvmOverloads/primaryConstructor.kt
+++ b/compiler/testData/codegen/boxWithStdlib/jvmOverloads/primaryConstructor.kt
@@ -3,6 +3,6 @@ class C @kotlin.jvm.JvmOverloads constructor(s1: String, s2: String = "K") {
 }
 
 fun box(): String {
-    val c = (javaClass<C>().getConstructor(javaClass<String>()).newInstance("O"))
+    val c = (C::class.java.getConstructor(String::class.java).newInstance("O"))
     return c.status
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/jvmOverloads/secondaryConstructor.kt b/compiler/testData/codegen/boxWithStdlib/jvmOverloads/secondaryConstructor.kt
index 102dee57b11..07692fe708f 100644
--- a/compiler/testData/codegen/boxWithStdlib/jvmOverloads/secondaryConstructor.kt
+++ b/compiler/testData/codegen/boxWithStdlib/jvmOverloads/secondaryConstructor.kt
@@ -7,6 +7,6 @@ class C(val i: Int) {
 }
 
 fun box(): String {
-    val c = (javaClass<C>().getConstructor(javaClass<String>()).newInstance("O"))
+    val c = (C::class.java.getConstructor(String::class.java).newInstance("O"))
     return c.status
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/nonLocalReturns/use.kt b/compiler/testData/codegen/boxWithStdlib/nonLocalReturns/use.kt
index 468c5508dd5..9568664da9c 100644
--- a/compiler/testData/codegen/boxWithStdlib/nonLocalReturns/use.kt
+++ b/compiler/testData/codegen/boxWithStdlib/nonLocalReturns/use.kt
@@ -41,7 +41,7 @@ class TestLocal() : Closeable {
                 underMutexFun()
                 throw MyException("exception")
             } catch (e: MyException) {
-                status += e.getMessage()!!
+                status += e.message!!
                 return status
             }
         }
@@ -67,7 +67,7 @@ class TestLocal() : Closeable {
                 underMutexFun()
                 throw MyException("exception")
             } catch (e: MyException) {
-                status += e.getMessage()
+                status += e.message
                 return status
             } finally {
                 status += "finally"
@@ -82,7 +82,7 @@ class TestLocal() : Closeable {
                 underMutexFun()
                 throw MyException("exception")
             } catch (e: MyException) {
-                status += e.getMessage()
+                status += e.message
                 return Holder("fail")
             } finally {
                 status += "finally"
diff --git a/compiler/testData/codegen/boxWithStdlib/nonLocalReturns/useWithException.kt b/compiler/testData/codegen/boxWithStdlib/nonLocalReturns/useWithException.kt
index 03bd17f76e2..d29190d6bda 100644
--- a/compiler/testData/codegen/boxWithStdlib/nonLocalReturns/useWithException.kt
+++ b/compiler/testData/codegen/boxWithStdlib/nonLocalReturns/useWithException.kt
@@ -44,7 +44,7 @@ class TestLocal() : Closeable {
                 underMutexFun()
                 throw MyException("exception")
             } catch (e: MyException) {
-                status += e.getMessage()!!
+                status += e.message!!
                 return status
             }
         }
@@ -70,7 +70,7 @@ class TestLocal() : Closeable {
                 underMutexFun()
                 throw MyException("exception")
             } catch (e: MyException) {
-                status += e.getMessage()
+                status += e.message
                 return status
             } finally {
                 status += "finally"
@@ -85,7 +85,7 @@ class TestLocal() : Closeable {
                 underMutexFun()
                 throw MyException("exception")
             } catch (e: MyException) {
-                status += e.getMessage()
+                status += e.message
                 return Holder("fail")
             } finally {
                 status += "finally"
diff --git a/compiler/testData/codegen/boxWithStdlib/privateConstructor/synthetic.kt b/compiler/testData/codegen/boxWithStdlib/privateConstructor/synthetic.kt
index e3fc6cd92d5..5078c0c729f 100644
--- a/compiler/testData/codegen/boxWithStdlib/privateConstructor/synthetic.kt
+++ b/compiler/testData/codegen/boxWithStdlib/privateConstructor/synthetic.kt
@@ -19,7 +19,7 @@ fun check(klass: Class<*>) {
 }
 
 fun box(): String {
-    check(javaClass<PrivateConstructor>())
+    check(PrivateConstructor::class.java)
     // Also check that synthetic accessors really work
     PrivateConstructor.Nested()
     return "OK"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyDownto.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyDownto.kt
index 64c7d0ca407..0912f85c4d7 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyDownto.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyDownto.kt
@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = 5 downTo 10
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>()) {
         return "Wrong elements for 5 downTo 10: $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = 5.toByte() downTo 10.toByte()
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>()) {
         return "Wrong elements for 5.toByte() downTo 10.toByte(): $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = 5.toShort() downTo 10.toShort()
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>()) {
         return "Wrong elements for 5.toShort() downTo 10.toShort(): $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = 5.toLong() downTo 10.toLong()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>()) {
         return "Wrong elements for 5.toLong() downTo 10.toLong(): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = 'a' downTo 'z'
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>()) {
         return "Wrong elements for 'a' downTo 'z': $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyRange.kt
index 4ed8e3a1f58..a965230a411 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyRange.kt
@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = 10..5
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>()) {
         return "Wrong elements for 10..5: $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = 10.toByte()..(-5).toByte()
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>()) {
         return "Wrong elements for 10.toByte()..(-5).toByte(): $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = 10.toShort()..(-5).toShort()
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>()) {
         return "Wrong elements for 10.toShort()..(-5).toShort(): $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = 10.toLong()..-5.toLong()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>()) {
         return "Wrong elements for 10.toLong()..-5.toLong(): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = 'z'..'a'
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>()) {
         return "Wrong elements for 'z'..'a': $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactDownToMinValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactDownToMinValue.kt
index 740fd42a6b6..92100f0be82 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactDownToMinValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactDownToMinValue.kt
@@ -17,7 +17,7 @@ fun box(): String {
     val range1 = (MinI + 5) downTo MinI step 3
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(MinI + 5, MinI + 2)) {
         return "Wrong elements for (MinI + 5) downTo MinI step 3: $list1"
@@ -27,7 +27,7 @@ fun box(): String {
     val range2 = (MinB + 5).toByte() downTo MinB step 3
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>((MinB + 5).toInt(), (MinB + 2).toInt())) {
         return "Wrong elements for (MinB + 5).toByte() downTo MinB step 3: $list2"
@@ -37,7 +37,7 @@ fun box(): String {
     val range3 = (MinS + 5).toShort() downTo MinS step 3
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>((MinS + 5).toInt(), (MinS + 2).toInt())) {
         return "Wrong elements for (MinS + 5).toShort() downTo MinS step 3: $list3"
@@ -47,7 +47,7 @@ fun box(): String {
     val range4 = (MinL + 5).toLong() downTo MinL step 3
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>((MinL + 5).toLong(), (MinL + 2).toLong())) {
         return "Wrong elements for (MinL + 5).toLong() downTo MinL step 3: $list4"
@@ -57,7 +57,7 @@ fun box(): String {
     val range5 = (MinC + 5) downTo MinC step 3
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>((MinC + 5), (MinC + 2))) {
         return "Wrong elements for (MinC + 5) downTo MinC step 3: $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedDownTo.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedDownTo.kt
index 953b70cd779..0fbd4b3469d 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedDownTo.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedDownTo.kt
@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = 8 downTo 3 step 2
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(8, 6, 4)) {
         return "Wrong elements for 8 downTo 3 step 2: $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = 8.toByte() downTo 3.toByte() step 2
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(8, 6, 4)) {
         return "Wrong elements for 8.toByte() downTo 3.toByte() step 2: $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = 8.toShort() downTo 3.toShort() step 2
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(8, 6, 4)) {
         return "Wrong elements for 8.toShort() downTo 3.toShort() step 2: $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = 8.toLong() downTo 3.toLong() step 2.toLong()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(8, 6, 4)) {
         return "Wrong elements for 8.toLong() downTo 3.toLong() step 2.toLong(): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = 'd' downTo 'a' step 2
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('d', 'b')) {
         return "Wrong elements for 'd' downTo 'a' step 2: $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedRange.kt
index ecc3af34145..fe679e3e535 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedRange.kt
@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = 3..8 step 2
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(3, 5, 7)) {
         return "Wrong elements for 3..8 step 2: $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = 3.toByte()..8.toByte() step 2
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(3, 5, 7)) {
         return "Wrong elements for 3.toByte()..8.toByte() step 2: $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = 3.toShort()..8.toShort() step 2
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(3, 5, 7)) {
         return "Wrong elements for 3.toShort()..8.toShort() step 2: $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = 3.toLong()..8.toLong() step 2.toLong()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(3, 5, 7)) {
         return "Wrong elements for 3.toLong()..8.toLong() step 2.toLong(): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = 'a'..'d' step 2
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('a', 'c')) {
         return "Wrong elements for 'a'..'d' step 2: $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactToMaxValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactToMaxValue.kt
index d0f9d59d35b..8a45d71ebb7 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactToMaxValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactToMaxValue.kt
@@ -17,7 +17,7 @@ fun box(): String {
     val range1 = (MaxI - 5)..MaxI step 3
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(MaxI - 5, MaxI - 2)) {
         return "Wrong elements for (MaxI - 5)..MaxI step 3: $list1"
@@ -27,7 +27,7 @@ fun box(): String {
     val range2 = (MaxB - 5).toByte()..MaxB step 3
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>((MaxB - 5).toInt(), (MaxB - 2).toInt())) {
         return "Wrong elements for (MaxB - 5).toByte()..MaxB step 3: $list2"
@@ -37,7 +37,7 @@ fun box(): String {
     val range3 = (MaxS - 5).toShort()..MaxS step 3
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>((MaxS - 5).toInt(), (MaxS - 2).toInt())) {
         return "Wrong elements for (MaxS - 5).toShort()..MaxS step 3: $list3"
@@ -47,7 +47,7 @@ fun box(): String {
     val range4 = (MaxL - 5).toLong()..MaxL step 3
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>((MaxL - 5).toLong(), (MaxL - 2).toLong())) {
         return "Wrong elements for (MaxL - 5).toLong()..MaxL step 3: $list4"
@@ -57,7 +57,7 @@ fun box(): String {
     val range5 = (MaxC - 5)..MaxC step 3
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>((MaxC - 5), (MaxC - 2))) {
         return "Wrong elements for (MaxC - 5)..MaxC step 3: $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueMinusTwoToMaxValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueMinusTwoToMaxValue.kt
index 9de7a0aa15c..7e32256de9b 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueMinusTwoToMaxValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueMinusTwoToMaxValue.kt
@@ -17,7 +17,7 @@ fun box(): String {
     val range1 = (MaxI - 2)..MaxI
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(MaxI - 2, MaxI - 1, MaxI)) {
         return "Wrong elements for (MaxI - 2)..MaxI: $list1"
@@ -27,7 +27,7 @@ fun box(): String {
     val range2 = (MaxB - 2).toByte()..MaxB
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>((MaxB - 2).toInt(), (MaxB - 1).toInt(), MaxB.toInt())) {
         return "Wrong elements for (MaxB - 2).toByte()..MaxB: $list2"
@@ -37,7 +37,7 @@ fun box(): String {
     val range3 = (MaxS - 2).toShort()..MaxS
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>((MaxS - 2).toInt(), (MaxS - 1).toInt(), MaxS.toInt())) {
         return "Wrong elements for (MaxS - 2).toShort()..MaxS: $list3"
@@ -47,7 +47,7 @@ fun box(): String {
     val range4 = (MaxL - 2).toLong()..MaxL
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>((MaxL - 2).toLong(), (MaxL - 1).toLong(), MaxL)) {
         return "Wrong elements for (MaxL - 2).toLong()..MaxL: $list4"
@@ -57,7 +57,7 @@ fun box(): String {
     val range5 = (MaxC - 2)..MaxC
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>((MaxC - 2), (MaxC - 1), MaxC)) {
         return "Wrong elements for (MaxC - 2)..MaxC: $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueToMaxValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueToMaxValue.kt
index e3f134fdff7..3d2240c941a 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueToMaxValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueToMaxValue.kt
@@ -17,7 +17,7 @@ fun box(): String {
     val range1 = MaxI..MaxI
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(MaxI)) {
         return "Wrong elements for MaxI..MaxI: $list1"
@@ -27,7 +27,7 @@ fun box(): String {
     val range2 = MaxB..MaxB
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(MaxB.toInt())) {
         return "Wrong elements for MaxB..MaxB: $list2"
@@ -37,7 +37,7 @@ fun box(): String {
     val range3 = MaxS..MaxS
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(MaxS.toInt())) {
         return "Wrong elements for MaxS..MaxS: $list3"
@@ -47,7 +47,7 @@ fun box(): String {
     val range4 = MaxL..MaxL
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(MaxL)) {
         return "Wrong elements for MaxL..MaxL: $list4"
@@ -57,7 +57,7 @@ fun box(): String {
     val range5 = MaxC..MaxC
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>(MaxC)) {
         return "Wrong elements for MaxC..MaxC: $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueToMinValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueToMinValue.kt
index bcccb05d702..e1c5119616f 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueToMinValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueToMinValue.kt
@@ -17,7 +17,7 @@ fun box(): String {
     val range1 = MaxI..MinI
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>()) {
         return "Wrong elements for MaxI..MinI: $list1"
@@ -27,7 +27,7 @@ fun box(): String {
     val range2 = MaxB..MinB
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>()) {
         return "Wrong elements for MaxB..MinB: $list2"
@@ -37,7 +37,7 @@ fun box(): String {
     val range3 = MaxS..MinS
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>()) {
         return "Wrong elements for MaxS..MinS: $list3"
@@ -47,7 +47,7 @@ fun box(): String {
     val range4 = MaxL..MinL
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>()) {
         return "Wrong elements for MaxL..MinL: $list4"
@@ -57,7 +57,7 @@ fun box(): String {
     val range5 = MaxC..MinC
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>()) {
         return "Wrong elements for MaxC..MinC: $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementDownTo.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementDownTo.kt
index fdae704411a..bb92a32c94d 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementDownTo.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementDownTo.kt
@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = 5 downTo 5
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(5)) {
         return "Wrong elements for 5 downTo 5: $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = 5.toByte() downTo 5.toByte()
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(5)) {
         return "Wrong elements for 5.toByte() downTo 5.toByte(): $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = 5.toShort() downTo 5.toShort()
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(5)) {
         return "Wrong elements for 5.toShort() downTo 5.toShort(): $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = 5.toLong() downTo 5.toLong()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(5.toLong())) {
         return "Wrong elements for 5.toLong() downTo 5.toLong(): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = 'k' downTo 'k'
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('k')) {
         return "Wrong elements for 'k' downTo 'k': $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementRange.kt
index 89932cd5169..9b88a12f2b1 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementRange.kt
@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = 5..5
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(5)) {
         return "Wrong elements for 5..5: $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = 5.toByte()..5.toByte()
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(5)) {
         return "Wrong elements for 5.toByte()..5.toByte(): $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = 5.toShort()..5.toShort()
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(5)) {
         return "Wrong elements for 5.toShort()..5.toShort(): $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = 5.toLong()..5.toLong()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(5.toLong())) {
         return "Wrong elements for 5.toLong()..5.toLong(): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = 'k'..'k'
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('k')) {
         return "Wrong elements for 'k'..'k': $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/openRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/openRange.kt
index 566db585bab..db3ae755bb2 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/openRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/openRange.kt
@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = 1 until 5
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(1, 2, 3, 4)) {
         return "Wrong elements for 1 until 5: $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = 1.toByte() until 5.toByte()
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(1, 2, 3, 4)) {
         return "Wrong elements for 1.toByte() until 5.toByte(): $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = 1.toShort() until 5.toShort()
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(1, 2, 3, 4)) {
         return "Wrong elements for 1.toShort() until 5.toShort(): $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = 1.toLong() until 5.toLong()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(1, 2, 3, 4)) {
         return "Wrong elements for 1.toLong() until 5.toLong(): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = 'a' until 'd'
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('a', 'b', 'c')) {
         return "Wrong elements for 'a' until 'd': $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionDownToMinValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionDownToMinValue.kt
index af49d2370e3..05e028cfab9 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionDownToMinValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionDownToMinValue.kt
@@ -17,7 +17,7 @@ fun box(): String {
     val range1 = (MinI + 2) downTo MinI step 1
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(MinI + 2, MinI + 1, MinI)) {
         return "Wrong elements for (MinI + 2) downTo MinI step 1: $list1"
@@ -27,7 +27,7 @@ fun box(): String {
     val range2 = (MinB + 2).toByte() downTo MinB step 1
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>((MinB + 2).toInt(), (MinB + 1).toInt(), MinB.toInt())) {
         return "Wrong elements for (MinB + 2).toByte() downTo MinB step 1: $list2"
@@ -37,7 +37,7 @@ fun box(): String {
     val range3 = (MinS + 2).toShort() downTo MinS step 1
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>((MinS + 2).toInt(), (MinS + 1).toInt(), MinS.toInt())) {
         return "Wrong elements for (MinS + 2).toShort() downTo MinS step 1: $list3"
@@ -47,7 +47,7 @@ fun box(): String {
     val range4 = (MinL + 2).toLong() downTo MinL step 1
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>((MinL + 2).toLong(), (MinL + 1).toLong(), MinL)) {
         return "Wrong elements for (MinL + 2).toLong() downTo MinL step 1: $list4"
@@ -57,7 +57,7 @@ fun box(): String {
     val range5 = (MinC + 2) downTo MinC step 1
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>((MinC + 2), (MinC + 1), MinC)) {
         return "Wrong elements for (MinC + 2) downTo MinC step 1: $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueMinusTwoToMaxValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueMinusTwoToMaxValue.kt
index dbbae7a1001..a7b7fba59db 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueMinusTwoToMaxValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueMinusTwoToMaxValue.kt
@@ -17,7 +17,7 @@ fun box(): String {
     val range1 = (MaxI - 2)..MaxI step 2
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(MaxI - 2, MaxI)) {
         return "Wrong elements for (MaxI - 2)..MaxI step 2: $list1"
@@ -27,7 +27,7 @@ fun box(): String {
     val range2 = (MaxB - 2).toByte()..MaxB step 2
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>((MaxB - 2).toInt(), MaxB.toInt())) {
         return "Wrong elements for (MaxB - 2).toByte()..MaxB step 2: $list2"
@@ -37,7 +37,7 @@ fun box(): String {
     val range3 = (MaxS - 2).toShort()..MaxS step 2
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>((MaxS - 2).toInt(), MaxS.toInt())) {
         return "Wrong elements for (MaxS - 2).toShort()..MaxS step 2: $list3"
@@ -47,7 +47,7 @@ fun box(): String {
     val range4 = (MaxL - 2).toLong()..MaxL step 2
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>((MaxL - 2).toLong(), MaxL)) {
         return "Wrong elements for (MaxL - 2).toLong()..MaxL step 2: $list4"
@@ -57,7 +57,7 @@ fun box(): String {
     val range5 = (MaxC - 2)..MaxC step 2
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>((MaxC - 2), MaxC)) {
         return "Wrong elements for (MaxC - 2)..MaxC step 2: $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueToMaxValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueToMaxValue.kt
index c5d0ffe5016..8e2a7a117b4 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueToMaxValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueToMaxValue.kt
@@ -17,7 +17,7 @@ fun box(): String {
     val range1 = MaxI..MaxI step 1
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(MaxI)) {
         return "Wrong elements for MaxI..MaxI step 1: $list1"
@@ -27,7 +27,7 @@ fun box(): String {
     val range2 = MaxB..MaxB step 1
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(MaxB.toInt())) {
         return "Wrong elements for MaxB..MaxB step 1: $list2"
@@ -37,7 +37,7 @@ fun box(): String {
     val range3 = MaxS..MaxS step 1
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(MaxS.toInt())) {
         return "Wrong elements for MaxS..MaxS step 1: $list3"
@@ -47,7 +47,7 @@ fun box(): String {
     val range4 = MaxL..MaxL step 1
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(MaxL)) {
         return "Wrong elements for MaxL..MaxL step 1: $list4"
@@ -57,7 +57,7 @@ fun box(): String {
     val range5 = MaxC..MaxC step 1
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>(MaxC)) {
         return "Wrong elements for MaxC..MaxC step 1: $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueToMinValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueToMinValue.kt
index 6a65378c225..f3dfd3538f5 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueToMinValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueToMinValue.kt
@@ -17,7 +17,7 @@ fun box(): String {
     val range1 = MaxI..MinI step 1
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>()) {
         return "Wrong elements for MaxI..MinI step 1: $list1"
@@ -27,7 +27,7 @@ fun box(): String {
     val range2 = MaxB..MinB step 1
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>()) {
         return "Wrong elements for MaxB..MinB step 1: $list2"
@@ -37,7 +37,7 @@ fun box(): String {
     val range3 = MaxS..MinS step 1
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>()) {
         return "Wrong elements for MaxS..MinS step 1: $list3"
@@ -47,7 +47,7 @@ fun box(): String {
     val range4 = MaxL..MinL step 1
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>()) {
         return "Wrong elements for MaxL..MinL step 1: $list4"
@@ -57,7 +57,7 @@ fun box(): String {
     val range5 = MaxC..MinC step 1
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>()) {
         return "Wrong elements for MaxC..MinC step 1: $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMinValueToMinValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMinValueToMinValue.kt
index 69e74095195..6c52915b863 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMinValueToMinValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMinValueToMinValue.kt
@@ -17,7 +17,7 @@ fun box(): String {
     val range1 = MinI..MinI step 1
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(MinI)) {
         return "Wrong elements for MinI..MinI step 1: $list1"
@@ -27,7 +27,7 @@ fun box(): String {
     val range2 = MinB..MinB step 1
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(MinB.toInt())) {
         return "Wrong elements for MinB..MinB step 1: $list2"
@@ -37,7 +37,7 @@ fun box(): String {
     val range3 = MinS..MinS step 1
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(MinS.toInt())) {
         return "Wrong elements for MinS..MinS step 1: $list3"
@@ -47,7 +47,7 @@ fun box(): String {
     val range4 = MinL..MinL step 1
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(MinL)) {
         return "Wrong elements for MinL..MinL step 1: $list4"
@@ -57,7 +57,7 @@ fun box(): String {
     val range5 = MinC..MinC step 1
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>(MinC)) {
         return "Wrong elements for MinC..MinC step 1: $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedBackSequence.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedBackSequence.kt
index 668d6b6a26e..074ec6d727f 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedBackSequence.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedBackSequence.kt
@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = (5 downTo 3).reversed()
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(3, 4, 5)) {
         return "Wrong elements for (5 downTo 3).reversed(): $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = (5.toByte() downTo 3.toByte()).reversed()
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(3, 4, 5)) {
         return "Wrong elements for (5.toByte() downTo 3.toByte()).reversed(): $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = (5.toShort() downTo 3.toShort()).reversed()
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(3, 4, 5)) {
         return "Wrong elements for (5.toShort() downTo 3.toShort()).reversed(): $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = (5.toLong() downTo 3.toLong()).reversed()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(3, 4, 5)) {
         return "Wrong elements for (5.toLong() downTo 3.toLong()).reversed(): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = ('c' downTo 'a').reversed()
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('a', 'b', 'c')) {
         return "Wrong elements for ('c' downTo 'a').reversed(): $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyBackSequence.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyBackSequence.kt
index 3416b706d66..955527cdccf 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyBackSequence.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyBackSequence.kt
@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = (3 downTo 5).reversed()
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>()) {
         return "Wrong elements for (3 downTo 5).reversed(): $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = (3.toByte() downTo 5.toByte()).reversed()
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>()) {
         return "Wrong elements for (3.toByte() downTo 5.toByte()).reversed(): $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = (3.toShort() downTo 5.toShort()).reversed()
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>()) {
         return "Wrong elements for (3.toShort() downTo 5.toShort()).reversed(): $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = (3.toLong() downTo 5.toLong()).reversed()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>()) {
         return "Wrong elements for (3.toLong() downTo 5.toLong()).reversed(): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = ('a' downTo 'c').reversed()
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>()) {
         return "Wrong elements for ('a' downTo 'c').reversed(): $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyRange.kt
index 1b902d81203..512a5c8a5a6 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyRange.kt
@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = (5..3).reversed()
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>()) {
         return "Wrong elements for (5..3).reversed(): $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = (5.toByte()..3.toByte()).reversed()
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>()) {
         return "Wrong elements for (5.toByte()..3.toByte()).reversed(): $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = (5.toShort()..3.toShort()).reversed()
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>()) {
         return "Wrong elements for (5.toShort()..3.toShort()).reversed(): $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = (5.toLong()..3.toLong()).reversed()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>()) {
         return "Wrong elements for (5.toLong()..3.toLong()).reversed(): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = ('c'..'a').reversed()
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>()) {
         return "Wrong elements for ('c'..'a').reversed(): $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedInexactSteppedDownTo.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedInexactSteppedDownTo.kt
index f15a9d19f9a..0bfc25c5b11 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedInexactSteppedDownTo.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedInexactSteppedDownTo.kt
@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = (8 downTo 3 step 2).reversed()
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(4, 6, 8)) {
         return "Wrong elements for (8 downTo 3 step 2).reversed(): $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = (8.toByte() downTo 3.toByte() step 2).reversed()
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(4, 6, 8)) {
         return "Wrong elements for (8.toByte() downTo 3.toByte() step 2).reversed(): $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = (8.toShort() downTo 3.toShort() step 2).reversed()
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(4, 6, 8)) {
         return "Wrong elements for (8.toShort() downTo 3.toShort() step 2).reversed(): $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = (8.toLong() downTo 3.toLong() step 2.toLong()).reversed()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(4, 6, 8)) {
         return "Wrong elements for (8.toLong() downTo 3.toLong() step 2.toLong()).reversed(): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = ('d' downTo 'a' step 2).reversed()
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('b', 'd')) {
         return "Wrong elements for ('d' downTo 'a' step 2).reversed(): $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedRange.kt
index 9d53637b608..92d15b9058e 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedRange.kt
@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = (3..5).reversed()
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(5, 4, 3)) {
         return "Wrong elements for (3..5).reversed(): $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = (3.toShort()..5.toShort()).reversed()
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(5, 4, 3)) {
         return "Wrong elements for (3.toShort()..5.toShort()).reversed(): $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = (3.toLong()..5.toLong()).reversed()
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Long>(5, 4, 3)) {
         return "Wrong elements for (3.toLong()..5.toLong()).reversed(): $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = ('a'..'c').reversed()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Char>('c', 'b', 'a')) {
         return "Wrong elements for ('a'..'c').reversed(): $list4"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedSimpleSteppedRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedSimpleSteppedRange.kt
index 94352c1e7bc..3c96a303c06 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedSimpleSteppedRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedSimpleSteppedRange.kt
@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = (3..9 step 2).reversed()
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(9, 7, 5, 3)) {
         return "Wrong elements for (3..9 step 2).reversed(): $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = (3.toByte()..9.toByte() step 2).reversed()
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(9, 7, 5, 3)) {
         return "Wrong elements for (3.toByte()..9.toByte() step 2).reversed(): $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = (3.toShort()..9.toShort() step 2).reversed()
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(9, 7, 5, 3)) {
         return "Wrong elements for (3.toShort()..9.toShort() step 2).reversed(): $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = (3.toLong()..9.toLong() step 2.toLong()).reversed()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(9, 7, 5, 3)) {
         return "Wrong elements for (3.toLong()..9.toLong() step 2.toLong()).reversed(): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = ('c'..'g' step 2).reversed()
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('g', 'e', 'c')) {
         return "Wrong elements for ('c'..'g' step 2).reversed(): $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleDownTo.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleDownTo.kt
index 6c8b2999184..cc5f68ff88a 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleDownTo.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleDownTo.kt
@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = 9 downTo 3
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(9, 8, 7, 6, 5, 4, 3)) {
         return "Wrong elements for 9 downTo 3: $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = 9.toByte() downTo 3.toByte()
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(9, 8, 7, 6, 5, 4, 3)) {
         return "Wrong elements for 9.toByte() downTo 3.toByte(): $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = 9.toShort() downTo 3.toShort()
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(9, 8, 7, 6, 5, 4, 3)) {
         return "Wrong elements for 9.toShort() downTo 3.toShort(): $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = 9.toLong() downTo 3.toLong()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(9, 8, 7, 6, 5, 4, 3)) {
         return "Wrong elements for 9.toLong() downTo 3.toLong(): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = 'g' downTo 'c'
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('g', 'f', 'e', 'd', 'c')) {
         return "Wrong elements for 'g' downTo 'c': $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRange.kt
index 4ad830d6734..b250598cf70 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRange.kt
@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = 3..9
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(3, 4, 5, 6, 7, 8, 9)) {
         return "Wrong elements for 3..9: $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = 3.toByte()..9.toByte()
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(3, 4, 5, 6, 7, 8, 9)) {
         return "Wrong elements for 3.toByte()..9.toByte(): $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = 3.toShort()..9.toShort()
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(3, 4, 5, 6, 7, 8, 9)) {
         return "Wrong elements for 3.toShort()..9.toShort(): $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = 3.toLong()..9.toLong()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(3, 4, 5, 6, 7, 8, 9)) {
         return "Wrong elements for 3.toLong()..9.toLong(): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = 'c'..'g'
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('c', 'd', 'e', 'f', 'g')) {
         return "Wrong elements for 'c'..'g': $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRangeWithNonConstantEnds.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRangeWithNonConstantEnds.kt
index 424f1dcbda4..35d2034b4c4 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRangeWithNonConstantEnds.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRangeWithNonConstantEnds.kt
@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = (1 + 2)..(10 - 1)
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(3, 4, 5, 6, 7, 8, 9)) {
         return "Wrong elements for (1 + 2)..(10 - 1): $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = (1.toByte() + 2.toByte()).toByte()..(10.toByte() - 1.toByte()).toByte()
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(3, 4, 5, 6, 7, 8, 9)) {
         return "Wrong elements for (1.toByte() + 2.toByte()).toByte()..(10.toByte() - 1.toByte()).toByte(): $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = (1.toShort() + 2.toShort()).toShort()..(10.toShort() - 1.toShort()).toShort()
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(3, 4, 5, 6, 7, 8, 9)) {
         return "Wrong elements for (1.toShort() + 2.toShort()).toShort()..(10.toShort() - 1.toShort()).toShort(): $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = (1.toLong() + 2.toLong())..(10.toLong() - 1.toLong())
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(3, 4, 5, 6, 7, 8, 9)) {
         return "Wrong elements for (1.toLong() + 2.toLong())..(10.toLong() - 1.toLong()): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = ("ace"[1])..("age"[1])
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('c', 'd', 'e', 'f', 'g')) {
         return "Wrong elements for (\"ace\"[1])..(\"age\"[1]): $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedDownTo.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedDownTo.kt
index 758c58fbdc6..a892d90da9f 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedDownTo.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedDownTo.kt
@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = 9 downTo 3 step 2
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(9, 7, 5, 3)) {
         return "Wrong elements for 9 downTo 3 step 2: $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = 9.toByte() downTo 3.toByte() step 2
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(9, 7, 5, 3)) {
         return "Wrong elements for 9.toByte() downTo 3.toByte() step 2: $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = 9.toShort() downTo 3.toShort() step 2
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(9, 7, 5, 3)) {
         return "Wrong elements for 9.toShort() downTo 3.toShort() step 2: $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = 9.toLong() downTo 3.toLong() step 2.toLong()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(9, 7, 5, 3)) {
         return "Wrong elements for 9.toLong() downTo 3.toLong() step 2.toLong(): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = 'g' downTo 'c' step 2
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('g', 'e', 'c')) {
         return "Wrong elements for 'g' downTo 'c' step 2: $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedRange.kt
index bcde73c9298..b6c5cd24f3b 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedRange.kt
@@ -6,7 +6,7 @@ fun box(): String {
     val range1 = 3..9 step 2
     for (i in range1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(3, 5, 7, 9)) {
         return "Wrong elements for 3..9 step 2: $list1"
@@ -16,7 +16,7 @@ fun box(): String {
     val range2 = 3.toByte()..9.toByte() step 2
     for (i in range2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(3, 5, 7, 9)) {
         return "Wrong elements for 3.toByte()..9.toByte() step 2: $list2"
@@ -26,7 +26,7 @@ fun box(): String {
     val range3 = 3.toShort()..9.toShort() step 2
     for (i in range3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(3, 5, 7, 9)) {
         return "Wrong elements for 3.toShort()..9.toShort() step 2: $list3"
@@ -36,7 +36,7 @@ fun box(): String {
     val range4 = 3.toLong()..9.toLong() step 2.toLong()
     for (i in range4) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(3, 5, 7, 9)) {
         return "Wrong elements for 3.toLong()..9.toLong() step 2.toLong(): $list4"
@@ -46,7 +46,7 @@ fun box(): String {
     val range5 = 'c'..'g' step 2
     for (i in range5) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('c', 'e', 'g')) {
         return "Wrong elements for 'c'..'g' step 2: $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/emptyDownto.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/emptyDownto.kt
index deaff5263ac..da34c280764 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/emptyDownto.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/emptyDownto.kt
@@ -5,7 +5,7 @@ fun box(): String {
     val list1 = ArrayList<Int>()
     for (i in 5 downTo 10) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>()) {
         return "Wrong elements for 5 downTo 10: $list1"
@@ -14,7 +14,7 @@ fun box(): String {
     val list2 = ArrayList<Int>()
     for (i in 5.toByte() downTo 10.toByte()) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>()) {
         return "Wrong elements for 5.toByte() downTo 10.toByte(): $list2"
@@ -23,7 +23,7 @@ fun box(): String {
     val list3 = ArrayList<Int>()
     for (i in 5.toShort() downTo 10.toShort()) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>()) {
         return "Wrong elements for 5.toShort() downTo 10.toShort(): $list3"
@@ -32,7 +32,7 @@ fun box(): String {
     val list4 = ArrayList<Long>()
     for (i in 5.toLong() downTo 10.toLong()) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>()) {
         return "Wrong elements for 5.toLong() downTo 10.toLong(): $list4"
@@ -41,7 +41,7 @@ fun box(): String {
     val list5 = ArrayList<Char>()
     for (i in 'a' downTo 'z') {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>()) {
         return "Wrong elements for 'a' downTo 'z': $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/emptyRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/emptyRange.kt
index 4e7e844738e..06268f432e2 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/emptyRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/emptyRange.kt
@@ -5,7 +5,7 @@ fun box(): String {
     val list1 = ArrayList<Int>()
     for (i in 10..5) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>()) {
         return "Wrong elements for 10..5: $list1"
@@ -14,7 +14,7 @@ fun box(): String {
     val list2 = ArrayList<Int>()
     for (i in 10.toByte()..(-5).toByte()) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>()) {
         return "Wrong elements for 10.toByte()..(-5).toByte(): $list2"
@@ -23,7 +23,7 @@ fun box(): String {
     val list3 = ArrayList<Int>()
     for (i in 10.toShort()..(-5).toShort()) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>()) {
         return "Wrong elements for 10.toShort()..(-5).toShort(): $list3"
@@ -32,7 +32,7 @@ fun box(): String {
     val list4 = ArrayList<Long>()
     for (i in 10.toLong()..-5.toLong()) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>()) {
         return "Wrong elements for 10.toLong()..-5.toLong(): $list4"
@@ -41,7 +41,7 @@ fun box(): String {
     val list5 = ArrayList<Char>()
     for (i in 'z'..'a') {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>()) {
         return "Wrong elements for 'z'..'a': $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactDownToMinValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactDownToMinValue.kt
index 6c65bf4852d..bb15dc78c66 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactDownToMinValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactDownToMinValue.kt
@@ -16,7 +16,7 @@ fun box(): String {
     val list1 = ArrayList<Int>()
     for (i in (MinI + 5) downTo MinI step 3) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(MinI + 5, MinI + 2)) {
         return "Wrong elements for (MinI + 5) downTo MinI step 3: $list1"
@@ -25,7 +25,7 @@ fun box(): String {
     val list2 = ArrayList<Int>()
     for (i in (MinB + 5).toByte() downTo MinB step 3) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>((MinB + 5).toInt(), (MinB + 2).toInt())) {
         return "Wrong elements for (MinB + 5).toByte() downTo MinB step 3: $list2"
@@ -34,7 +34,7 @@ fun box(): String {
     val list3 = ArrayList<Int>()
     for (i in (MinS + 5).toShort() downTo MinS step 3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>((MinS + 5).toInt(), (MinS + 2).toInt())) {
         return "Wrong elements for (MinS + 5).toShort() downTo MinS step 3: $list3"
@@ -43,7 +43,7 @@ fun box(): String {
     val list4 = ArrayList<Long>()
     for (i in (MinL + 5).toLong() downTo MinL step 3) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>((MinL + 5).toLong(), (MinL + 2).toLong())) {
         return "Wrong elements for (MinL + 5).toLong() downTo MinL step 3: $list4"
@@ -52,7 +52,7 @@ fun box(): String {
     val list5 = ArrayList<Char>()
     for (i in (MinC + 5) downTo MinC step 3) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>((MinC + 5), (MinC + 2))) {
         return "Wrong elements for (MinC + 5) downTo MinC step 3: $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactSteppedDownTo.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactSteppedDownTo.kt
index 2aafcb5b741..db36a6bed47 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactSteppedDownTo.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactSteppedDownTo.kt
@@ -5,7 +5,7 @@ fun box(): String {
     val list1 = ArrayList<Int>()
     for (i in 8 downTo 3 step 2) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(8, 6, 4)) {
         return "Wrong elements for 8 downTo 3 step 2: $list1"
@@ -14,7 +14,7 @@ fun box(): String {
     val list2 = ArrayList<Int>()
     for (i in 8.toByte() downTo 3.toByte() step 2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(8, 6, 4)) {
         return "Wrong elements for 8.toByte() downTo 3.toByte() step 2: $list2"
@@ -23,7 +23,7 @@ fun box(): String {
     val list3 = ArrayList<Int>()
     for (i in 8.toShort() downTo 3.toShort() step 2) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(8, 6, 4)) {
         return "Wrong elements for 8.toShort() downTo 3.toShort() step 2: $list3"
@@ -32,7 +32,7 @@ fun box(): String {
     val list4 = ArrayList<Long>()
     for (i in 8.toLong() downTo 3.toLong() step 2.toLong()) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(8, 6, 4)) {
         return "Wrong elements for 8.toLong() downTo 3.toLong() step 2.toLong(): $list4"
@@ -41,7 +41,7 @@ fun box(): String {
     val list5 = ArrayList<Char>()
     for (i in 'd' downTo 'a' step 2) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('d', 'b')) {
         return "Wrong elements for 'd' downTo 'a' step 2: $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactSteppedRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactSteppedRange.kt
index 59942cd2f7e..1071411da04 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactSteppedRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactSteppedRange.kt
@@ -5,7 +5,7 @@ fun box(): String {
     val list1 = ArrayList<Int>()
     for (i in 3..8 step 2) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(3, 5, 7)) {
         return "Wrong elements for 3..8 step 2: $list1"
@@ -14,7 +14,7 @@ fun box(): String {
     val list2 = ArrayList<Int>()
     for (i in 3.toByte()..8.toByte() step 2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(3, 5, 7)) {
         return "Wrong elements for 3.toByte()..8.toByte() step 2: $list2"
@@ -23,7 +23,7 @@ fun box(): String {
     val list3 = ArrayList<Int>()
     for (i in 3.toShort()..8.toShort() step 2) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(3, 5, 7)) {
         return "Wrong elements for 3.toShort()..8.toShort() step 2: $list3"
@@ -32,7 +32,7 @@ fun box(): String {
     val list4 = ArrayList<Long>()
     for (i in 3.toLong()..8.toLong() step 2.toLong()) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(3, 5, 7)) {
         return "Wrong elements for 3.toLong()..8.toLong() step 2.toLong(): $list4"
@@ -41,7 +41,7 @@ fun box(): String {
     val list5 = ArrayList<Char>()
     for (i in 'a'..'d' step 2) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('a', 'c')) {
         return "Wrong elements for 'a'..'d' step 2: $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactToMaxValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactToMaxValue.kt
index eca8fea6bb0..503732f47b0 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactToMaxValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactToMaxValue.kt
@@ -16,7 +16,7 @@ fun box(): String {
     val list1 = ArrayList<Int>()
     for (i in (MaxI - 5)..MaxI step 3) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(MaxI - 5, MaxI - 2)) {
         return "Wrong elements for (MaxI - 5)..MaxI step 3: $list1"
@@ -25,7 +25,7 @@ fun box(): String {
     val list2 = ArrayList<Int>()
     for (i in (MaxB - 5).toByte()..MaxB step 3) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>((MaxB - 5).toInt(), (MaxB - 2).toInt())) {
         return "Wrong elements for (MaxB - 5).toByte()..MaxB step 3: $list2"
@@ -34,7 +34,7 @@ fun box(): String {
     val list3 = ArrayList<Int>()
     for (i in (MaxS - 5).toShort()..MaxS step 3) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>((MaxS - 5).toInt(), (MaxS - 2).toInt())) {
         return "Wrong elements for (MaxS - 5).toShort()..MaxS step 3: $list3"
@@ -43,7 +43,7 @@ fun box(): String {
     val list4 = ArrayList<Long>()
     for (i in (MaxL - 5).toLong()..MaxL step 3) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>((MaxL - 5).toLong(), (MaxL - 2).toLong())) {
         return "Wrong elements for (MaxL - 5).toLong()..MaxL step 3: $list4"
@@ -52,7 +52,7 @@ fun box(): String {
     val list5 = ArrayList<Char>()
     for (i in (MaxC - 5)..MaxC step 3) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>((MaxC - 5), (MaxC - 2))) {
         return "Wrong elements for (MaxC - 5)..MaxC step 3: $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueMinusTwoToMaxValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueMinusTwoToMaxValue.kt
index e800248bbb2..da12a8da7e9 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueMinusTwoToMaxValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueMinusTwoToMaxValue.kt
@@ -16,7 +16,7 @@ fun box(): String {
     val list1 = ArrayList<Int>()
     for (i in (MaxI - 2)..MaxI) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(MaxI - 2, MaxI - 1, MaxI)) {
         return "Wrong elements for (MaxI - 2)..MaxI: $list1"
@@ -25,7 +25,7 @@ fun box(): String {
     val list2 = ArrayList<Int>()
     for (i in (MaxB - 2).toByte()..MaxB) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>((MaxB - 2).toInt(), (MaxB - 1).toInt(), MaxB.toInt())) {
         return "Wrong elements for (MaxB - 2).toByte()..MaxB: $list2"
@@ -34,7 +34,7 @@ fun box(): String {
     val list3 = ArrayList<Int>()
     for (i in (MaxS - 2).toShort()..MaxS) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>((MaxS - 2).toInt(), (MaxS - 1).toInt(), MaxS.toInt())) {
         return "Wrong elements for (MaxS - 2).toShort()..MaxS: $list3"
@@ -43,7 +43,7 @@ fun box(): String {
     val list4 = ArrayList<Long>()
     for (i in (MaxL - 2).toLong()..MaxL) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>((MaxL - 2).toLong(), (MaxL - 1).toLong(), MaxL)) {
         return "Wrong elements for (MaxL - 2).toLong()..MaxL: $list4"
@@ -52,7 +52,7 @@ fun box(): String {
     val list5 = ArrayList<Char>()
     for (i in (MaxC - 2)..MaxC) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>((MaxC - 2), (MaxC - 1), MaxC)) {
         return "Wrong elements for (MaxC - 2)..MaxC: $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueToMaxValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueToMaxValue.kt
index 9649e40335a..7278d76daef 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueToMaxValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueToMaxValue.kt
@@ -16,7 +16,7 @@ fun box(): String {
     val list1 = ArrayList<Int>()
     for (i in MaxI..MaxI) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(MaxI)) {
         return "Wrong elements for MaxI..MaxI: $list1"
@@ -25,7 +25,7 @@ fun box(): String {
     val list2 = ArrayList<Int>()
     for (i in MaxB..MaxB) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(MaxB.toInt())) {
         return "Wrong elements for MaxB..MaxB: $list2"
@@ -34,7 +34,7 @@ fun box(): String {
     val list3 = ArrayList<Int>()
     for (i in MaxS..MaxS) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(MaxS.toInt())) {
         return "Wrong elements for MaxS..MaxS: $list3"
@@ -43,7 +43,7 @@ fun box(): String {
     val list4 = ArrayList<Long>()
     for (i in MaxL..MaxL) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(MaxL)) {
         return "Wrong elements for MaxL..MaxL: $list4"
@@ -52,7 +52,7 @@ fun box(): String {
     val list5 = ArrayList<Char>()
     for (i in MaxC..MaxC) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>(MaxC)) {
         return "Wrong elements for MaxC..MaxC: $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueToMinValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueToMinValue.kt
index 0e0fdc506d2..9126b61a743 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueToMinValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueToMinValue.kt
@@ -16,7 +16,7 @@ fun box(): String {
     val list1 = ArrayList<Int>()
     for (i in MaxI..MinI) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>()) {
         return "Wrong elements for MaxI..MinI: $list1"
@@ -25,7 +25,7 @@ fun box(): String {
     val list2 = ArrayList<Int>()
     for (i in MaxB..MinB) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>()) {
         return "Wrong elements for MaxB..MinB: $list2"
@@ -34,7 +34,7 @@ fun box(): String {
     val list3 = ArrayList<Int>()
     for (i in MaxS..MinS) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>()) {
         return "Wrong elements for MaxS..MinS: $list3"
@@ -43,7 +43,7 @@ fun box(): String {
     val list4 = ArrayList<Long>()
     for (i in MaxL..MinL) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>()) {
         return "Wrong elements for MaxL..MinL: $list4"
@@ -52,7 +52,7 @@ fun box(): String {
     val list5 = ArrayList<Char>()
     for (i in MaxC..MinC) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>()) {
         return "Wrong elements for MaxC..MinC: $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/oneElementDownTo.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/oneElementDownTo.kt
index 5c2ba8e430d..21e94841cf1 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/oneElementDownTo.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/oneElementDownTo.kt
@@ -5,7 +5,7 @@ fun box(): String {
     val list1 = ArrayList<Int>()
     for (i in 5 downTo 5) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(5)) {
         return "Wrong elements for 5 downTo 5: $list1"
@@ -14,7 +14,7 @@ fun box(): String {
     val list2 = ArrayList<Int>()
     for (i in 5.toByte() downTo 5.toByte()) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(5)) {
         return "Wrong elements for 5.toByte() downTo 5.toByte(): $list2"
@@ -23,7 +23,7 @@ fun box(): String {
     val list3 = ArrayList<Int>()
     for (i in 5.toShort() downTo 5.toShort()) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(5)) {
         return "Wrong elements for 5.toShort() downTo 5.toShort(): $list3"
@@ -32,7 +32,7 @@ fun box(): String {
     val list4 = ArrayList<Long>()
     for (i in 5.toLong() downTo 5.toLong()) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(5.toLong())) {
         return "Wrong elements for 5.toLong() downTo 5.toLong(): $list4"
@@ -41,7 +41,7 @@ fun box(): String {
     val list5 = ArrayList<Char>()
     for (i in 'k' downTo 'k') {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('k')) {
         return "Wrong elements for 'k' downTo 'k': $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/oneElementRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/oneElementRange.kt
index b2cd270f997..14f71e7a2b6 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/oneElementRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/oneElementRange.kt
@@ -5,7 +5,7 @@ fun box(): String {
     val list1 = ArrayList<Int>()
     for (i in 5..5) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(5)) {
         return "Wrong elements for 5..5: $list1"
@@ -14,7 +14,7 @@ fun box(): String {
     val list2 = ArrayList<Int>()
     for (i in 5.toByte()..5.toByte()) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(5)) {
         return "Wrong elements for 5.toByte()..5.toByte(): $list2"
@@ -23,7 +23,7 @@ fun box(): String {
     val list3 = ArrayList<Int>()
     for (i in 5.toShort()..5.toShort()) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(5)) {
         return "Wrong elements for 5.toShort()..5.toShort(): $list3"
@@ -32,7 +32,7 @@ fun box(): String {
     val list4 = ArrayList<Long>()
     for (i in 5.toLong()..5.toLong()) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(5.toLong())) {
         return "Wrong elements for 5.toLong()..5.toLong(): $list4"
@@ -41,7 +41,7 @@ fun box(): String {
     val list5 = ArrayList<Char>()
     for (i in 'k'..'k') {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('k')) {
         return "Wrong elements for 'k'..'k': $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/openRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/openRange.kt
index 526107234c6..6d8110f0198 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/openRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/openRange.kt
@@ -5,7 +5,7 @@ fun box(): String {
     val list1 = ArrayList<Int>()
     for (i in 1 until 5) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(1, 2, 3, 4)) {
         return "Wrong elements for 1 until 5: $list1"
@@ -14,7 +14,7 @@ fun box(): String {
     val list2 = ArrayList<Int>()
     for (i in 1.toByte() until 5.toByte()) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(1, 2, 3, 4)) {
         return "Wrong elements for 1.toByte() until 5.toByte(): $list2"
@@ -23,7 +23,7 @@ fun box(): String {
     val list3 = ArrayList<Int>()
     for (i in 1.toShort() until 5.toShort()) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(1, 2, 3, 4)) {
         return "Wrong elements for 1.toShort() until 5.toShort(): $list3"
@@ -32,7 +32,7 @@ fun box(): String {
     val list4 = ArrayList<Long>()
     for (i in 1.toLong() until 5.toLong()) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(1, 2, 3, 4)) {
         return "Wrong elements for 1.toLong() until 5.toLong(): $list4"
@@ -41,7 +41,7 @@ fun box(): String {
     val list5 = ArrayList<Char>()
     for (i in 'a' until 'd') {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('a', 'b', 'c')) {
         return "Wrong elements for 'a' until 'd': $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionDownToMinValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionDownToMinValue.kt
index 05d0d6338ec..baec07dcae2 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionDownToMinValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionDownToMinValue.kt
@@ -16,7 +16,7 @@ fun box(): String {
     val list1 = ArrayList<Int>()
     for (i in (MinI + 2) downTo MinI step 1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(MinI + 2, MinI + 1, MinI)) {
         return "Wrong elements for (MinI + 2) downTo MinI step 1: $list1"
@@ -25,7 +25,7 @@ fun box(): String {
     val list2 = ArrayList<Int>()
     for (i in (MinB + 2).toByte() downTo MinB step 1) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>((MinB + 2).toInt(), (MinB + 1).toInt(), MinB.toInt())) {
         return "Wrong elements for (MinB + 2).toByte() downTo MinB step 1: $list2"
@@ -34,7 +34,7 @@ fun box(): String {
     val list3 = ArrayList<Int>()
     for (i in (MinS + 2).toShort() downTo MinS step 1) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>((MinS + 2).toInt(), (MinS + 1).toInt(), MinS.toInt())) {
         return "Wrong elements for (MinS + 2).toShort() downTo MinS step 1: $list3"
@@ -43,7 +43,7 @@ fun box(): String {
     val list4 = ArrayList<Long>()
     for (i in (MinL + 2).toLong() downTo MinL step 1) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>((MinL + 2).toLong(), (MinL + 1).toLong(), MinL)) {
         return "Wrong elements for (MinL + 2).toLong() downTo MinL step 1: $list4"
@@ -52,7 +52,7 @@ fun box(): String {
     val list5 = ArrayList<Char>()
     for (i in (MinC + 2) downTo MinC step 1) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>((MinC + 2), (MinC + 1), MinC)) {
         return "Wrong elements for (MinC + 2) downTo MinC step 1: $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueMinusTwoToMaxValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueMinusTwoToMaxValue.kt
index 6110e5aafc2..5895949634f 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueMinusTwoToMaxValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueMinusTwoToMaxValue.kt
@@ -16,7 +16,7 @@ fun box(): String {
     val list1 = ArrayList<Int>()
     for (i in (MaxI - 2)..MaxI step 2) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(MaxI - 2, MaxI)) {
         return "Wrong elements for (MaxI - 2)..MaxI step 2: $list1"
@@ -25,7 +25,7 @@ fun box(): String {
     val list2 = ArrayList<Int>()
     for (i in (MaxB - 2).toByte()..MaxB step 2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>((MaxB - 2).toInt(), MaxB.toInt())) {
         return "Wrong elements for (MaxB - 2).toByte()..MaxB step 2: $list2"
@@ -34,7 +34,7 @@ fun box(): String {
     val list3 = ArrayList<Int>()
     for (i in (MaxS - 2).toShort()..MaxS step 2) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>((MaxS - 2).toInt(), MaxS.toInt())) {
         return "Wrong elements for (MaxS - 2).toShort()..MaxS step 2: $list3"
@@ -43,7 +43,7 @@ fun box(): String {
     val list4 = ArrayList<Long>()
     for (i in (MaxL - 2).toLong()..MaxL step 2) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>((MaxL - 2).toLong(), MaxL)) {
         return "Wrong elements for (MaxL - 2).toLong()..MaxL step 2: $list4"
@@ -52,7 +52,7 @@ fun box(): String {
     val list5 = ArrayList<Char>()
     for (i in (MaxC - 2)..MaxC step 2) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>((MaxC - 2), MaxC)) {
         return "Wrong elements for (MaxC - 2)..MaxC step 2: $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueToMaxValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueToMaxValue.kt
index 19ae4c1ba50..4935b0bebd0 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueToMaxValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueToMaxValue.kt
@@ -16,7 +16,7 @@ fun box(): String {
     val list1 = ArrayList<Int>()
     for (i in MaxI..MaxI step 1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(MaxI)) {
         return "Wrong elements for MaxI..MaxI step 1: $list1"
@@ -25,7 +25,7 @@ fun box(): String {
     val list2 = ArrayList<Int>()
     for (i in MaxB..MaxB step 1) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(MaxB.toInt())) {
         return "Wrong elements for MaxB..MaxB step 1: $list2"
@@ -34,7 +34,7 @@ fun box(): String {
     val list3 = ArrayList<Int>()
     for (i in MaxS..MaxS step 1) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(MaxS.toInt())) {
         return "Wrong elements for MaxS..MaxS step 1: $list3"
@@ -43,7 +43,7 @@ fun box(): String {
     val list4 = ArrayList<Long>()
     for (i in MaxL..MaxL step 1) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(MaxL)) {
         return "Wrong elements for MaxL..MaxL step 1: $list4"
@@ -52,7 +52,7 @@ fun box(): String {
     val list5 = ArrayList<Char>()
     for (i in MaxC..MaxC step 1) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>(MaxC)) {
         return "Wrong elements for MaxC..MaxC step 1: $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueToMinValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueToMinValue.kt
index b1aa729c2c5..80e6d7bbbb6 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueToMinValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueToMinValue.kt
@@ -16,7 +16,7 @@ fun box(): String {
     val list1 = ArrayList<Int>()
     for (i in MaxI..MinI step 1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>()) {
         return "Wrong elements for MaxI..MinI step 1: $list1"
@@ -25,7 +25,7 @@ fun box(): String {
     val list2 = ArrayList<Int>()
     for (i in MaxB..MinB step 1) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>()) {
         return "Wrong elements for MaxB..MinB step 1: $list2"
@@ -34,7 +34,7 @@ fun box(): String {
     val list3 = ArrayList<Int>()
     for (i in MaxS..MinS step 1) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>()) {
         return "Wrong elements for MaxS..MinS step 1: $list3"
@@ -43,7 +43,7 @@ fun box(): String {
     val list4 = ArrayList<Long>()
     for (i in MaxL..MinL step 1) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>()) {
         return "Wrong elements for MaxL..MinL step 1: $list4"
@@ -52,7 +52,7 @@ fun box(): String {
     val list5 = ArrayList<Char>()
     for (i in MaxC..MinC step 1) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>()) {
         return "Wrong elements for MaxC..MinC step 1: $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMinValueToMinValue.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMinValueToMinValue.kt
index c9cfbb89fa4..05f576f1552 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMinValueToMinValue.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMinValueToMinValue.kt
@@ -16,7 +16,7 @@ fun box(): String {
     val list1 = ArrayList<Int>()
     for (i in MinI..MinI step 1) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(MinI)) {
         return "Wrong elements for MinI..MinI step 1: $list1"
@@ -25,7 +25,7 @@ fun box(): String {
     val list2 = ArrayList<Int>()
     for (i in MinB..MinB step 1) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(MinB.toInt())) {
         return "Wrong elements for MinB..MinB step 1: $list2"
@@ -34,7 +34,7 @@ fun box(): String {
     val list3 = ArrayList<Int>()
     for (i in MinS..MinS step 1) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(MinS.toInt())) {
         return "Wrong elements for MinS..MinS step 1: $list3"
@@ -43,7 +43,7 @@ fun box(): String {
     val list4 = ArrayList<Long>()
     for (i in MinL..MinL step 1) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(MinL)) {
         return "Wrong elements for MinL..MinL step 1: $list4"
@@ -52,7 +52,7 @@ fun box(): String {
     val list5 = ArrayList<Char>()
     for (i in MinC..MinC step 1) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>(MinC)) {
         return "Wrong elements for MinC..MinC step 1: $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedBackSequence.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedBackSequence.kt
index 9df58a580f9..d2e8e88cd51 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedBackSequence.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedBackSequence.kt
@@ -5,7 +5,7 @@ fun box(): String {
     val list1 = ArrayList<Int>()
     for (i in (5 downTo 3).reversed()) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(3, 4, 5)) {
         return "Wrong elements for (5 downTo 3).reversed(): $list1"
@@ -14,7 +14,7 @@ fun box(): String {
     val list2 = ArrayList<Int>()
     for (i in (5.toByte() downTo 3.toByte()).reversed()) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(3, 4, 5)) {
         return "Wrong elements for (5.toByte() downTo 3.toByte()).reversed(): $list2"
@@ -23,7 +23,7 @@ fun box(): String {
     val list3 = ArrayList<Int>()
     for (i in (5.toShort() downTo 3.toShort()).reversed()) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(3, 4, 5)) {
         return "Wrong elements for (5.toShort() downTo 3.toShort()).reversed(): $list3"
@@ -32,7 +32,7 @@ fun box(): String {
     val list4 = ArrayList<Long>()
     for (i in (5.toLong() downTo 3.toLong()).reversed()) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(3, 4, 5)) {
         return "Wrong elements for (5.toLong() downTo 3.toLong()).reversed(): $list4"
@@ -41,7 +41,7 @@ fun box(): String {
     val list5 = ArrayList<Char>()
     for (i in ('c' downTo 'a').reversed()) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('a', 'b', 'c')) {
         return "Wrong elements for ('c' downTo 'a').reversed(): $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedEmptyBackSequence.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedEmptyBackSequence.kt
index 87a568cf051..f4431b433cf 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedEmptyBackSequence.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedEmptyBackSequence.kt
@@ -5,7 +5,7 @@ fun box(): String {
     val list1 = ArrayList<Int>()
     for (i in (3 downTo 5).reversed()) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>()) {
         return "Wrong elements for (3 downTo 5).reversed(): $list1"
@@ -14,7 +14,7 @@ fun box(): String {
     val list2 = ArrayList<Int>()
     for (i in (3.toByte() downTo 5.toByte()).reversed()) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>()) {
         return "Wrong elements for (3.toByte() downTo 5.toByte()).reversed(): $list2"
@@ -23,7 +23,7 @@ fun box(): String {
     val list3 = ArrayList<Int>()
     for (i in (3.toShort() downTo 5.toShort()).reversed()) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>()) {
         return "Wrong elements for (3.toShort() downTo 5.toShort()).reversed(): $list3"
@@ -32,7 +32,7 @@ fun box(): String {
     val list4 = ArrayList<Long>()
     for (i in (3.toLong() downTo 5.toLong()).reversed()) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>()) {
         return "Wrong elements for (3.toLong() downTo 5.toLong()).reversed(): $list4"
@@ -41,7 +41,7 @@ fun box(): String {
     val list5 = ArrayList<Char>()
     for (i in ('a' downTo 'c').reversed()) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>()) {
         return "Wrong elements for ('a' downTo 'c').reversed(): $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedEmptyRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedEmptyRange.kt
index a7f5afe958d..50ffa6efb9b 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedEmptyRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedEmptyRange.kt
@@ -5,7 +5,7 @@ fun box(): String {
     val list1 = ArrayList<Int>()
     for (i in (5..3).reversed()) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>()) {
         return "Wrong elements for (5..3).reversed(): $list1"
@@ -14,7 +14,7 @@ fun box(): String {
     val list2 = ArrayList<Int>()
     for (i in (5.toByte()..3.toByte()).reversed()) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>()) {
         return "Wrong elements for (5.toByte()..3.toByte()).reversed(): $list2"
@@ -23,7 +23,7 @@ fun box(): String {
     val list3 = ArrayList<Int>()
     for (i in (5.toShort()..3.toShort()).reversed()) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>()) {
         return "Wrong elements for (5.toShort()..3.toShort()).reversed(): $list3"
@@ -32,7 +32,7 @@ fun box(): String {
     val list4 = ArrayList<Long>()
     for (i in (5.toLong()..3.toLong()).reversed()) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>()) {
         return "Wrong elements for (5.toLong()..3.toLong()).reversed(): $list4"
@@ -41,7 +41,7 @@ fun box(): String {
     val list5 = ArrayList<Char>()
     for (i in ('c'..'a').reversed()) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>()) {
         return "Wrong elements for ('c'..'a').reversed(): $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedInexactSteppedDownTo.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedInexactSteppedDownTo.kt
index 4c92150c280..c1959412965 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedInexactSteppedDownTo.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedInexactSteppedDownTo.kt
@@ -5,7 +5,7 @@ fun box(): String {
     val list1 = ArrayList<Int>()
     for (i in (8 downTo 3 step 2).reversed()) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(4, 6, 8)) {
         return "Wrong elements for (8 downTo 3 step 2).reversed(): $list1"
@@ -14,7 +14,7 @@ fun box(): String {
     val list2 = ArrayList<Int>()
     for (i in (8.toByte() downTo 3.toByte() step 2).reversed()) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(4, 6, 8)) {
         return "Wrong elements for (8.toByte() downTo 3.toByte() step 2).reversed(): $list2"
@@ -23,7 +23,7 @@ fun box(): String {
     val list3 = ArrayList<Int>()
     for (i in (8.toShort() downTo 3.toShort() step 2).reversed()) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(4, 6, 8)) {
         return "Wrong elements for (8.toShort() downTo 3.toShort() step 2).reversed(): $list3"
@@ -32,7 +32,7 @@ fun box(): String {
     val list4 = ArrayList<Long>()
     for (i in (8.toLong() downTo 3.toLong() step 2.toLong()).reversed()) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(4, 6, 8)) {
         return "Wrong elements for (8.toLong() downTo 3.toLong() step 2.toLong()).reversed(): $list4"
@@ -41,7 +41,7 @@ fun box(): String {
     val list5 = ArrayList<Char>()
     for (i in ('d' downTo 'a' step 2).reversed()) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('b', 'd')) {
         return "Wrong elements for ('d' downTo 'a' step 2).reversed(): $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedRange.kt
index 9323c13ca49..8152dd64782 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedRange.kt
@@ -5,7 +5,7 @@ fun box(): String {
     val list1 = ArrayList<Int>()
     for (i in (3..5).reversed()) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(5, 4, 3)) {
         return "Wrong elements for (3..5).reversed(): $list1"
@@ -14,7 +14,7 @@ fun box(): String {
     val list2 = ArrayList<Int>()
     for (i in (3.toShort()..5.toShort()).reversed()) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(5, 4, 3)) {
         return "Wrong elements for (3.toShort()..5.toShort()).reversed(): $list2"
@@ -23,7 +23,7 @@ fun box(): String {
     val list3 = ArrayList<Long>()
     for (i in (3.toLong()..5.toLong()).reversed()) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Long>(5, 4, 3)) {
         return "Wrong elements for (3.toLong()..5.toLong()).reversed(): $list3"
@@ -32,7 +32,7 @@ fun box(): String {
     val list4 = ArrayList<Char>()
     for (i in ('a'..'c').reversed()) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Char>('c', 'b', 'a')) {
         return "Wrong elements for ('a'..'c').reversed(): $list4"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedSimpleSteppedRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedSimpleSteppedRange.kt
index 910c72d8c67..6f31b5025fa 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedSimpleSteppedRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedSimpleSteppedRange.kt
@@ -5,7 +5,7 @@ fun box(): String {
     val list1 = ArrayList<Int>()
     for (i in (3..9 step 2).reversed()) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(9, 7, 5, 3)) {
         return "Wrong elements for (3..9 step 2).reversed(): $list1"
@@ -14,7 +14,7 @@ fun box(): String {
     val list2 = ArrayList<Int>()
     for (i in (3.toByte()..9.toByte() step 2).reversed()) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(9, 7, 5, 3)) {
         return "Wrong elements for (3.toByte()..9.toByte() step 2).reversed(): $list2"
@@ -23,7 +23,7 @@ fun box(): String {
     val list3 = ArrayList<Int>()
     for (i in (3.toShort()..9.toShort() step 2).reversed()) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(9, 7, 5, 3)) {
         return "Wrong elements for (3.toShort()..9.toShort() step 2).reversed(): $list3"
@@ -32,7 +32,7 @@ fun box(): String {
     val list4 = ArrayList<Long>()
     for (i in (3.toLong()..9.toLong() step 2.toLong()).reversed()) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(9, 7, 5, 3)) {
         return "Wrong elements for (3.toLong()..9.toLong() step 2.toLong()).reversed(): $list4"
@@ -41,7 +41,7 @@ fun box(): String {
     val list5 = ArrayList<Char>()
     for (i in ('c'..'g' step 2).reversed()) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('g', 'e', 'c')) {
         return "Wrong elements for ('c'..'g' step 2).reversed(): $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleDownTo.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleDownTo.kt
index 1a8cb6394c9..94441dc82e1 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleDownTo.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleDownTo.kt
@@ -5,7 +5,7 @@ fun box(): String {
     val list1 = ArrayList<Int>()
     for (i in 9 downTo 3) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(9, 8, 7, 6, 5, 4, 3)) {
         return "Wrong elements for 9 downTo 3: $list1"
@@ -14,7 +14,7 @@ fun box(): String {
     val list2 = ArrayList<Int>()
     for (i in 9.toByte() downTo 3.toByte()) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(9, 8, 7, 6, 5, 4, 3)) {
         return "Wrong elements for 9.toByte() downTo 3.toByte(): $list2"
@@ -23,7 +23,7 @@ fun box(): String {
     val list3 = ArrayList<Int>()
     for (i in 9.toShort() downTo 3.toShort()) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(9, 8, 7, 6, 5, 4, 3)) {
         return "Wrong elements for 9.toShort() downTo 3.toShort(): $list3"
@@ -32,7 +32,7 @@ fun box(): String {
     val list4 = ArrayList<Long>()
     for (i in 9.toLong() downTo 3.toLong()) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(9, 8, 7, 6, 5, 4, 3)) {
         return "Wrong elements for 9.toLong() downTo 3.toLong(): $list4"
@@ -41,7 +41,7 @@ fun box(): String {
     val list5 = ArrayList<Char>()
     for (i in 'g' downTo 'c') {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('g', 'f', 'e', 'd', 'c')) {
         return "Wrong elements for 'g' downTo 'c': $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleRange.kt
index 4de044abc72..e44ce2a5bc8 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleRange.kt
@@ -5,7 +5,7 @@ fun box(): String {
     val list1 = ArrayList<Int>()
     for (i in 3..9) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(3, 4, 5, 6, 7, 8, 9)) {
         return "Wrong elements for 3..9: $list1"
@@ -14,7 +14,7 @@ fun box(): String {
     val list2 = ArrayList<Int>()
     for (i in 3.toByte()..9.toByte()) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(3, 4, 5, 6, 7, 8, 9)) {
         return "Wrong elements for 3.toByte()..9.toByte(): $list2"
@@ -23,7 +23,7 @@ fun box(): String {
     val list3 = ArrayList<Int>()
     for (i in 3.toShort()..9.toShort()) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(3, 4, 5, 6, 7, 8, 9)) {
         return "Wrong elements for 3.toShort()..9.toShort(): $list3"
@@ -32,7 +32,7 @@ fun box(): String {
     val list4 = ArrayList<Long>()
     for (i in 3.toLong()..9.toLong()) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(3, 4, 5, 6, 7, 8, 9)) {
         return "Wrong elements for 3.toLong()..9.toLong(): $list4"
@@ -41,7 +41,7 @@ fun box(): String {
     val list5 = ArrayList<Char>()
     for (i in 'c'..'g') {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('c', 'd', 'e', 'f', 'g')) {
         return "Wrong elements for 'c'..'g': $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleRangeWithNonConstantEnds.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleRangeWithNonConstantEnds.kt
index ebbdc189e70..eb8abcd9c9c 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleRangeWithNonConstantEnds.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleRangeWithNonConstantEnds.kt
@@ -5,7 +5,7 @@ fun box(): String {
     val list1 = ArrayList<Int>()
     for (i in (1 + 2)..(10 - 1)) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(3, 4, 5, 6, 7, 8, 9)) {
         return "Wrong elements for (1 + 2)..(10 - 1): $list1"
@@ -14,7 +14,7 @@ fun box(): String {
     val list2 = ArrayList<Int>()
     for (i in (1.toByte() + 2.toByte()).toByte()..(10.toByte() - 1.toByte()).toByte()) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(3, 4, 5, 6, 7, 8, 9)) {
         return "Wrong elements for (1.toByte() + 2.toByte()).toByte()..(10.toByte() - 1.toByte()).toByte(): $list2"
@@ -23,7 +23,7 @@ fun box(): String {
     val list3 = ArrayList<Int>()
     for (i in (1.toShort() + 2.toShort()).toShort()..(10.toShort() - 1.toShort()).toShort()) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(3, 4, 5, 6, 7, 8, 9)) {
         return "Wrong elements for (1.toShort() + 2.toShort()).toShort()..(10.toShort() - 1.toShort()).toShort(): $list3"
@@ -32,7 +32,7 @@ fun box(): String {
     val list4 = ArrayList<Long>()
     for (i in (1.toLong() + 2.toLong())..(10.toLong() - 1.toLong())) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(3, 4, 5, 6, 7, 8, 9)) {
         return "Wrong elements for (1.toLong() + 2.toLong())..(10.toLong() - 1.toLong()): $list4"
@@ -41,7 +41,7 @@ fun box(): String {
     val list5 = ArrayList<Char>()
     for (i in ("ace"[1])..("age"[1])) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('c', 'd', 'e', 'f', 'g')) {
         return "Wrong elements for (\"ace\"[1])..(\"age\"[1]): $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleSteppedDownTo.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleSteppedDownTo.kt
index ca7d8b800ba..0b4139af209 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleSteppedDownTo.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleSteppedDownTo.kt
@@ -5,7 +5,7 @@ fun box(): String {
     val list1 = ArrayList<Int>()
     for (i in 9 downTo 3 step 2) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(9, 7, 5, 3)) {
         return "Wrong elements for 9 downTo 3 step 2: $list1"
@@ -14,7 +14,7 @@ fun box(): String {
     val list2 = ArrayList<Int>()
     for (i in 9.toByte() downTo 3.toByte() step 2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(9, 7, 5, 3)) {
         return "Wrong elements for 9.toByte() downTo 3.toByte() step 2: $list2"
@@ -23,7 +23,7 @@ fun box(): String {
     val list3 = ArrayList<Int>()
     for (i in 9.toShort() downTo 3.toShort() step 2) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(9, 7, 5, 3)) {
         return "Wrong elements for 9.toShort() downTo 3.toShort() step 2: $list3"
@@ -32,7 +32,7 @@ fun box(): String {
     val list4 = ArrayList<Long>()
     for (i in 9.toLong() downTo 3.toLong() step 2.toLong()) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(9, 7, 5, 3)) {
         return "Wrong elements for 9.toLong() downTo 3.toLong() step 2.toLong(): $list4"
@@ -41,7 +41,7 @@ fun box(): String {
     val list5 = ArrayList<Char>()
     for (i in 'g' downTo 'c' step 2) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('g', 'e', 'c')) {
         return "Wrong elements for 'g' downTo 'c' step 2: $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleSteppedRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleSteppedRange.kt
index c399064999b..98730b32783 100644
--- a/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleSteppedRange.kt
+++ b/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleSteppedRange.kt
@@ -5,7 +5,7 @@ fun box(): String {
     val list1 = ArrayList<Int>()
     for (i in 3..9 step 2) {
         list1.add(i)
-        if (list1.size() > 23) break
+        if (list1.size > 23) break
     }
     if (list1 != listOf<Int>(3, 5, 7, 9)) {
         return "Wrong elements for 3..9 step 2: $list1"
@@ -14,7 +14,7 @@ fun box(): String {
     val list2 = ArrayList<Int>()
     for (i in 3.toByte()..9.toByte() step 2) {
         list2.add(i)
-        if (list2.size() > 23) break
+        if (list2.size > 23) break
     }
     if (list2 != listOf<Int>(3, 5, 7, 9)) {
         return "Wrong elements for 3.toByte()..9.toByte() step 2: $list2"
@@ -23,7 +23,7 @@ fun box(): String {
     val list3 = ArrayList<Int>()
     for (i in 3.toShort()..9.toShort() step 2) {
         list3.add(i)
-        if (list3.size() > 23) break
+        if (list3.size > 23) break
     }
     if (list3 != listOf<Int>(3, 5, 7, 9)) {
         return "Wrong elements for 3.toShort()..9.toShort() step 2: $list3"
@@ -32,7 +32,7 @@ fun box(): String {
     val list4 = ArrayList<Long>()
     for (i in 3.toLong()..9.toLong() step 2.toLong()) {
         list4.add(i)
-        if (list4.size() > 23) break
+        if (list4.size > 23) break
     }
     if (list4 != listOf<Long>(3, 5, 7, 9)) {
         return "Wrong elements for 3.toLong()..9.toLong() step 2.toLong(): $list4"
@@ -41,7 +41,7 @@ fun box(): String {
     val list5 = ArrayList<Char>()
     for (i in 'c'..'g' step 2) {
         list5.add(i)
-        if (list5.size() > 23) break
+        if (list5.size > 23) break
     }
     if (list5 != listOf<Char>('c', 'e', 'g')) {
         return "Wrong elements for 'c'..'g' step 2: $list5"
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/annotations/annotationRetentionAnnotation.kt b/compiler/testData/codegen/boxWithStdlib/reflection/annotations/annotationRetentionAnnotation.kt
index c6226b3f986..593ac093a85 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/annotations/annotationRetentionAnnotation.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/annotations/annotationRetentionAnnotation.kt
@@ -6,7 +6,7 @@ annotation class Anno
 fun box(): String {
     val a = Anno::class.annotations
 
-    if (a.size() != 1) return "Fail 1: $a"
+    if (a.size != 1) return "Fail 1: $a"
     val ann = a.single() as? Retention ?: return "Fail 2: ${a.single()}"
     assertEquals(AnnotationRetention.RUNTIME, ann.value)
 
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/annotations/retentions.kt b/compiler/testData/codegen/boxWithStdlib/reflection/annotations/retentions.kt
index a52a0c41b97..7ac85019596 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/annotations/retentions.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/annotations/retentions.kt
@@ -13,6 +13,6 @@ annotation class RuntimeAnno
 @BinaryAnno
 @RuntimeAnno
 fun box(): String {
-    assertEquals(listOf(javaClass<RuntimeAnno>()), ::box.annotations.map { it.annotationType() })
+    assertEquals(listOf(RuntimeAnno::class.java), ::box.annotations.map { it.annotationClass.java })
     return "OK"
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/annotations/simpleConstructorAnnotation.kt b/compiler/testData/codegen/boxWithStdlib/reflection/annotations/simpleConstructorAnnotation.kt
index e2935a3d9dd..21b6d1d0807 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/annotations/simpleConstructorAnnotation.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/annotations/simpleConstructorAnnotation.kt
@@ -7,7 +7,7 @@ class C @Primary constructor() {
 }
 
 fun box(): String {
-    val ans = C::class.constructors.map { it.annotations.single().annotationType().simpleName }.sorted()
+    val ans = C::class.constructors.map { it.annotations.single().annotationClass.java.simpleName }.sorted()
     if (ans != listOf("Primary", "Secondary")) return "Fail: $ans"
     return "OK"
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/call/exceptionHappened.kt b/compiler/testData/codegen/boxWithStdlib/reflection/call/exceptionHappened.kt
index aabbbdac620..a311aebdd44 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/call/exceptionHappened.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/call/exceptionHappened.kt
@@ -10,7 +10,7 @@ fun box(): String {
     try {
         ::fail.call("OK")
     } catch (e: InvocationTargetException) {
-        return e.getTargetException().getMessage().toString()
+        return e.getTargetException().message.toString()
     }
 
     return "Fail: no exception was thrown"
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/call/incorrectNumberOfArguments.kt b/compiler/testData/codegen/boxWithStdlib/reflection/call/incorrectNumberOfArguments.kt
index 9265b09fb4f..fc459011d3e 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/call/incorrectNumberOfArguments.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/call/incorrectNumberOfArguments.kt
@@ -19,8 +19,8 @@ object O {
 }
 
 fun check(callable: KCallable<*>, vararg args: Any?) {
-    val expected = callable.parameters.size()
-    val actual = args.size()
+    val expected = callable.parameters.size
+    val actual = args.size
 
     if (expected == actual) {
         throw AssertionError("Bad test case: expected and actual number of arguments should differ (was $expected vs $actual)")
@@ -32,10 +32,10 @@ fun check(callable: KCallable<*>, vararg args: Any?) {
         callable.call(*args)
         throw AssertionError("Fail: an IllegalArgumentException should have been thrown")
     } catch (e: IllegalArgumentException) {
-        if (e.getMessage() != expectedExceptionMessage) {
+        if (e.message != expectedExceptionMessage) {
             // This most probably means that we don't check number of passed arguments in reflection
             // and the default check from Java reflection yields an IllegalArgumentException, but with a not that helpful message
-            throw AssertionError("Fail: an exception with an unrecognized message was thrown: \"${e.getMessage()}\"" +
+            throw AssertionError("Fail: an exception with an unrecognized message was thrown: \"${e.message}\"" +
                                  "\nExpected message was: $expectedExceptionMessage")
         }
     }
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/call/simpleTopLevelFunctions.kt b/compiler/testData/codegen/boxWithStdlib/reflection/call/simpleTopLevelFunctions.kt
index 2db97adddc3..93536b69e39 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/call/simpleTopLevelFunctions.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/call/simpleTopLevelFunctions.kt
@@ -1,4 +1,4 @@
-fun String.foo(): Int = length()
+fun String.foo(): Int = length
 
 var state = "Fail"
 
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/classLiterals/reifiedTypeClassLiteral.kt b/compiler/testData/codegen/boxWithStdlib/reflection/classLiterals/reifiedTypeClassLiteral.kt
index 637eb88e559..9b2012bbcd9 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/classLiterals/reifiedTypeClassLiteral.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/classLiterals/reifiedTypeClassLiteral.kt
@@ -19,10 +19,10 @@ fun box(): String {
     assertEquals("Error", simpleName<Error>())
     assertEquals("Klass, Other", twoReifiedParams<Klass, Other>())
 
-    assertEquals(javaClass<String>(), myJavaClass<String>())
-    assertEquals(javaClass<IntArray>(), myJavaClass<IntArray>())
-    assertEquals(javaClass<Klass>(), myJavaClass<Klass>())
-    assertEquals(javaClass<Error>(), myJavaClass<Error>())
+    assertEquals(String::class.java, myJavaClass<String>())
+    assertEquals(IntArray::class.java, myJavaClass<IntArray>())
+    assertEquals(Klass::class.java, myJavaClass<Klass>())
+    assertEquals(Error::class.java, myJavaClass<Error>())
 
     return "OK"
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/classes/defaultType.kt b/compiler/testData/codegen/boxWithStdlib/reflection/classes/defaultType.kt
index e99f3463744..802e0a765b7 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/classes/defaultType.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/classes/defaultType.kt
@@ -12,10 +12,10 @@ fun simple() = Simple()
 fun genericIntString() = Generic<Int, String>()
 
 fun box(): String {
-    assertEquals(javaClass<Simple>(), Simple::class.defaultType.javaType)
+    assertEquals(Simple::class.java, Simple::class.defaultType.javaType)
     assertEquals(::simple.returnType, Simple::class.defaultType)
 
-    assertEquals(javaClass<Generic<*, *>>(), Generic::class.defaultType.javaType)
+    assertEquals(Generic::class.java, Generic::class.defaultType.javaType)
     assertEquals(Generic<*, *>::thiz.returnType, Generic::class.defaultType)
 
     // Generic<Int, String> != Generic<K, V>
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/constructors/simpleGetConstructors.kt b/compiler/testData/codegen/boxWithStdlib/reflection/constructors/simpleGetConstructors.kt
index 0803ece9190..3f4e52ac1c9 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/constructors/simpleGetConstructors.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/constructors/simpleGetConstructors.kt
@@ -4,7 +4,7 @@ import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
 open class A private constructor(x: Int) {
-    public constructor(s: String): this(s.length())
+    public constructor(s: String): this(s.length)
     constructor(): this("")
 }
 
@@ -16,14 +16,14 @@ class C {
 }
 
 fun box(): String {
-    assertEquals(3, A::class.constructors.size())
-    assertEquals(1, B::class.constructors.size())
+    assertEquals(3, A::class.constructors.size)
+    assertEquals(1, B::class.constructors.size)
 
     assertTrue(Collections.disjoint(A::class.members, A::class.constructors))
     assertTrue(Collections.disjoint(B::class.members, B::class.constructors))
 
-    assertEquals(1, C.Nested::class.constructors.size())
-    assertEquals(1, C.Inner::class.constructors.size())
+    assertEquals(1, C.Nested::class.constructors.size)
+    assertEquals(1, C.Inner::class.constructors.size)
 
     return "OK"
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/localClassInTopLevelFunction.kt b/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/localClassInTopLevelFunction.kt
index 4de4bfda981..b56966d171b 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/localClassInTopLevelFunction.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/localClassInTopLevelFunction.kt
@@ -3,7 +3,7 @@
 fun box(): String {
     class C
 
-    val name = javaClass<C>().getSimpleName()
+    val name = C::class.java.getSimpleName()
     if (name != "box\$C") return "Fail: $name"
 
     return "OK"
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/genericSignature/kt5112.kt b/compiler/testData/codegen/boxWithStdlib/reflection/genericSignature/kt5112.kt
index 0d9cf66256a..5356819b58a 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/genericSignature/kt5112.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/genericSignature/kt5112.kt
@@ -20,7 +20,7 @@ fun box(): String {
     val genericTypeInClassObject = ErrorsJvmTrait.javaClass.getDeclaredField("param").getGenericType()
     if (genericTypeInClassObject.toString() != "test.G<java.lang.String>") return "fail1: $genericTypeInClassObject"
 
-    val genericTypeInClass = javaClass<ErrorsJvmClass>().getField("param").getGenericType()
+    val genericTypeInClass = ErrorsJvmClass::class.java.getField("param").getGenericType()
     if (genericTypeInClass.toString() != "test.G<java.lang.String>") return "fail1: genericTypeInClass"
     return "OK"
 }
\ No newline at end of file
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/genericSignature/kt6106.kt b/compiler/testData/codegen/boxWithStdlib/reflection/genericSignature/kt6106.kt
index 699deb27048..e14ab00fe62 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/genericSignature/kt6106.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/genericSignature/kt6106.kt
@@ -13,10 +13,10 @@ class A {
 }
 
 fun box(): String {
-    val method = javaClass<A>().getDeclaredMethod("a", javaClass<B>())
+    val method = A::class.java.getDeclaredMethod("a", B::class.java)
     val genericParameterTypes = method.getGenericParameterTypes()
 
-    if (genericParameterTypes.size() != 1) return "Wrong number of generic parameters"
+    if (genericParameterTypes.size != 1) return "Wrong number of generic parameters"
 
     if (genericParameterTypes[0].toString() != "T") return "Wrong parameter type ${genericParameterTypes[0].toString()}"
 
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/kClassInAnnotation/array.kt b/compiler/testData/codegen/boxWithStdlib/reflection/kClassInAnnotation/array.kt
index 16f0947107e..d5a7046a678 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/kClassInAnnotation/array.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/kClassInAnnotation/array.kt
@@ -9,7 +9,7 @@ class K
 @Ann(arrayOf(O::class, K::class)) class MyClass
 
 fun box(): String {
-    val args = javaClass<MyClass>().getAnnotation(javaClass<Ann>()).args
+    val args = MyClass::class.java.getAnnotation(Ann::class.java).args
     val argName1 = args[0].simpleName ?: "fail 1"
     val argName2 = args[1].simpleName ?: "fail 2"
     return argName1 + argName2
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/kClassInAnnotation/basic.kt b/compiler/testData/codegen/boxWithStdlib/reflection/kClassInAnnotation/basic.kt
index 05efcc9ada1..07e70c679cf 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/kClassInAnnotation/basic.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/kClassInAnnotation/basic.kt
@@ -8,6 +8,6 @@ class OK
 @Ann(OK::class) class MyClass
 
 fun box(): String {
-    val argName = javaClass<MyClass>().getAnnotation(javaClass<Ann>()).arg.simpleName ?: "fail 1"
+    val argName = MyClass::class.java.getAnnotation(Ann::class.java).arg.simpleName ?: "fail 1"
     return argName
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/kClassInAnnotation/checkcast.kt b/compiler/testData/codegen/boxWithStdlib/reflection/kClassInAnnotation/checkcast.kt
index 2af5caa9947..b239fa76926 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/kClassInAnnotation/checkcast.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/kClassInAnnotation/checkcast.kt
@@ -2,7 +2,7 @@ import kotlin.reflect.KClass
 
 fun box(): String {
     try {
-        javaClass<String>() as KClass<String>
+        String::class.java as KClass<String>
     } catch (e: Exception) {
         return "OK"
     }
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/kClassInAnnotation/vararg.kt b/compiler/testData/codegen/boxWithStdlib/reflection/kClassInAnnotation/vararg.kt
index 2e6311852d2..12557abece1 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/kClassInAnnotation/vararg.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/kClassInAnnotation/vararg.kt
@@ -9,7 +9,7 @@ class K
 @Ann(O::class, K::class) class MyClass
 
 fun box(): String {
-    val args = javaClass<MyClass>().getAnnotation(javaClass<Ann>()).args
+    val args = MyClass::class.java.getAnnotation(Ann::class.java).args
     val argName1 = args[0].simpleName ?: "fail 1"
     val argName2 = args[1].simpleName ?: "fail 2"
     return argName1 + argName2
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/extensionProperty.kt b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/extensionProperty.kt
index 520fc873034..a4d0c5c1036 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/extensionProperty.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/extensionProperty.kt
@@ -15,8 +15,8 @@ fun box(): String {
     val getter = p.javaGetter!!
     val setter = p.javaSetter!!
 
-    assertEquals(getter, Class.forName("ExtensionPropertyKt").getMethod("getExt", javaClass<K>()))
-    assertEquals(setter, Class.forName("ExtensionPropertyKt").getMethod("setExt", javaClass<K>(), javaClass<Double>()))
+    assertEquals(getter, Class.forName("ExtensionPropertyKt").getMethod("getExt", K::class.java))
+    assertEquals(setter, Class.forName("ExtensionPropertyKt").getMethod("setExt", K::class.java, Double::class.java))
 
     val k = K(42L)
     assert(getter.invoke(null, k) == 42.0) { "Fail k getter" }
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/functions.kt b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/functions.kt
index b385de6e60f..f7201fed09e 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/functions.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/functions.kt
@@ -2,10 +2,10 @@ import kotlin.reflect.*
 import kotlin.reflect.jvm.*
 
 class K {
-    fun foo(s: String): Int = s.length()
+    fun foo(s: String): Int = s.length
 }
-fun bar(s: String): Int = s.length()
-fun String.baz(): Int = this.length()
+fun bar(s: String): Int = s.length
+fun String.baz(): Int = this.length
 
 fun check(f: KFunction<Int>) {
     assert(f.javaConstructor == null) { "Fail f constructor" }
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/mappedClassIsEqualToClassLiteral.kt b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/mappedClassIsEqualToClassLiteral.kt
index 084731d3dff..d0d863e0119 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/mappedClassIsEqualToClassLiteral.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/mappedClassIsEqualToClassLiteral.kt
@@ -1,7 +1,7 @@
 class A
 
 fun box(): String {
-    val a1 = javaClass<A>().kotlin
+    val a1 = A::class.java.kotlin
     val a2 = A::class
 
     if (a1 != a2) return "Fail equals"
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/memberProperty.kt b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/memberProperty.kt
index e3b867fab78..da042a50a22 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/memberProperty.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/memberProperty.kt
@@ -11,8 +11,8 @@ fun box(): String {
     val getter = p.javaGetter!!
     val setter = p.javaSetter!!
 
-    assertEquals(getter, javaClass<K>().getMethod("getValue"))
-    assertEquals(setter, javaClass<K>().getMethod("setValue", javaClass<Long>()))
+    assertEquals(getter, K::class.java.getMethod("getValue"))
+    assertEquals(setter, K::class.java.getMethod("setValue", Long::class.java))
 
     val k = K(42L)
     assert(getter.invoke(k) == 42L) { "Fail k getter" }
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic/companionObjectFunction.kt b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic/companionObjectFunction.kt
index 32af776afd4..3ffae681f83 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic/companionObjectFunction.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic/companionObjectFunction.kt
@@ -5,7 +5,7 @@ import kotlin.test.*
 
 class C {
     companion object {
-        @static fun foo(s: String): Int = s.length()
+        @static fun foo(s: String): Int = s.length
     }
 }
 
@@ -19,12 +19,12 @@ fun box(): String {
     assertEquals(3, k.call(C, "def"))
 
 
-    val staticMethod = javaClass<C>().getDeclaredMethod("foo", javaClass<String>())
+    val staticMethod = C::class.java.getDeclaredMethod("foo", String::class.java)
     val k2 = staticMethod.kotlinFunction ?:
              return "Fail: no Kotlin function found for static bridge for @JvmStatic method in companion object C::foo"
     assertEquals(3, k2.call(C, "ghi"))
 
-    assertFailsWith(javaClass<NullPointerException>()) { k2.call(null, "")!! }
+    assertFailsWith(NullPointerException::class.java) { k2.call(null, "")!! }
 
     val j2 = k2.javaMethod
     assertEquals(j, j2)
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic/objectFunction.kt b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic/objectFunction.kt
index 1519eccf781..44b710cdc92 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic/objectFunction.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic/objectFunction.kt
@@ -4,7 +4,7 @@ import kotlin.reflect.jvm.*
 import kotlin.test.assertEquals
 
 object O {
-    @static fun foo(s: String): Int = s.length()
+    @static fun foo(s: String): Int = s.length
 }
 
 fun box(): String {
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/syntheticFields.kt b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/syntheticFields.kt
index b89018363e9..54332c52819 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/syntheticFields.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/syntheticFields.kt
@@ -5,7 +5,7 @@ enum class A {
 }
 
 fun box(): String {
-    for (field in javaClass<A>().getDeclaredFields()) {
+    for (field in A::class.java.getDeclaredFields()) {
         val prop = field.kotlin
         if (prop != null) return "Fail, property found: $prop"
     }
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/topLevelProperty.kt b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/topLevelProperty.kt
index e1b8ba66e9a..4ba52bdb2d9 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/topLevelProperty.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/topLevelProperty.kt
@@ -15,7 +15,7 @@ fun box(): String {
     val setter = p.javaSetter!!
 
     assertEquals(getter, Class.forName("TopLevelPropertyKt").getMethod("getTopLevel"))
-    assertEquals(setter, Class.forName("TopLevelPropertyKt").getMethod("setTopLevel", javaClass<String>()))
+    assertEquals(setter, Class.forName("TopLevelPropertyKt").getMethod("setTopLevel", String::class.java))
 
     assert(getter.invoke(null) == "123") { "Fail k getter" }
     setter.invoke(null, "456")
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/array.kt b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/array.kt
index b0314032986..260d143c279 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/array.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/array.kt
@@ -14,9 +14,9 @@ class A<T> {
 }
 
 fun box(): String {
-    assertEquals(javaClass<Array<String>>(), ::foo.parameters[0].type.javaType)
-    assertEquals(javaClass<Array<Int>>(), ::foo.parameters[1].type.javaType)
-    assertEquals(javaClass<Array<Array<Any>>>(), ::foo.parameters[2].type.javaType)
+    assertEquals(Array<String>::class.java, ::foo.parameters[0].type.javaType)
+    assertEquals(Array<Int>::class.java, ::foo.parameters[1].type.javaType)
+    assertEquals(Array<Array<Any>>::class.java, ::foo.parameters[2].type.javaType)
 
     val g = ::bar.returnType.javaType
     if (g !is GenericArrayType || g.genericComponentType !is ParameterizedType)
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/constructors.kt b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/constructors.kt
index e5aace1ff85..e38f0b5762e 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/constructors.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/constructors.kt
@@ -8,13 +8,13 @@ class A(d: Double, s: String, parent: A?) {
 }
 
 fun box(): String {
-    assertEquals(listOf(java.lang.Double.TYPE, javaClass<String>(), javaClass<A>()), ::A.parameters.map { it.type.javaType })
-    assertEquals(listOf(javaClass<A>()), A::Nested.parameters.map { it.type.javaType })
-    assertEquals(listOf(javaClass<A>(), javaClass<A.Nested>()), A::Inner.parameters.map { it.type.javaType })
+    assertEquals(listOf(java.lang.Double.TYPE, String::class.java, A::class.java), ::A.parameters.map { it.type.javaType })
+    assertEquals(listOf(A::class.java), A::Nested.parameters.map { it.type.javaType })
+    assertEquals(listOf(A::class.java, A.Nested::class.java), A::Inner.parameters.map { it.type.javaType })
 
-    assertEquals(javaClass<A>(), ::A.returnType.javaType)
-    assertEquals(javaClass<A.Nested>(), A::Nested.returnType.javaType)
-    assertEquals(javaClass<A.Inner>(), A::Inner.returnType.javaType)
+    assertEquals(A::class.java, ::A.returnType.javaType)
+    assertEquals(A.Nested::class.java, A::Nested.returnType.javaType)
+    assertEquals(A.Inner::class.java, A::Inner.returnType.javaType)
 
     return "OK"
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/memberFunctions.kt b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/memberFunctions.kt
index 41e5065ff4c..dc07f282df4 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/memberFunctions.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/memberFunctions.kt
@@ -12,12 +12,12 @@ object O {
 
 fun box(): String {
     val foo = A::foo
-    assertEquals(listOf(javaClass<A>(), javaClass<java.lang.Long>()), foo.parameters.map { it.type.javaType })
+    assertEquals(listOf(A::class.java, java.lang.Long::class.java), foo.parameters.map { it.type.javaType })
     assertEquals(java.lang.Long.TYPE, foo.returnType.javaType)
 
     val bar = O::class.members.single { it.name == "bar" }
-    assertEquals(listOf(javaClass<O>(), javaClass<A>()), bar.parameters.map { it.type.javaType })
-    assertEquals(javaClass<String>(), bar.returnType.javaType)
+    assertEquals(listOf(O::class.java, A::class.java), bar.parameters.map { it.type.javaType })
+    assertEquals(String::class.java, bar.returnType.javaType)
 
     return "OK"
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/overrideAnyWithPrimitive.kt b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/overrideAnyWithPrimitive.kt
index e8abbcb4823..c1be4965aa7 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/overrideAnyWithPrimitive.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/overrideAnyWithPrimitive.kt
@@ -11,10 +11,10 @@ class A : I {
 }
 
 fun box(): String {
-    assertEquals(javaClass<Integer>(), A::foo.returnType.javaType)
+    assertEquals(Integer::class.java, A::foo.returnType.javaType)
     assertNotEquals(Integer.TYPE, A::foo.returnType.javaType)
 
-    assertNotEquals(javaClass<Integer>(), A::bar.returnType.javaType)
+    assertNotEquals(Integer::class.java, A::bar.returnType.javaType)
     assertEquals(Integer.TYPE, A::bar.returnType.javaType)
 
     assertEquals(java.lang.Long.TYPE, A::bar.parameters.last().type.javaType)
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/propertyAccessors.kt b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/propertyAccessors.kt
index 18c6312763a..671632f96a7 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/propertyAccessors.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/propertyAccessors.kt
@@ -11,14 +11,14 @@ object O {
 
 fun box(): String {
     val foo = A::class.members.single { it.name == "foo" } as KMutableProperty<*>
-    assertEquals(listOf(javaClass<A>()), foo.parameters.map { it.type.javaType })
-    assertEquals(listOf(javaClass<A>()), foo.getter.parameters.map { it.type.javaType })
-    assertEquals(listOf(javaClass<A>(), javaClass<String>()), foo.setter.parameters.map { it.type.javaType })
+    assertEquals(listOf(A::class.java), foo.parameters.map { it.type.javaType })
+    assertEquals(listOf(A::class.java), foo.getter.parameters.map { it.type.javaType })
+    assertEquals(listOf(A::class.java, String::class.java), foo.setter.parameters.map { it.type.javaType })
 
     val bar = O::class.members.single { it.name == "bar" } as KMutableProperty<*>
-    assertEquals(listOf(javaClass<O>()), bar.parameters.map { it.type.javaType })
-    assertEquals(listOf(javaClass<O>()), bar.getter.parameters.map { it.type.javaType })
-    assertEquals(listOf(javaClass<O>(), javaClass<String>()), bar.setter.parameters.map { it.type.javaType })
+    assertEquals(listOf(O::class.java), bar.parameters.map { it.type.javaType })
+    assertEquals(listOf(O::class.java), bar.getter.parameters.map { it.type.javaType })
+    assertEquals(listOf(O::class.java, String::class.java), bar.setter.parameters.map { it.type.javaType })
 
     return "OK"
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/topLevelFunctions.kt b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/topLevelFunctions.kt
index a37124768b1..8e40b3e9b83 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/topLevelFunctions.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/topLevelFunctions.kt
@@ -1,15 +1,15 @@
 import kotlin.reflect.jvm.*
 import kotlin.test.assertEquals
 
-fun free(s: String): Int = s.length()
+fun free(s: String): Int = s.length
 
 fun Any.extension() {}
 
 fun box(): String {
     assertEquals(java.lang.Integer.TYPE, ::free.returnType.javaType)
-    assertEquals(javaClass<String>(), ::free.parameters.single().type.javaType)
+    assertEquals(String::class.java, ::free.parameters.single().type.javaType)
 
-    assertEquals(javaClass<Any>(), Any::extension.parameters.single().type.javaType)
+    assertEquals(Any::class.java, Any::extension.parameters.single().type.javaType)
 
     return "OK"
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/unit.kt b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/unit.kt
index e988c125f94..7e0f21d1734 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/unit.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/unit.kt
@@ -6,15 +6,15 @@ fun foo(unitParam: Unit, nullableUnitParam: Unit?): Unit {}
 var bar: Unit = Unit
 
 fun box(): String {
-    assert(javaClass<Unit>() != java.lang.Void.TYPE)
+    assert(Unit::class.java != java.lang.Void.TYPE)
 
-    assertEquals(javaClass<Unit>(), ::foo.parameters[0].type.javaType)
-    assertEquals(javaClass<Unit>(), ::foo.parameters[1].type.javaType)
+    assertEquals(Unit::class.java, ::foo.parameters[0].type.javaType)
+    assertEquals(Unit::class.java, ::foo.parameters[1].type.javaType)
     assertEquals(java.lang.Void.TYPE, ::foo.returnType.javaType)
 
-    assertEquals(javaClass<Unit>(), ::bar.returnType.javaType)
-    assertEquals(javaClass<Unit>(), ::bar.getter.returnType.javaType)
-    assertEquals(javaClass<Unit>(), ::bar.setter.parameters.single().type.javaType)
+    assertEquals(Unit::class.java, ::bar.returnType.javaType)
+    assertEquals(Unit::class.java, ::bar.getter.returnType.javaType)
+    assertEquals(Unit::class.java, ::bar.setter.parameters.single().type.javaType)
     assertEquals(java.lang.Void.TYPE, ::bar.setter.returnType.javaType)
 
     return "OK"
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/memberExtensionToString.kt b/compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/memberExtensionToString.kt
index 76c950d3994..46e5b58005e 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/memberExtensionToString.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/memberExtensionToString.kt
@@ -9,10 +9,10 @@ class A {
 }
 
 fun box(): String {
-    val p = javaClass<A>().kotlin.memberExtensionProperties.single()
+    val p = A::class.java.kotlin.memberExtensionProperties.single()
     return if ("$p" == "var A.(kotlin.String.)id: kotlin.String") "OK" else "Fail $p"
 
-    val q = javaClass<A>().kotlin.declaredFunctions.single()
+    val q = A::class.java.kotlin.declaredFunctions.single()
     if ("$q" != "fun A.(kotlin.Int.)foo(): kotlin.Double") return "Fail q $q"
 
     return "OK"
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/parameters/functionParameterNameAndIndex.kt b/compiler/testData/codegen/boxWithStdlib/reflection/parameters/functionParameterNameAndIndex.kt
index a4b8c28b5a5..81726490c9b 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/parameters/functionParameterNameAndIndex.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/parameters/functionParameterNameAndIndex.kt
@@ -1,7 +1,7 @@
 import kotlin.reflect.*
 import kotlin.test.assertEquals
 
-fun foo(bar: String): Int = bar.length()
+fun foo(bar: String): Int = bar.length
 
 class A(val c: String) {
     fun foz(baz: Int) {}
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/properties/accessors/extensionPropertyAccessors.kt b/compiler/testData/codegen/boxWithStdlib/reflection/properties/accessors/extensionPropertyAccessors.kt
index 42cbcc74e80..46dc4fe8829 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/properties/accessors/extensionPropertyAccessors.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/properties/accessors/extensionPropertyAccessors.kt
@@ -3,7 +3,7 @@ import kotlin.test.assertEquals
 var state: String = ""
 
 var String.prop: String
-    get() = length().toString()
+    get() = length.toString()
     set(value) { state = this + value }
 
 fun box(): String {
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/properties/accessors/memberExtensions.kt b/compiler/testData/codegen/boxWithStdlib/reflection/properties/accessors/memberExtensions.kt
index 481a3659536..7c7113b4849 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/properties/accessors/memberExtensions.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/properties/accessors/memberExtensions.kt
@@ -3,7 +3,7 @@ import kotlin.test.assertEquals
 
 class C(var state: String) {
     var String.prop: String
-        get() = length().toString()
+        get() = length.toString()
         set(value) { state = this + value }
 }
 
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/properties/callPrivatePropertyFromGetProperties.kt b/compiler/testData/codegen/boxWithStdlib/reflection/properties/callPrivatePropertyFromGetProperties.kt
index 5e48be92c03..1959cc102a4 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/properties/callPrivatePropertyFromGetProperties.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/properties/callPrivatePropertyFromGetProperties.kt
@@ -4,7 +4,7 @@ import kotlin.reflect.jvm.*
 class K(private val value: String)
 
 fun box(): String {
-    val p = javaClass<K>().kotlin.memberProperties.single() as KProperty1<K, String>
+    val p = K::class.java.kotlin.memberProperties.single() as KProperty1<K, String>
 
     try {
         return p.get(K("Fail: private property should not be accessible by default"))
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/properties/fakeOverridesInSubclass.kt b/compiler/testData/codegen/boxWithStdlib/reflection/properties/fakeOverridesInSubclass.kt
index 14e19c0318f..2e015f4ea08 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/properties/fakeOverridesInSubclass.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/properties/fakeOverridesInSubclass.kt
@@ -6,10 +6,10 @@ open class Super(val r: String)
 class Sub(r: String) : Super(r)
 
 fun box(): String {
-    val props = javaClass<Sub>().kotlin.declaredMemberProperties
+    val props = Sub::class.java.kotlin.declaredMemberProperties
     if (!props.isEmpty()) return "Fail $props"
 
-    val allProps = javaClass<Sub>().kotlin.memberProperties
+    val allProps = Sub::class.java.kotlin.memberProperties
     assertEquals(listOf("r"), allProps.map { it.name })
     return allProps.single().get(Sub("OK")) as String
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/properties/getExtensionPropertiesMutableVsReadonly.kt b/compiler/testData/codegen/boxWithStdlib/reflection/properties/getExtensionPropertiesMutableVsReadonly.kt
index 35660897e50..d2c66f58b34 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/properties/getExtensionPropertiesMutableVsReadonly.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/properties/getExtensionPropertiesMutableVsReadonly.kt
@@ -12,7 +12,7 @@ class A {
 }
 
 fun box(): String {
-    val props = javaClass<A>().kotlin.memberExtensionProperties
+    val props = A::class.java.kotlin.memberExtensionProperties
     val readonly = props.single { it.name == "readonly" }
     assert(readonly !is KMutableProperty2<A, *, *>) { "Fail 1: $readonly" }
     val mutable = props.single { it.name == "mutable" }
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/properties/getPropertiesMutableVsReadonly.kt b/compiler/testData/codegen/boxWithStdlib/reflection/properties/getPropertiesMutableVsReadonly.kt
index e37c6139eae..9d29e03f7ce 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/properties/getPropertiesMutableVsReadonly.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/properties/getPropertiesMutableVsReadonly.kt
@@ -5,7 +5,7 @@ class A(val readonly: String) {
 }
 
 fun box(): String {
-    val props = javaClass<A>().kotlin.memberProperties
+    val props = A::class.java.kotlin.memberProperties
     val readonly = props.single { it.name == "readonly" }
     assert(readonly !is KMutableProperty1<A, *>) { "Fail 1: $readonly" }
     val mutable = props.single { it.name == "mutable" }
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/properties/memberAndMemberExtensionWithSameName.kt b/compiler/testData/codegen/boxWithStdlib/reflection/properties/memberAndMemberExtensionWithSameName.kt
index 51646a5a991..ac93a917c42 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/properties/memberAndMemberExtensionWithSameName.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/properties/memberAndMemberExtensionWithSameName.kt
@@ -7,13 +7,13 @@ class A {
 
 fun box(): String {
     run {
-        val foo: KProperty1<A, *> = javaClass<A>().kotlin.memberProperties.single()
+        val foo: KProperty1<A, *> = A::class.java.kotlin.memberProperties.single()
         assert(foo.name == "foo") { "Fail name: $foo (${foo.name})" }
         assert(foo.get(A()) == "member") { "Fail value: ${foo.get(A())}" }
     }
 
     run {
-        val foo: KProperty2<A, *, *> = javaClass<A>().kotlin.memberExtensionProperties.single()
+        val foo: KProperty2<A, *, *> = A::class.java.kotlin.memberExtensionProperties.single()
         assert(foo.name == "foo") { "Fail name: $foo (${foo.name})" }
         foo as KProperty2<A, Unit, *>
         assert(foo.get(A(), Unit) == "extension") { "Fail value: ${foo.get(A(), Unit)}" }
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/properties/simpleGetProperties.kt b/compiler/testData/codegen/boxWithStdlib/reflection/properties/simpleGetProperties.kt
index bfa6925bb3d..30dca9b3264 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/properties/simpleGetProperties.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/properties/simpleGetProperties.kt
@@ -11,7 +11,7 @@ class A(param: String) {
 }
 
 fun box(): String {
-    val klass = javaClass<A>().kotlin
+    val klass = A::class.java.kotlin
 
     val props = klass.memberProperties
 
diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/Kt1619Test.kt b/compiler/testData/codegen/boxWithStdlib/regressions/Kt1619Test.kt
index 044f0a9f442..2b435b31ee9 100644
--- a/compiler/testData/codegen/boxWithStdlib/regressions/Kt1619Test.kt
+++ b/compiler/testData/codegen/boxWithStdlib/regressions/Kt1619Test.kt
@@ -3,7 +3,7 @@ package regressions
 class Kt1619Test {
 
     fun doSomething(list: List<String?>): Int {
-        return list.size()
+        return list.size
     }
 
     fun testCollectionNotNullCanBeUsedForNullables(): Int {
diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/generic.kt b/compiler/testData/codegen/boxWithStdlib/regressions/generic.kt
index e45b8ab50c8..21203c396d3 100644
--- a/compiler/testData/codegen/boxWithStdlib/regressions/generic.kt
+++ b/compiler/testData/codegen/boxWithStdlib/regressions/generic.kt
@@ -17,5 +17,5 @@ fun box(): String {
   list.add("Munich")
 
   val m: ArrayList<String> = list.findAll<String>({ name: String -> name.startsWith("M")})
-  return if (m.size() == 2) "OK" else "fail"
+  return if (m.size == 2) "OK" else "fail"
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/getGenericInterfaces.kt b/compiler/testData/codegen/boxWithStdlib/regressions/getGenericInterfaces.kt
index 1037ed73a05..b7ba0bc09f6 100644
--- a/compiler/testData/codegen/boxWithStdlib/regressions/getGenericInterfaces.kt
+++ b/compiler/testData/codegen/boxWithStdlib/regressions/getGenericInterfaces.kt
@@ -11,14 +11,14 @@ class ClassWithGenericSuperInterface: java.util.Comparator<String> {
 fun check(klass: Class<*>) {
     val interfaces = klass.getInterfaces().toList()
     val genericInterfaces = klass.getGenericInterfaces().toList()
-    if (interfaces.size() != genericInterfaces.size()) {
+    if (interfaces.size != genericInterfaces.size) {
         throw AssertionError("interfaces=$interfaces, genericInterfaces=$genericInterfaces")
     }
 }
 
 fun box(): String {
-    check(javaClass<SimpleClass>())
-    check(javaClass<ClassWithNonGenericSuperInterface>())
-    check(javaClass<ClassWithGenericSuperInterface>())
+    check(SimpleClass::class.java)
+    check(ClassWithNonGenericSuperInterface::class.java)
+    check(ClassWithGenericSuperInterface::class.java)
     return "OK"
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/kt1932.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt1932.kt
index 365bcdde4f5..89c2a937e80 100644
--- a/compiler/testData/codegen/boxWithStdlib/regressions/kt1932.kt
+++ b/compiler/testData/codegen/boxWithStdlib/regressions/kt1932.kt
@@ -10,7 +10,7 @@ class Test() {
 
 fun box(): String {
     val test = Test()
-    for (method in javaClass<Test>().getMethods()!!) {
+    for (method in Test::class.java.getMethods()!!) {
         val anns = method?.getAnnotations() as Array<Annotation>
         if (!anns.isEmpty()) {
             for (ann in anns) {
diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/kt2318.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt2318.kt
index 182774f7e0b..359283c9de8 100644
--- a/compiler/testData/codegen/boxWithStdlib/regressions/kt2318.kt
+++ b/compiler/testData/codegen/boxWithStdlib/regressions/kt2318.kt
@@ -1,11 +1,11 @@
 fun box(): String {
-    javaClass<Boolean>()
-    javaClass<Byte>()
-    javaClass<Short>()
-    javaClass<Char>()
-    javaClass<Int>()
-    javaClass<Long>()
-    javaClass<Float>()
-    javaClass<Double>()
+    Boolean::class.java
+    Byte::class.java
+    Short::class.java
+    Char::class.java
+    Int::class.java
+    Long::class.java
+    Float::class.java
+    Double::class.java
     return "OK"
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/kt3046.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt3046.kt
index b43fe4c23c4..6297b6a74d2 100644
--- a/compiler/testData/codegen/boxWithStdlib/regressions/kt3046.kt
+++ b/compiler/testData/codegen/boxWithStdlib/regressions/kt3046.kt
@@ -1,20 +1,20 @@
 fun box(): String {
   val bool = true
-  if (bool.javaClass != javaClass<Boolean>()) return "javaClass function on boolean fails"
+  if (bool.javaClass != Boolean::class.java) return "javaClass function on boolean fails"
   val b = 1.toByte()
-  if (b.javaClass != javaClass<Byte>()) return "javaClass function on byte fails"
+  if (b.javaClass != Byte::class.java) return "javaClass function on byte fails"
   val s = 1.toShort()
-  if (s.javaClass != javaClass<Short>()) return "javaClass function on short fails"
+  if (s.javaClass != Short::class.java) return "javaClass function on short fails"
   val c = 'c'
-  if (c.javaClass != javaClass<Char>()) return "javaClass function on char fails"
+  if (c.javaClass != Char::class.java) return "javaClass function on char fails"
   val i = 1
-  if (i.javaClass != javaClass<Int>()) return "javaClass function on int fails"
+  if (i.javaClass != Int::class.java) return "javaClass function on int fails"
   val l = 1.toLong()
-  if (l.javaClass != javaClass<Long>()) return "javaClass function on long fails"
+  if (l.javaClass != Long::class.java) return "javaClass function on long fails"
   val f = 1.toFloat()
-  if (f.javaClass != javaClass<Float>()) return "javaClass function on float fails"
+  if (f.javaClass != Float::class.java) return "javaClass function on float fails"
   val d = 1.0
-  if (d.javaClass != javaClass<Double>()) return "javaClass function on double fails"
+  if (d.javaClass != Double::class.java) return "javaClass function on double fails"
 
   return "OK"
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/kt4259.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt4259.kt
index 7d609780d22..c486ed77d84 100644
--- a/compiler/testData/codegen/boxWithStdlib/regressions/kt4259.kt
+++ b/compiler/testData/codegen/boxWithStdlib/regressions/kt4259.kt
@@ -1,6 +1,6 @@
 fun box(): String {
     val s: String? = "a"
-    val o: Char? = s?.charAt(0)
+    val o: Char? = s?.get(0)
     val c: Any? = o?.javaClass
     return if (c !=  null) "OK"  else "fail"
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/kt4262.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt4262.kt
index b52f9a0ac15..94b4fe059ea 100644
--- a/compiler/testData/codegen/boxWithStdlib/regressions/kt4262.kt
+++ b/compiler/testData/codegen/boxWithStdlib/regressions/kt4262.kt
@@ -4,7 +4,7 @@ fun <E : Enum<E>> Byte.toEnum(clazz : Class<E>) : E =
 enum class Letters { A, B, C }
 
 fun box(): String {
-    val clazz = javaClass<Letters>()
+    val clazz = Letters::class.java
     val r = 1.toByte().toEnum(clazz)
     return if (r == Letters.B) "OK" else "Fail: $r"
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/kt6434.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt6434.kt
index 5ae625cacb7..2ad094dbcdd 100644
--- a/compiler/testData/codegen/boxWithStdlib/regressions/kt6434.kt
+++ b/compiler/testData/codegen/boxWithStdlib/regressions/kt6434.kt
@@ -7,7 +7,7 @@ class C(val nums: Map<E, Int>) {
     val normalizedNums = loadNormalizedNums()
 
     private fun loadNormalizedNums(): Map<E, Float> {
-        val vals = nums.values()
+        val vals = nums.values
         val min = vals.min()!!
         val max = vals.max()!!
         val rangeDiff = (max - min).toFloat()
@@ -23,6 +23,6 @@ class C(val nums: Map<E, Int>) {
 }
 
 fun box(): String {
-    val res = C(hashMapOf(E.VALUE to 11, E.VALUE2 to 12)).normalizedNums.values().sorted().joinToString()
+    val res = C(hashMapOf(E.VALUE to 11, E.VALUE2 to 12)).normalizedNums.values.sorted().joinToString()
     return  if ("0.0, 1.0" == res) "OK" else "fail $res"
 }
\ No newline at end of file
diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/kt715.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt715.kt
index a3c3f64407b..123c9d8c643 100644
--- a/compiler/testData/codegen/boxWithStdlib/regressions/kt715.kt
+++ b/compiler/testData/codegen/boxWithStdlib/regressions/kt715.kt
@@ -1,5 +1,8 @@
 import kotlin.*
 
+@Suppress("REIFIED_TYPE_PARAMETER_NO_INLINE")
+inline fun <reified T: Any> javaClass(): Class<T> = T::class.java
+
 val test = "lala".javaClass
 
 val test2 = javaClass<Iterator<Int>> ()
diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/kt789.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt789.kt
index d2d9311acf9..9ce0845893f 100644
--- a/compiler/testData/codegen/boxWithStdlib/regressions/kt789.kt
+++ b/compiler/testData/codegen/boxWithStdlib/regressions/kt789.kt
@@ -8,5 +8,5 @@ fun box() : String {
     val a = ArrayList<Int>();
     a.add(1)
     a.add(2)
-    return if((a.size() == 2) && (a.get(1) == 2) && (a.get(0) == 1)) "OK" else "fail"
+    return if((a.size == 2) && (a.get(1) == 2) && (a.get(0) == 1)) "OK" else "fail"
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/referenceToSelfInLocal.kt b/compiler/testData/codegen/boxWithStdlib/regressions/referenceToSelfInLocal.kt
index f5e8866d4b2..605bb372b3e 100644
--- a/compiler/testData/codegen/boxWithStdlib/regressions/referenceToSelfInLocal.kt
+++ b/compiler/testData/codegen/boxWithStdlib/regressions/referenceToSelfInLocal.kt
@@ -5,7 +5,7 @@ fun box(): String {
 
     class MyClass() {
         init {
-            accessedFromConstructor = javaClass<MyClass>()
+            accessedFromConstructor = MyClass::class.java
         }
     }
 
diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/typeCastException.kt b/compiler/testData/codegen/boxWithStdlib/regressions/typeCastException.kt
index 5a25780bb51..972f550e342 100644
--- a/compiler/testData/codegen/boxWithStdlib/regressions/typeCastException.kt
+++ b/compiler/testData/codegen/boxWithStdlib/regressions/typeCastException.kt
@@ -9,7 +9,7 @@ fun box(): String {
         a as Array<String>
     }
     catch (e: TypeCastException) {
-        if (e.getMessage() != "null cannot be cast to non-null type kotlin.Array<kotlin.String>") {
+        if (e.message != "null cannot be cast to non-null type kotlin.Array<kotlin.String>") {
             return "Fail 1: $e"
         }
     }
@@ -19,7 +19,7 @@ fun box(): String {
         x as String
     }
     catch (e: TypeCastException) {
-        if (e.getMessage() != "null cannot be cast to non-null type kotlin.String") {
+        if (e.message != "null cannot be cast to non-null type kotlin.String") {
             return "Fail 2: $e"
         }
     }
diff --git a/compiler/testData/codegen/boxWithStdlib/reified/DIExample.kt b/compiler/testData/codegen/boxWithStdlib/reified/DIExample.kt
index 2a9ad1bd2f1..6ef4caf88ea 100644
--- a/compiler/testData/codegen/boxWithStdlib/reified/DIExample.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reified/DIExample.kt
@@ -10,7 +10,7 @@ class Project {
         }
 }
 
-inline operator fun <reified T : Any> Project.getValue(t: Any?, p: KProperty<*>): T = getInstance(javaClass<T>())
+inline operator fun <reified T : Any> Project.getValue(t: Any?, p: KProperty<*>): T = getInstance(T::class.java)
 
 val project = Project()
 val x1: Int by project
diff --git a/compiler/testData/codegen/boxWithStdlib/reified/anonymousObject.kt b/compiler/testData/codegen/boxWithStdlib/reified/anonymousObject.kt
index 201975c5901..8178965a31f 100644
--- a/compiler/testData/codegen/boxWithStdlib/reified/anonymousObject.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reified/anonymousObject.kt
@@ -7,7 +7,7 @@ abstract class A {
 inline fun<reified T : Any> foo(): A {
     return object : A() {
         override fun f(): String {
-            return javaClass<T>().getName()
+            return T::class.java.getName()
         }
     }
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/reified/anonymousObjectNoPropagate.kt b/compiler/testData/codegen/boxWithStdlib/reified/anonymousObjectNoPropagate.kt
index 85d21973bb6..0756a97ccb5 100644
--- a/compiler/testData/codegen/boxWithStdlib/reified/anonymousObjectNoPropagate.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reified/anonymousObjectNoPropagate.kt
@@ -12,14 +12,14 @@ inline fun doWorkInline(block: () -> String) = block()
 fun box(): String {
     val x = object {
         inline fun <reified T : Any> bar1(): A = object : A {
-            override fun f1(): String = javaClass<T>().getName()
-            override fun f2(): String = doWork { javaClass<T>().getName() }
-            override fun f3(): String = doWorkInline { javaClass<T>().getName() }
+            override fun f1(): String = T::class.java.getName()
+            override fun f2(): String = doWork { T::class.java.getName() }
+            override fun f3(): String = doWorkInline { T::class.java.getName() }
         }
 
-        inline fun <reified T : Any> bar2() = javaClass<T>().getName()
-        inline fun <reified T : Any> bar3() = doWork { javaClass<T>().getName() }
-        inline fun <reified T : Any> bar4() = doWorkInline { javaClass<T>().getName() }
+        inline fun <reified T : Any> bar2() = T::class.java.getName()
+        inline fun <reified T : Any> bar3() = doWork { T::class.java.getName() }
+        inline fun <reified T : Any> bar4() = doWorkInline { T::class.java.getName() }
     }
 
     val y: A = x.bar1<String>()
diff --git a/compiler/testData/codegen/boxWithStdlib/reified/defaultJavaClass.kt b/compiler/testData/codegen/boxWithStdlib/reified/defaultJavaClass.kt
index 51d238a7acc..918afc81466 100644
--- a/compiler/testData/codegen/boxWithStdlib/reified/defaultJavaClass.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reified/defaultJavaClass.kt
@@ -1,6 +1,6 @@
 import kotlin.test.assertEquals
 
-inline fun <reified T : Any> foo(x: Class<T> = javaClass<T>()): String = x.getName()
+inline fun <reified T : Any> foo(x: Class<T> = T::class.java): String = x.getName()
 
 inline fun <reified R : Any> bar(x: R): String = foo<R>()
 
diff --git a/compiler/testData/codegen/boxWithStdlib/reified/javaClass.kt b/compiler/testData/codegen/boxWithStdlib/reified/javaClass.kt
index 9ff1298fa60..7d487e720d4 100644
--- a/compiler/testData/codegen/boxWithStdlib/reified/javaClass.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reified/javaClass.kt
@@ -1,7 +1,7 @@
 import kotlin.test.assertEquals
 
 inline fun<reified T : Any> javaClassName(): String {
-    return javaClass<T>().getName()
+    return T::class.java.getName()
 }
 
 fun box(): String {
diff --git a/compiler/testData/codegen/boxWithStdlib/reified/nestedReified.kt b/compiler/testData/codegen/boxWithStdlib/reified/nestedReified.kt
index 19957731e9a..2ec778a7c9d 100644
--- a/compiler/testData/codegen/boxWithStdlib/reified/nestedReified.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reified/nestedReified.kt
@@ -3,7 +3,7 @@ import kotlin.test.assertEquals
 inline fun <reified T : Any, reified R : Any> foo(): Array<String> {
     val x = object {
         inline fun <reified T1 : Any, reified T : Any> bar(): Array<String> = arrayOf(
-                javaClass<T1>().getName(), javaClass<T>().getName(), javaClass<R>().getName()
+                T1::class.java.getName(), T::class.java.getName(), R::class.java.getName()
         )
         fun f1() = bar<T, R>()
         fun f2() = bar<R, T>()
diff --git a/compiler/testData/codegen/boxWithStdlib/reified/nonInlineableLambdaInReifiedFunction.kt b/compiler/testData/codegen/boxWithStdlib/reified/nonInlineableLambdaInReifiedFunction.kt
index a5743434ea7..2dc96dcde97 100644
--- a/compiler/testData/codegen/boxWithStdlib/reified/nonInlineableLambdaInReifiedFunction.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reified/nonInlineableLambdaInReifiedFunction.kt
@@ -2,10 +2,10 @@ import kotlin.test.assertEquals
 
 fun foo(block: () -> String) = block()
 inline fun<reified T : Any> bar1(x: T): String = foo() {
-    javaClass<T>().getName()
+    T::class.java.getName()
 }
 inline fun<reified T : Any> bar2(x: T, y: String): String = foo() {
-    javaClass<T>().getName() + "#" + y
+    T::class.java.getName() + "#" + y
 }
 
 fun box(): String {
diff --git a/compiler/testData/codegen/boxWithStdlib/reified/recursiveNonInlineableLambda.kt b/compiler/testData/codegen/boxWithStdlib/reified/recursiveNonInlineableLambda.kt
index ec41a2904a8..9fb50925297 100644
--- a/compiler/testData/codegen/boxWithStdlib/reified/recursiveNonInlineableLambda.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reified/recursiveNonInlineableLambda.kt
@@ -3,10 +3,10 @@ import kotlin.test.assertEquals
 fun foo(block: () -> String) = block()
 
 inline fun<reified T : Any> bar1(): String = foo() {
-    javaClass<T>().getName()
+    T::class.java.getName()
 }
 inline fun<reified T : Any> bar2(y: String): String = foo() {
-    javaClass<T>().getName() + "#" + y
+    T::class.java.getName() + "#" + y
 }
 
 inline fun<T1, T2, reified R1 : Any, reified R2 : Any> bar3(y: String) =
diff --git a/compiler/testData/codegen/boxWithStdlib/reified/reifiedInlineFunOfObject.kt b/compiler/testData/codegen/boxWithStdlib/reified/reifiedInlineFunOfObject.kt
index b20587701d8..0c0537e2b48 100644
--- a/compiler/testData/codegen/boxWithStdlib/reified/reifiedInlineFunOfObject.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reified/reifiedInlineFunOfObject.kt
@@ -9,7 +9,7 @@ interface A {
 
 fun box(): String {
     val x: A = object : A {
-        private inline fun <reified T : Any> localClassName(): String = javaClass<T>().getName()
+        private inline fun <reified T : Any> localClassName(): String = T::class.java.getName()
         override fun f(): String = foo { localClassName<String>() }
         override fun g(): String = foo { localClassName<Int>() }
     }
diff --git a/compiler/testData/codegen/boxWithStdlib/reified/reifiedInlineFunOfObjectWithinReified.kt b/compiler/testData/codegen/boxWithStdlib/reified/reifiedInlineFunOfObjectWithinReified.kt
index 4816da556ef..5ac8e112c04 100644
--- a/compiler/testData/codegen/boxWithStdlib/reified/reifiedInlineFunOfObjectWithinReified.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reified/reifiedInlineFunOfObjectWithinReified.kt
@@ -2,7 +2,7 @@ import kotlin.test.assertEquals
 
 fun foo(block: () -> String) = block()
 
-inline fun <reified T : Any> className(): String = javaClass<T>().getName()
+inline fun <reified T : Any> className(): String = T::class.java.getName()
 
 inline fun <reified T : Any> lambdaShouldBeReified(): String = foo { className<T>() }
 
diff --git a/compiler/testData/codegen/boxWithStdlib/reified/reifiedInlineIntoNonInlineableLambda.kt b/compiler/testData/codegen/boxWithStdlib/reified/reifiedInlineIntoNonInlineableLambda.kt
index 616fcc270ef..29a4dd4b4f2 100644
--- a/compiler/testData/codegen/boxWithStdlib/reified/reifiedInlineIntoNonInlineableLambda.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reified/reifiedInlineIntoNonInlineableLambda.kt
@@ -2,7 +2,7 @@ import kotlin.test.assertEquals
 
 fun foo(block: () -> String) = block()
 
-inline fun<reified T : Any> className(): String = javaClass<T>().getName()
+inline fun<reified T : Any> className(): String = T::class.java.getName()
 
 interface A {
     fun f(): String
diff --git a/compiler/testData/codegen/boxWithStdlib/reified/spreads.kt b/compiler/testData/codegen/boxWithStdlib/reified/spreads.kt
index 2793d58803f..066f13b6f6e 100644
--- a/compiler/testData/codegen/boxWithStdlib/reified/spreads.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reified/spreads.kt
@@ -1,6 +1,6 @@
 import kotlin.test.assertEquals
 
-fun <T> foo(vararg a: T) = a.size()
+fun <T> foo(vararg a: T) = a.size
 
 inline fun <reified T> bar(a: Array<T>, block: () -> T): Array<T> {
     assertEquals(4, foo(*a, block(), block()))
diff --git a/compiler/testData/codegen/boxWithStdlib/reified/varargs.kt b/compiler/testData/codegen/boxWithStdlib/reified/varargs.kt
index 58c48c33277..d593428d2de 100644
--- a/compiler/testData/codegen/boxWithStdlib/reified/varargs.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reified/varargs.kt
@@ -1,6 +1,6 @@
 import kotlin.test.assertEquals
 
-fun <T> foo(vararg a: T) = a.size()
+fun <T> foo(vararg a: T) = a.size
 
 inline fun <reified T> bar(block: () -> T): Array<T> {
     assertEquals(2, foo(block(), block()))
@@ -20,7 +20,7 @@ fun box(): String {
     assertEquals("234", b.map { it.toString() }.joinToString(""))
 
     val c: Array<String> = empty()
-    assertEquals(0, c.size())
+    assertEquals(0, c.size)
 
     return "OK"
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/synthetic/syntheticAccessorNames.kt b/compiler/testData/codegen/boxWithStdlib/synthetic/syntheticAccessorNames.kt
index d63e4ffc397..b2393e95b9d 100644
--- a/compiler/testData/codegen/boxWithStdlib/synthetic/syntheticAccessorNames.kt
+++ b/compiler/testData/codegen/boxWithStdlib/synthetic/syntheticAccessorNames.kt
@@ -29,9 +29,9 @@ fun check(klass: Class<*>) {
 }
 
 fun box(): String {
-    check(javaClass<PrivatePropertyGet>())
-    check(javaClass<PrivatePropertySet>())
-    check(javaClass<PrivateMethod>())
+    check(PrivatePropertyGet::class.java)
+    check(PrivatePropertySet::class.java)
+    check(PrivateMethod::class.java)
 
     // Also check that synthetic accessors really work
     PrivatePropertyGet().Inner()
diff --git a/compiler/testData/codegen/boxWithStdlib/topLevelPrivate/noPrivateNoAccessorsInMultiFileFacade.kt b/compiler/testData/codegen/boxWithStdlib/topLevelPrivate/noPrivateNoAccessorsInMultiFileFacade.kt
index 4d54ca84811..87cd2a141a3 100644
--- a/compiler/testData/codegen/boxWithStdlib/topLevelPrivate/noPrivateNoAccessorsInMultiFileFacade.kt
+++ b/compiler/testData/codegen/boxWithStdlib/topLevelPrivate/noPrivateNoAccessorsInMultiFileFacade.kt
@@ -11,7 +11,7 @@ private fun test() = "K"
 fun box(): String {
 
     val clazz = Class.forName("test.TestKt")
-    assertEquals(1, clazz.declaredMethods.size(), "Facade should have only box and getProp methods")
+    assertEquals(1, clazz.declaredMethods.size, "Facade should have only box and getProp methods")
     assertEquals("box", clazz.declaredMethods.first().name, "Facade should have only box method")
 
     return {
diff --git a/compiler/testData/codegen/boxWithStdlib/topLevelPrivate/noPrivateNoAccessorsInMultiFileFacade2.kt b/compiler/testData/codegen/boxWithStdlib/topLevelPrivate/noPrivateNoAccessorsInMultiFileFacade2.kt
index 07cbaab0ea3..7f02e734285 100644
--- a/compiler/testData/codegen/boxWithStdlib/topLevelPrivate/noPrivateNoAccessorsInMultiFileFacade2.kt
+++ b/compiler/testData/codegen/boxWithStdlib/topLevelPrivate/noPrivateNoAccessorsInMultiFileFacade2.kt
@@ -13,7 +13,7 @@ private fun test() = "K"
 fun box(): String {
 
     val clazz = Class.forName("test.TestKt")
-    assertEquals(2, clazz.declaredMethods.size(), "Facade should have only box method")
+    assertEquals(2, clazz.declaredMethods.size, "Facade should have only box method")
     val methods = clazz.declaredMethods.map { it.name }
     assertTrue(methods.contains("box"), "Facade should have box method")
     assertTrue(methods.contains("getProp"), "Facade should have box method")
diff --git a/compiler/testData/codegen/regressions/kt297.kt b/compiler/testData/codegen/regressions/kt297.kt
index 169d061c6de..255848588f3 100644
--- a/compiler/testData/codegen/regressions/kt297.kt
+++ b/compiler/testData/codegen/regressions/kt297.kt
@@ -1,4 +1,4 @@
 // KT-297 Overload resolution ambiguity with required in interface
 interface ALE<T> : java.util.ArrayList<T> {
-   fun getOrValue(index: Int, value : T) : T = if(index >= 0 && index < size()) get(index) else value
+   fun getOrValue(index: Int, value : T) : T = if(index >= 0 && index < size) get(index) else value
 }
\ No newline at end of file
diff --git a/compiler/testData/compileKotlinAgainstKotlin/AnnotationInTrait.B.kt b/compiler/testData/compileKotlinAgainstKotlin/AnnotationInTrait.B.kt
index 3b64480e623..de90e93d7f3 100644
--- a/compiler/testData/compileKotlinAgainstKotlin/AnnotationInTrait.B.kt
+++ b/compiler/testData/compileKotlinAgainstKotlin/AnnotationInTrait.B.kt
@@ -1,7 +1,7 @@
 class C : a.Tr
 
 fun main(args: Array<String>) {
-    val method = javaClass<C>().getDeclaredMethod("foo")
+    val method = C::class.java.getDeclaredMethod("foo")
     val annotations = method.getDeclaredAnnotations().joinToString("\n")
     if (annotations != "@a.Ann()") {
         throw AssertionError(annotations)
diff --git a/compiler/testData/compileKotlinAgainstKotlin/InlinedConstants.B.kt b/compiler/testData/compileKotlinAgainstKotlin/InlinedConstants.B.kt
index 1cce6203cee..74ee84228d8 100644
--- a/compiler/testData/compileKotlinAgainstKotlin/InlinedConstants.B.kt
+++ b/compiler/testData/compileKotlinAgainstKotlin/InlinedConstants.B.kt
@@ -4,8 +4,8 @@ import constants.*
 class DummyClass()
 
 fun main(args: Array<String>) {
-    val klass = javaClass<DummyClass>()!!
-    val annotationClass = javaClass<AnnotationClass>()
+    val klass = DummyClass::class.java
+    val annotationClass = AnnotationClass::class.java
     val annotation = klass.getAnnotation(annotationClass)!!
     val value = annotation.value
     require(value == "100 20000 2000000 2000000000000 3.14 3.14 true \u03c0 :)", { "Annotation value: $value" })
diff --git a/compiler/testData/compileKotlinAgainstKotlin/PlatformTypes.B.kt b/compiler/testData/compileKotlinAgainstKotlin/PlatformTypes.B.kt
index 8218db5f749..61d4d74a0a9 100644
--- a/compiler/testData/compileKotlinAgainstKotlin/PlatformTypes.B.kt
+++ b/compiler/testData/compileKotlinAgainstKotlin/PlatformTypes.B.kt
@@ -11,7 +11,7 @@ fun main(args: Array<String>) {
     val p: Inv<PrintStream> = inv(printStream())
     val p1: Inv<PrintStream?> = inv(printStream())
 
-    list().size()
+    list().size
     val l: Inv<List<String>> = inv(list())
     val l1: Inv<MutableList<String>?> = inv(list())
 
diff --git a/compiler/testData/compileKotlinAgainstKotlin/PropertyReference.A.kt b/compiler/testData/compileKotlinAgainstKotlin/PropertyReference.A.kt
index f1131339069..ea68a0dea53 100644
--- a/compiler/testData/compileKotlinAgainstKotlin/PropertyReference.A.kt
+++ b/compiler/testData/compileKotlinAgainstKotlin/PropertyReference.A.kt
@@ -3,4 +3,4 @@ package a
 public var topLevel: Int = 42
 
 public val String.extension: Long
-    get() = length().toLong()
+    get() = length.toLong()
diff --git a/compiler/testData/compileKotlinAgainstKotlin/RecursiveGeneric.B.kt b/compiler/testData/compileKotlinAgainstKotlin/RecursiveGeneric.B.kt
index d2500c4c800..348e2a47f0c 100644
--- a/compiler/testData/compileKotlinAgainstKotlin/RecursiveGeneric.B.kt
+++ b/compiler/testData/compileKotlinAgainstKotlin/RecursiveGeneric.B.kt
@@ -1,7 +1,7 @@
 import a.*
 
 fun main(args: Array<String>) {
-    val declaredMethod = javaClass<Super>().getDeclaredMethod("foo", javaClass<Rec<*, *>>())
+    val declaredMethod = Super::class.java.getDeclaredMethod("foo", Rec::class.java)
     val genericString = declaredMethod.toGenericString()
     if (genericString != "public abstract a.Rec<?, ?> a.Super.foo(a.Rec<?, ?>)") throw AssertionError(genericString)
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1778.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1778.kt
index 9c170fe3d52..1d1bf593f1d 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1778.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1778.kt
@@ -5,8 +5,8 @@ package kt1778
 fun main(args : Array<String>) {
     val x = checkSubtype<Any>(args[0])
     if(x is <!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>java.lang.CharSequence<!>) {
-        if ("a" == x) <!DEBUG_INFO_SMARTCAST!>x<!>.length() else <!DEBUG_INFO_SMARTCAST!>x<!>.length() // OK
-        if ("a" == x || "b" == x) <!DEBUG_INFO_SMARTCAST!>x<!>.length() else <!DEBUG_INFO_SMARTCAST!>x<!>.length() // <– THEN ERROR
-        if ("a" == x && "a" == x) <!DEBUG_INFO_SMARTCAST!>x<!>.length() else <!DEBUG_INFO_SMARTCAST!>x<!>.length() // <– ELSE ERROR
+        if ("a" == x) <!DEBUG_INFO_SMARTCAST!>x<!>.length else <!DEBUG_INFO_SMARTCAST!>x<!>.length() // OK
+        if ("a" == x || "b" == x) <!DEBUG_INFO_SMARTCAST!>x<!>.length else <!DEBUG_INFO_SMARTCAST!>x<!>.length() // <– THEN ERROR
+        if ("a" == x && "a" == x) <!DEBUG_INFO_SMARTCAST!>x<!>.length else <!DEBUG_INFO_SMARTCAST!>x<!>.length() // <– ELSE ERROR
     }
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.kt b/compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.kt
index 70f3b60482b..23ab125c796 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.kt
@@ -2,6 +2,8 @@
 
 inline fun<reified T> foo(block: () -> T): String = block().toString()
 
+inline fun <reified T: Any> javaClass(): Class<T> = T::class.java
+
 fun box() {
     val a = <!UNSUPPORTED!><!REIFIED_TYPE_FORBIDDEN_SUBSTITUTION!>arrayOf<!>(null!!)<!>
     val b = <!UNSUPPORTED!><!REIFIED_TYPE_FORBIDDEN_SUBSTITUTION!>Array<!><Nothing?>(5) { null!! }<!>
diff --git a/compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.txt b/compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.txt
index 06f92867336..e6dbfc7e217 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.txt
@@ -2,3 +2,4 @@ package
 
 public fun box(): kotlin.Unit
 public inline fun </*0*/ reified T> foo(/*0*/ block: () -> T): kotlin.String
+public inline fun </*0*/ reified T : kotlin.Any> javaClass(): java.lang.Class<T>
diff --git a/compiler/testData/evaluate/constant/strings.kt b/compiler/testData/evaluate/constant/strings.kt
index 9cf013166bf..04e0cf9e2e8 100644
--- a/compiler/testData/evaluate/constant/strings.kt
+++ b/compiler/testData/evaluate/constant/strings.kt
@@ -23,7 +23,7 @@ val prop5 = "${1.toFloat()}"
 val prop6 = "${1.0}"
 
 // val prop7: null
-val prop7 = "${javaClass<Int>()}"
+val prop7 = "${Int::class.java}"
 
 // val prop8: \"a1.0\"
 val prop8 = "a${1.toDouble()}"
diff --git a/compiler/testData/repl/classes/classRedeclaration.repl b/compiler/testData/repl/classes/classRedeclaration.repl
index 97e53be0ad1..7ff656f7103 100644
--- a/compiler/testData/repl/classes/classRedeclaration.repl
+++ b/compiler/testData/repl/classes/classRedeclaration.repl
@@ -9,5 +9,5 @@
 Old
 >>> A().foo()
 New
->>> oldA.javaClass == javaClass<A>()
+>>> oldA.javaClass == A::class.java
 false
diff --git a/compiler/testData/repl/classes/simpleTrait.repl b/compiler/testData/repl/classes/simpleTrait.repl
index 160c0565415..fdbfda942af 100644
--- a/compiler/testData/repl/classes/simpleTrait.repl
+++ b/compiler/testData/repl/classes/simpleTrait.repl
@@ -2,5 +2,5 @@
 >>> interface B : A {
 ...    fun foo() = 45
 ... }
->>> javaClass<A>().isAssignableFrom(javaClass<B>())
+>>> A::class.java.isAssignableFrom(B::class.java)
 true
diff --git a/eval4j/src/org/jetbrains/eval4j/values.kt b/eval4j/src/org/jetbrains/eval4j/values.kt
index 0f7ca0e2881..5536760572f 100644
--- a/eval4j/src/org/jetbrains/eval4j/values.kt
+++ b/eval4j/src/org/jetbrains/eval4j/values.kt
@@ -99,7 +99,7 @@ fun int(v: Int) = IntValue(v, Type.INT_TYPE)
 fun long(v: Long) = LongValue(v)
 fun float(v: Float) = FloatValue(v)
 fun double(v: Double) = DoubleValue(v)
-//fun <T> obj(v: T, t: Type = if (v != null) Type.getType(v.javaClass) else Type.getType(javaClass<Any>())) = ObjectValue(v, t)
+//fun <T> obj(v: T, t: Type = if (v != null) Type.getType(v.javaClass) else Type.getType(Any::class.java)) = ObjectValue(v, t)
 
 val NULL_VALUE = ObjectValue(null, Type.getObjectType("null"))
 
diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java
index 9620690217b..afc95d44c7d 100644
--- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java
@@ -47,7 +47,7 @@ public class GenerateRangesCodegenTestData {
     public static final String LITERAL_TEMPLATE =    "    val $LIST = ArrayList<$TYPE>()\n" +
                                                      "    for (i in $RANGE_EXPR) {\n" +
                                                      "        $LIST.add(i)\n" +
-                                                     "        if ($LIST.size() > 23) break\n" +
+                                                     "        if ($LIST.size > 23) break\n" +
                                                      "    }\n" +
                                                      "    if ($LIST != listOf<$TYPE>($LIST_ELEMENTS)) {\n" +
                                                      "        return \"Wrong elements for $RANGE_EXPR_ESCAPED: $$LIST\"\n" +
@@ -58,7 +58,7 @@ public class GenerateRangesCodegenTestData {
                                                      "    val $RANGE = $RANGE_EXPR\n" +
                                                      "    for (i in $RANGE) {\n" +
                                                      "        $LIST.add(i)\n" +
-                                                     "        if ($LIST.size() > 23) break\n" +
+                                                     "        if ($LIST.size > 23) break\n" +
                                                      "    }\n" +
                                                      "    if ($LIST != listOf<$TYPE>($LIST_ELEMENTS)) {\n" +
                                                      "        return \"Wrong elements for $RANGE_EXPR_ESCAPED: $$LIST\"\n" +
diff --git a/idea/idea-completion/testData/smart/ImplicitlyTypedValInitializer2.kt b/idea/idea-completion/testData/smart/ImplicitlyTypedValInitializer2.kt
index 4f377067022..116541615f4 100644
--- a/idea/idea-completion/testData/smart/ImplicitlyTypedValInitializer2.kt
+++ b/idea/idea-completion/testData/smart/ImplicitlyTypedValInitializer2.kt
@@ -1,5 +1,5 @@
 class A(s: String) {
-    val v = s.<caret>length()
+    val v = s.<caret>length
 }
 
 // EXIST: hashCode
diff --git a/idea/testData/debugger/tinyApp/outs/arrays.out b/idea/testData/debugger/tinyApp/outs/arrays.out
index d1a03a940aa..8674c3c4857 100644
--- a/idea/testData/debugger/tinyApp/outs/arrays.out
+++ b/idea/testData/debugger/tinyApp/outs/arrays.out
@@ -6,7 +6,7 @@ Compile bytecode for arrayOf(1, 2).map { it.toString() }
 Compile bytecode for arrayOf(1, 2, 101, 102).filter { it > 100 }
 Compile bytecode for arrayOf(1, 2).none()
 Compile bytecode for arrayOf(1, 2).count()
-Compile bytecode for arrayOf(1, 2).size()
+Compile bytecode for arrayOf(1, 2).size
 Compile bytecode for arrayOf(1, 2).first()
 Compile bytecode for arrayOf(1, 2).last()
 Compile bytecode for intArrayOf(1, 2).max()
diff --git a/idea/testData/debugger/tinyApp/outs/clearCache.out b/idea/testData/debugger/tinyApp/outs/clearCache.out
index 4acfbbbdcc2..e02c9b66c3a 100644
--- a/idea/testData/debugger/tinyApp/outs/clearCache.out
+++ b/idea/testData/debugger/tinyApp/outs/clearCache.out
@@ -31,12 +31,12 @@ clearCache.kt:52
 Compile bytecode for o.test()
 clearCache.kt:60
 clearCache.kt:78
-Compile bytecode for c.size()
+Compile bytecode for c.size
 clearCache.kt:86
 clearCache.kt:95
 clearCache.kt:105
 clearCache.kt:113
-Compile bytecode for c.size()
+Compile bytecode for c.size
 clearCache.kt:123
 Compile bytecode for o.test()
 clearCache.kt:131
diff --git a/idea/testData/debugger/tinyApp/outs/collections.out b/idea/testData/debugger/tinyApp/outs/collections.out
index 8f0bfbc9633..0774a68cfaf 100644
--- a/idea/testData/debugger/tinyApp/outs/collections.out
+++ b/idea/testData/debugger/tinyApp/outs/collections.out
@@ -6,11 +6,11 @@ Compile bytecode for arrayListOf(1, 2).map { it.toString() }
 Compile bytecode for arrayListOf(1, 2, 101, 102).filter { it > 100 }
 Compile bytecode for arrayListOf(1, 2).max()
 Compile bytecode for arrayListOf(1, 2).count()
-Compile bytecode for arrayListOf(1, 2).size()
+Compile bytecode for arrayListOf(1, 2).size
 Compile bytecode for arrayListOf(1, 2).drop(1)
 Compile bytecode for ar.map { if (it > 50) "big" else "small" }
   .filter { it == "small" }
-  .size()
+  .size
 
 // RESULT: 2: I
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
diff --git a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out
index af8f4630fc5..0aec4232a55 100644
--- a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out
+++ b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out
@@ -10,7 +10,7 @@ import kotlin.reflect.KProperty
 fun main(args: Array<String>) {
     val a = A()
     //Breakpoint!
-    args.size()
+    args.size
 }
 
 class A {
@@ -28,6 +28,7 @@ class MyDelegateThrowsException {
 
 // PRINT_FRAME
 
+Compile bytecode for args.size
  frame    = main():9, DelegatedPropertyInClassKt {delegatedPropertyInClass}
    local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = delegatedPropertyInClass.kt, 6)
    local    = a: delegatedPropertyInClass.A = {delegatedPropertyInClass.A@uniqueID} (sp = delegatedPropertyInClass.kt, 7)
@@ -40,6 +41,7 @@ class MyDelegateThrowsException {
        field    = detailMessage: java.lang.String = null (sp = Throwable.!EXT!)
        field    = cause: java.lang.Throwable = {java.lang.IllegalStateException@uniqueID}java.lang.IllegalStateException (sp = Throwable.!EXT!)
        field    = stackTrace: java.lang.StackTraceElement[] = null (sp = Throwable.!EXT!)
+   extra    = args.size
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWoRenderer.out b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWoRenderer.out
index 06d5c30a469..057b0f6b0a0 100644
--- a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWoRenderer.out
+++ b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWoRenderer.out
@@ -10,7 +10,7 @@ import kotlin.reflect.KProperty
 fun main(args: Array<String>) {
     val a = A()
     //Breakpoint!
-    args.size()
+    args.size
 }
 
 class A {
@@ -24,11 +24,13 @@ class MyDelegate {
 // RENDER_DELEGATED_PROPERTIES: false
 // PRINT_FRAME
 
+Compile bytecode for args.size
  frame    = main():9, DelegatedPropertyInClassWoRendererKt {delegatedPropertyInClassWoRenderer}
    local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = delegatedPropertyInClassWoRenderer.kt, 6)
    local    = a: delegatedPropertyInClassWoRenderer.A = {delegatedPropertyInClassWoRenderer.A@uniqueID} (sp = delegatedPropertyInClassWoRenderer.kt, 7)
      field    = prop: int = {delegatedPropertyInClassWoRenderer.MyDelegate@uniqueID} (sp = delegatedPropertyInClassWoRenderer.kt, 13)
                 - Class has no fields
+   extra    = args.size
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/extractLocalVariables.out b/idea/testData/debugger/tinyApp/outs/extractLocalVariables.out
index 19bf2cc4c66..993020af211 100644
--- a/idea/testData/debugger/tinyApp/outs/extractLocalVariables.out
+++ b/idea/testData/debugger/tinyApp/outs/extractLocalVariables.out
@@ -4,7 +4,7 @@ Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socke
 extractLocalVariables.kt:7
 Compile bytecode for a
 Compile bytecode for klass.f1(1)
-Compile bytecode for args.size()
+Compile bytecode for args.size
 Compile bytecode for klass.b
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
diff --git a/idea/testData/debugger/tinyApp/outs/simple.out b/idea/testData/debugger/tinyApp/outs/simple.out
index c9cac52453d..905ba4fb8cd 100644
--- a/idea/testData/debugger/tinyApp/outs/simple.out
+++ b/idea/testData/debugger/tinyApp/outs/simple.out
@@ -5,7 +5,7 @@ simple.kt:6
 Compile bytecode for 1
 Compile bytecode for 1 + 1
 Compile bytecode for val a = 1
-a + args.size()
+a + args.size
 
 // RESULT: 1: I
 
diff --git a/idea/testData/debugger/tinyApp/outs/stdlib.out b/idea/testData/debugger/tinyApp/outs/stdlib.out
index db059436402..daf3baea579 100644
--- a/idea/testData/debugger/tinyApp/outs/stdlib.out
+++ b/idea/testData/debugger/tinyApp/outs/stdlib.out
@@ -5,11 +5,11 @@ stdlib.kt:5
 Compile bytecode for arrayOf(100, 101)
 Compile bytecode for arrayOf("a", "b", "c")
 Compile bytecode for intArrayOf(1, 2)
-Compile bytecode for javaClass<String>()
-Compile bytecode for javaClass<Int>()
+Compile bytecode for String::class.java
+Compile bytecode for Int::class.java
 Compile bytecode for 100.toInt()
 Compile bytecode for 100.toLong()
-Compile bytecode for args.sortedBy { it }.size()
+Compile bytecode for args.sortedBy { it }.size
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/toStringRenderer.out b/idea/testData/debugger/tinyApp/outs/toStringRenderer.out
index 92a33734201..c8801c51e0e 100644
--- a/idea/testData/debugger/tinyApp/outs/toStringRenderer.out
+++ b/idea/testData/debugger/tinyApp/outs/toStringRenderer.out
@@ -7,7 +7,7 @@ package toStringRenderer
 fun main(args: Array<String>) {
     val a = A()
     //Breakpoint!
-    args.size()
+    args.size
 }
 
 class A {
@@ -15,10 +15,12 @@ class A {
 }
 
 // PRINT_FRAME
+Compile bytecode for args.size
  frame    = main():6, ToStringRendererKt {toStringRenderer}
    local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = toStringRenderer.kt, 3)
    local    = a: toStringRenderer.A = {toStringRenderer.A@uniqueID}myA (sp = toStringRenderer.kt, 4)
               - Class has no fields
+   extra    = args.size
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/clearCache.kt b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/clearCache.kt
index cf8dc535aba..cf5f1da8b7f 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/clearCache.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/clearCache.kt
@@ -72,7 +72,7 @@ class Derived: Base() {
 fun subTypePlatform() {
     if (true) {
         val c: MutableList<String> = ArrayList<String>()
-        // EXPRESSION: c.size()
+        // EXPRESSION: c.size
         // RESULT: 0: I
         //Breakpoint!
         val b = 1
@@ -80,7 +80,7 @@ fun subTypePlatform() {
 
     if (true) {
         val c: List<String> = ArrayList<String>()
-        // EXPRESSION: c.size()
+        // EXPRESSION: c.size
         // RESULT: 0: I
         //Breakpoint!
         val b = 1
@@ -89,7 +89,7 @@ fun subTypePlatform() {
     if (true) {
         val c = ArrayList<String>()
         c.add("a")
-        // EXPRESSION: c.size()
+        // EXPRESSION: c.size
         // RESULT: 1: I
         //Breakpoint!
         val b = 1
@@ -99,7 +99,7 @@ fun subTypePlatform() {
         val c = ArrayList<Int>()
         c.add(1)
         c.add(2)
-        // EXPRESSION: c.size()
+        // EXPRESSION: c.size
         // RESULT: 2: I
         //Breakpoint!
         val b = 1
@@ -107,7 +107,7 @@ fun subTypePlatform() {
 
     if (true) {
         val c = HashSet<Int>()
-        // EXPRESSION: c.size()
+        // EXPRESSION: c.size
         // RESULT: 0: I
         //Breakpoint!
         val b = 1
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/.kt.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/.kt.kt
index 8c7e5a4749c..f3a2bff5120 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/.kt.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/.kt.kt
@@ -2,7 +2,7 @@
 
 fun main(args: Array<String>) {
     //Breakpoint!
-    args.size()
+    args.size
 }
 
 class Test(val a: Int)
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/abstractFunCall.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/abstractFunCall.kt
index 6a2c61055be..643597888c1 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/abstractFunCall.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/abstractFunCall.kt
@@ -2,7 +2,7 @@ package abstractFunCall
 
 fun main(args: Array<String>) {
     //Breakpoint!
-    args.size()
+    args.size
 }
 
 // EXPRESSION: (1 as java.lang.Number).intValue()
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/arrays.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/arrays.kt
index c44cc13a659..7af32ddc564 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/arrays.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/arrays.kt
@@ -2,7 +2,7 @@ package arrays
 
 fun main(args: Array<String>) {
     //Breakpoint!
-    args.size()
+    args.size
 }
 
 // EXPRESSION: arrayOf(1, 2).map { it.toString() }
@@ -17,7 +17,7 @@ fun main(args: Array<String>) {
 // EXPRESSION: arrayOf(1, 2).count()
 // RESULT: 2: I
 
-// EXPRESSION: arrayOf(1, 2).size()
+// EXPRESSION: arrayOf(1, 2).size
 // RESULT: 2: I
 
 // EXPRESSION: arrayOf(1, 2).first()
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/classFromAnotherPackage.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/classFromAnotherPackage.kt
index 05965ddea67..b94f5b8da9e 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/classFromAnotherPackage.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/classFromAnotherPackage.kt
@@ -4,7 +4,7 @@ import forTests.MyJavaClass
 
 fun main(args: Array<String>) {
     //Breakpoint!
-    args.size()
+    args.size
 }
 
 // EXPRESSION: MyJavaClass()
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/collections.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/collections.kt
index 3a8b3ba0c8e..3238557a2bb 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/collections.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/collections.kt
@@ -3,7 +3,7 @@ package collections
 fun main(args: Array<String>) {
     val ar = intArrayOf(1, 2, 100, 200)
     //Breakpoint!
-    args.size()
+    args.size
 }
 
 // EXPRESSION: arrayListOf(1, 2).map { it.toString() }
@@ -18,7 +18,7 @@ fun main(args: Array<String>) {
 // EXPRESSION: arrayListOf(1, 2).count()
 // RESULT: 2: I
 
-// EXPRESSION: arrayListOf(1, 2).size()
+// EXPRESSION: arrayListOf(1, 2).size
 // RESULT: 2: I
 
 // EXPRESSION: arrayListOf(1, 2).drop(1)
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/collections.kt.fragment b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/collections.kt.fragment
index b33475dbe1c..8c2be2df173 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/collections.kt.fragment
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/collections.kt.fragment
@@ -1,5 +1,5 @@
 ar.map { if (it > 50) "big" else "small" }
   .filter { it == "small" }
-  .size()
+  .size
 
 // RESULT: 2: I
\ No newline at end of file
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceLambda.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceLambda.kt
index e44e5a53be6..69c9596a8f0 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceLambda.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceLambda.kt
@@ -3,7 +3,7 @@ package ceLambda
 fun main(args: Array<String>) {
     val a = 1
     //Breakpoint!
-    args.size()
+    args.size
 }
 
 fun foo(p: () -> Int) = p()
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceLocalClass.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceLocalClass.kt
index ffa89222056..6caebb5bb23 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceLocalClass.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceLocalClass.kt
@@ -3,6 +3,6 @@ package ceLocalClass
 fun main(args: Array<String>) {
     val a = 1
     //Breakpoint!
-    args.size()
+    args.size
 }
 
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceObject.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceObject.kt
index da6fe34da19..14ca878ae87 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceObject.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceObject.kt
@@ -2,7 +2,7 @@ package ceObject
 
 fun main(args: Array<String>) {
     //Breakpoint!
-    args.size()
+    args.size
 }
 
 interface T {
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceSeveralLambdas.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceSeveralLambdas.kt
index 5fec775c45d..5b703754053 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceSeveralLambdas.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceSeveralLambdas.kt
@@ -2,7 +2,7 @@ package ceSeveralLambdas
 
 fun main(args: Array<String>) {
     //Breakpoint!
-    args.size()
+    args.size
 }
 
 fun foo(p: () -> Int) = p()
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/dependentOnFile.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/dependentOnFile.kt
index 5e107fbca51..4a7231f9d0f 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/dependentOnFile.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/dependentOnFile.kt
@@ -4,7 +4,7 @@ import kotlin.reflect.KProperty
 
 fun main(args: Array<String>) {
     //Breakpoint!
-    args.size()
+    args.size
 }
 
 class TestClass {
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/doubles.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/doubles.kt
index 235e81319d7..1ba2c60ef79 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/doubles.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/doubles.kt
@@ -4,7 +4,7 @@ fun main(args: Array<String>) {
     val d1 = 1.0
     val d2 = 3.0
     //Breakpoint!
-    args.size()
+    args.size
 }
 
 // EXPRESSION: d1 + d2
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/enums.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/enums.kt
index 2790c5fc9c3..f5ae3d71828 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/enums.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/enums.kt
@@ -4,7 +4,7 @@ import enums.MyEnum.A
 
 fun main(args: Array<String>) {
     //Breakpoint!
-    args.size()
+    args.size
 }
 
 enum class MyEnum { A }
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extractLocalVariables.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extractLocalVariables.kt
index 0e70022a082..d3e8fa703ff 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extractLocalVariables.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extractLocalVariables.kt
@@ -18,7 +18,7 @@ class MyClass {
 // EXPRESSION: klass.f1(1)
 // RESULT: 1: I
 
-// EXPRESSION: args.size()
+// EXPRESSION: args.size
 // RESULT: 0: I
 
 // EXPRESSION: klass.b
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extractVariablesFromCall.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extractVariablesFromCall.kt
index e4acae7f27e..c433156b933 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extractVariablesFromCall.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extractVariablesFromCall.kt
@@ -8,11 +8,11 @@ fun main(args: Array<String>) {
     val c = 0
 }
 
-fun f1(i: Int, s: String) = i + s.length()
-infix fun Int.f2(s: String) = this + s.length()
+fun f1(i: Int, s: String) = i + s.length
+infix fun Int.f2(s: String) = this + s.length
 
 class MyClass {
-    fun f1(i: Int, s: String) = i + s.length()
+    fun f1(i: Int, s: String) = i + s.length
 }
 
 // EXPRESSION: f1(a, s)
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/delegatedPropertyInClass.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/delegatedPropertyInClass.kt
index 2a45266131e..15b8b485295 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/delegatedPropertyInClass.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/delegatedPropertyInClass.kt
@@ -6,7 +6,7 @@ import kotlin.reflect.KProperty
 fun main(args: Array<String>) {
     val a = A()
     //Breakpoint!
-    args.size()
+    args.size
 }
 
 class A {
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/delegatedPropertyInClassWoRenderer.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/delegatedPropertyInClassWoRenderer.kt
index 8a0864bd90e..0fd62e1a275 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/delegatedPropertyInClassWoRenderer.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/delegatedPropertyInClassWoRenderer.kt
@@ -6,7 +6,7 @@ import kotlin.reflect.KProperty
 fun main(args: Array<String>) {
     val a = A()
     //Breakpoint!
-    args.size()
+    args.size
 }
 
 class A {
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/imports.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/imports.kt
index c23542f3581..ada125a5b97 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/imports.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/imports.kt
@@ -7,7 +7,7 @@ import java.util.HashMap as JHashMap
 
 fun main(args: Array<String>) {
     //Breakpoint!
-    args.size()
+    args.size
 }
 
 // EXPRESSION: Collections.emptyList<String>()
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/importsLambdaContext.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/importsLambdaContext.kt
index a4215942eeb..77b4fc4984f 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/importsLambdaContext.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/importsLambdaContext.kt
@@ -7,7 +7,7 @@ import java.util.HashMap as JHashMap
 
 fun main(args: Array<String>) {
     //Breakpoint! (lambdaOrdinal = 0)
-    arrayOf(1).map { args.size() }
+    arrayOf(1).map { args.size }
 }
 
 // EXPRESSION: Collections.emptyList<String>()
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/kt5554OnlyIntsShouldBeCoerced.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/kt5554OnlyIntsShouldBeCoerced.kt
index 68186ce5a4b..423c1a5ff94 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/kt5554OnlyIntsShouldBeCoerced.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/kt5554OnlyIntsShouldBeCoerced.kt
@@ -2,7 +2,7 @@ package kt5554OnlyIntsShouldBeCoerced
 
 fun main(args: Array<String>) {
     //Breakpoint!
-    args.size()
+    args.size
 }
 
 // EXPRESSION: Class.forName("java.lang.Object").getGenericInterfaces()
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/methodWithBreakpoint.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/methodWithBreakpoint.kt
index 905665b5ebf..4c31d33114b 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/methodWithBreakpoint.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/methodWithBreakpoint.kt
@@ -2,7 +2,7 @@ package methodWithBreakpoint
 
 fun main(args: Array<String>) {
     //Breakpoint!
-    args.size()
+    args.size
 }
 
 fun foo(): Int {
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/multilineExpressionAtBreakpoint.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/multilineExpressionAtBreakpoint.kt
index 0ef4b79f265..47f51f7a6c2 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/multilineExpressionAtBreakpoint.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/multilineExpressionAtBreakpoint.kt
@@ -3,7 +3,7 @@ package multilineExpressionAtBreakpoint
 fun main(args: Array<String>) {
     //Breakpoint!
     args
-        .size()
+        .size
         .downTo(0)
 }
 
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/package.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/package.kt
index 93a209718b2..051a53e73df 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/package.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/package.kt
@@ -3,7 +3,7 @@ package `package`
 // Check that package fq-name is correctly escaped
 fun main(args: Array<String>) {
     //Breakpoint!
-    args.size()
+    args.size
 }
 
 // EXPRESSION: 1
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/privateMember.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/privateMember.kt
index cfec2bf9c04..1ced9ae98d6 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/privateMember.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/privateMember.kt
@@ -6,7 +6,7 @@ fun main(args: Array<String>) {
     val derivedAsBase: Base = Derived()
 
     //Breakpoint!
-    args.size()
+    args.size
 }
 
 class MyClass {
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/protectedMember.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/protectedMember.kt
index f3cacfe489a..82ad3ec25ae 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/protectedMember.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/protectedMember.kt
@@ -2,7 +2,7 @@ package protectedMember
 
 fun main(args: Array<String>) {
     //Breakpoint!
-    args.size()
+    args.size
 }
 
 class MyClass {
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/renderer/toStringRenderer.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/renderer/toStringRenderer.kt
index 01235b3fed7..b236a8c6591 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/renderer/toStringRenderer.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/renderer/toStringRenderer.kt
@@ -3,7 +3,7 @@ package toStringRenderer
 fun main(args: Array<String>) {
     val a = A()
     //Breakpoint!
-    args.size()
+    args.size
 }
 
 class A {
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/simple.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/simple.kt
index 12798051f09..12f7e672043 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/simple.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/simple.kt
@@ -3,7 +3,7 @@ package simple
 // this test is used also to check more than one file for package in JetPositionManager:prepareTypeMapper. see forTests/simple.kt
 fun main(args: Array<String>) {
     //Breakpoint!
-    args.size()
+    args.size
 }
 
 // EXPRESSION: 1
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/simple.kt.fragment b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/simple.kt.fragment
index efb2dbb6787..4c5b81a3e61 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/simple.kt.fragment
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/simple.kt.fragment
@@ -1,4 +1,4 @@
 val a = 1
-a + args.size()
+a + args.size
 
 // RESULT: 1: I
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/stdlib.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/stdlib.kt
index d02f1d8c15e..bd0c866fcc2 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/stdlib.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/stdlib.kt
@@ -2,7 +2,7 @@ package stdlib
 
 fun main(args: Array<String>) {
     //Breakpoint!
-    args.size()
+    args.size
 }
 
 // EXPRESSION: arrayOf(100, 101)
@@ -14,10 +14,10 @@ fun main(args: Array<String>) {
 // EXPRESSION: intArrayOf(1, 2)
 // RESULT: instance of int[2] (id=ID): [I
 
-// EXPRESSION: javaClass<String>()
+// EXPRESSION: String::class.java
 // RESULT: instance of java.lang.Class(reflected class=java.lang.String, id=ID): Ljava/lang/Class;
 
-// EXPRESSION: javaClass<Int>()
+// EXPRESSION: Int::class.java
 // RESULT: instance of java.lang.Class(reflected class=int, id=ID): Ljava/lang/Class;
 
 // EXPRESSION: 100.toInt()
@@ -26,5 +26,5 @@ fun main(args: Array<String>) {
 // EXPRESSION: 100.toLong()
 // RESULT: 100: J
 
-// EXPRESSION: args.sortedBy { it }.size()
+// EXPRESSION: args.sortedBy { it }.size
 // RESULT: 0: I
\ No newline at end of file
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/unsafeCall.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/unsafeCall.kt
index 89e4643bbc3..1a78f08827f 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/unsafeCall.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/unsafeCall.kt
@@ -5,7 +5,7 @@ fun main(args: Array<String>) {
     val s1: String? = "a"
     val s2: String? = null
     //Breakpoint!
-    args.size()
+    args.size
 }
 
 // EXPRESSION: s1.length
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/vars.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/vars.kt
index 295767335a7..a4b1bd4cd51 100644
--- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/vars.kt
+++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/vars.kt
@@ -4,7 +4,7 @@ fun main(args: Array<String>) {
     var a = 1
     a += 1
     //Breakpoint!
-    args.size()
+    args.size
 }
 
 // EXPRESSION: a
diff --git a/idea/testData/debugger/tinyApp/src/stepping/custom/simpleConditionalBreakpoint.kt b/idea/testData/debugger/tinyApp/src/stepping/custom/simpleConditionalBreakpoint.kt
index 272df353a05..ad6a85690ef 100644
--- a/idea/testData/debugger/tinyApp/src/stepping/custom/simpleConditionalBreakpoint.kt
+++ b/idea/testData/debugger/tinyApp/src/stepping/custom/simpleConditionalBreakpoint.kt
@@ -2,7 +2,7 @@ package simpleConditionalBreakpoint
 
 fun main(args: Array<String>) {
     //Breakpoint! (condition = 1 == 1)
-    args.size()
+    args.size
 }
 
 // RESUME: 1
\ No newline at end of file
diff --git a/idea/testData/debugger/tinyApp/src/stepping/filters/doNotSkipClassloader.kt b/idea/testData/debugger/tinyApp/src/stepping/filters/doNotSkipClassloader.kt
index 2b0745aafbe..0fbcebd1895 100644
--- a/idea/testData/debugger/tinyApp/src/stepping/filters/doNotSkipClassloader.kt
+++ b/idea/testData/debugger/tinyApp/src/stepping/filters/doNotSkipClassloader.kt
@@ -1,7 +1,7 @@
 package doNotSkipClassloader
 
 fun main(args: Array<String>) {
-    val loader = javaClass<A>().getClassLoader()!!
+    val loader = A::class.java.getClassLoader()!!
     try {
         //Breakpoint!
         val aaa = loader.loadClass("skipClassloader.A")
diff --git a/idea/testData/debugger/tinyApp/src/stepping/filters/skipClassloader.kt b/idea/testData/debugger/tinyApp/src/stepping/filters/skipClassloader.kt
index 41bf170e929..67310d67576 100644
--- a/idea/testData/debugger/tinyApp/src/stepping/filters/skipClassloader.kt
+++ b/idea/testData/debugger/tinyApp/src/stepping/filters/skipClassloader.kt
@@ -1,7 +1,7 @@
 package skipClassloader
 
 fun main(args: Array<String>) {
-    val loader = javaClass<A>().getClassLoader()!!
+    val loader = A::class.java.getClassLoader()!!
     try {
         //Breakpoint!
         val aaa = loader.loadClass("skipClassloader.A")
diff --git a/idea/testData/editor/optimizeImports/ClassFromSameFileImportAddedBug.kt b/idea/testData/editor/optimizeImports/ClassFromSameFileImportAddedBug.kt
index 84541f2df02..b6fb4e4398b 100644
--- a/idea/testData/editor/optimizeImports/ClassFromSameFileImportAddedBug.kt
+++ b/idea/testData/editor/optimizeImports/ClassFromSameFileImportAddedBug.kt
@@ -2,7 +2,7 @@ import java.io.Serializable
 
 public class Test : Serializable {
     companion object {
-        val clazz = javaClass<Test>()
+        val clazz = Test::class.java
     }
 
 }
\ No newline at end of file
diff --git a/idea/testData/editor/optimizeImports/ClassFromSameFileImportAddedBug.kt.after b/idea/testData/editor/optimizeImports/ClassFromSameFileImportAddedBug.kt.after
index 84541f2df02..b6fb4e4398b 100644
--- a/idea/testData/editor/optimizeImports/ClassFromSameFileImportAddedBug.kt.after
+++ b/idea/testData/editor/optimizeImports/ClassFromSameFileImportAddedBug.kt.after
@@ -2,7 +2,7 @@ import java.io.Serializable
 
 public class Test : Serializable {
     companion object {
-        val clazz = javaClass<Test>()
+        val clazz = Test::class.java
     }
 
 }
\ No newline at end of file
diff --git a/idea/testData/intentions/convertAssertToIf/inapplicableNoCondition.kt b/idea/testData/intentions/convertAssertToIf/inapplicableNoCondition.kt
index eb9f7930b42..c553a06e2ab 100644
--- a/idea/testData/intentions/convertAssertToIf/inapplicableNoCondition.kt
+++ b/idea/testData/intentions/convertAssertToIf/inapplicableNoCondition.kt
@@ -1,6 +1,6 @@
 // IS_APPLICABLE: false
 // WITH_RUNTIME
-// ERROR: None of the following functions can be called with the arguments supplied: <br>public fun assert(value: kotlin.Boolean): kotlin.Unit defined in kotlin<br>public inline fun assert(value: kotlin.Boolean, lazyMessage: () -> kotlin.Any): kotlin.Unit defined in kotlin<br>@kotlin.Deprecated public fun assert(value: kotlin.Boolean, message: kotlin.Any = ...): kotlin.Unit defined in kotlin
+// ERROR: None of the following functions can be called with the arguments supplied: <br>public fun assert(value: kotlin.Boolean): kotlin.Unit defined in kotlin<br>public inline fun assert(value: kotlin.Boolean, lazyMessage: () -> kotlin.Any): kotlin.Unit defined in kotlin
 
 fun foo() {
     <caret>assert()
diff --git a/idea/testData/intentions/iterationOverMap/Getters.kt b/idea/testData/intentions/iterationOverMap/Getters.kt
index 00ce9f65ca8..8f2b59d692d 100644
--- a/idea/testData/intentions/iterationOverMap/Getters.kt
+++ b/idea/testData/intentions/iterationOverMap/Getters.kt
@@ -2,9 +2,9 @@
 
 fun main(args: Array<String>) {
     val map = hashMapOf(1 to 1)
-    for (<caret>entry in map.entrySet()) {
-        val key = entry.getKey()
-        val value = entry.getValue()
+    for (<caret>entry in map.entries) {
+        val key = entry.key
+        val value = entry.value
 
     }
 }
\ No newline at end of file
diff --git a/idea/testData/intentions/specifyTypeExplicitly/loopParameter.kt b/idea/testData/intentions/specifyTypeExplicitly/loopParameter.kt
index faae679560e..3186d98f203 100644
--- a/idea/testData/intentions/specifyTypeExplicitly/loopParameter.kt
+++ b/idea/testData/intentions/specifyTypeExplicitly/loopParameter.kt
@@ -3,7 +3,7 @@
 import java.util.HashMap
 
 fun foo(map : HashMap<String, Int>) {
-    for (<caret>entry in map.entrySet()) {
+    for (<caret>entry in map.entries) {
 
     }
 }
\ No newline at end of file
diff --git a/idea/testData/intentions/specifyTypeExplicitly/loopParameter.kt.after b/idea/testData/intentions/specifyTypeExplicitly/loopParameter.kt.after
index 32f4f937299..afda0d44a70 100644
--- a/idea/testData/intentions/specifyTypeExplicitly/loopParameter.kt.after
+++ b/idea/testData/intentions/specifyTypeExplicitly/loopParameter.kt.after
@@ -3,7 +3,7 @@
 import java.util.HashMap
 
 fun foo(map : HashMap<String, Int>) {
-    for (entry: MutableMap.MutableEntry<String, Int><caret> in map.entrySet()) {
+    for (entry: MutableMap.MutableEntry<String, Int><caret> in map.entries) {
 
     }
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt b/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt
index fe3dff28c96..c2f4607e995 100644
--- a/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt
+++ b/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt
@@ -3,5 +3,5 @@
 // PARAM_DESCRIPTOR: value-parameter val it: kotlin.collections.Map.Entry<(kotlin.Boolean..kotlin.Boolean?), (kotlin.Boolean..kotlin.Boolean?)> defined in test.<anonymous>
 // PARAM_TYPES: kotlin.collections.Map.Entry<(kotlin.Boolean..kotlin.Boolean?), (kotlin.Boolean..kotlin.Boolean?)>
 fun test() {
-    J.getMap().filter { <selection>it.getKey()</selection> }
+    J.getMap().filter { <selection>it.key</selection> }
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt.after b/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt.after
index 17ad7669be6..f9f97a20629 100644
--- a/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt.after
+++ b/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt.after
@@ -6,4 +6,4 @@ fun test() {
     J.getMap().filter { b(it) }
 }
 
-private fun b(it: Map.Entry<Boolean, Boolean>): Boolean? = it.getKey()
\ No newline at end of file
+private fun b(it: Map.Entry<Boolean, Boolean>): Boolean? = it.key
\ No newline at end of file
diff --git a/idea/testData/refactoring/introduceLambdaParameter/lambdaArgument.kt b/idea/testData/refactoring/introduceLambdaParameter/lambdaArgument.kt
index ea1a8ba2f37..5b71fe8cd71 100644
--- a/idea/testData/refactoring/introduceLambdaParameter/lambdaArgument.kt
+++ b/idea/testData/refactoring/introduceLambdaParameter/lambdaArgument.kt
@@ -1,2 +1,2 @@
 // WITH_RUNTIME
-fun foo(list: List<String>) = list.filter <selection>{ it.length() > 6 }</selection>
\ No newline at end of file
+fun foo(list: List<String>) = list.filter <selection>{ it.length > 6 }</selection>
\ No newline at end of file
diff --git a/idea/testData/refactoring/introduceLambdaParameter/lambdaArgument.kt.after b/idea/testData/refactoring/introduceLambdaParameter/lambdaArgument.kt.after
index 68abb9310bb..c2d53e6c61c 100644
--- a/idea/testData/refactoring/introduceLambdaParameter/lambdaArgument.kt.after
+++ b/idea/testData/refactoring/introduceLambdaParameter/lambdaArgument.kt.after
@@ -1,2 +1,2 @@
 // WITH_RUNTIME
-fun foo(list: List<String>, function: () -> (String) -> Boolean = { { it.length() > 6 } }) = list.filter(function())
\ No newline at end of file
+fun foo(list: List<String>, function: () -> (String) -> Boolean = { { it.length > 6 } }) = list.filter(function())
\ No newline at end of file
diff --git a/idea/testData/refactoring/introduceParameter/lambdaArgument.kt b/idea/testData/refactoring/introduceParameter/lambdaArgument.kt
index ea1a8ba2f37..5b71fe8cd71 100644
--- a/idea/testData/refactoring/introduceParameter/lambdaArgument.kt
+++ b/idea/testData/refactoring/introduceParameter/lambdaArgument.kt
@@ -1,2 +1,2 @@
 // WITH_RUNTIME
-fun foo(list: List<String>) = list.filter <selection>{ it.length() > 6 }</selection>
\ No newline at end of file
+fun foo(list: List<String>) = list.filter <selection>{ it.length > 6 }</selection>
\ No newline at end of file
diff --git a/idea/testData/refactoring/introduceParameter/lambdaArgument.kt.after b/idea/testData/refactoring/introduceParameter/lambdaArgument.kt.after
index a642c6a90be..3fc252a542a 100644
--- a/idea/testData/refactoring/introduceParameter/lambdaArgument.kt.after
+++ b/idea/testData/refactoring/introduceParameter/lambdaArgument.kt.after
@@ -1,2 +1,2 @@
 // WITH_RUNTIME
-fun foo(list: List<String>, function: (String) -> Boolean = { it.length() > 6 }) = list.filter(function)
\ No newline at end of file
+fun foo(list: List<String>, function: (String) -> Boolean = { it.length > 6 }) = list.filter(function)
\ No newline at end of file
diff --git a/idea/testData/refactoring/introduceVariable/FunctionLiteralWithExtraArgs.kt b/idea/testData/refactoring/introduceVariable/FunctionLiteralWithExtraArgs.kt
index fb7fbd1904b..8da215017ca 100644
--- a/idea/testData/refactoring/introduceVariable/FunctionLiteralWithExtraArgs.kt
+++ b/idea/testData/refactoring/introduceVariable/FunctionLiteralWithExtraArgs.kt
@@ -1,4 +1,4 @@
 // WITH_RUNTIME
 fun foo(c : Collection<String>){
-  c.filterTo(ArrayList<String>())<selection>{ it.length() > 1 }</selection>
+  c.filterTo(ArrayList<String>())<selection>{ it.length > 1 }</selection>
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/introduceVariable/FunctionLiteralWithExtraArgs.kt.after b/idea/testData/refactoring/introduceVariable/FunctionLiteralWithExtraArgs.kt.after
index 50cb059c6a6..d477781b1e1 100644
--- a/idea/testData/refactoring/introduceVariable/FunctionLiteralWithExtraArgs.kt.after
+++ b/idea/testData/refactoring/introduceVariable/FunctionLiteralWithExtraArgs.kt.after
@@ -1,5 +1,5 @@
 // WITH_RUNTIME
 fun foo(c : Collection<String>){
-    val predicate: (String) -> Boolean = { it.length() > 1 }
+    val predicate: (String) -> Boolean = { it.length > 1 }
     c.filterTo(ArrayList<String>(), predicate)
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/selfReferences/after/target/A.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/selfReferences/after/target/A.kt
index f15b6633d7d..ea9504a7b32 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/selfReferences/after/target/A.kt
+++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/selfReferences/after/target/A.kt
@@ -1,8 +1,8 @@
 package target
 
 class A(val a: A, val a2: A) {
-    val klass = javaClass<A>()
-    val klass2 = javaClass<A>()
+    val klass = A::class.java
+    val klass2 = A::class.java
     val aa = A(a)
     val aa2 = A(a)
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/selfReferences/before/source/A.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/selfReferences/before/source/A.kt
index 0b3774446a4..d75471cdae5 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/selfReferences/before/source/A.kt
+++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/selfReferences/before/source/A.kt
@@ -1,8 +1,8 @@
 package source
 
 class <caret>A(val a: A, val a2: source.A) {
-    val klass = javaClass<A>()
-    val klass2 = javaClass<source.A>()
+    val klass = A::class.java
+    val klass2 = source.A::class.java
     val aa = A(a)
     val aa2 = source.A(a)
 }
diff --git a/idea/testData/resolve/partialBodyResolve/As.completion b/idea/testData/resolve/partialBodyResolve/As.completion
index 46670d7c572..a08d2e9b728 100644
--- a/idea/testData/resolve/partialBodyResolve/As.completion
+++ b/idea/testData/resolve/partialBodyResolve/As.completion
@@ -6,14 +6,14 @@ fun foo(p: Any, p1: Any?) {
     /* STATEMENT DELETED: z(f() as String) */
 
     if (a) {
-        print((p as String).length())
+        print((p as String).length)
     }
     else {
         print((p as String).get(1))
     }
 
     if (y()) {
-        print(<caret>p.charAt(1))
+        print(<caret>p[1])
         /* STATEMENT DELETED: p1 as String */
     }
 
diff --git a/idea/testData/resolve/partialBodyResolve/As.dump b/idea/testData/resolve/partialBodyResolve/As.dump
index d058ba29737..910d5e27d1a 100644
--- a/idea/testData/resolve/partialBodyResolve/As.dump
+++ b/idea/testData/resolve/partialBodyResolve/As.dump
@@ -6,14 +6,14 @@ fun foo(p: Any, p1: Any?) {
     /* STATEMENT DELETED: z(f() as String) */
 
     if (a) {
-        print((p as String).length())
+        print((p as String).length)
     }
     else {
         print((p as String).get(1))
     }
 
     if (y()) {
-        print(<caret>p.charAt(1))
+        print(<caret>p[1])
         /* STATEMENT DELETED: p1 as String */
     }
 
diff --git a/idea/testData/resolve/partialBodyResolve/As.kt b/idea/testData/resolve/partialBodyResolve/As.kt
index 79f96025b6c..14be62da33f 100644
--- a/idea/testData/resolve/partialBodyResolve/As.kt
+++ b/idea/testData/resolve/partialBodyResolve/As.kt
@@ -4,14 +4,14 @@ fun foo(p: Any, p1: Any?) {
     z(f() as String)
 
     if (a) {
-        print((p as String).length())
+        print((p as String).length)
     }
     else {
         print((p as String).get(1))
     }
 
     if (y()) {
-        print(<caret>p.charAt(1))
+        print(<caret>p[1])
         p1 as String
     }
 
diff --git a/idea/testData/resolve/partialBodyResolve/BangBang.completion b/idea/testData/resolve/partialBodyResolve/BangBang.completion
index 6ed2f602fd2..ff3031ce2a8 100644
--- a/idea/testData/resolve/partialBodyResolve/BangBang.completion
+++ b/idea/testData/resolve/partialBodyResolve/BangBang.completion
@@ -5,14 +5,14 @@ fun foo(p: String?, p1: Any?) {
     /* STATEMENT DELETED: y(f()!!) */
 
     if (a) {
-        print(p!!.length())
+        print(p!!.length)
     }
     else {
         print(p!!.get(1))
     }
 
     if (y()) {
-        print(<caret>p.charAt(1))
+        print(<caret>p[1])
         /* STATEMENT DELETED: p1!! */
     }
 
diff --git a/idea/testData/resolve/partialBodyResolve/BangBang.dump b/idea/testData/resolve/partialBodyResolve/BangBang.dump
index c09b141a4b5..1b7374ea532 100644
--- a/idea/testData/resolve/partialBodyResolve/BangBang.dump
+++ b/idea/testData/resolve/partialBodyResolve/BangBang.dump
@@ -5,14 +5,14 @@ fun foo(p: String?, p1: Any?) {
     /* STATEMENT DELETED: y(f()!!) */
 
     if (a) {
-        print(p!!.length())
+        print(p!!.length)
     }
     else {
         print(p!!.get(1))
     }
 
     if (y()) {
-        print(<caret>p.charAt(1))
+        print(<caret>p[1])
         /* STATEMENT DELETED: p1!! */
     }
 
diff --git a/idea/testData/resolve/partialBodyResolve/BangBang.kt b/idea/testData/resolve/partialBodyResolve/BangBang.kt
index 26793f80d9d..791c2afc378 100644
--- a/idea/testData/resolve/partialBodyResolve/BangBang.kt
+++ b/idea/testData/resolve/partialBodyResolve/BangBang.kt
@@ -3,14 +3,14 @@ fun foo(p: String?, p1: Any?) {
     y(f()!!)
 
     if (a) {
-        print(p!!.length())
+        print(p!!.length)
     }
     else {
         print(p!!.get(1))
     }
 
     if (y()) {
-        print(<caret>p.charAt(1))
+        print(<caret>p[1])
         p1!!
     }
 
diff --git a/idea/testData/resolve/references/AnnotationTypeParameter.kt b/idea/testData/resolve/references/AnnotationTypeParameter.kt
index fbb6e8505d5..5389eea2af6 100644
--- a/idea/testData/resolve/references/AnnotationTypeParameter.kt
+++ b/idea/testData/resolve/references/AnnotationTypeParameter.kt
@@ -3,7 +3,7 @@ package testing
 annotation class Annotation<T>(val clazz: Class<T>)
 class ATest
 
-@[Annotation<<caret>ATest>(javaClass<ATest>())]
+@[Annotation<<caret>ATest>(ATest::class.java)]
 class BTest
 
 // REF: (testing).ATest
\ No newline at end of file
diff --git a/idea/testData/unifier/equivalence/expressions/calls/callTypeArgumentsRuntime.kt b/idea/testData/unifier/equivalence/expressions/calls/callTypeArgumentsRuntime.kt
index 752a6e23f5e..2ae6b799cac 100644
--- a/idea/testData/unifier/equivalence/expressions/calls/callTypeArgumentsRuntime.kt
+++ b/idea/testData/unifier/equivalence/expressions/calls/callTypeArgumentsRuntime.kt
@@ -11,9 +11,9 @@ fun <T> bar(klass: Class<T>) {
 }
 
 fun main() {
-    foo(<selection>javaClass<A>()</selection>)
-    foo(javaClass<B>())
-    bar(javaClass<B>())
-    bar(javaClass<A>())
+    foo(<selection>A::class.java</selection>)
+    foo(B::class.java)
+    bar(B::class.java)
+    bar(A::class.java)
     javaClass()
 }
\ No newline at end of file
diff --git a/idea/testData/unifier/equivalence/expressions/calls/callTypeArgumentsRuntime.kt.match b/idea/testData/unifier/equivalence/expressions/calls/callTypeArgumentsRuntime.kt.match
index 45f0e273efd..2768b1c67dc 100644
--- a/idea/testData/unifier/equivalence/expressions/calls/callTypeArgumentsRuntime.kt.match
+++ b/idea/testData/unifier/equivalence/expressions/calls/callTypeArgumentsRuntime.kt.match
@@ -1,3 +1,3 @@
-javaClass<A>()
+A::class.java
 
-javaClass<A>()
\ No newline at end of file
+A::class.java
\ No newline at end of file
diff --git a/js/js.translator/testData/dataClass/cases/keyrole.kt b/js/js.translator/testData/dataClass/cases/keyrole.kt
index d040a40c9ce..c07b80fd37f 100644
--- a/js/js.translator/testData/dataClass/cases/keyrole.kt
+++ b/js/js.translator/testData/dataClass/cases/keyrole.kt
@@ -11,13 +11,13 @@ fun box(): String {
     setD.add(Holder(Dat("a", "b")))
     setD.add(Holder(Dat("a", "b")))
     setD.add(Holder(Dat("a", "b")))
-    assertEquals(1, setD.size())
+    assertEquals(1, setD.size)
 
     val setO = java.util.HashSet<Holder<Obj>>()
     setO.add(Holder(Obj("a", "b")))
     setO.add(Holder(Obj("a", "b")))
     setO.add(Holder(Obj("a", "b")))
-    assertEquals(3, setO.size())
+    assertEquals(3, setO.size)
 
     return "OK"
 }
\ No newline at end of file
diff --git a/js/js.translator/testData/enum/cases/standardMethods.kt b/js/js.translator/testData/enum/cases/standardMethods.kt
index bb35034a572..54fdb4cce34 100644
--- a/js/js.translator/testData/enum/cases/standardMethods.kt
+++ b/js/js.translator/testData/enum/cases/standardMethods.kt
@@ -27,7 +27,7 @@ fun box(): String {
     if (!ok2.identityEquals(ok)) return "ok2 not identity equal ok"
 
 
-    if (EmptyEnum.values().size() != 0) return "EmptyEnum.values().size != 0"
+    if (EmptyEnum.values().size != 0) return "EmptyEnum.values().size != 0"
 
     if (A.values() != arrayOf(A.a, A.b, A.c)) return "Wrong A.values(): " + A.values().toString()
 
diff --git a/js/js.translator/testData/examples/cases/overloadBinaryOperator.kt b/js/js.translator/testData/examples/cases/overloadBinaryOperator.kt
index 9682dad1385..8056a562fc5 100644
--- a/js/js.translator/testData/examples/cases/overloadBinaryOperator.kt
+++ b/js/js.translator/testData/examples/cases/overloadBinaryOperator.kt
@@ -21,5 +21,5 @@ fun box(): String {
     v1.add("foo")
     v2.add("bar")
     val v3 = v1 + v2
-    return if (v3.contents.size() == 2) "OK" else "fail"
+    return if (v3.contents.size == 2) "OK" else "fail"
 }
diff --git a/js/js.translator/testData/examples/cases/overloadPlusAssignReturn.kt b/js/js.translator/testData/examples/cases/overloadPlusAssignReturn.kt
index 4e107093ddd..b6db9de510e 100644
--- a/js/js.translator/testData/examples/cases/overloadPlusAssignReturn.kt
+++ b/js/js.translator/testData/examples/cases/overloadPlusAssignReturn.kt
@@ -23,5 +23,5 @@ fun box(): String {
     val v3 = v1
     v2.add("bar")
     v1 += v2
-    return if (v1.contents.size() == 2 && v3.contents.size() == 2) "OK" else "fail"
+    return if (v1.contents.size == 2 && v3.contents.size == 2) "OK" else "fail"
 }
diff --git a/js/js.translator/testData/examples/cases/overloadPlusToPlusAssign.kt b/js/js.translator/testData/examples/cases/overloadPlusToPlusAssign.kt
index 7b6863a7ab9..ce095b152ef 100644
--- a/js/js.translator/testData/examples/cases/overloadPlusToPlusAssign.kt
+++ b/js/js.translator/testData/examples/cases/overloadPlusToPlusAssign.kt
@@ -26,5 +26,5 @@ fun box(): String {
     val v3 = v1
     v2.add("bar")
     v1 += v2
-    return if (v1.contents.size() == 2 && v3.contents.size() == 1) "OK" else "fail"
+    return if (v1.contents.size == 2 && v3.contents.size == 1) "OK" else "fail"
 }
diff --git a/js/js.translator/testData/examples/cases/overloadUnaryOperator.kt b/js/js.translator/testData/examples/cases/overloadUnaryOperator.kt
index 3dc4581518e..b664b78768b 100644
--- a/js/js.translator/testData/examples/cases/overloadUnaryOperator.kt
+++ b/js/js.translator/testData/examples/cases/overloadUnaryOperator.kt
@@ -10,7 +10,7 @@ class ArrayWrapper<T>() {
     operator fun unaryMinus(): ArrayWrapper<T> {
         val result = ArrayWrapper<T>()
         result.contents.addAll(contents)
-        var i = contents.size();
+        var i = contents.size;
         for (a in contents) {
             result.contents[--i] = a;
         }
diff --git a/js/js.translator/testData/examples/sortedTests/unsupported/initializerBlockDImpl.kt b/js/js.translator/testData/examples/sortedTests/unsupported/initializerBlockDImpl.kt
index cb1e9cccf14..9d96d4fb40a 100644
--- a/js/js.translator/testData/examples/sortedTests/unsupported/initializerBlockDImpl.kt
+++ b/js/js.translator/testData/examples/sortedTests/unsupported/initializerBlockDImpl.kt
@@ -15,6 +15,6 @@ class World() {
 
 fun box(): String {
     val w = World()
-    if (w.items.size() != 1) return "fail"
+    if (w.items.size != 1) return "fail"
     return "OK"
 }
diff --git a/js/js.translator/testData/examples/sortedTests/unsupported/innerClass.kt b/js/js.translator/testData/examples/sortedTests/unsupported/innerClass.kt
index 8f3437e40c1..525c01f8eb7 100644
--- a/js/js.translator/testData/examples/sortedTests/unsupported/innerClass.kt
+++ b/js/js.translator/testData/examples/sortedTests/unsupported/innerClass.kt
@@ -1,7 +1,7 @@
 class Outer(val foo: StringBuilder) {
     class Inner() {
         fun len(): Int {
-            return foo.length()
+            return foo.length
         }
     }
 
diff --git a/js/js.translator/testData/expression/evaluationOrder/cases/callVarargs.kt b/js/js.translator/testData/expression/evaluationOrder/cases/callVarargs.kt
index a5af4f45442..adb8eaf15ea 100644
--- a/js/js.translator/testData/expression/evaluationOrder/cases/callVarargs.kt
+++ b/js/js.translator/testData/expression/evaluationOrder/cases/callVarargs.kt
@@ -8,7 +8,7 @@ fun <T> bar(s: String, value: T): T {
 }
 
 fun <T> baz(vararg args: T): String {
-    return "baz: ${args.size()}"
+    return "baz: ${args.size}"
 }
 
 fun <T> idVarArg(vararg a: T) = a
diff --git a/js/js.translator/testData/expression/for/cases/forWithSideEffectImElementAccessAndWithEmptyBody.kt b/js/js.translator/testData/expression/for/cases/forWithSideEffectImElementAccessAndWithEmptyBody.kt
index 6bc2c99db3f..ccc20b195f9 100644
--- a/js/js.translator/testData/expression/for/cases/forWithSideEffectImElementAccessAndWithEmptyBody.kt
+++ b/js/js.translator/testData/expression/for/cases/forWithSideEffectImElementAccessAndWithEmptyBody.kt
@@ -19,7 +19,7 @@ class C {
         var data = arrayOf(T(3), T(1), T(2))
         override fun hasNext(): Boolean {
             log += "C.hasNext();"
-            return i < data.size()
+            return i < data.size
         }
 
         override fun next(): T {
diff --git a/js/js.translator/testData/expression/function/cases/mangling.kt b/js/js.translator/testData/expression/function/cases/mangling.kt
index 799eeba22bc..d150aabff6c 100644
--- a/js/js.translator/testData/expression/function/cases/mangling.kt
+++ b/js/js.translator/testData/expression/function/cases/mangling.kt
@@ -142,7 +142,7 @@ val CALEE_NAME = RegExp("""\b\w*(baz[^(]*)""")
 fun Function0<Unit>.extractNames(): Array<String> {
     val names = CALEE_NAME.exec(this.toString())
 
-    if (names == null || names.size() != 2) {
+    if (names == null || names.size != 2) {
         throw Exception("Cannot extract function name, $names for actual = \"$this\"")
     }
 
diff --git a/js/js.translator/testData/expression/function/cases/manglingAnyMethods.kt b/js/js.translator/testData/expression/function/cases/manglingAnyMethods.kt
index e2354f9fe06..8c51e1a2203 100644
--- a/js/js.translator/testData/expression/function/cases/manglingAnyMethods.kt
+++ b/js/js.translator/testData/expression/function/cases/manglingAnyMethods.kt
@@ -39,7 +39,7 @@ val CALEE_NAME = RegExp("""((?:equals|hashCode|toString)[^(]*)""")
 fun <T> Function0<T>.extractNames(): Array<String> {
     val names = CALEE_NAME.exec(this.toString())
 
-    if (names == null || names.size() != 2) {
+    if (names == null || names.size != 2) {
         throw Exception("Cannot extract function name, $names for actual = \"$this\"")
     }
 
diff --git a/js/js.translator/testData/expression/function/cases/vararg.kt b/js/js.translator/testData/expression/function/cases/vararg.kt
index 22dcdb4670c..15030e25713 100644
--- a/js/js.translator/testData/expression/function/cases/vararg.kt
+++ b/js/js.translator/testData/expression/function/cases/vararg.kt
@@ -1,7 +1,7 @@
 package foo
 
 fun testSize(expectedSize: Int, vararg i: Int): Boolean {
-    return (i.size() == expectedSize)
+    return (i.size == expectedSize)
 }
 
 fun testSum(expectedSum: Int, vararg i: Int): Boolean {
@@ -17,7 +17,7 @@ fun testSpreadOperator(vararg args: Int): Boolean {
     var sum = 0;
     for (a in args) sum += a
 
-    return testSize(args.size(), *args) && testSum(sum, *args)
+    return testSize(args.size, *args) && testSum(sum, *args)
 }
 
 class Bar(val size: Int, val sum: Int) {
@@ -74,23 +74,23 @@ fun box(): String {
     if (!spreadInObjectMethodCall(2, 3, 1, 2))
         return "failed when call method of object using spread operator"
 
-    if (!testVarargWithFunLit(1, 2, 3) { args -> args.size() == 3 })
+    if (!testVarargWithFunLit(1, 2, 3) { args -> args.size == 3 })
         return "failed when call function with vararg and fun literal"
 
     val a = arrayOf(1, 2, 3)
     val b = arrayOf(4, 5)
 
-    assertEquals(5, arrayOf(*a, *b).size())
-    assertEquals(8, arrayOf(10, *a, 20,  *b, 30).size())
+    assertEquals(5, arrayOf(*a, *b).size)
+    assertEquals(8, arrayOf(10, *a, 20,  *b, 30).size)
 
-    assertEquals(5, idVarArgs(*a, *b).size())
-    assertEquals(8, idVarArgs(10, *a, 20,  *b, 30).size())
+    assertEquals(5, idVarArgs(*a, *b).size)
+    assertEquals(8, idVarArgs(10, *a, 20,  *b, 30).size)
 
-    assertEquals(9, arrayOf(1, *a, *a, 1, 2).size())
-    assertEquals(9, idVarArgs(1, *a, *a, 1, 2).size())
+    assertEquals(9, arrayOf(1, *a, *a, 1, 2).size)
+    assertEquals(9, idVarArgs(1, *a, *a, 1, 2).size)
 
-    assertEquals(9, arrayOf(1, *a, *arrayOf(1, 2, 3), 1, 2).size())
-    assertEquals(9, idVarArgs(1, *a, *arrayOf(1, 2, 3), 1, 2).size())
+    assertEquals(9, arrayOf(1, *a, *arrayOf(1, 2, 3), 1, 2).size)
+    assertEquals(9, idVarArgs(1, *a, *arrayOf(1, 2, 3), 1, 2).size)
 
     assertEquals(90, sumFunValuesOnParameters(1, 2, 3, 4, 5, 6, 7, 8, 9) { 2*it })
     assertEquals(90, sumFunValuesOnParameters(1, 2, *intArrayOf(3, 4, 5, 6, 7, 8, 9)) { 2*it })
@@ -99,9 +99,9 @@ fun box(): String {
     assertEquals(90, sumFunValuesOnParameters(1, 2, *intArrayOf(3, 4, 5), *intArrayOf(6, 7, 8, 9)) { 2*it })
     assertEquals(90, sumFunValuesOnParameters(1, 2, *intArrayOf(3, 4), 5, 6, *intArrayOf(7, 8, 9)) { 2*it })
 
-    assertEquals(2, idArrayVarArg(arrayOf(1), *arrayOf(arrayOf(2, 3, 4))).size())
-    assertEquals(3, idArrayVarArg(arrayOf(1, 2), *arrayOf(arrayOf(3, 4), arrayOf(5, 6))).size())
-    assertEquals(6, idArrayVarArg(arrayOf(1, 2), *arrayOf(arrayOf(3, 4), arrayOf(5, 6)), arrayOf(7), *arrayOf(arrayOf(8, 9), arrayOf(10, 11))).size())
+    assertEquals(2, idArrayVarArg(arrayOf(1), *arrayOf(arrayOf(2, 3, 4))).size)
+    assertEquals(3, idArrayVarArg(arrayOf(1, 2), *arrayOf(arrayOf(3, 4), arrayOf(5, 6))).size)
+    assertEquals(6, idArrayVarArg(arrayOf(1, 2), *arrayOf(arrayOf(3, 4), arrayOf(5, 6)), arrayOf(7), *arrayOf(arrayOf(8, 9), arrayOf(10, 11))).size)
 
     return "OK"
 }
\ No newline at end of file
diff --git a/js/js.translator/testData/expression/misc/cases/elvisReturnNested.kt b/js/js.translator/testData/expression/misc/cases/elvisReturnNested.kt
index 46566730adf..620aff9d20b 100644
--- a/js/js.translator/testData/expression/misc/cases/elvisReturnNested.kt
+++ b/js/js.translator/testData/expression/misc/cases/elvisReturnNested.kt
@@ -7,8 +7,8 @@
 package foo
 
 fun firstNotNullLen(s1 : String?, s2 : String?, s3 : String?) : Int {
-    val len = (s1?.length() ?: s2?.length()) ?:
-                (s2?.length() ?: s3?.length()) ?:
+    val len = (s1?.length ?: s2?.length) ?:
+                (s2?.length ?: s3?.length) ?:
                     return 0
     return len
 }
diff --git a/js/js.translator/testData/expression/misc/cases/elvisReturnSimple.kt b/js/js.translator/testData/expression/misc/cases/elvisReturnSimple.kt
index 26b67939e3c..0b724dc3082 100644
--- a/js/js.translator/testData/expression/misc/cases/elvisReturnSimple.kt
+++ b/js/js.translator/testData/expression/misc/cases/elvisReturnSimple.kt
@@ -8,11 +8,11 @@ package foo
 
 fun stringLen(s : String?) : Int {
     val s1 : String = s ?: return 0
-    return s1.length()
+    return s1.length
 }
 
 fun stringReturnInLeftLen(s : String?) : Int {
-    val s1 = (if (s != null) { return s.length() } else { null }) ?: return 0
+    val s1 = (if (s != null) { return s.length } else { null }) ?: return 0
 }
 
 fun box(): String {
diff --git a/js/js.translator/testData/expression/string/cases/extensionMethods.kt b/js/js.translator/testData/expression/string/cases/extensionMethods.kt
index e6a3eff726a..ea970ec11bb 100644
--- a/js/js.translator/testData/expression/string/cases/extensionMethods.kt
+++ b/js/js.translator/testData/expression/string/cases/extensionMethods.kt
@@ -22,7 +22,7 @@ fun assertEquals(expected: Any, actual: Any, s: CharSequence, whatTested: String
 
 fun testString(s: String, expectedSize: Int, indexOfB: Int) {
     assertEquals(expectedSize, s.size, s, "size")
-    assertEquals(expectedSize, s.length(), s, "length()")
+    assertEquals(expectedSize, s.length, s, "length")
     assertEquals(expectedSize == 0, s.isEmpty(), s, "isEmpty()")
     assertEquals(expectedSize != 0, s.startsWith(startsWithParam), s, "startsWith(\"$startsWithParam\")")
     assertEquals(expectedSize != 0, s.endsWith(endsWithParam), s, "endsWith(\"$endsWithParam\")")
@@ -35,7 +35,7 @@ fun testString(s: String, expectedSize: Int, indexOfB: Int) {
 
 fun testCharSequence(s: CharSequence, expectedSize: Int) {
     assertEquals(expectedSize, s.size, s, "size")
-    assertEquals(expectedSize, s.length(), s, "length()")
+    assertEquals(expectedSize, s.length, s, "length")
     assertEquals(expectedSize == 0, s.isEmpty(), s, "isEmpty()")
 }
 
diff --git a/js/js.translator/testData/expression/string/cases/subSequence.kt b/js/js.translator/testData/expression/string/cases/subSequence.kt
index 2e4d03987f5..025a49d6343 100644
--- a/js/js.translator/testData/expression/string/cases/subSequence.kt
+++ b/js/js.translator/testData/expression/string/cases/subSequence.kt
@@ -3,7 +3,7 @@ package foo
 fun box(): String {
     val kotlin: String = "kotlin"
 
-    if (kotlin.subSequence(0, kotlin.length()) != kotlin) return "Fail 0"
+    if (kotlin.subSequence(0, kotlin.length) != kotlin) return "Fail 0"
 
     val kot: CharSequence = kotlin.subSequence(0, 3)
     if (kot.toString() != "kot") return "Fail 1: $kot"
diff --git a/js/js.translator/testData/expression/try/cases/tryCatchExpressionWithMessage.kt b/js/js.translator/testData/expression/try/cases/tryCatchExpressionWithMessage.kt
index 913994035c5..4d0fb09c3f4 100644
--- a/js/js.translator/testData/expression/try/cases/tryCatchExpressionWithMessage.kt
+++ b/js/js.translator/testData/expression/try/cases/tryCatchExpressionWithMessage.kt
@@ -7,7 +7,7 @@ fun box(): String {
     try {
         throw Exception("Exception")
     } catch (e: Throwable) {
-        s = "Throwable:" + e.getMessage()!!
+        s = "Throwable:" + e.message!!
     }
     assertEquals("Throwable:Exception", s)
 
@@ -15,7 +15,7 @@ fun box(): String {
     try {
         throw Exception("Exception")
     } catch (e: Exception) {
-        s = "Exception:" + e.getMessage()!!
+        s = "Exception:" + e.message!!
     }
     assertEquals("Exception:Exception", s)
 
@@ -23,7 +23,7 @@ fun box(): String {
     try {
         throw RuntimeException("RuntimeException")
     } catch (e: Exception) {
-        s = "Exception:" + e.getMessage()!!
+        s = "Exception:" + e.message!!
     }
     assertEquals("Exception:RuntimeException", s)
 
@@ -31,7 +31,7 @@ fun box(): String {
     try {
         throw NullPointerException("NullPointerException")
     } catch (e: Exception) {
-        s = "Exception:" + e.getMessage()!!
+        s = "Exception:" + e.message!!
     }
     assertEquals("Exception:NullPointerException", s)
 
@@ -39,18 +39,18 @@ fun box(): String {
     try {
         throw IndexOutOfBoundsException("IndexOutOfBoundsException")
     } catch (e: NullPointerException) {
-        s = "NullPointerException:" + e.getMessage()!!
+        s = "NullPointerException:" + e.message!!
     } catch (e: RuntimeException) {
-        s = "RuntimeException:" + e.getMessage()!!
+        s = "RuntimeException:" + e.message!!
     } catch (e: Exception) {
-        s = "Exception:" + e.getMessage()!!
+        s = "Exception:" + e.message!!
     }
     assertEquals("RuntimeException:IndexOutOfBoundsException", s)
 
     try {
         throw RuntimeException()
     } catch (e: Exception) {
-        assertEquals(null, e.getMessage())
+        assertEquals(null, e.message)
     }
 
    return "OK"
diff --git a/js/js.translator/testData/extensionFunction/cases/generic.kt b/js/js.translator/testData/extensionFunction/cases/generic.kt
index 109cb27641c..a1e03717d28 100644
--- a/js/js.translator/testData/extensionFunction/cases/generic.kt
+++ b/js/js.translator/testData/extensionFunction/cases/generic.kt
@@ -20,5 +20,5 @@ fun box(): String {
 
 
     val m: ArrayList<Int> = list.findAll<Int>({ name: Int -> name < 4 })
-    return if (m.size() == 2) "OK" else "fail"
+    return if (m.size == 2) "OK" else "fail"
 }
diff --git a/js/js.translator/testData/extensionProperty/cases/simplePropertyWithGetter.kt b/js/js.translator/testData/extensionProperty/cases/simplePropertyWithGetter.kt
index 5ea9dc86ad1..eb85eb77335 100644
--- a/js/js.translator/testData/extensionProperty/cases/simplePropertyWithGetter.kt
+++ b/js/js.translator/testData/extensionProperty/cases/simplePropertyWithGetter.kt
@@ -1,7 +1,7 @@
 package foo
 
 val String.prop: Int
-    get() = length()
+    get() = length
 
 val Int.quadruple: Int
     get() = this * 4
diff --git a/js/js.translator/testData/inheritance/cases/inheritFromCharIterator.kt b/js/js.translator/testData/inheritance/cases/inheritFromCharIterator.kt
index 549da2f9ab4..9f80fd52be7 100644
--- a/js/js.translator/testData/inheritance/cases/inheritFromCharIterator.kt
+++ b/js/js.translator/testData/inheritance/cases/inheritFromCharIterator.kt
@@ -4,7 +4,7 @@ class MyCharIterator : CharIterator() {
     val data = arrayOf('O', 'K')
     var i = 0
 
-    override fun hasNext(): Boolean = i < data.size()
+    override fun hasNext(): Boolean = i < data.size
     override fun nextChar(): Char = data[i++]
 }
 
diff --git a/js/js.translator/testData/inline/cases/arrayLiteralAliasing.kt b/js/js.translator/testData/inline/cases/arrayLiteralAliasing.kt
index 11426c655a2..0020b227e6e 100644
--- a/js/js.translator/testData/inline/cases/arrayLiteralAliasing.kt
+++ b/js/js.translator/testData/inline/cases/arrayLiteralAliasing.kt
@@ -9,7 +9,7 @@ package foo
 data class PairArray<T, R>(val fst: Array<T>, val snd: Array<R>)
 
 inline fun moveTo(source: Array<Int>, sink: Array<Int>): PairArray<Int, Int> {
-    val size = source.size()
+    val size = source.size
     for (i in 1..size) {
         val element = source[0]
         source.splice(0, 1)
diff --git a/js/js.translator/testData/inlineMultiFile/cases/builders/builders.2.kt b/js/js.translator/testData/inlineMultiFile/cases/builders/builders.2.kt
index ee5241df59a..ddd9900d05b 100644
--- a/js/js.translator/testData/inlineMultiFile/cases/builders/builders.2.kt
+++ b/js/js.translator/testData/inlineMultiFile/cases/builders/builders.2.kt
@@ -44,7 +44,7 @@ abstract class Tag(val name: String) : Element() {
 
     private fun renderAttributes(): String? {
         val builder = StringBuilder()
-        for (a in attributes.keySet()) {
+        for (a in attributes.keys) {
             builder.append(" $a=\"${attributes[a]}\"")
         }
         return builder.toString()
diff --git a/js/js.translator/testData/inlineMultiFile/cases/buildersAndLambdaCapturing/buildersAndLambdaCapturing.2.kt b/js/js.translator/testData/inlineMultiFile/cases/buildersAndLambdaCapturing/buildersAndLambdaCapturing.2.kt
index 6747c44046d..787324a5ccd 100644
--- a/js/js.translator/testData/inlineMultiFile/cases/buildersAndLambdaCapturing/buildersAndLambdaCapturing.2.kt
+++ b/js/js.translator/testData/inlineMultiFile/cases/buildersAndLambdaCapturing/buildersAndLambdaCapturing.2.kt
@@ -44,7 +44,7 @@ abstract class Tag(val name: String) : Element() {
 
     private fun renderAttributes(): String? {
         val builder = StringBuilder()
-        for (a in attributes.keySet()) {
+        for (a in attributes.keys) {
             builder.append(" $a=\"${attributes[a]}\"")
         }
         return builder.toString()
diff --git a/js/js.translator/testData/inlineMultiFile/cases/closureChain/closureChain.1.kt b/js/js.translator/testData/inlineMultiFile/cases/closureChain/closureChain.1.kt
index 3866655ffe7..ff12c291519 100644
--- a/js/js.translator/testData/inlineMultiFile/cases/closureChain/closureChain.1.kt
+++ b/js/js.translator/testData/inlineMultiFile/cases/closureChain/closureChain.1.kt
@@ -7,7 +7,7 @@ package foo
 
 fun test1(): Int {
     val inlineX = Inline()
-    return inlineX.foo({ z: Int -> "" + z}, 25, { -> this.length() })
+    return inlineX.foo({ z: Int -> "" + z}, 25, { -> this.length })
 }
 
 fun box(): String {
diff --git a/js/js.translator/testData/inlineMultiFile/cases/tryCatchFinally/tryCatchFinally.1.kt b/js/js.translator/testData/inlineMultiFile/cases/tryCatchFinally/tryCatchFinally.1.kt
index e3cd5b1aa7d..bcf49352ae2 100644
--- a/js/js.translator/testData/inlineMultiFile/cases/tryCatchFinally/tryCatchFinally.1.kt
+++ b/js/js.translator/testData/inlineMultiFile/cases/tryCatchFinally/tryCatchFinally.1.kt
@@ -64,7 +64,7 @@ fun test3(): Int {
                 })
         return res
     } catch (e: RuntimeException) {
-        return e.getMessage()?.toInt2()!!
+        return e.message?.toInt2()!!
     }
 }
 
diff --git a/js/js.translator/testData/java/abstractList/cases/iterator.kt b/js/js.translator/testData/java/abstractList/cases/iterator.kt
index f0cdc5243ea..b46299c7e47 100644
--- a/js/js.translator/testData/java/abstractList/cases/iterator.kt
+++ b/js/js.translator/testData/java/abstractList/cases/iterator.kt
@@ -4,7 +4,7 @@ import java.util.AbstractList
 
 class MyList<T>(vararg val data: T) : AbstractList<T>() {
     override fun get(index: Int) = data[index]
-    override val size: Int get() = data.size()
+    override val size: Int get() = data.size
 }
 
 fun <T> test(expected: String, list: List<T>) {
diff --git a/js/js.translator/testData/java/arrayList/cases/access.kt b/js/js.translator/testData/java/arrayList/cases/access.kt
index b7072d63538..acd9eacf5a5 100644
--- a/js/js.translator/testData/java/arrayList/cases/access.kt
+++ b/js/js.translator/testData/java/arrayList/cases/access.kt
@@ -6,5 +6,5 @@ fun box(): Boolean {
     val a = ArrayList<Int>();
     a.add(1)
     a.add(2)
-    return (a.size() == 2) && (a.get(1) == 2) && (a.get(0) == 1);
+    return (a.size == 2) && (a.get(1) == 2) && (a.get(0) == 1);
 }
\ No newline at end of file
diff --git a/js/js.translator/testData/java/arrayList/cases/arrayAccess.kt b/js/js.translator/testData/java/arrayList/cases/arrayAccess.kt
index 131c57f03e3..0f4136a48e5 100644
--- a/js/js.translator/testData/java/arrayList/cases/arrayAccess.kt
+++ b/js/js.translator/testData/java/arrayList/cases/arrayAccess.kt
@@ -7,5 +7,5 @@ fun box(): Boolean {
     a.add(1)
     a.add(2)
     a[1] = 100
-    return (a.size() == 2) && (a[1] == 100) && (a[0] == 1);
+    return (a.size == 2) && (a[1] == 100) && (a[0] == 1);
 }
\ No newline at end of file
diff --git a/js/js.translator/testData/java/arrayList/cases/constructWithCapacity.kt b/js/js.translator/testData/java/arrayList/cases/constructWithCapacity.kt
index dd548d8d5ab..c2951c75cc9 100644
--- a/js/js.translator/testData/java/arrayList/cases/constructWithCapacity.kt
+++ b/js/js.translator/testData/java/arrayList/cases/constructWithCapacity.kt
@@ -4,5 +4,5 @@ import java.util.ArrayList
 
 fun box(): Boolean {
     val al = ArrayList<Int>(10)
-    return al.size() == 0
+    return al.size == 0
 }
\ No newline at end of file
diff --git a/js/js.translator/testData/java/arrayList/cases/constructWithSideEffectParam.kt b/js/js.translator/testData/java/arrayList/cases/constructWithSideEffectParam.kt
index e6c3d51fb1f..cf3f0731e28 100644
--- a/js/js.translator/testData/java/arrayList/cases/constructWithSideEffectParam.kt
+++ b/js/js.translator/testData/java/arrayList/cases/constructWithSideEffectParam.kt
@@ -10,5 +10,5 @@ fun withSideEffect(v: Int): Int {
 
 fun box(): Boolean {
     val al = ArrayList<Int>(withSideEffect(2))
-    return al.size() == 0 && baz == 2
+    return al.size == 0 && baz == 2
 }
\ No newline at end of file
diff --git a/js/js.translator/testData/java/arrayList/cases/emptyList.kt b/js/js.translator/testData/java/arrayList/cases/emptyList.kt
index ef1c4ace7bb..f244bd3d85f 100644
--- a/js/js.translator/testData/java/arrayList/cases/emptyList.kt
+++ b/js/js.translator/testData/java/arrayList/cases/emptyList.kt
@@ -4,5 +4,5 @@ import java.util.ArrayList;
 
 fun box(): Boolean {
     val a = ArrayList<Int>();
-    return a.size() == 0;
+    return a.size == 0;
 }
\ No newline at end of file
diff --git a/js/js.translator/testData/java/arrayList/cases/indexOf.kt b/js/js.translator/testData/java/arrayList/cases/indexOf.kt
index 35fb23b5f25..03b61dc8e78 100644
--- a/js/js.translator/testData/java/arrayList/cases/indexOf.kt
+++ b/js/js.translator/testData/java/arrayList/cases/indexOf.kt
@@ -3,7 +3,7 @@ package foo
 import java.util.ArrayList;
 
 fun <T> test(list: List<T>, elements: List<T>, expected: List<Int>, method: List<T>.(T) -> Int, methodName: String): String? {
-    for (i in 0..elements.size() - 1) {
+    for (i in 0..elements.size - 1) {
         val actual = list.method(elements[i])
         if (actual != expected[i]) return "$methodName failed when find: ${elements[i]}, expected: ${expected[i]}, actual: $actual"
     }
diff --git a/js/js.translator/testData/java/arrayList/cases/iterate.kt b/js/js.translator/testData/java/arrayList/cases/iterate.kt
index 23e222f424a..0ef4139db5e 100644
--- a/js/js.translator/testData/java/arrayList/cases/iterate.kt
+++ b/js/js.translator/testData/java/arrayList/cases/iterate.kt
@@ -12,5 +12,5 @@ fun box(): Boolean {
     for (a in arr) {
         sum += a;
     }
-    return (sum == 55) && (arr.size() == 10)
+    return (sum == 55) && (arr.size == 10)
 }
\ No newline at end of file
diff --git a/js/js.translator/testData/java/arrayList/cases/remove.kt b/js/js.translator/testData/java/arrayList/cases/remove.kt
index 5bba7ae689d..021de03adfb 100644
--- a/js/js.translator/testData/java/arrayList/cases/remove.kt
+++ b/js/js.translator/testData/java/arrayList/cases/remove.kt
@@ -10,5 +10,5 @@ fun box(): Boolean {
 
     val removedElement = arr.removeAt(2)
     val removed = arr.remove(4)
-    return arr.size() == 4 && removedElement == 2 && removed && arr[0] == 0 && arr[1] == 1 && arr[2] == 3 && arr[3] == 5
+    return arr.size == 4 && removedElement == 2 && removed && arr[0] == 0 && arr[1] == 1 && arr[2] == 3 && arr[3] == 5
 }
\ No newline at end of file
diff --git a/js/js.translator/testData/java/arrayList/cases/removeAll.kt b/js/js.translator/testData/java/arrayList/cases/removeAll.kt
index 3060244f535..e871d0c47aa 100644
--- a/js/js.translator/testData/java/arrayList/cases/removeAll.kt
+++ b/js/js.translator/testData/java/arrayList/cases/removeAll.kt
@@ -4,7 +4,7 @@ import java.util.ArrayList;
 
 
 fun <T> test(a: List<T>, b: List<T>, removed: Boolean, expected: List<T>): String? {
-    val t = ArrayList<T>(a.size())
+    val t = ArrayList<T>(a.size)
     t.addAll(a)
 
     if (t.removeAll(b) != removed) return "$a.removeAll($b) != $removed, result list: $t"
diff --git a/js/js.translator/testData/jsCode/cases/literal.kt b/js/js.translator/testData/jsCode/cases/literal.kt
index 2ea45c35038..6bd1934a721 100644
--- a/js/js.translator/testData/jsCode/cases/literal.kt
+++ b/js/js.translator/testData/jsCode/cases/literal.kt
@@ -5,8 +5,8 @@ package foo
 }
 
 fun <T> assertArrayEquals(expected: Array<T>, actual: Array<T>) {
-    val expectedSize = expected.size()
-    val actualSize = actual.size()
+    val expectedSize = expected.size
+    val actualSize = actual.size
 
     if (expectedSize != actualSize) {
         throw Exception("expected size -- $expectedSize, actual size -- $actualSize")
diff --git a/js/js.translator/testData/multideclaration/cases/multiValForMap.kt b/js/js.translator/testData/multideclaration/cases/multiValForMap.kt
index f25618ae205..6fe6699cef7 100644
--- a/js/js.translator/testData/multideclaration/cases/multiValForMap.kt
+++ b/js/js.translator/testData/multideclaration/cases/multiValForMap.kt
@@ -4,18 +4,18 @@ import java.util.HashMap
 
 
 operator fun <K, V> Map<K, V>.iterator(): Iterator<Map.Entry<K, V>> {
-    val entrySet = this.entrySet()
+    val entrySet = this.entries
     return entrySet.iterator()
 }
 
 /** Returns the key of the entry */
 operator fun <K, V> Map.Entry<K, V>.component1(): K {
-    return getKey()
+    return key
 }
 
 /** Returns the value of the entry */
 operator fun <K, V> Map.Entry<K, V>.component2(): V {
-    return getValue()
+    return value
 }
 
 fun box(): String {
diff --git a/js/js.translator/testData/native/cases/vararg.kt b/js/js.translator/testData/native/cases/vararg.kt
index 4dd5c5f9268..05a02f41328 100644
--- a/js/js.translator/testData/native/cases/vararg.kt
+++ b/js/js.translator/testData/native/cases/vararg.kt
@@ -56,7 +56,7 @@ fun testSpreadOperatorWithSureCall(a: Bar?, vararg args: Int): Boolean {
 
 fun testCallOrder(vararg args: Int) =
         Bar.startNewTest() &&
-        Bar(args.size(), 0).test(1, 1, *args) && Bar(args.size(), 2).test(3, 1, *args) &&
+        Bar(args.size, 0).test(1, 1, *args) && Bar(args.size, 2).test(3, 1, *args) &&
         !Bar.hasOrderProblem
 
 @native
@@ -105,7 +105,7 @@ fun box(): String {
     if (!spreadInPackageMethodCall(2, 1, 2))
         return "failed when call package method using spread operator"
 
-    if (!(testNativeVarargWithFunLit(1, 2, 3) { args -> args.size() == 3 }))
+    if (!(testNativeVarargWithFunLit(1, 2, 3) { args -> args.size == 3 }))
         return "failed when call native function with vararg and fun literal"
 
     if (!(testSpreadOperatorWithSafeCall(null, null)))
@@ -141,9 +141,9 @@ fun box(): String {
     assertEquals(90, sumFunValuesOnParameters(1, 2, *intArrayOf(3, 4, 5), *intArrayOf(6, 7, 8, 9)) { 2*it })
     assertEquals(90, sumFunValuesOnParameters(1, 2, *intArrayOf(3, 4), 5, 6, *intArrayOf(7, 8, 9)) { 2*it })
 
-    assertEquals(2, idArrayVarArg(arrayOf(1), *arrayOf(arrayOf(2, 3, 4))).size())
-    assertEquals(3, idArrayVarArg(arrayOf(1, 2), *arrayOf(arrayOf(3, 4), arrayOf(5, 6))).size())
-    assertEquals(6, idArrayVarArg(arrayOf(1, 2), *arrayOf(arrayOf(3, 4), arrayOf(5, 6)), arrayOf(7), *arrayOf(arrayOf(8, 9), arrayOf(10, 11))).size())
+    assertEquals(2, idArrayVarArg(arrayOf(1), *arrayOf(arrayOf(2, 3, 4))).size)
+    assertEquals(3, idArrayVarArg(arrayOf(1, 2), *arrayOf(arrayOf(3, 4), arrayOf(5, 6))).size)
+    assertEquals(6, idArrayVarArg(arrayOf(1, 2), *arrayOf(arrayOf(3, 4), arrayOf(5, 6)), arrayOf(7), *arrayOf(arrayOf(8, 9), arrayOf(10, 11))).size)
 
     return "OK"
 }
diff --git a/js/js.translator/testData/number/cases/longArray.kt b/js/js.translator/testData/number/cases/longArray.kt
index 2fae27351d6..625135da337 100644
--- a/js/js.translator/testData/number/cases/longArray.kt
+++ b/js/js.translator/testData/number/cases/longArray.kt
@@ -5,7 +5,7 @@ fun box(): String {
     val arr = LongArray(2)
 
     val expected: Long = 0
-    assertEquals(arr.size(), 2)
+    assertEquals(arr.size, 2)
     assertEquals(expected, arr[0])
     assertEquals(expected, arr[1])
 
diff --git a/js/js.translator/testData/operatorOverloading/cases/overloadPlusAssignArrayList.kt b/js/js.translator/testData/operatorOverloading/cases/overloadPlusAssignArrayList.kt
index e670f8f2d4b..fa92b6997d5 100644
--- a/js/js.translator/testData/operatorOverloading/cases/overloadPlusAssignArrayList.kt
+++ b/js/js.translator/testData/operatorOverloading/cases/overloadPlusAssignArrayList.kt
@@ -24,5 +24,5 @@ fun box(): String {
     v1.add("foo")
     v2.add("bar")
     v1 += v2
-    return if (v1.contents.size() == 2) "OK" else "fail"
+    return if (v1.contents.size == 2) "OK" else "fail"
 }
diff --git a/js/js.translator/testData/operatorOverloading/cases/overloadPlusAssignViaExtensionFunction.kt b/js/js.translator/testData/operatorOverloading/cases/overloadPlusAssignViaExtensionFunction.kt
index 4b060a81184..9767349b59e 100644
--- a/js/js.translator/testData/operatorOverloading/cases/overloadPlusAssignViaExtensionFunction.kt
+++ b/js/js.translator/testData/operatorOverloading/cases/overloadPlusAssignViaExtensionFunction.kt
@@ -19,5 +19,5 @@ fun box(): Boolean {
     val a = A(v1)
     a += v2
 
-    return (v1.size() == 2 && v1[0] == "foo" && v1[1] == "bar")
+    return (v1.size == 2 && v1[0] == "foo" && v1[1] == "bar")
 }
diff --git a/js/js.translator/testData/operatorOverloading/cases/overloadPlusViaExtensionFunction.kt b/js/js.translator/testData/operatorOverloading/cases/overloadPlusViaExtensionFunction.kt
index 53d70a312ba..eecf9d74fa8 100644
--- a/js/js.translator/testData/operatorOverloading/cases/overloadPlusViaExtensionFunction.kt
+++ b/js/js.translator/testData/operatorOverloading/cases/overloadPlusViaExtensionFunction.kt
@@ -16,5 +16,5 @@ fun box(): Boolean {
     v2.add("bar")
     val v = v1 + v2
 
-    return (v.size() == 2 && v[0] == "foo" && v[1] == "bar")
+    return (v.size == 2 && v[0] == "foo" && v[1] == "bar")
 }
diff --git a/js/js.translator/testData/reservedWords/_commonFiles/helpers.kt b/js/js.translator/testData/reservedWords/_commonFiles/helpers.kt
index 02bb57bb238..debca3838d2 100644
--- a/js/js.translator/testData/reservedWords/_commonFiles/helpers.kt
+++ b/js/js.translator/testData/reservedWords/_commonFiles/helpers.kt
@@ -9,7 +9,7 @@ fun test(keyword: String, expectedRenamed: Boolean, f: Any) {
     val fs = f.toString().replace("while (false)", "")
     val matches = Regex("[\\w$]*$keyword[\\w_$]*").matchAll(fs).map { it.value }.toList()
 
-    assertNotEquals(0, matches.size(), "matches is empty for fs = $fs")
+    assertNotEquals(0, matches.size, "matches is empty for fs = $fs")
 
     val actual = matches.last()
 
diff --git a/js/js.translator/testData/rtti/cases/collectionClassesIsCheck.kt b/js/js.translator/testData/rtti/cases/collectionClassesIsCheck.kt
index b99972e8957..1a21971672e 100644
--- a/js/js.translator/testData/rtti/cases/collectionClassesIsCheck.kt
+++ b/js/js.translator/testData/rtti/cases/collectionClassesIsCheck.kt
@@ -45,8 +45,8 @@ fun checkHashMap(obj: Any) {
     assertTrue(obj is HashMap<*, *>, "checkHashMap: is HashMap")
     assertTrue(obj is MutableMap<*, *>, "checkHashMap: is MutableMap")
     assertTrue(obj is Map<*, *>, "checkHashMap: is Map")
-    assertTrue((obj as Map<*, *>).values() is Collection, "checkHashMap: values() is Collection")
-    assertTrue((obj as Map<*, *>).keySet() is Set, "checkHashMap: keySet() is Set")
+    assertTrue((obj as Map<*, *>).values is Collection, "checkHashMap: values is Collection")
+    assertTrue((obj as Map<*, *>).keys is Set, "checkHashMap: keys is Set")
 }
 
 fun checkLinkedHashMap(obj: Any) {
diff --git a/js/js.translator/testData/rtti/cases/stdlibEmptyListClass.kt b/js/js.translator/testData/rtti/cases/stdlibEmptyListClass.kt
index 505d27dd423..7a0284b3825 100644
--- a/js/js.translator/testData/rtti/cases/stdlibEmptyListClass.kt
+++ b/js/js.translator/testData/rtti/cases/stdlibEmptyListClass.kt
@@ -12,7 +12,7 @@ fun box(): String {
     assertTrue((stdlib_emptyListClass() as Any) !is ArrayList<*>, "stdlib_emptyListClass() !is ArrayList<*>")
 
     assertTrue(stdlib_emptyListClass().isEmpty(), "stdlib_emptyListClass().isEmpty()")
-    assertTrue(stdlib_emptyListClass().size() == 0, "stdlib_emptyListClass().size() == 0")
+    assertTrue(stdlib_emptyListClass().size == 0, "stdlib_emptyListClass().size == 0")
 
     return "OK"
 }
diff --git a/js/js.translator/testData/standardClasses/cases/hashMapTypeOfElement.kt b/js/js.translator/testData/standardClasses/cases/hashMapTypeOfElement.kt
index d6d2a023acb..b5b3ba40894 100644
--- a/js/js.translator/testData/standardClasses/cases/hashMapTypeOfElement.kt
+++ b/js/js.translator/testData/standardClasses/cases/hashMapTypeOfElement.kt
@@ -9,75 +9,75 @@ fun box(): String {
 
     val mapWithIntKeys = HashMap<Int, Int>()
     mapWithIntKeys[1] = 1
-    assertEquals("number", jsTypeOf (mapWithIntKeys.keySet().iterator().next()), "mapWithIntKeys")
+    assertEquals("number", jsTypeOf (mapWithIntKeys.keys.iterator().next()), "mapWithIntKeys")
 
     val mapWithShortKeys = HashMap<Short, Int>()
     mapWithShortKeys[1.toShort()] = 1
-    assertEquals("number", jsTypeOf (mapWithShortKeys.keySet().iterator().next()), "mapWithShortKeys")
+    assertEquals("number", jsTypeOf (mapWithShortKeys.keys.iterator().next()), "mapWithShortKeys")
 
     val mapWithByteKeys = HashMap<Byte, Int>()
     mapWithByteKeys[1.toByte()] = 1
-    assertEquals("number", jsTypeOf (mapWithByteKeys.keySet().iterator().next()), "mapWithByteKeys")
+    assertEquals("number", jsTypeOf (mapWithByteKeys.keys.iterator().next()), "mapWithByteKeys")
 
     val mapWithDoubleKeys = HashMap<Double, Int>()
     mapWithDoubleKeys[1.0] = 1
-    assertEquals("number", jsTypeOf (mapWithDoubleKeys.keySet().iterator().next()), "mapWithDoubleKeys")
+    assertEquals("number", jsTypeOf (mapWithDoubleKeys.keys.iterator().next()), "mapWithDoubleKeys")
 
     mapWithDoubleKeys.clear()
     var dNaN = 0.0 / 0.0
     mapWithDoubleKeys[dNaN] = 100
     assertEquals(100, mapWithDoubleKeys[dNaN])
-    assertEquals("number", jsTypeOf (mapWithDoubleKeys.keySet().iterator().next()), "dNaN")
+    assertEquals("number", jsTypeOf (mapWithDoubleKeys.keys.iterator().next()), "dNaN")
 
     mapWithDoubleKeys.clear()
     var dPositiveInfinity = +1.0 / 0.0
     mapWithDoubleKeys[dPositiveInfinity] = 100
     assertEquals(100, mapWithDoubleKeys[dPositiveInfinity])
-    assertEquals("number", jsTypeOf (mapWithDoubleKeys.keySet().iterator().next()), "dPositiveInfinity")
+    assertEquals("number", jsTypeOf (mapWithDoubleKeys.keys.iterator().next()), "dPositiveInfinity")
 
     mapWithDoubleKeys.clear()
     var dNegativeInfinity = -1.0 / 0.0
     mapWithDoubleKeys[dNegativeInfinity] = 100
     assertEquals(100, mapWithDoubleKeys[dNegativeInfinity])
-    assertEquals("number", jsTypeOf (mapWithDoubleKeys.keySet().iterator().next()), "dNegativeInfinity")
+    assertEquals("number", jsTypeOf (mapWithDoubleKeys.keys.iterator().next()), "dNegativeInfinity")
 
     val mapWithFloatKeys = HashMap<Float, Int>()
     mapWithFloatKeys[1.0f] = 1
-    assertEquals("number", jsTypeOf (mapWithFloatKeys.keySet().iterator().next()), "mapWithFloatKeys")
+    assertEquals("number", jsTypeOf (mapWithFloatKeys.keys.iterator().next()), "mapWithFloatKeys")
 
     mapWithFloatKeys.clear()
     var fNaN: Float = 0.0f / 0.0f
     mapWithFloatKeys[fNaN] = 100
     assertEquals(100, mapWithFloatKeys[fNaN])
-    assertEquals("number", jsTypeOf (mapWithFloatKeys.keySet().iterator().next()), "fNaN")
+    assertEquals("number", jsTypeOf (mapWithFloatKeys.keys.iterator().next()), "fNaN")
 
     mapWithFloatKeys.clear()
     var fPositiveInfinity = +1.0f / 0.0f
     mapWithFloatKeys[fPositiveInfinity] = 100
     assertEquals(100, mapWithFloatKeys[fPositiveInfinity])
-    assertEquals("number", jsTypeOf (mapWithFloatKeys.keySet().iterator().next()), "fPositiveInfinity")
+    assertEquals("number", jsTypeOf (mapWithFloatKeys.keys.iterator().next()), "fPositiveInfinity")
 
     mapWithFloatKeys.clear()
     var NegativeInfinity = -1.0f / 0.0f
     mapWithFloatKeys[NegativeInfinity] = 100
     assertEquals(100, mapWithFloatKeys[NegativeInfinity])
-    assertEquals("number", jsTypeOf (mapWithFloatKeys.keySet().iterator().next()), "fNegativeInfinity")
+    assertEquals("number", jsTypeOf (mapWithFloatKeys.keys.iterator().next()), "fNegativeInfinity")
 
     val mapWithCharKeys = HashMap<Char, Int>()
     mapWithCharKeys['A'] = 1
-    assertEquals("number", jsTypeOf (mapWithCharKeys.keySet().iterator().next()), "mapWithCharKeys")
+    assertEquals("number", jsTypeOf (mapWithCharKeys.keys.iterator().next()), "mapWithCharKeys")
 
     val mapWithLongKeys = HashMap<Long, Int>()
     mapWithLongKeys[1L] = 1
-    assertEquals("number", jsTypeOf (mapWithLongKeys.keySet().iterator().next()), "mapWithLongKeys")
+    assertEquals("number", jsTypeOf (mapWithLongKeys.keys.iterator().next()), "mapWithLongKeys")
 
     val mapWithBooleanKeys = HashMap<Boolean, Int>()
     mapWithBooleanKeys[true] = 1
-    assertEquals("boolean", jsTypeOf (mapWithBooleanKeys.keySet().iterator().next()), "mapWithBooleanKeys")
+    assertEquals("boolean", jsTypeOf (mapWithBooleanKeys.keys.iterator().next()), "mapWithBooleanKeys")
 
     val mapWithStringKeys = HashMap<String, Int>()
     mapWithStringKeys["key"] = 1
-    assertEquals("string", jsTypeOf (mapWithStringKeys.keySet().iterator().next()), "mapWithStringKeys")
+    assertEquals("string", jsTypeOf (mapWithStringKeys.keys.iterator().next()), "mapWithStringKeys")
 
     return "OK"
 }
diff --git a/js/js.translator/testData/webDemoExamples1/cases/isCheck.kt b/js/js.translator/testData/webDemoExamples1/cases/isCheck.kt
index 8e08831569e..77f5b7e3e1e 100644
--- a/js/js.translator/testData/webDemoExamples1/cases/isCheck.kt
+++ b/js/js.translator/testData/webDemoExamples1/cases/isCheck.kt
@@ -5,6 +5,6 @@ fun main(args: Array<String>) {
 
 fun getStringLength(obj: Any): Int? {
     if (obj is String)
-        return obj.length() // no cast to String is needed
+        return obj.length // no cast to String is needed
     return null
 }
\ No newline at end of file
diff --git a/js/js.translator/testData/webDemoExamples1/cases/multiLanguageHello.kt b/js/js.translator/testData/webDemoExamples1/cases/multiLanguageHello.kt
index e1b6cf38df5..2ffd12f0f17 100644
--- a/js/js.translator/testData/webDemoExamples1/cases/multiLanguageHello.kt
+++ b/js/js.translator/testData/webDemoExamples1/cases/multiLanguageHello.kt
@@ -1,5 +1,5 @@
 fun main(args: Array<String>) {
-    val language = if (args.size() == 0) "EN" else args[0]
+    val language = if (args.size == 0) "EN" else args[0]
     println(when (language) {
                 "EN" -> "Hello!"
                 "FR" -> "Salut!"
diff --git a/js/js.translator/testData/webDemoExamples1/cases/nullChecks.kt b/js/js.translator/testData/webDemoExamples1/cases/nullChecks.kt
index 0ee0e00dec0..af61d76fc08 100644
--- a/js/js.translator/testData/webDemoExamples1/cases/nullChecks.kt
+++ b/js/js.translator/testData/webDemoExamples1/cases/nullChecks.kt
@@ -10,7 +10,7 @@ fun myParseInt(str: String): Int? {
 }
 
 fun main(args: Array<String>) {
-    if (args.size() < 2) {
+    if (args.size < 2) {
         print("No number supplied");
     }
     else {
diff --git a/js/js.translator/testData/webDemoExamples1/cases/ranges.kt b/js/js.translator/testData/webDemoExamples1/cases/ranges.kt
index 192e76e98f3..0e999b09011 100644
--- a/js/js.translator/testData/webDemoExamples1/cases/ranges.kt
+++ b/js/js.translator/testData/webDemoExamples1/cases/ranges.kt
@@ -19,8 +19,8 @@ fun main(args: Array<String>) {
     array.add("bbb")
     array.add("ccc")
 
-    if (x !in 0..array.size())
-        println("Out: array has only ${array.size()} elements. x = ${x}")
+    if (x !in 0..array.size)
+        println("Out: array has only ${array.size} elements. x = ${x}")
 
     //Check if a collection contains an object:
     if ("aaa" in array) // collection.contains(obj) is called
diff --git a/js/js.translator/testData/webDemoExamples1/cases/whileLoop.kt b/js/js.translator/testData/webDemoExamples1/cases/whileLoop.kt
index ceabe60250e..3ce84a02a0a 100644
--- a/js/js.translator/testData/webDemoExamples1/cases/whileLoop.kt
+++ b/js/js.translator/testData/webDemoExamples1/cases/whileLoop.kt
@@ -1,5 +1,5 @@
 fun main(args: Array<String>) {
     var i = 0
-    while (i < args.size())
+    while (i < args.size)
         println(args[i++])
 }
diff --git a/js/js.translator/testData/webDemoExamples2/cases/bottles.kt b/js/js.translator/testData/webDemoExamples2/cases/bottles.kt
index b297beac575..4ea5c7fd74f 100644
--- a/js/js.translator/testData/webDemoExamples2/cases/bottles.kt
+++ b/js/js.translator/testData/webDemoExamples2/cases/bottles.kt
@@ -72,4 +72,4 @@ fun bottlesOfBeer(count: Int): String =
 // From the std package
 // This is an extension property, i.e. a property that is defined for the
 // type Array<T>, but does not sit inside the class Array
-fun <T> Array<T>.isEmpty() = size() == 0
+fun <T> Array<T>.isEmpty() = size == 0
diff --git a/js/js.translator/testData/webDemoExamples2/cases/builder.kt b/js/js.translator/testData/webDemoExamples2/cases/builder.kt
index c2c13d72a4e..5e381f53e0e 100644
--- a/js/js.translator/testData/webDemoExamples2/cases/builder.kt
+++ b/js/js.translator/testData/webDemoExamples2/cases/builder.kt
@@ -81,7 +81,7 @@ abstract class Tag(val name: String) : Element() {
 
     private fun renderAttributes(): String? {
         val builder = StringBuilder()
-        for (a in attributes.keySet()) {
+        for (a in attributes.keys) {
             builder.append(" $a=\"${attributes[a]}\"")
         }
         return builder.toString()
diff --git a/js/js.translator/testData/webDemoExamples2/cases/life.kt b/js/js.translator/testData/webDemoExamples2/cases/life.kt
index 3833dbd9487..646d1ea5ce0 100644
--- a/js/js.translator/testData/webDemoExamples2/cases/life.kt
+++ b/js/js.translator/testData/webDemoExamples2/cases/life.kt
@@ -124,15 +124,15 @@ fun makeField(s: String): Field {
     val lines: List<String> = s.split("\n")
 
     val w = Collections.max<String>(lines.toList(), comparator<String> { o1, o2 ->
-        val l1: Int = o1.length()
-        val l2 = o2.length()
+        val l1: Int = o1.length
+        val l2 = o2.length
         l1 - l2
     })!!
-    val data = Array(lines.size()) { Array(w.length()) { false } }
+    val data = Array(lines.size) { Array(w.length) { false } }
 
     // workaround
     for (i in data.indices) {
-        data[i] = Array(w.length()) { false }
+        data[i] = Array(w.length) { false }
         for (j in data[i].indices)
             data[i][j] = false
     }
@@ -144,5 +144,5 @@ fun makeField(s: String): Field {
         }
     }
 
-    return Field(w.length(), lines.size()) { i, j -> data[i][j] }
+    return Field(w.length, lines.size) { i, j -> data[i][j] }
 }
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-reflection/src/main/kotlin/main/main.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/test-reflection/src/main/kotlin/main/main.kt
index bcebeb225b4..a4dddd73f26 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-reflection/src/main/kotlin/main/main.kt
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-reflection/src/main/kotlin/main/main.kt
@@ -36,7 +36,7 @@ fun box(): String {
     if (ext.get(42) != 42) return "Fail ext: ${ext.get(42)}"
 
     val a = A::class
-    if (a.memberProperties.size() != 1) return "Fail: ${a.memberProperties}"
+    if (a.memberProperties.size != 1) return "Fail: ${a.memberProperties}"
 
     val p = A::prop
     if (p.name != "prop") return "Fail name: ${p.name}"