diff --git a/idea/idea-completion/testData/basic/common/override/Generics.kt b/idea/idea-completion/testData/basic/common/override/Generics.kt
index e8112cf5f6a..79f6d002174 100644
--- a/idea/idea-completion/testData/basic/common/override/Generics.kt
+++ b/idea/idea-completion/testData/basic/common/override/Generics.kt
@@ -9,4 +9,4 @@ class A<T> : List<String>, I<T> {
 // EXIST: { lookupString: "override", itemText: "override" }
 // EXIST: { itemText: "override fun hashCode(): Int {...}", tailText: null, typeText: "Any" }
 // EXIST: { itemText: "override fun foo(t: T): T {...}", tailText: null, typeText: "I" }
-// EXIST: { itemText: "override fun get(index: Int): String {...}", tailText: null, typeText: "List" }
+// EXIST: { itemText: "override operator fun get(index: Int): String {...}", tailText: null, typeText: "List" }
diff --git a/idea/idea-completion/testData/basic/common/override/Simple.kt b/idea/idea-completion/testData/basic/common/override/Simple.kt
index 733fa400c7a..a4f03501135 100644
--- a/idea/idea-completion/testData/basic/common/override/Simple.kt
+++ b/idea/idea-completion/testData/basic/common/override/Simple.kt
@@ -17,7 +17,7 @@ class A : Base2(), I {
 
 // EXIST: { lookupString: "override", itemText: "override" }
 // EXIST: { itemText: "override fun bar() {...}", lookupString: "override", tailText: null, typeText: "Base1" }
-// EXIST: { itemText: "override fun equals(other: Any?): Boolean {...}", lookupString: "override", tailText: null, typeText: "Any" }
+// EXIST: { itemText: "override operator fun equals(other: Any?): Boolean {...}", lookupString: "override", tailText: null, typeText: "Any" }
 // EXIST: { itemText: "override fun foo() {...}", lookupString: "override", tailText: null, typeText: "I" }
 // EXIST: { itemText: "override fun hashCode(): Int {...}", lookupString: "override", tailText: null, typeText: "Any" }
 // EXIST: { itemText: "override val someVal: Int", lookupString: "override", tailText: null, typeText: "I" }
diff --git a/idea/idea-completion/testData/handlers/basic/override/KeepAnnotationBefore.kt b/idea/idea-completion/testData/handlers/basic/override/KeepAnnotationBefore.kt
index 2f32113e657..1cd4c8babf1 100644
--- a/idea/idea-completion/testData/handlers/basic/override/KeepAnnotationBefore.kt
+++ b/idea/idea-completion/testData/handlers/basic/override/KeepAnnotationBefore.kt
@@ -3,4 +3,4 @@ class A {
     o<caret>
 }
 
-// ELEMENT_TEXT: "override fun equals(other: Any?): Boolean {...}"
+// ELEMENT_TEXT: "override operator fun equals(other: Any?): Boolean {...}"
diff --git a/idea/idea-completion/testData/handlers/basic/override/KeepAnnotationBefore.kt.after b/idea/idea-completion/testData/handlers/basic/override/KeepAnnotationBefore.kt.after
index f34c4cbfc83..f946aa328c7 100644
--- a/idea/idea-completion/testData/handlers/basic/override/KeepAnnotationBefore.kt.after
+++ b/idea/idea-completion/testData/handlers/basic/override/KeepAnnotationBefore.kt.after
@@ -5,4 +5,4 @@ class A {
     }
 }
 
-// ELEMENT_TEXT: "override fun equals(other: Any?): Boolean {...}"
+// ELEMENT_TEXT: "override operator fun equals(other: Any?): Boolean {...}"
diff --git a/idea/idea-completion/testData/handlers/basic/override/KeepModifiersBefore.kt b/idea/idea-completion/testData/handlers/basic/override/KeepModifiersBefore.kt
index 02383882320..2b02c07f7f0 100644
--- a/idea/idea-completion/testData/handlers/basic/override/KeepModifiersBefore.kt
+++ b/idea/idea-completion/testData/handlers/basic/override/KeepModifiersBefore.kt
@@ -3,4 +3,4 @@ class A {
     public o<caret>
 }
 
-// ELEMENT_TEXT: "override fun equals(other: Any?): Boolean {...}"
+// ELEMENT_TEXT: "override operator fun equals(other: Any?): Boolean {...}"
diff --git a/idea/idea-completion/testData/handlers/basic/override/KeepModifiersBefore.kt.after b/idea/idea-completion/testData/handlers/basic/override/KeepModifiersBefore.kt.after
index 055f2fe7a4b..0216d9dca4d 100644
--- a/idea/idea-completion/testData/handlers/basic/override/KeepModifiersBefore.kt.after
+++ b/idea/idea-completion/testData/handlers/basic/override/KeepModifiersBefore.kt.after
@@ -5,4 +5,4 @@ class A {
     }
 }
 
-// ELEMENT_TEXT: "override fun equals(other: Any?): Boolean {...}"
+// ELEMENT_TEXT: "override operator fun equals(other: Any?): Boolean {...}"
diff --git a/idea/idea-completion/testData/handlers/basic/override/OverrideFunction.kt b/idea/idea-completion/testData/handlers/basic/override/OverrideFunction.kt
index 94523fa7266..4dc930afce4 100644
--- a/idea/idea-completion/testData/handlers/basic/override/OverrideFunction.kt
+++ b/idea/idea-completion/testData/handlers/basic/override/OverrideFunction.kt
@@ -2,4 +2,4 @@ class A {
     o<caret>
 }
 
-// ELEMENT_TEXT: "override fun equals(other: Any?): Boolean {...}"
+// ELEMENT_TEXT: "override operator fun equals(other: Any?): Boolean {...}"
diff --git a/idea/idea-completion/testData/handlers/basic/override/OverrideFunction.kt.after b/idea/idea-completion/testData/handlers/basic/override/OverrideFunction.kt.after
index 8938f4d0427..9dcae1c33a7 100644
--- a/idea/idea-completion/testData/handlers/basic/override/OverrideFunction.kt.after
+++ b/idea/idea-completion/testData/handlers/basic/override/OverrideFunction.kt.after
@@ -4,4 +4,4 @@ class A {
     }
 }
 
-// ELEMENT_TEXT: "override fun equals(other: Any?): Boolean {...}"
+// ELEMENT_TEXT: "override operator fun equals(other: Any?): Boolean {...}"
diff --git a/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator.kt b/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator.kt
index 3418633aab0..f52515522ce 100644
--- a/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator.kt
+++ b/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator.kt
@@ -1,5 +1,5 @@
-// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract fun iterator(): kotlin.Iterator<kotlin.String> defined in kotlin.Iterable'
-// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract fun iterator(): kotlin.Iterator<kotlin.String> defined in kotlin.Iterable'
+// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): kotlin.Iterator<kotlin.String> defined in kotlin.Iterable'
+// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): kotlin.Iterator<kotlin.String> defined in kotlin.Iterable'
 package demo
 
 internal class Test : Iterable<String> {
diff --git a/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator2.kt b/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator2.kt
index 7e3c47ec96f..34f87e67323 100644
--- a/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator2.kt
+++ b/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator2.kt
@@ -1,5 +1,5 @@
-// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract fun iterator(): kotlin.Iterator<kotlin.String> defined in kotlin.Iterable'
-// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract fun iterator(): kotlin.Iterator<kotlin.String> defined in kotlin.Iterable'
+// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): kotlin.Iterator<kotlin.String> defined in kotlin.Iterable'
+// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): kotlin.Iterator<kotlin.String> defined in kotlin.Iterable'
 package demo
 
 import java.util.*
diff --git a/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator3.kt b/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator3.kt
index 9877b696696..cc8253ced7e 100644
--- a/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator3.kt
+++ b/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator3.kt
@@ -1,4 +1,4 @@
-// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract fun iterator(): kotlin.Iterator<kotlin.String> defined in kotlin.Iterable'
+// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): kotlin.Iterator<kotlin.String> defined in kotlin.Iterable'
 package demo
 
 internal class Test : Iterable<String> {
diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/layoutVariants/test_VIEW.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/layoutVariants/test_VIEW.kt
index ef8b92f5c12..2b7a5d0bde7 100644
--- a/plugins/android-compiler-plugin/testData/android/converter/simple/layoutVariants/test_VIEW.kt
+++ b/plugins/android-compiler-plugin/testData/android/converter/simple/layoutVariants/test_VIEW.kt
@@ -3,5 +3,5 @@ package kotlinx.android.synthetic.test.view
 import kotlin.internal.flexible.ft
 
 val android.view.View.button: ft<android.view.View, android.view.View?>
-    get() = findViewById(0) as? android.view.View
+    get() = findViewById(0)
 
diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/sameIds/test_VIEW.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/sameIds/test_VIEW.kt
index dfb42132f71..e44723f7b7c 100644
--- a/plugins/android-compiler-plugin/testData/android/converter/simple/sameIds/test_VIEW.kt
+++ b/plugins/android-compiler-plugin/testData/android/converter/simple/sameIds/test_VIEW.kt
@@ -3,7 +3,7 @@ package kotlinx.android.synthetic.test.view
 import kotlin.internal.flexible.ft
 
 val android.view.View.textView1: ft<android.view.View, android.view.View?>
-    get() = findViewById(0) as? android.view.View
+    get() = findViewById(0)
 
 val android.view.View.textView2: ft<android.widget.TextView, android.widget.TextView?>
     get() = findViewById(0) as? android.widget.TextView
diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/test_VIEW.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/test_VIEW.kt
index 06a090da2c6..f63faf48685 100644
--- a/plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/test_VIEW.kt
+++ b/plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/test_VIEW.kt
@@ -3,7 +3,7 @@ package kotlinx.android.synthetic.test.view
 import kotlin.internal.flexible.ft
 
 val android.view.View.button: ft<android.view.View, android.view.View?>
-    get() = findViewById(0) as? android.view.View
+    get() = findViewById(0)
 
 val android.view.View.button2: ft<android.widget.Button, android.widget.Button?>
     get() = findViewById(0) as? android.widget.Button
diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/specialTags/test_VIEW.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/specialTags/test_VIEW.kt
index cc6fdab5062..b731bbe8620 100644
--- a/plugins/android-compiler-plugin/testData/android/converter/simple/specialTags/test_VIEW.kt
+++ b/plugins/android-compiler-plugin/testData/android/converter/simple/specialTags/test_VIEW.kt
@@ -3,7 +3,7 @@ package kotlinx.android.synthetic.test.view
 import kotlin.internal.flexible.ft
 
 val android.view.View.includeTag: ft<android.view.View, android.view.View?>
-    get() = findViewById(0) as? android.view.View
+    get() = findViewById(0)
 
 val android.view.View.`fun`: ft<android.widget.TextView, android.widget.TextView?>
     get() = findViewById(0) as? android.widget.TextView
diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/supportSpecialTags/test_VIEW.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/supportSpecialTags/test_VIEW.kt
index cc6fdab5062..b731bbe8620 100644
--- a/plugins/android-compiler-plugin/testData/android/converter/simple/supportSpecialTags/test_VIEW.kt
+++ b/plugins/android-compiler-plugin/testData/android/converter/simple/supportSpecialTags/test_VIEW.kt
@@ -3,7 +3,7 @@ package kotlinx.android.synthetic.test.view
 import kotlin.internal.flexible.ft
 
 val android.view.View.includeTag: ft<android.view.View, android.view.View?>
-    get() = findViewById(0) as? android.view.View
+    get() = findViewById(0)
 
 val android.view.View.`fun`: ft<android.widget.TextView, android.widget.TextView?>
     get() = findViewById(0) as? android.widget.TextView
diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedFqName/test_VIEW.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedFqName/test_VIEW.kt
index c28df07767f..5753274e6c8 100644
--- a/plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedFqName/test_VIEW.kt
+++ b/plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedFqName/test_VIEW.kt
@@ -3,6 +3,6 @@ package kotlinx.android.synthetic.test.view
 import kotlin.internal.flexible.ft
 
 @kotlin.internal.flexible.InvalidWidgetType("a.b.c")
-val android.view.View.MyView: ft<android.view.View, android.view.View?>
-    get() = findViewById(0) as? android.view.View
+val android.view.View.MyView: ft<a.b.c, a.b.c?>
+    get() = findViewById(0) as? a.b.c
 
diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedWidget/test_VIEW.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedWidget/test_VIEW.kt
index 382625c2029..73c80f30c8c 100644
--- a/plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedWidget/test_VIEW.kt
+++ b/plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedWidget/test_VIEW.kt
@@ -4,5 +4,5 @@ import kotlin.internal.flexible.ft
 
 @kotlin.internal.flexible.InvalidWidgetType("KeyboardView")
 val android.view.View.MyKeyboardView: ft<android.view.View, android.view.View?>
-    get() = findViewById(0) as? android.view.View
+    get() = findViewById(0)