diff --git a/compiler/testData/diagnostics/tests/j+k/defaultMethods.kt b/compiler/testData/diagnostics/tests/j+k/defaultMethods.kt
index 8d68fcbaea6..1c9e5b23dfe 100644
--- a/compiler/testData/diagnostics/tests/j+k/defaultMethods.kt
+++ b/compiler/testData/diagnostics/tests/j+k/defaultMethods.kt
@@ -46,14 +46,14 @@ interface KotlinInterface : JavaInterface {
     }
 }
 
-interface KotlinInterfaceInderectInheritance : KotlinInterface {
+interface KotlinInterfaceIndirectInheritance : KotlinInterface {
     fun foooo() {
         <!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
         super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
 
         object  {
             fun run () {
-                super@KotlinInterfaceInderectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
+                super@KotlinInterfaceIndirectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
             }
         }
     }
@@ -64,7 +64,7 @@ interface KotlinInterfaceInderectInheritance : KotlinInterface {
 
             object  {
                 fun run () {
-                    super@KotlinInterfaceInderectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
+                    super@KotlinInterfaceIndirectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
                 }
             }
             return ""
@@ -98,7 +98,7 @@ open class KotlinClass : JavaInterface {
         }
 }
 
-class KotlinClassInderectInheritance : KotlinClass() {
+class KotlinClassIndirectInheritance : KotlinClass() {
     fun foo2(){
         <!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
         super.test()
@@ -106,7 +106,7 @@ class KotlinClassInderectInheritance : KotlinClass() {
 
         object  {
             fun run () {
-                super@KotlinClassInderectInheritance.test()
+                super@KotlinClassIndirectInheritance.test()
             }
         }
     }
@@ -118,14 +118,14 @@ class KotlinClassInderectInheritance : KotlinClass() {
 
             object  {
                 fun run () {
-                    super@KotlinClassInderectInheritance.test()
+                    super@KotlinClassIndirectInheritance.test()
                 }
             }
             return ""
         }
 }
 
-class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance {
+class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
     fun foo() {
         <!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
         super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
@@ -133,7 +133,7 @@ class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance {
 
         object  {
             fun run () {
-                super@KotlinClassInderectInheritance2.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
+                super@KotlinClassIndirectInheritance2.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
             }
         }
     }
@@ -145,7 +145,7 @@ class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance {
 
             object  {
                 fun run () {
-                    super@KotlinClassInderectInheritance2.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
+                    super@KotlinClassIndirectInheritance2.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
                 }
             }
             return ""
@@ -156,11 +156,11 @@ fun test() {
     JavaInterface.<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
     KotlinClass().foo()
     KotlinClass().property
-    KotlinClassInderectInheritance2().foo()
-    KotlinClassInderectInheritance2().property
+    KotlinClassIndirectInheritance2().foo()
+    KotlinClassIndirectInheritance2().property
 
     KotlinClass().test()
     KotlinClass().property
     KotlinClass().testOverride()
-    KotlinClassInderectInheritance().testOverride()
+    KotlinClassIndirectInheritance().testOverride()
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/defaultMethods.txt b/compiler/testData/diagnostics/tests/j+k/defaultMethods.txt
index fd4c9917a62..27dbcbff711 100644
--- a/compiler/testData/diagnostics/tests/j+k/defaultMethods.txt
+++ b/compiler/testData/diagnostics/tests/j+k/defaultMethods.txt
@@ -24,8 +24,8 @@ public open class KotlinClass : JavaInterface {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public final class KotlinClassInderectInheritance : KotlinClass {
-    public constructor KotlinClassInderectInheritance()
+public final class KotlinClassIndirectInheritance : KotlinClass {
+    public constructor KotlinClassIndirectInheritance()
     public final override /*1*/ /*fake_override*/ val property: kotlin.String
     public final val property2: kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -37,8 +37,8 @@ public final class KotlinClassInderectInheritance : KotlinClass {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public final class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance {
-    public constructor KotlinClassInderectInheritance2()
+public final class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
+    public constructor KotlinClassIndirectInheritance2()
     public final val property: kotlin.String
     public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String
     public open override /*1*/ /*fake_override*/ val propertyyy: kotlin.String
@@ -62,7 +62,7 @@ public interface KotlinInterface : JavaInterface {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public interface KotlinInterfaceInderectInheritance : KotlinInterface {
+public interface KotlinInterfaceIndirectInheritance : KotlinInterface {
     public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String
     public open val propertyyy: kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/j+k/defaultMethods_warning.kt b/compiler/testData/diagnostics/tests/j+k/defaultMethods_warning.kt
index e5e04215bfa..24b07f902fc 100644
--- a/compiler/testData/diagnostics/tests/j+k/defaultMethods_warning.kt
+++ b/compiler/testData/diagnostics/tests/j+k/defaultMethods_warning.kt
@@ -48,14 +48,14 @@ interface KotlinInterface : JavaInterface {
     }
 }
 
-interface KotlinInterfaceInderectInheritance : KotlinInterface {
+interface KotlinInterfaceIndirectInheritance : KotlinInterface {
     fun foooo() {
         <!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET!>testStatic<!>()
         super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
 
         object  {
             fun run () {
-                super@KotlinInterfaceInderectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
+                super@KotlinInterfaceIndirectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
             }
         }
     }
@@ -66,7 +66,7 @@ interface KotlinInterfaceInderectInheritance : KotlinInterface {
 
             object  {
                 fun run () {
-                    super@KotlinInterfaceInderectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
+                    super@KotlinInterfaceIndirectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
                 }
             }
             return ""
@@ -100,7 +100,7 @@ open class KotlinClass : JavaInterface {
         }
 }
 
-class KotlinClassInderectInheritance : KotlinClass() {
+class KotlinClassIndirectInheritance : KotlinClass() {
     fun foo2(){
         <!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET!>testStatic<!>()
         super.test()
@@ -108,7 +108,7 @@ class KotlinClassInderectInheritance : KotlinClass() {
 
         object  {
             fun run () {
-                super@KotlinClassInderectInheritance.test()
+                super@KotlinClassIndirectInheritance.test()
             }
         }
     }
@@ -120,14 +120,14 @@ class KotlinClassInderectInheritance : KotlinClass() {
 
             object  {
                 fun run () {
-                    super@KotlinClassInderectInheritance.test()
+                    super@KotlinClassIndirectInheritance.test()
                 }
             }
             return ""
         }
 }
 
-class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance {
+class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
     fun foo(){
         <!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET!>testStatic<!>()
         super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET!>test<!>()
@@ -135,7 +135,7 @@ class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance {
 
         object  {
             fun run () {
-                super@KotlinClassInderectInheritance2.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET!>test<!>()
+                super@KotlinClassIndirectInheritance2.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET!>test<!>()
             }
         }
     }
@@ -147,7 +147,7 @@ class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance {
 
             object  {
                 fun run () {
-                    super@KotlinClassInderectInheritance2.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET!>test<!>()
+                    super@KotlinClassIndirectInheritance2.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET!>test<!>()
                 }
             }
             return ""
@@ -158,11 +158,11 @@ fun test() {
     JavaInterface.<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET!>testStatic<!>()
     KotlinClass().foo()
     KotlinClass().property
-    KotlinClassInderectInheritance2().foo()
-    KotlinClassInderectInheritance2().property
+    KotlinClassIndirectInheritance2().foo()
+    KotlinClassIndirectInheritance2().property
 
     KotlinClass().test()
     KotlinClass().property
     KotlinClass().testOverride()
-    KotlinClassInderectInheritance().testOverride()
+    KotlinClassIndirectInheritance().testOverride()
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/defaultMethods_warning.txt b/compiler/testData/diagnostics/tests/j+k/defaultMethods_warning.txt
index fd4c9917a62..27dbcbff711 100644
--- a/compiler/testData/diagnostics/tests/j+k/defaultMethods_warning.txt
+++ b/compiler/testData/diagnostics/tests/j+k/defaultMethods_warning.txt
@@ -24,8 +24,8 @@ public open class KotlinClass : JavaInterface {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public final class KotlinClassInderectInheritance : KotlinClass {
-    public constructor KotlinClassInderectInheritance()
+public final class KotlinClassIndirectInheritance : KotlinClass {
+    public constructor KotlinClassIndirectInheritance()
     public final override /*1*/ /*fake_override*/ val property: kotlin.String
     public final val property2: kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -37,8 +37,8 @@ public final class KotlinClassInderectInheritance : KotlinClass {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public final class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance {
-    public constructor KotlinClassInderectInheritance2()
+public final class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
+    public constructor KotlinClassIndirectInheritance2()
     public final val property: kotlin.String
     public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String
     public open override /*1*/ /*fake_override*/ val propertyyy: kotlin.String
@@ -62,7 +62,7 @@ public interface KotlinInterface : JavaInterface {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public interface KotlinInterfaceInderectInheritance : KotlinInterface {
+public interface KotlinInterfaceIndirectInheritance : KotlinInterface {
     public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String
     public open val propertyyy: kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverride.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverride.kt
index 58e6b9a382a..d186a17f081 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverride.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverride.kt
@@ -36,7 +36,7 @@ interface KotlinInterfaceForIndirect : JavaInterface {
 
 }
 
-interface KotlinInterfaceInderectInheritance : KotlinInterfaceForIndirect {
+interface KotlinInterfaceIndirectInheritance : KotlinInterfaceForIndirect {
 
     @JvmDefault
     override fun test() {}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverride.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverride.txt
index 026bc133cce..b24afc80609 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverride.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverride.txt
@@ -33,7 +33,7 @@ public interface KotlinInterfaceForIndirect : JavaInterface {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public interface KotlinInterfaceInderectInheritance : KotlinInterfaceForIndirect {
+public interface KotlinInterfaceIndirectInheritance : KotlinInterfaceForIndirect {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     @kotlin.jvm.JvmDefault public open override /*1*/ fun test(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaults.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaults.kt
index f7e49d692c5..b86bde5d9d0 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaults.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaults.kt
@@ -105,7 +105,7 @@ interface KotlinInterface : KInterface {
 
 }
 
-interface KotlinInterfaceInderectInheritance : KotlinInterface {
+interface KotlinInterfaceIndirectInheritance : KotlinInterface {
     @JvmDefault
     fun foooo() {
         super.test()
@@ -116,11 +116,11 @@ interface KotlinInterfaceInderectInheritance : KotlinInterface {
 
         object  {
             fun run () {
-                super@KotlinInterfaceInderectInheritance.test()
-                super@KotlinInterfaceInderectInheritance.property
+                super@KotlinInterfaceIndirectInheritance.test()
+                super@KotlinInterfaceIndirectInheritance.property
 
-                super@KotlinInterfaceInderectInheritance.testNonDefault()
-                super@KotlinInterfaceInderectInheritance.propertyNonDefault
+                super@KotlinInterfaceIndirectInheritance.testNonDefault()
+                super@KotlinInterfaceIndirectInheritance.propertyNonDefault
             }
         }
     }
@@ -136,11 +136,11 @@ interface KotlinInterfaceInderectInheritance : KotlinInterface {
 
             object  {
                 fun run () {
-                    super@KotlinInterfaceInderectInheritance.test()
-                    super@KotlinInterfaceInderectInheritance.property
+                    super@KotlinInterfaceIndirectInheritance.test()
+                    super@KotlinInterfaceIndirectInheritance.property
 
-                    super@KotlinInterfaceInderectInheritance.testNonDefault()
-                    super@KotlinInterfaceInderectInheritance.propertyNonDefault
+                    super@KotlinInterfaceIndirectInheritance.testNonDefault()
+                    super@KotlinInterfaceIndirectInheritance.propertyNonDefault
                 }
             }
             return ""
@@ -155,11 +155,11 @@ interface KotlinInterfaceInderectInheritance : KotlinInterface {
 
         object  {
             fun run () {
-                super@KotlinInterfaceInderectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
-                super@KotlinInterfaceInderectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>property<!>
+                super@KotlinInterfaceIndirectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
+                super@KotlinInterfaceIndirectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>property<!>
 
-                super@KotlinInterfaceInderectInheritance.testNonDefault()
-                super@KotlinInterfaceInderectInheritance.propertyNonDefault
+                super@KotlinInterfaceIndirectInheritance.testNonDefault()
+                super@KotlinInterfaceIndirectInheritance.propertyNonDefault
             }
         }
     }
@@ -174,11 +174,11 @@ interface KotlinInterfaceInderectInheritance : KotlinInterface {
 
             object  {
                 fun run () {
-                    super@KotlinInterfaceInderectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
-                    super@KotlinInterfaceInderectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>property<!>
+                    super@KotlinInterfaceIndirectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
+                    super@KotlinInterfaceIndirectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>property<!>
 
-                    super@KotlinInterfaceInderectInheritance.testNonDefault()
-                    super@KotlinInterfaceInderectInheritance.propertyNonDefault
+                    super@KotlinInterfaceIndirectInheritance.testNonDefault()
+                    super@KotlinInterfaceIndirectInheritance.propertyNonDefault
                 }
             }
             return ""
@@ -226,7 +226,7 @@ open class KotlinClass : KInterface {
         }
 }
 
-class KotlinClassInderectInheritance : KotlinClass() {
+class KotlinClassIndirectInheritance : KotlinClass() {
     fun foo2() {
         super.test()
         super.property
@@ -236,11 +236,11 @@ class KotlinClassInderectInheritance : KotlinClass() {
 
         object  {
             fun run () {
-                super@KotlinClassInderectInheritance.test()
-                super@KotlinClassInderectInheritance.property
+                super@KotlinClassIndirectInheritance.test()
+                super@KotlinClassIndirectInheritance.property
 
-                super@KotlinClassInderectInheritance.testNonDefault()
-                super@KotlinClassInderectInheritance.propertyNonDefault
+                super@KotlinClassIndirectInheritance.testNonDefault()
+                super@KotlinClassIndirectInheritance.propertyNonDefault
             }
         }
 
@@ -256,18 +256,18 @@ class KotlinClassInderectInheritance : KotlinClass() {
 
             object  {
                 fun run () {
-                    super@KotlinClassInderectInheritance.test()
-                    super@KotlinClassInderectInheritance.property
+                    super@KotlinClassIndirectInheritance.test()
+                    super@KotlinClassIndirectInheritance.property
 
-                    super@KotlinClassInderectInheritance.testNonDefault()
-                    super@KotlinClassInderectInheritance.propertyNonDefault
+                    super@KotlinClassIndirectInheritance.testNonDefault()
+                    super@KotlinClassIndirectInheritance.propertyNonDefault
                 }
             }
             return ""
         }
 }
 
-class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance {
+class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
     fun foo() {
         super.test()
         super.property
@@ -277,11 +277,11 @@ class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance {
 
         object  {
             fun run () {
-                super@KotlinClassInderectInheritance2.test()
-                super@KotlinClassInderectInheritance2.property
+                super@KotlinClassIndirectInheritance2.test()
+                super@KotlinClassIndirectInheritance2.property
 
-                super@KotlinClassInderectInheritance2.testNonDefault()
-                super@KotlinClassInderectInheritance2.propertyNonDefault
+                super@KotlinClassIndirectInheritance2.testNonDefault()
+                super@KotlinClassIndirectInheritance2.propertyNonDefault
             }
         }
     }
@@ -296,11 +296,11 @@ class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance {
 
             object  {
                 fun run () {
-                    super@KotlinClassInderectInheritance2.test()
-                    super@KotlinClassInderectInheritance2.property
+                    super@KotlinClassIndirectInheritance2.test()
+                    super@KotlinClassIndirectInheritance2.property
 
-                    super@KotlinClassInderectInheritance2.testNonDefault()
-                    super@KotlinClassInderectInheritance2.propertyNonDefault
+                    super@KotlinClassIndirectInheritance2.testNonDefault()
+                    super@KotlinClassIndirectInheritance2.propertyNonDefault
                 }
             }
             return ""
@@ -311,10 +311,10 @@ fun test() {
     KotlinClass().test()
     KotlinClass().property
     KotlinClass().propertyNonDefault
-    KotlinClassInderectInheritance2().test()
-    KotlinClassInderectInheritance2().testNonDefault()
-    KotlinClassInderectInheritance2().propertyyy
-    KotlinClassInderectInheritance2().propertyyyNonDefault
+    KotlinClassIndirectInheritance2().test()
+    KotlinClassIndirectInheritance2().testNonDefault()
+    KotlinClassIndirectInheritance2().propertyyy
+    KotlinClassIndirectInheritance2().propertyyyNonDefault
 
     KotlinClass().test()
     KotlinClass().testNonDefault()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaults.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaults.txt
index 6920a3938dd..400f40a13c2 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaults.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaults.txt
@@ -25,8 +25,8 @@ public open class KotlinClass : KInterface {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public final class KotlinClassInderectInheritance : KotlinClass {
-    public constructor KotlinClassInderectInheritance()
+public final class KotlinClassIndirectInheritance : KotlinClass {
+    public constructor KotlinClassIndirectInheritance()
     @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val property: kotlin.String
     public final val property2: kotlin.String
     public open override /*1*/ /*fake_override*/ val propertyNonDefault: kotlin.String
@@ -40,8 +40,8 @@ public final class KotlinClassInderectInheritance : KotlinClass {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public final class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance {
-    public constructor KotlinClassInderectInheritance2()
+public final class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
+    public constructor KotlinClassIndirectInheritance2()
     @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val property: kotlin.String
     public open override /*1*/ /*fake_override*/ val propertyNonDefault: kotlin.String
     @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String
@@ -75,7 +75,7 @@ public interface KotlinInterface : KInterface {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public interface KotlinInterfaceInderectInheritance : KotlinInterface {
+public interface KotlinInterfaceIndirectInheritance : KotlinInterface {
     @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val property: kotlin.String
     public open override /*1*/ /*fake_override*/ val propertyNonDefault: kotlin.String
     @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultsWithJava.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultsWithJava.kt
index 52406193d6f..1eb5a82f280 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultsWithJava.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultsWithJava.kt
@@ -46,14 +46,14 @@ interface KotlinInterface : JavaInterface {
     }
 }
 
-interface KotlinInterfaceInderectInheritance : KotlinInterface {
+interface KotlinInterfaceIndirectInheritance : KotlinInterface {
     @JvmDefault
     fun foooo() {
         super.test()
 
         object  {
             fun run () {
-                super@KotlinInterfaceInderectInheritance.test()
+                super@KotlinInterfaceIndirectInheritance.test()
             }
         }
     }
@@ -65,7 +65,7 @@ interface KotlinInterfaceInderectInheritance : KotlinInterface {
 
             object  {
                 fun run () {
-                    super@KotlinInterfaceInderectInheritance.test()
+                    super@KotlinInterfaceIndirectInheritance.test()
                 }
             }
             return ""
@@ -98,14 +98,14 @@ open class KotlinClass : JavaInterface {
         }
 }
 
-class KotlinClassInderectInheritance : KotlinClass() {
+class KotlinClassIndirectInheritance : KotlinClass() {
     fun foo2() {
         super.test()
         super.testOverride()
 
         object  {
             fun run () {
-                super@KotlinClassInderectInheritance.test()
+                super@KotlinClassIndirectInheritance.test()
             }
         }
     }
@@ -117,21 +117,21 @@ class KotlinClassInderectInheritance : KotlinClass() {
 
             object  {
                 fun run () {
-                    super@KotlinClassInderectInheritance.test()
+                    super@KotlinClassIndirectInheritance.test()
                 }
             }
             return ""
         }
 }
 
-class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance {
+class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
     fun foo() {
         super.test()
         super.testOverride()
 
         object  {
             fun run () {
-                super@KotlinClassInderectInheritance2.test()
+                super@KotlinClassIndirectInheritance2.test()
             }
         }
     }
@@ -143,7 +143,7 @@ class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance {
 
             object  {
                 fun run () {
-                    super@KotlinClassInderectInheritance2.test()
+                    super@KotlinClassIndirectInheritance2.test()
                 }
             }
             return ""
@@ -153,11 +153,11 @@ class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance {
 fun test() {
     KotlinClass().foo()
     KotlinClass().property
-    KotlinClassInderectInheritance2().foo()
-    KotlinClassInderectInheritance2().property
+    KotlinClassIndirectInheritance2().foo()
+    KotlinClassIndirectInheritance2().property
 
     KotlinClass().test()
     KotlinClass().property
     KotlinClass().testOverride()
-    KotlinClassInderectInheritance().testOverride()
+    KotlinClassIndirectInheritance().testOverride()
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultsWithJava.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultsWithJava.txt
index a4459f2f68c..d6bf75a67d4 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultsWithJava.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultsWithJava.txt
@@ -21,8 +21,8 @@ public open class KotlinClass : JavaInterface {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public final class KotlinClassInderectInheritance : KotlinClass {
-    public constructor KotlinClassInderectInheritance()
+public final class KotlinClassIndirectInheritance : KotlinClass {
+    public constructor KotlinClassIndirectInheritance()
     public final override /*1*/ /*fake_override*/ val property: kotlin.String
     public final val property2: kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -34,8 +34,8 @@ public final class KotlinClassInderectInheritance : KotlinClass {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public final class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance {
-    public constructor KotlinClassInderectInheritance2()
+public final class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
+    public constructor KotlinClassIndirectInheritance2()
     public final val property: kotlin.String
     @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String
     @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val propertyyy: kotlin.String
@@ -59,7 +59,7 @@ public interface KotlinInterface : JavaInterface {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public interface KotlinInterfaceInderectInheritance : KotlinInterface {
+public interface KotlinInterfaceIndirectInheritance : KotlinInterface {
     @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String
     @kotlin.jvm.JvmDefault public open val propertyyy: kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean