From 0dac2e3d60fa0a1c29d63cada9b0f0d19c6ca3c5 Mon Sep 17 00:00:00 2001
From: Alexey Belkov <alexey.belkov@jetbrains.com>
Date: Tue, 22 Nov 2022 16:44:55 +0400
Subject: [PATCH] [kotlin] rename "trait" to "interface" in testdata files

GitOrigin-RevId: 07fa5555d704a3cdf7cb3754486323fee83a0209
---
 .../tests/K2IntentionTestGenerated.java       |   6 +-
 .../completion/testData/injava/Class.java     |   2 +-
 .../testData/injava/ClassesFromNamespace.java |   2 +-
 ...{TraitMember.java => InterfaceMember.java} |   2 +-
 .../injava/mockLib/mockLib/foo/main.kt        |   2 +-
 ...edKotlinInJavaCompletionTestGenerated.java |  10 +-
 ...inSourceInJavaCompletionTestGenerated.java |  10 +-
 .../codeInsight/FirOverrideImplementTest.kt   |  12 +-
 ...ghLevelQuickFixMultiFileTestGenerated.java |  16 +-
 .../HighLevelQuickFixTestGenerated.java       |  12 +-
 ...nstKotlinBinariesCheckerTestGenerated.java |   6 +-
 ...ainstKotlinSourceCheckerTestGenerated.java |   6 +-
 .../KotlinHighlightVisitorTestGenerated.java  |  30 +--
 .../InsertImportOnPasteTestGenerated.java     |  20 +-
 .../codeInsight/LineMarkersTestGenerated.java |  46 ++---
 .../idea/codeInsight/OverrideImplementTest.kt |   8 +-
 .../hierarchy/HierarchyTestGenerated.java     |  56 +++---
 .../HighlightingTestGenerated.java            |  10 +-
 .../intentions/K1IntentionTestGenerated.java  |   6 +-
 .../idea/javaFacade/KotlinJavaFacadeTest.java |   6 +-
 .../navigation/GotoSuperTestGenerated.java    |  10 +-
 ...KotlinGotoImplementationMultifileTest.java |   2 +-
 ...KotlinGotoImplementationTestGenerated.java |  10 +-
 .../navigation/KotlinGotoTestGenerated.java   |  16 +-
 .../QuickFixMultiFileTestGenerated.java       |  64 +++----
 .../idea/quickfix/QuickFixTestGenerated.java  | 172 +++++++++---------
 .../introduce/ExtractionTestGenerated.java    |  28 +--
 .../safeDelete/SafeDeleteTestGenerated.java   |  20 +-
 .../ReferenceResolveInJavaTestGenerated.java  |  12 +-
 .../tests/testData/checker/Abstract.fir.kt    |   2 +-
 .../idea/tests/testData/checker/Abstract.kt   |   2 +-
 ...t.fir.kt => InterfaceSupertypeList.fir.kt} |   0
 ...rtypeList.kt => InterfaceSupertypeList.kt} |   0
 .../tests/testData/checker/Override.fir.kt    |  14 +-
 .../idea/tests/testData/checker/Override.kt   |  12 +-
 .../checker/OverridesAndGenerics.fir.kt       |  14 +-
 .../testData/checker/OverridesAndGenerics.kt  |  14 +-
 .../{trait.kt => interface.kt}                |   0
 .../twoInterfaces.kt}                         |   0
 .../ClassObjectInStaticNestedClass.kt         |   6 +-
 ....kt => FakeOverrideToStringInInterface.kt} |   0
 ...> FakeOverridesForInterfaceFunWithImpl.kt} |   0
 .../{Trait.kt => Interface.kt}                |   0
 ...OverridingMarkerOnDefaultInterfaceImpl.kt} |   0
 ...s.kt => OverridenInterfaceDeclarations.kt} |   0
 ...verridingTooltipOnDefaultInterfaceImpl.kt} |   0
 ...tringInTrait.kt => ToStringInInterface.kt} |   0
 .../foo/JavaClass.java                        |   0
 .../foo/JavaClass.java.after                  |   0
 .../foo/KotlinInterface.kt}                   |   2 +-
 .../functionWithTypeParameters.kt             |   4 +-
 .../functionWithTypeParameters.kt.after       |   4 +-
 ...lement.kt => interfaceGenericImplement.kt} |   0
 ...ter => interfaceGenericImplement.kt.after} |   0
 ...nction.kt => interfaceNullableFunction.kt} |   0
 ...ter => interfaceNullableFunction.kt.after} |   0
 .../AlreadyImportedViaStar.expected.kt        |   2 +-
 .../AlreadyImportedViaStar.expected.names     |   2 +-
 .../imports/AlreadyImportedViaStar.kt         |   4 +-
 .../imports/ClassObjectInner.expected.kt      |   2 +-
 .../imports/ClassObjectInner.expected.names   |   2 +-
 .../copyPaste/imports/ClassObjectInner.kt     |   6 +-
 .../DependencyOnKotlinLibrary.expected.kt     |   2 +-
 .../DependencyOnKotlinLibrary.expected.names  |   2 +-
 .../imports/DependencyOnKotlinLibrary.kt      |   2 +-
 .../imports/ImportDependency.dependency.kt    |   2 +-
 .../imports/ImportDependency.expected.kt      |   2 +-
 .../imports/ImportDependency.expected.names   |   2 +-
 .../copyPaste/imports/ImportDependency.kt     |   2 +-
 .../imports/ImportedElementCopied.expected.kt |   6 +-
 .../imports/ImportedElementCopied.kt          |   4 +-
 .../copyPaste/imports/Inner.expected.kt       |   2 +-
 .../copyPaste/imports/Inner.expected.names    |   2 +-
 .../tests/testData/copyPaste/imports/Inner.kt |   4 +-
 ...rait.expected.kt => Interface.expected.kt} |   0
 ...xpected.names => Interface.expected.names} |   0
 .../imports/{Trait.kt => Interface.kt}        |   0
 .../imports/KotlinLibrary/Dependency.kt       |   2 +-
 .../NoImportForSamePackage.expected.kt        |   2 +-
 .../NoImportForSamePackage.expected.names     |   2 +-
 .../imports/NoImportForSamePackage.kt         |   4 +-
 .../decompiler/navigation/library/main.kt     |   8 +-
 .../InheritingClasses/InheritingClasses.kt    |  12 +-
 .../InheritingClasses/InheritingClasses.txt   |  24 +--
 .../AllFromInterface_verification.xml}        |   0
 .../main.kt                                   |   0
 .../ClassFromInterface_verification.xml}      |   0
 .../main.kt                                   |   0
 .../InterfaceFromClass_verification.xml}      |   0
 .../main.kt                                   |   0
 .../InterfaceFromInterface_verification.xml}  |   0
 .../main.kt                                   |   0
 .../ObjectFromInterface_verification.xml}     |   0
 .../main.kt                                   |   0
 .../TwoInterfaces_verification.xml}           |   0
 .../{TwoTraits => TwoInterfaces}/main.kt      |   0
 ...otlinFunctionInInterface_verification.xml} |   0
 .../main0.kt                                  |   0
 .../main1.java                                |   0
 ...otlinPropertyInInterface_verification.xml} |   0
 .../main0.kt                                  |   0
 .../main1.java                                |   0
 .../highlighter/TypesAndAnnotations.kt        |   4 +-
 .../highlighter/deprecated/ClassObject.kt     |  12 +-
 .../highlighter/deprecated/Interface.kt       |  14 ++
 .../testData/highlighter/deprecated/Trait.kt  |  14 --
 .../TypesAndAnnotations.kt                    |   4 +-
 .../TypesAndAnnotations.kt.highlighting       |   4 +-
 .../parameter/paramPropertyOverride.kt        |   4 +-
 .../property/classMemberOverride.kt           |   6 +-
 ...ideInTrait.kt => onOverrideInInterface.kt} |   0
 ...Trait.kt => WrapFunWithImplInInterface.kt} |   0
 ...it.kt => WrapFunWithoutImplInInterface.kt} |   0
 ...rapVarPropertyWithAccessorsInInterface.kt} |   0
 .../AssignKotlinClassToObjectInJava.java      |   4 +-
 .../AssignKotlinClassToObjectInJava.kt        |   2 +-
 ... => ImplementedMethodsFromInterfaces.java} |   0
 ...kt => ImplementedMethodsFromInterfaces.kt} |   0
 .../UseKotlinSubclassesOfMappedTypes.java     |   2 +-
 .../UseKotlinSubclassesOfMappedTypes.kt       |   2 +-
 .../navigation/gotoClass/inClassObject.kt     |   8 +-
 .../gotoClass/interfaceWithFunImplement.kt    |  10 +
 .../navigation/gotoClass/localDeclarations.kt |   8 +-
 ...nTrait.kt => noImplementationInterface.kt} |   4 +-
 .../gotoClass/traitWithFunImplement.kt        |  10 -
 .../navigation/gotoClass/typealias.kt         |   6 +-
 ...{TraitSimple.test => InterfaceSimple.test} |   0
 .../navigation/gotoSymbol/properties.kt       |   8 +-
 .../navigation/gotoSymbol/typealias.kt        |   6 +-
 ...> InterfaceImplementorsWithDeclaration.kt} |   0
 .../ImplementJavaInterfaceInKotlin.kt         |   4 +-
 .../ImplementKotlinInterfaceInJava.java}      |   0
 .../ImplementKotlinInterfaceInJava.kt}        |   0
 .../autoImports/importInterface.after.kt      |   9 +
 .../importInterface.before.Dependency.kt      |   3 +
 .../importInterface.before.Main.kt            |   7 +
 ...portNullableInterfaceWithGenerics.after.kt |   9 +
 ...InterfaceWithGenerics.before.Dependency.kt |   3 +
 ...llableInterfaceWithGenerics.before.Main.kt |   7 +
 .../importNullableTraitWithGenerics.after.kt  |   9 -
 ...ableTraitWithGenerics.before.Dependency.kt |   3 -
 ...rtNullableTraitWithGenerics.before.Main.kt |   7 -
 .../quickfix/autoImports/importTrait.after.kt |   9 -
 .../importTrait.before.Dependency.kt          |   3 -
 .../autoImports/importTrait.before.Main.kt    |   7 -
 ...upertrait.kt => callWithSuperInterface.kt} |   0
 ....after => callWithSuperInterface.kt.after} |   0
 ...faceAndJavaReceiver.after.Dependency.java} |   0
 ...ithSuperInterfaceAndJavaReceiver.after.kt} |   0
 ...aceAndJavaReceiver.before.Dependency.java} |   0
 ...erInterfaceAndJavaReceiver.before.Main.kt} |   0
 ...orToNestedGroovySuperclass.before.Main.kt} |   0
 ...roovySuperclass.before.data.Sample.groovy} |   0
 ...estedJavaSuperclass.after.Dependency.java} |   0
 ...eDelegatorToNestedJavaSuperclass.after.kt} |   0
 ...stedJavaSuperclass.before.Dependency.java} |   0
 ...atorToNestedJavaSuperclass.before.Main.kt} |   0
 ...s.kt => interfaceDelegatorToSuperclass.kt} |   0
 ...> interfaceDelegatorToSuperclass.kt.after} |   0
 ....kt => interfaceDelegatorToSuperclass2.kt} |   0
 ... interfaceDelegatorToSuperclass2.kt.after} |   0
 ...raitInPackage.kt => interfaceInPackage.kt} |   0
 ...e.kt.after => interfaceInPackage.kt.after} |   0
 ...ceWithJavaQualifier.after.Dependency.java} |   0
 ...kt => interfaceWithJavaQualifier.after.kt} |   0
 ...eWithJavaQualifier.before.Dependency.java} |   0
 ...interfaceWithJavaQualifier.before.Main.kt} |   0
 ...Qualifier.kt => interfaceWithQualifier.kt} |   0
 ....after => interfaceWithQualifier.kt.after} |   0
 ...NestedJavaQualifier.after.Dependency.java} |   0
 ...> interfaceByNestedJavaQualifier.after.kt} |   0
 ...estedJavaQualifier.before.Dependency.java} |   0
 ...rfaceByNestedJavaQualifier.before.Main.kt} |   0
 ...ByQualifier.kt => interfaceByQualifier.kt} |   0
 ...kt.after => interfaceByQualifier.kt.after} |   0
 ...itNoReceiver.kt => interfaceNoReceiver.kt} |   0
 ...ertrait.kt => objectWithSuperinterface.kt} |   0
 ...fter => objectWithSuperinterface.kt.after} |   0
 ...aceJavaTypeReceiver.after.Dependency.java} |   0
 ....kt => interfaceJavaTypeReceiver.after.kt} |   0
 ...ceJavaTypeReceiver.before.Dependency.java} |   0
 ... interfaceJavaTypeReceiver.before.Main.kt} |   0
 ....kt => interfaceNotQualifierNoTypeArgs.kt} |   0
 ... interfaceNotQualifierNoTypeArgs.kt.after} |   0
 ...nOnTrait.kt => extensionFunOnInterface.kt} |   0
 ...after => extensionFunOnInterface.kt.after} |   0
 .../call/{funOnTrait.kt => funOnInterface.kt} |   0
 ...Trait.kt.after => funOnInterface.kt.after} |   0
 ...sorInTrait.kt => inAccessorInInterface.kt} |   0
 ...kt => implementInterfaceFinalSupertype.kt} |   0
 ...implementInterfaceFinalSupertype.kt.after} |   0
 .../{finalTrait.kt => finalInterface.kt}      |   0
 ...Trait.kt.after => finalInterface.kt.after} |   0
 ...t.kt => removeInnerForClassInInterface.kt} |   0
 ...> removeInnerForClassInInterface.kt.after} |   0
 ...nctionTrait.kt => addFunctionInterface.kt} |   0
 ...kt.after => addFunctionInterface.kt.after} |   0
 ...oTraits.kt => addFunctionTwoInterfaces.kt} |   0
 ...fter => addFunctionTwoInterfaces.kt.after} |   0
 ...s.kt => addParameterTwoSuperinterfaces.kt} |   0
 ...> addParameterTwoSuperinterfaces.kt.after} |   0
 ...t.kt => changeParameterTypeInInterface.kt} |   0
 ...> changeParameterTypeInInterface.kt.after} |   0
 ...t => changeParameterTypeSuperInterface.kt} |   0
 ...hangeParameterTypeSuperInterface.kt.after} |   0
 ...its.kt => removeParameterTwoInterfaces.kt} |   0
 ... => removeParameterTwoInterfaces.kt.after} |   0
 .../{trait.kt => interface.kt}                |   0
 .../{trait.kt.after => interface.kt.after}    |   0
 ...{traitFunction.kt => interfaceFunction.kt} |   0
 ...on.kt.after => interfaceFunction.kt.after} |   0
 ...zyToTrait.kt => extractLazyToInterface.kt} |   0
 ...ts => extractLazyToInterface.kt.conflicts} |   0
 ...ait.kt => extractWithGetterToInterface.kt} |   0
 ... => extractWithGetterToInterface.kt.after} |   0
 ...t => extractWithInitializerToInterface.kt} |   0
 ...ctWithInitializerToInterface.kt.conflicts} |   0
 .../automaticRenamerParameter/after/main.kt   |   4 +-
 .../automaticRenamerParameter/before/main.kt  |   4 +-
 .../after/main.kt                             |   4 +-
 .../before/main.kt                            |   4 +-
 .../kotlinClass/{trait1.kt => interface1.kt}  |   0
 .../{trait1.kt.after => interface1.kt.after}  |   0
 .../kotlinClass/{trait2.kt => interface2.kt}  |   0
 .../{trait2.kt.after => interface2.kt.after}  |   0
 ...it2.kt.messages => interface2.kt.messages} |   0
 .../dependency/dependencies.kt                |  10 +-
 .../sourceOnly/ClassObjectStaticField.java    |   6 +-
 .../DelegatedMethodFromInterfaceNoImpl.java   |   9 +
 .../DelegatedMethodFromInterfaceWithImpl.java |   9 +
 .../DelegatedMethodFromTraitNoImpl.java       |   9 -
 .../DelegatedMethodFromTraitWithImpl.java     |   9 -
 ...ReceiverForExtensionFunctionOnSuperType.kt |   6 +-
 ...tAsReceiverForMemberPropertyInSuperType.kt |   4 +-
 .../structureView/fileStructure/Render.after  |   6 +-
 .../structureView/fileStructure/Render.kt     |   4 +-
 ...otlinConverterSingleFileTestGenerated.java |  10 +-
 ...etrizationWithTwoBoundsWithExtending.java} |   0
 ...ametrizationWithTwoBoundsWithExtending.kt} |   0
 .../K2IrKotlinSteppingTestGenerated.java      |  10 +-
 .../cases/K2PositionManagerTestGenerated.java |  10 +-
 ...KotlinEvaluateExpressionTestGenerated.java |   6 +-
 ...onWithIRFragmentCompilerTestGenerated.java |   6 +-
 .../test/IrKotlinSteppingTestGenerated.java   |  10 +-
 ...nEvaluateExpressionInMppTestGenerated.java |   6 +-
 ...KotlinEvaluateExpressionTestGenerated.java |   6 +-
 .../test/KotlinSteppingTestGenerated.java     |  10 +-
 .../test/PositionManagerTestGenerated.java    |  10 +-
 ...isInTrait.kt => extractThisInInterface.kt} |   2 +-
 ...InTrait.out => extractThisInInterface.out} |   4 +-
 .../{trait.kt => interface.kt}                |   0
 .../stepInto/{traits.kt => interfaces.kt}     |   2 +-
 .../testData/stepping/stepInto/interfaces.out |  34 ++++
 .../testData/stepping/stepInto/traits.out     |  34 ----
 .../PerformanceHighlightingTestGenerated.java |  10 +-
 .../safeDelete/K2SafeDeleteTestGenerated.java |  20 +-
 256 files changed, 635 insertions(+), 635 deletions(-)
 rename plugins/kotlin/completion/testData/injava/{TraitMember.java => InterfaceMember.java} (60%)
 rename plugins/kotlin/idea/tests/testData/checker/{TraitSupertypeList.fir.kt => InterfaceSupertypeList.fir.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/checker/{TraitSupertypeList.kt => InterfaceSupertypeList.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/checker/duplicateJvmSignature/functionAndProperty/{trait.kt => interface.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/checker/duplicateJvmSignature/{traitImpl/twoTraits.kt => interfaceImpl/twoInterfaces.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/{FakeOverrideToStringInTrait.kt => FakeOverrideToStringInInterface.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/{FakeOverridesForTraitFunWithImpl.kt => FakeOverridesForInterfaceFunWithImpl.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/{Trait.kt => Interface.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/{NoOverridingMarkerOnDefaultTraitImpl.kt => NoOverridingMarkerOnDefaultInterfaceImpl.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/{OverridenTraitDeclarations.kt => OverridenInterfaceDeclarations.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/{OverridingTooltipOnDefaultTraitImpl.kt => OverridingTooltipOnDefaultInterfaceImpl.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/{ToStringInTrait.kt => ToStringInInterface.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/{functionFromTraitInJava => functionFromInterfaceInJava}/foo/JavaClass.java (100%)
 rename plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/{functionFromTraitInJava => functionFromInterfaceInJava}/foo/JavaClass.java.after (100%)
 rename plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/{functionFromTraitInJava/foo/KotlinTrait.kt => functionFromInterfaceInJava/foo/KotlinInterface.kt} (78%)
 rename plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/{traitGenericImplement.kt => interfaceGenericImplement.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/{traitGenericImplement.kt.after => interfaceGenericImplement.kt.after} (100%)
 rename plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/{traitNullableFunction.kt => interfaceNullableFunction.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/{traitNullableFunction.kt.after => interfaceNullableFunction.kt.after} (100%)
 rename plugins/kotlin/idea/tests/testData/copyPaste/imports/{Trait.expected.kt => Interface.expected.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/copyPaste/imports/{Trait.expected.names => Interface.expected.names} (100%)
 rename plugins/kotlin/idea/tests/testData/copyPaste/imports/{Trait.kt => Interface.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/hierarchy/class/sub/{AllFromTrait/AllFromTrait_verification.xml => AllFromInterface/AllFromInterface_verification.xml} (100%)
 rename plugins/kotlin/idea/tests/testData/hierarchy/class/sub/{AllFromTrait => AllFromInterface}/main.kt (100%)
 rename plugins/kotlin/idea/tests/testData/hierarchy/class/sub/{ClassFromTrait/ClassFromTrait_verification.xml => ClassFromInterface/ClassFromInterface_verification.xml} (100%)
 rename plugins/kotlin/idea/tests/testData/hierarchy/class/sub/{ClassFromTrait => ClassFromInterface}/main.kt (100%)
 rename plugins/kotlin/idea/tests/testData/hierarchy/class/sub/{TraitFromClass/TraitFromClass_verification.xml => InterfaceFromClass/InterfaceFromClass_verification.xml} (100%)
 rename plugins/kotlin/idea/tests/testData/hierarchy/class/sub/{TraitFromClass => InterfaceFromClass}/main.kt (100%)
 rename plugins/kotlin/idea/tests/testData/hierarchy/class/sub/{TraitFromTrait/TraitFromTrait_verification.xml => InterfaceFromInterface/InterfaceFromInterface_verification.xml} (100%)
 rename plugins/kotlin/idea/tests/testData/hierarchy/class/sub/{TraitFromTrait => InterfaceFromInterface}/main.kt (100%)
 rename plugins/kotlin/idea/tests/testData/hierarchy/class/sub/{ObjectFromTrait/ObjectFromTrait_verification.xml => ObjectFromInterface/ObjectFromInterface_verification.xml} (100%)
 rename plugins/kotlin/idea/tests/testData/hierarchy/class/sub/{ObjectFromTrait => ObjectFromInterface}/main.kt (100%)
 rename plugins/kotlin/idea/tests/testData/hierarchy/class/super/{TwoTraits/TwoTraits_verification.xml => TwoInterfaces/TwoInterfaces_verification.xml} (100%)
 rename plugins/kotlin/idea/tests/testData/hierarchy/class/super/{TwoTraits => TwoInterfaces}/main.kt (100%)
 rename plugins/kotlin/idea/tests/testData/hierarchy/overrides/{kotlinFunctionInTrait/KotlinFunctionInTrait_verification.xml => kotlinFunctionInInterface/KotlinFunctionInInterface_verification.xml} (100%)
 rename plugins/kotlin/idea/tests/testData/hierarchy/overrides/{kotlinFunctionInTrait => kotlinFunctionInInterface}/main0.kt (100%)
 rename plugins/kotlin/idea/tests/testData/hierarchy/overrides/{kotlinFunctionInTrait => kotlinFunctionInInterface}/main1.java (100%)
 rename plugins/kotlin/idea/tests/testData/hierarchy/overrides/{kotlinPropertyInTrait/KotlinPropertyInTrait_verification.xml => kotlinPropertyInInterface/KotlinPropertyInInterface_verification.xml} (100%)
 rename plugins/kotlin/idea/tests/testData/hierarchy/overrides/{kotlinPropertyInTrait => kotlinPropertyInInterface}/main0.kt (100%)
 rename plugins/kotlin/idea/tests/testData/hierarchy/overrides/{kotlinPropertyInTrait => kotlinPropertyInInterface}/main1.java (100%)
 create mode 100644 plugins/kotlin/idea/tests/testData/highlighter/deprecated/Interface.kt
 delete mode 100644 plugins/kotlin/idea/tests/testData/highlighter/deprecated/Trait.kt
 rename plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/{onOverrideInTrait.kt => onOverrideInInterface.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/javaFacade/{WrapFunWithImplInTrait.kt => WrapFunWithImplInInterface.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/javaFacade/{WrapFunWithoutImplInTrait.kt => WrapFunWithoutImplInInterface.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/javaFacade/{WrapVarPropertyWithAccessorsInTrait.kt => WrapVarPropertyWithAccessorsInInterface.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/kotlinAndJavaChecker/javaAgainstKotlin/{ImplementedMethodsFromTraits.java => ImplementedMethodsFromInterfaces.java} (100%)
 rename plugins/kotlin/idea/tests/testData/kotlinAndJavaChecker/javaAgainstKotlin/{ImplementedMethodsFromTraits.kt => ImplementedMethodsFromInterfaces.kt} (100%)
 create mode 100644 plugins/kotlin/idea/tests/testData/navigation/gotoClass/interfaceWithFunImplement.kt
 rename plugins/kotlin/idea/tests/testData/navigation/gotoClass/{noImplementationTrait.kt => noImplementationInterface.kt} (52%)
 delete mode 100644 plugins/kotlin/idea/tests/testData/navigation/gotoClass/traitWithFunImplement.kt
 rename plugins/kotlin/idea/tests/testData/navigation/gotoSuper/{TraitSimple.test => InterfaceSimple.test} (100%)
 rename plugins/kotlin/idea/tests/testData/navigation/implementations/{TraitImplementorsWithDeclaration.kt => InterfaceImplementorsWithDeclaration.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/{ImplementKotlinTraitInJava/ImplementKotlinTraitInJava.java => ImplementKotlinInterfaceInJava/ImplementKotlinInterfaceInJava.java} (100%)
 rename plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/{ImplementKotlinTraitInJava/ImplementKotlinTraitInJava.kt => ImplementKotlinInterfaceInJava/ImplementKotlinInterfaceInJava.kt} (100%)
 create mode 100644 plugins/kotlin/idea/tests/testData/quickfix/autoImports/importInterface.after.kt
 create mode 100644 plugins/kotlin/idea/tests/testData/quickfix/autoImports/importInterface.before.Dependency.kt
 create mode 100644 plugins/kotlin/idea/tests/testData/quickfix/autoImports/importInterface.before.Main.kt
 create mode 100644 plugins/kotlin/idea/tests/testData/quickfix/autoImports/importNullableInterfaceWithGenerics.after.kt
 create mode 100644 plugins/kotlin/idea/tests/testData/quickfix/autoImports/importNullableInterfaceWithGenerics.before.Dependency.kt
 create mode 100644 plugins/kotlin/idea/tests/testData/quickfix/autoImports/importNullableInterfaceWithGenerics.before.Main.kt
 delete mode 100644 plugins/kotlin/idea/tests/testData/quickfix/autoImports/importNullableTraitWithGenerics.after.kt
 delete mode 100644 plugins/kotlin/idea/tests/testData/quickfix/autoImports/importNullableTraitWithGenerics.before.Dependency.kt
 delete mode 100644 plugins/kotlin/idea/tests/testData/quickfix/autoImports/importNullableTraitWithGenerics.before.Main.kt
 delete mode 100644 plugins/kotlin/idea/tests/testData/quickfix/autoImports/importTrait.after.kt
 delete mode 100644 plugins/kotlin/idea/tests/testData/quickfix/autoImports/importTrait.before.Dependency.kt
 delete mode 100644 plugins/kotlin/idea/tests/testData/quickfix/autoImports/importTrait.before.Main.kt
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/{callWithSupertrait.kt => callWithSuperInterface.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/{callWithSupertrait.kt.after => callWithSuperInterface.kt.after} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/{callWithSupertraitAndJavaReceiver.after.Dependency.java => callWithSuperInterfaceAndJavaReceiver.after.Dependency.java} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/{callWithSupertraitAndJavaReceiver.after.kt => callWithSuperInterfaceAndJavaReceiver.after.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/{callWithSupertraitAndJavaReceiver.before.Dependency.java => callWithSuperInterfaceAndJavaReceiver.before.Dependency.java} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/{callWithSupertraitAndJavaReceiver.before.Main.kt => callWithSuperInterfaceAndJavaReceiver.before.Main.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/{traitDelegatorToNestedGroovySuperclass.before.Main.kt => interfaceDelegatorToNestedGroovySuperclass.before.Main.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/{traitDelegatorToNestedGroovySuperclass.before.data.Sample.groovy => interfaceDelegatorToNestedGroovySuperclass.before.data.Sample.groovy} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/{traitDelegatorToNestedJavaSuperclass.after.Dependency.java => interfaceDelegatorToNestedJavaSuperclass.after.Dependency.java} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/{traitDelegatorToNestedJavaSuperclass.after.kt => interfaceDelegatorToNestedJavaSuperclass.after.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/{traitDelegatorToNestedJavaSuperclass.before.Dependency.java => interfaceDelegatorToNestedJavaSuperclass.before.Dependency.java} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/{traitDelegatorToNestedJavaSuperclass.before.Main.kt => interfaceDelegatorToNestedJavaSuperclass.before.Main.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/{traitDelegatorToSuperclass.kt => interfaceDelegatorToSuperclass.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/{traitDelegatorToSuperclass.kt.after => interfaceDelegatorToSuperclass.kt.after} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/{traitDelegatorToSuperclass2.kt => interfaceDelegatorToSuperclass2.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/{traitDelegatorToSuperclass2.kt.after => interfaceDelegatorToSuperclass2.kt.after} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/{traitInPackage.kt => interfaceInPackage.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/{traitInPackage.kt.after => interfaceInPackage.kt.after} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/{traitWithJavaQualifier.after.Dependency.java => interfaceWithJavaQualifier.after.Dependency.java} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/{traitWithJavaQualifier.after.kt => interfaceWithJavaQualifier.after.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/{traitWithJavaQualifier.before.Dependency.java => interfaceWithJavaQualifier.before.Dependency.java} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/{traitWithJavaQualifier.before.Main.kt => interfaceWithJavaQualifier.before.Main.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/{traitWithQualifier.kt => interfaceWithQualifier.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/{traitWithQualifier.kt.after => interfaceWithQualifier.kt.after} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/{traitByNestedJavaQualifier.after.Dependency.java => interfaceByNestedJavaQualifier.after.Dependency.java} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/{traitByNestedJavaQualifier.after.kt => interfaceByNestedJavaQualifier.after.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/{traitByNestedJavaQualifier.before.Dependency.java => interfaceByNestedJavaQualifier.before.Dependency.java} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/{traitByNestedJavaQualifier.before.Main.kt => interfaceByNestedJavaQualifier.before.Main.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/{traitByQualifier.kt => interfaceByQualifier.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/{traitByQualifier.kt.after => interfaceByQualifier.kt.after} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/{traitNoReceiver.kt => interfaceNoReceiver.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/{objectWithSupertrait.kt => objectWithSuperinterface.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/{objectWithSupertrait.kt.after => objectWithSuperinterface.kt.after} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/{traitJavaTypeReceiver.after.Dependency.java => interfaceJavaTypeReceiver.after.Dependency.java} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/{traitJavaTypeReceiver.after.kt => interfaceJavaTypeReceiver.after.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/{traitJavaTypeReceiver.before.Dependency.java => interfaceJavaTypeReceiver.before.Dependency.java} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/{traitJavaTypeReceiver.before.Main.kt => interfaceJavaTypeReceiver.before.Main.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/{traitNotQualifierNoTypeArgs.kt => interfaceNotQualifierNoTypeArgs.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/{traitNotQualifierNoTypeArgs.kt.after => interfaceNotQualifierNoTypeArgs.kt.after} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/{extensionFunOnTrait.kt => extensionFunOnInterface.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/{extensionFunOnTrait.kt.after => extensionFunOnInterface.kt.after} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/{funOnTrait.kt => funOnInterface.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/{funOnTrait.kt.after => funOnInterface.kt.after} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/{inAccessorInTrait.kt => inAccessorInInterface.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/modifiers/addOpenToClassDeclaration/{implementTraitFinalSupertype.kt => implementInterfaceFinalSupertype.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/modifiers/addOpenToClassDeclaration/{implementTraitFinalSupertype.kt.after => implementInterfaceFinalSupertype.kt.after} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/modifiers/{finalTrait.kt => finalInterface.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/modifiers/{finalTrait.kt.after => finalInterface.kt.after} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/modifiers/{removeInnerForClassInTrait.kt => removeInnerForClassInInterface.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/modifiers/{removeInnerForClassInTrait.kt.after => removeInnerForClassInInterface.kt.after} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/{addFunctionTrait.kt => addFunctionInterface.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/{addFunctionTrait.kt.after => addFunctionInterface.kt.after} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/{addFunctionTwoTraits.kt => addFunctionTwoInterfaces.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/{addFunctionTwoTraits.kt.after => addFunctionTwoInterfaces.kt.after} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/{addParameterTwoSupertraits.kt => addParameterTwoSuperinterfaces.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/{addParameterTwoSupertraits.kt.after => addParameterTwoSuperinterfaces.kt.after} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/{changeParameterTypeInTrait.kt => changeParameterTypeInInterface.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/{changeParameterTypeInTrait.kt.after => changeParameterTypeInInterface.kt.after} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/{changeParameterTypeSuperTrait.kt => changeParameterTypeSuperInterface.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/{changeParameterTypeSuperTrait.kt.after => changeParameterTypeSuperInterface.kt.after} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/{removeParameterTwoTraits.kt => removeParameterTwoInterfaces.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/{removeParameterTwoTraits.kt.after => removeParameterTwoInterfaces.kt.after} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/suppress/declarationKinds/{trait.kt => interface.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/quickfix/suppress/declarationKinds/{trait.kt.after => interface.kt.after} (100%)
 rename plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/{traitFunction.kt => interfaceFunction.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/{traitFunction.kt.after => interfaceFunction.kt.after} (100%)
 rename plugins/kotlin/idea/tests/testData/refactoring/introduceProperty/{extractLazyToTrait.kt => extractLazyToInterface.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/refactoring/introduceProperty/{extractLazyToTrait.kt.conflicts => extractLazyToInterface.kt.conflicts} (100%)
 rename plugins/kotlin/idea/tests/testData/refactoring/introduceProperty/{extractWithGetterToTrait.kt => extractWithGetterToInterface.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/refactoring/introduceProperty/{extractWithGetterToTrait.kt.after => extractWithGetterToInterface.kt.after} (100%)
 rename plugins/kotlin/idea/tests/testData/refactoring/introduceProperty/{extractWithInitializerToTrait.kt => extractWithInitializerToInterface.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/refactoring/introduceProperty/{extractWithInitializerToTrait.kt.conflicts => extractWithInitializerToInterface.kt.conflicts} (100%)
 rename plugins/kotlin/idea/tests/testData/refactoring/safeDelete/deleteClass/kotlinClass/{trait1.kt => interface1.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/refactoring/safeDelete/deleteClass/kotlinClass/{trait1.kt.after => interface1.kt.after} (100%)
 rename plugins/kotlin/idea/tests/testData/refactoring/safeDelete/deleteClass/kotlinClass/{trait2.kt => interface2.kt} (100%)
 rename plugins/kotlin/idea/tests/testData/refactoring/safeDelete/deleteClass/kotlinClass/{trait2.kt.after => interface2.kt.after} (100%)
 rename plugins/kotlin/idea/tests/testData/refactoring/safeDelete/deleteClass/kotlinClass/{trait2.kt.messages => interface2.kt.messages} (100%)
 create mode 100644 plugins/kotlin/idea/tests/testData/resolve/referenceInJava/sourceOnly/DelegatedMethodFromInterfaceNoImpl.java
 create mode 100644 plugins/kotlin/idea/tests/testData/resolve/referenceInJava/sourceOnly/DelegatedMethodFromInterfaceWithImpl.java
 delete mode 100644 plugins/kotlin/idea/tests/testData/resolve/referenceInJava/sourceOnly/DelegatedMethodFromTraitNoImpl.java
 delete mode 100644 plugins/kotlin/idea/tests/testData/resolve/referenceInJava/sourceOnly/DelegatedMethodFromTraitWithImpl.java
 rename plugins/kotlin/j2k/new/tests/testData/newJ2k/typeParameters/{traitDoubleParametrizationWithTwoBoundsWithExtending.java => interfaceDoubleParametrizationWithTwoBoundsWithExtending.java} (100%)
 rename plugins/kotlin/j2k/new/tests/testData/newJ2k/typeParameters/{traitDoubleParametrizationWithTwoBoundsWithExtending.kt => interfaceDoubleParametrizationWithTwoBoundsWithExtending.kt} (100%)
 rename plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/{extractThisInTrait.kt => extractThisInInterface.kt} (89%)
 rename plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/{extractThisInTrait.out => extractThisInInterface.out} (65%)
 rename plugins/kotlin/jvm-debugger/test/testData/positionManager/{trait.kt => interface.kt} (100%)
 rename plugins/kotlin/jvm-debugger/test/testData/stepping/stepInto/{traits.kt => interfaces.kt} (98%)
 create mode 100644 plugins/kotlin/jvm-debugger/test/testData/stepping/stepInto/interfaces.out
 delete mode 100644 plugins/kotlin/jvm-debugger/test/testData/stepping/stepInto/traits.out

diff --git a/plugins/kotlin/code-insight/intentions-k2/tests/test/org/jetbrains/kotlin/idea/k2/intentions/tests/K2IntentionTestGenerated.java b/plugins/kotlin/code-insight/intentions-k2/tests/test/org/jetbrains/kotlin/idea/k2/intentions/tests/K2IntentionTestGenerated.java
index 72af818f5663..cd74714d07fd 100644
--- a/plugins/kotlin/code-insight/intentions-k2/tests/test/org/jetbrains/kotlin/idea/k2/intentions/tests/K2IntentionTestGenerated.java
+++ b/plugins/kotlin/code-insight/intentions-k2/tests/test/org/jetbrains/kotlin/idea/k2/intentions/tests/K2IntentionTestGenerated.java
@@ -1932,9 +1932,9 @@ public abstract class K2IntentionTestGenerated extends AbstractK2IntentionTest {
             runTest("../../../idea/tests/testData/intentions/removeExplicitType/onOverride.kt");
         }
 
-        @TestMetadata("onOverrideInTrait.kt")
-        public void testOnOverrideInTrait() throws Exception {
-            runTest("../../../idea/tests/testData/intentions/removeExplicitType/onOverrideInTrait.kt");
+        @TestMetadata("onOverrideInInterface.kt")
+        public void testOnOverrideInInterface() throws Exception {
+            runTest("../../../idea/tests/testData/intentions/removeExplicitType/onOverrideInInterface.kt");
         }
 
         @TestMetadata("onPropertyAccessor.kt")
diff --git a/plugins/kotlin/completion/testData/injava/Class.java b/plugins/kotlin/completion/testData/injava/Class.java
index 39dba32f5cd2..a8611d2f94ef 100644
--- a/plugins/kotlin/completion/testData/injava/Class.java
+++ b/plugins/kotlin/completion/testData/injava/Class.java
@@ -7,5 +7,5 @@ public class Testing {
 }
 
 // EXIST: LibClass
-// EXIST: LibTrait
+// EXIST: LibInterface
 // EXIST: LibEnum
diff --git a/plugins/kotlin/completion/testData/injava/ClassesFromNamespace.java b/plugins/kotlin/completion/testData/injava/ClassesFromNamespace.java
index b65662a1844a..7ae26bd20726 100644
--- a/plugins/kotlin/completion/testData/injava/ClassesFromNamespace.java
+++ b/plugins/kotlin/completion/testData/injava/ClassesFromNamespace.java
@@ -9,7 +9,7 @@ public class Testing {
 // note: "NUMBER" check also assures that FooPackage$src$ classes are not visible
 
 // EXIST: LibClass
-// EXIST: LibTrait
+// EXIST: LibInterface
 // EXIST: LibEnum
 // EXIST: LibObject
 // EXIST: MainKt
diff --git a/plugins/kotlin/completion/testData/injava/TraitMember.java b/plugins/kotlin/completion/testData/injava/InterfaceMember.java
similarity index 60%
rename from plugins/kotlin/completion/testData/injava/TraitMember.java
rename to plugins/kotlin/completion/testData/injava/InterfaceMember.java
index 1ab9d04d21b2..a3200a4ed88d 100644
--- a/plugins/kotlin/completion/testData/injava/TraitMember.java
+++ b/plugins/kotlin/completion/testData/injava/InterfaceMember.java
@@ -1,5 +1,5 @@
 public class Testing {
-    void f(mockLib.foo.LibTrait p) {
+    void f(mockLib.foo.LibInterface p) {
         p.<caret>
     }
 }
diff --git a/plugins/kotlin/completion/testData/injava/mockLib/mockLib/foo/main.kt b/plugins/kotlin/completion/testData/injava/mockLib/mockLib/foo/main.kt
index eb5d832513fb..00c7ebb34baa 100644
--- a/plugins/kotlin/completion/testData/injava/mockLib/mockLib/foo/main.kt
+++ b/plugins/kotlin/completion/testData/injava/mockLib/mockLib/foo/main.kt
@@ -20,7 +20,7 @@ public class LibClass {
     public val nested: Nested = Nested()
 }
 
-public interface LibTrait {
+public interface LibInterface {
     public fun foo() {
     }
 }
diff --git a/plugins/kotlin/completion/tests-k1/test/org/jetbrains/kotlin/idea/completion/test/CompiledKotlinInJavaCompletionTestGenerated.java b/plugins/kotlin/completion/tests-k1/test/org/jetbrains/kotlin/idea/completion/test/CompiledKotlinInJavaCompletionTestGenerated.java
index d70c374c5fa7..498bc53e3aab 100644
--- a/plugins/kotlin/completion/tests-k1/test/org/jetbrains/kotlin/idea/completion/test/CompiledKotlinInJavaCompletionTestGenerated.java
+++ b/plugins/kotlin/completion/tests-k1/test/org/jetbrains/kotlin/idea/completion/test/CompiledKotlinInJavaCompletionTestGenerated.java
@@ -83,6 +83,11 @@ public class CompiledKotlinInJavaCompletionTestGenerated extends AbstractCompile
         runTest("../testData/injava/InterfaceDefaultImplsNonImported.java");
     }
 
+    @TestMetadata("InterfaceMember.java")
+    public void testInterfaceMember() throws Exception {
+        runTest("../testData/injava/InterfaceMember.java");
+    }
+
     @TestMetadata("MultiFileFacade.java")
     public void testMultiFileFacade() throws Exception {
         runTest("../testData/injava/MultiFileFacade.java");
@@ -162,9 +167,4 @@ public class CompiledKotlinInJavaCompletionTestGenerated extends AbstractCompile
     public void testTopLevelMembers() throws Exception {
         runTest("../testData/injava/TopLevelMembers.java");
     }
-
-    @TestMetadata("TraitMember.java")
-    public void testTraitMember() throws Exception {
-        runTest("../testData/injava/TraitMember.java");
-    }
 }
diff --git a/plugins/kotlin/completion/tests-k1/test/org/jetbrains/kotlin/idea/completion/test/KotlinSourceInJavaCompletionTestGenerated.java b/plugins/kotlin/completion/tests-k1/test/org/jetbrains/kotlin/idea/completion/test/KotlinSourceInJavaCompletionTestGenerated.java
index f48e8fa80027..eb920041b9e5 100644
--- a/plugins/kotlin/completion/tests-k1/test/org/jetbrains/kotlin/idea/completion/test/KotlinSourceInJavaCompletionTestGenerated.java
+++ b/plugins/kotlin/completion/tests-k1/test/org/jetbrains/kotlin/idea/completion/test/KotlinSourceInJavaCompletionTestGenerated.java
@@ -83,6 +83,11 @@ public class KotlinSourceInJavaCompletionTestGenerated extends AbstractKotlinSou
         runTest("../testData/injava/InterfaceDefaultImplsNonImported.java");
     }
 
+    @TestMetadata("InterfaceMember.java")
+    public void testInterfaceMember() throws Exception {
+        runTest("../testData/injava/InterfaceMember.java");
+    }
+
     @TestMetadata("MultiFileFacade.java")
     public void testMultiFileFacade() throws Exception {
         runTest("../testData/injava/MultiFileFacade.java");
@@ -162,9 +167,4 @@ public class KotlinSourceInJavaCompletionTestGenerated extends AbstractKotlinSou
     public void testTopLevelMembers() throws Exception {
         runTest("../testData/injava/TopLevelMembers.java");
     }
-
-    @TestMetadata("TraitMember.java")
-    public void testTraitMember() throws Exception {
-        runTest("../testData/injava/TraitMember.java");
-    }
 }
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/codeInsight/FirOverrideImplementTest.kt b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/codeInsight/FirOverrideImplementTest.kt
index e1ee2ed8d386..640fec25b34f 100644
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/codeInsight/FirOverrideImplementTest.kt
+++ b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/codeInsight/FirOverrideImplementTest.kt
@@ -68,8 +68,8 @@ internal class FirOverrideImplementTest : OverrideImplementTest<KtClassMember>()
         super.testJavaParameters()
     }
 
-    override fun testFunctionFromTraitInJava() {
-        super.testFunctionFromTraitInJava()
+    override fun testFunctionFromInterfaceInJava() {
+        super.testFunctionFromInterfaceInJava()
     }
 
     override fun testGenericMethod() {
@@ -84,8 +84,8 @@ internal class FirOverrideImplementTest : OverrideImplementTest<KtClassMember>()
         super.testProperty()
     }
 
-    override fun testTraitGenericImplement() {
-        super.testTraitGenericImplement()
+    override fun testInterfaceGenericImplement() {
+        super.testInterfaceGenericImplement()
     }
 
     override fun testDefaultValues() {
@@ -100,8 +100,8 @@ internal class FirOverrideImplementTest : OverrideImplementTest<KtClassMember>()
         super.testGenerateMulti()
     }
 
-    override fun testTraitNullableFunction() {
-        super.testTraitNullableFunction()
+    override fun testInterfaceNullableFunction() {
+        super.testInterfaceNullableFunction()
     }
 
     override fun testOverrideUnitFunction() {
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixMultiFileTestGenerated.java b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixMultiFileTestGenerated.java
index 5a9b8108553a..f7c0d66bba94 100644
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixMultiFileTestGenerated.java
+++ b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixMultiFileTestGenerated.java
@@ -360,6 +360,11 @@ public abstract class HighLevelQuickFixMultiFileTestGenerated extends AbstractHi
             runTest("../idea/tests/testData/quickfix/autoImports/importInFirstPartInUserType.test");
         }
 
+        @TestMetadata("importInterface.before.Main.kt")
+        public void testImportInterface() throws Exception {
+            runTest("../idea/tests/testData/quickfix/autoImports/importInterface.before.Main.kt");
+        }
+
         @TestMetadata("importKotlinCompanionPropertyAsFieldFromJava.test")
         public void testImportKotlinCompanionPropertyAsFieldFromJava() throws Exception {
             runTest("../idea/tests/testData/quickfix/autoImports/importKotlinCompanionPropertyAsFieldFromJava.test");
@@ -420,9 +425,9 @@ public abstract class HighLevelQuickFixMultiFileTestGenerated extends AbstractHi
             runTest("../idea/tests/testData/quickfix/autoImports/importKotlinStaticPropertyOverloadedSetterFromJava.test");
         }
 
-        @TestMetadata("importNullableTraitWithGenerics.before.Main.kt")
-        public void testImportNullableTraitWithGenerics() throws Exception {
-            runTest("../idea/tests/testData/quickfix/autoImports/importNullableTraitWithGenerics.before.Main.kt");
+        @TestMetadata("importNullableInterfaceWithGenerics.before.Main.kt")
+        public void testImportNullableInterfaceWithGenerics() throws Exception {
+            runTest("../idea/tests/testData/quickfix/autoImports/importNullableInterfaceWithGenerics.before.Main.kt");
         }
 
         @TestMetadata("ImportOperatorInvokeWithConvention.before.Main.kt")
@@ -430,11 +435,6 @@ public abstract class HighLevelQuickFixMultiFileTestGenerated extends AbstractHi
             runTest("../idea/tests/testData/quickfix/autoImports/ImportOperatorInvokeWithConvention.before.Main.kt");
         }
 
-        @TestMetadata("importTrait.before.Main.kt")
-        public void testImportTrait() throws Exception {
-            runTest("../idea/tests/testData/quickfix/autoImports/importTrait.before.Main.kt");
-        }
-
         @TestMetadata("indexCallExtensionGet.test")
         public void testIndexCallExtensionGet() throws Exception {
             runTest("../idea/tests/testData/quickfix/autoImports/indexCallExtensionGet.test");
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixTestGenerated.java b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixTestGenerated.java
index 791efa08f4f4..5e3c35be1593 100644
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixTestGenerated.java
+++ b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixTestGenerated.java
@@ -899,9 +899,9 @@ public abstract class HighLevelQuickFixTestGenerated extends AbstractHighLevelQu
             runTest("../idea/tests/testData/quickfix/modifiers/cannotMakeClassAnnotation.kt");
         }
 
-        @TestMetadata("finalTrait.kt")
-        public void testFinalTrait() throws Exception {
-            runTest("../idea/tests/testData/quickfix/modifiers/finalTrait.kt");
+        @TestMetadata("finalInterface.kt")
+        public void testFinalInterface() throws Exception {
+            runTest("../idea/tests/testData/quickfix/modifiers/finalInterface.kt");
         }
 
         @TestMetadata("illegalEnumAnnotation1.kt")
@@ -1104,9 +1104,9 @@ public abstract class HighLevelQuickFixTestGenerated extends AbstractHighLevelQu
             runTest("../idea/tests/testData/quickfix/modifiers/removeIncompatibleModifier.kt");
         }
 
-        @TestMetadata("removeInnerForClassInTrait.kt")
-        public void testRemoveInnerForClassInTrait() throws Exception {
-            runTest("../idea/tests/testData/quickfix/modifiers/removeInnerForClassInTrait.kt");
+        @TestMetadata("removeInnerForClassInInterface.kt")
+        public void testRemoveInnerForClassInInterface() throws Exception {
+            runTest("../idea/tests/testData/quickfix/modifiers/removeInnerForClassInInterface.kt");
         }
 
         @TestMetadata("removeModifierFromForbiddenOperatorMod.kt")
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/checkers/JavaAgainstKotlinBinariesCheckerTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/checkers/JavaAgainstKotlinBinariesCheckerTestGenerated.java
index e63b8c084909..e55a3d60172b 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/checkers/JavaAgainstKotlinBinariesCheckerTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/checkers/JavaAgainstKotlinBinariesCheckerTestGenerated.java
@@ -108,9 +108,9 @@ public class JavaAgainstKotlinBinariesCheckerTestGenerated extends AbstractJavaA
         runTest("testData/kotlinAndJavaChecker/javaAgainstKotlin/FunctionInNestedClassInDataFlowInspection.kt");
     }
 
-    @TestMetadata("ImplementedMethodsFromTraits.kt")
-    public void testImplementedMethodsFromTraits() throws Exception {
-        runTest("testData/kotlinAndJavaChecker/javaAgainstKotlin/ImplementedMethodsFromTraits.kt");
+    @TestMetadata("ImplementedMethodsFromInterfaces.kt")
+    public void testImplementedMethodsFromInterfaces() throws Exception {
+        runTest("testData/kotlinAndJavaChecker/javaAgainstKotlin/ImplementedMethodsFromInterfaces.kt");
     }
 
     @TestMetadata("InferenceReturnType_1_6.kt")
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/checkers/JavaAgainstKotlinSourceCheckerTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/checkers/JavaAgainstKotlinSourceCheckerTestGenerated.java
index 7e4f5b0d4300..7c3c0872ba45 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/checkers/JavaAgainstKotlinSourceCheckerTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/checkers/JavaAgainstKotlinSourceCheckerTestGenerated.java
@@ -110,9 +110,9 @@ public abstract class JavaAgainstKotlinSourceCheckerTestGenerated extends Abstra
             runTest("testData/kotlinAndJavaChecker/javaAgainstKotlin/FunctionInNestedClassInDataFlowInspection.kt");
         }
 
-        @TestMetadata("ImplementedMethodsFromTraits.kt")
-        public void testImplementedMethodsFromTraits() throws Exception {
-            runTest("testData/kotlinAndJavaChecker/javaAgainstKotlin/ImplementedMethodsFromTraits.kt");
+        @TestMetadata("ImplementedMethodsFromInterfaces.kt")
+        public void testImplementedMethodsFromInterfaces() throws Exception {
+            runTest("testData/kotlinAndJavaChecker/javaAgainstKotlin/ImplementedMethodsFromInterfaces.kt");
         }
 
         @TestMetadata("InferenceReturnType_1_6.kt")
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/checkers/KotlinHighlightVisitorTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/checkers/KotlinHighlightVisitorTestGenerated.java
index f84d57f48eae..575c1ca5fcf7 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/checkers/KotlinHighlightVisitorTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/checkers/KotlinHighlightVisitorTestGenerated.java
@@ -145,6 +145,11 @@ public abstract class KotlinHighlightVisitorTestGenerated extends AbstractKotlin
             runTest("testData/checker/IncDec.kt");
         }
 
+        @TestMetadata("InterfaceSupertypeList.kt")
+        public void testInterfaceSupertypeList() throws Exception {
+            runTest("testData/checker/InterfaceSupertypeList.kt");
+        }
+
         @TestMetadata("IsExpressions.kt")
         public void testIsExpressions() throws Exception {
             runTest("testData/checker/IsExpressions.kt");
@@ -315,11 +320,6 @@ public abstract class KotlinHighlightVisitorTestGenerated extends AbstractKotlin
             runTest("testData/checker/SuppressedHighlighting.kt");
         }
 
-        @TestMetadata("TraitSupertypeList.kt")
-        public void testTraitSupertypeList() throws Exception {
-            runTest("testData/checker/TraitSupertypeList.kt");
-        }
-
         @TestMetadata("trivialHierarchyLoop.kt")
         public void testTrivialHierarchyLoop() throws Exception {
             runTest("testData/checker/trivialHierarchyLoop.kt");
@@ -711,6 +711,11 @@ public abstract class KotlinHighlightVisitorTestGenerated extends AbstractKotlin
                 runTest("testData/checker/duplicateJvmSignature/functionAndProperty/classObject.kt");
             }
 
+            @TestMetadata("interface.kt")
+            public void testInterface() throws Exception {
+                runTest("testData/checker/duplicateJvmSignature/functionAndProperty/interface.kt");
+            }
+
             @TestMetadata("localClass.kt")
             public void testLocalClass() throws Exception {
                 runTest("testData/checker/duplicateJvmSignature/functionAndProperty/localClass.kt");
@@ -740,23 +745,18 @@ public abstract class KotlinHighlightVisitorTestGenerated extends AbstractKotlin
             public void testTopLevelMultifileRuntime() throws Exception {
                 runTest("testData/checker/duplicateJvmSignature/functionAndProperty/topLevelMultifileRuntime.kt");
             }
-
-            @TestMetadata("trait.kt")
-            public void testTrait() throws Exception {
-                runTest("testData/checker/duplicateJvmSignature/functionAndProperty/trait.kt");
-            }
         }
 
         @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("testData/checker/duplicateJvmSignature/traitImpl")
-        public static class TraitImpl extends AbstractKotlinHighlightVisitorTest {
+        @TestMetadata("testData/checker/duplicateJvmSignature/interfaceImpl")
+        public static class InterfaceImpl extends AbstractKotlinHighlightVisitorTest {
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
             }
 
-            @TestMetadata("twoTraits.kt")
-            public void testTwoTraits() throws Exception {
-                runTest("testData/checker/duplicateJvmSignature/traitImpl/twoTraits.kt");
+            @TestMetadata("twoInterfaces.kt")
+            public void testTwoInterfaces() throws Exception {
+                runTest("testData/checker/duplicateJvmSignature/interfaceImpl/twoInterfaces.kt");
             }
         }
     }
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/InsertImportOnPasteTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/InsertImportOnPasteTestGenerated.java
index 3f8cd03eb6db..f48a726f9829 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/InsertImportOnPasteTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/InsertImportOnPasteTestGenerated.java
@@ -220,6 +220,11 @@ public abstract class InsertImportOnPasteTestGenerated extends AbstractInsertImp
             runTest("testData/copyPaste/imports/Inner.kt");
         }
 
+        @TestMetadata("Interface.kt")
+        public void testInterface() throws Exception {
+            runTest("testData/copyPaste/imports/Interface.kt");
+        }
+
         @TestMetadata("Invoke.kt")
         public void testInvoke() throws Exception {
             runTest("testData/copyPaste/imports/Invoke.kt");
@@ -355,11 +360,6 @@ public abstract class InsertImportOnPasteTestGenerated extends AbstractInsertImp
             runTest("testData/copyPaste/imports/TopLevelProperty.kt");
         }
 
-        @TestMetadata("Trait.kt")
-        public void testTrait() throws Exception {
-            runTest("testData/copyPaste/imports/Trait.kt");
-        }
-
         @TestMetadata("TypeArgForUnresolvedCall.kt")
         public void testTypeArgForUnresolvedCall() throws Exception {
             runTest("testData/copyPaste/imports/TypeArgForUnresolvedCall.kt");
@@ -578,6 +578,11 @@ public abstract class InsertImportOnPasteTestGenerated extends AbstractInsertImp
             runTest("testData/copyPaste/imports/Inner.kt");
         }
 
+        @TestMetadata("Interface.kt")
+        public void testInterface() throws Exception {
+            runTest("testData/copyPaste/imports/Interface.kt");
+        }
+
         @TestMetadata("Invoke.kt")
         public void testInvoke() throws Exception {
             runTest("testData/copyPaste/imports/Invoke.kt");
@@ -713,11 +718,6 @@ public abstract class InsertImportOnPasteTestGenerated extends AbstractInsertImp
             runTest("testData/copyPaste/imports/TopLevelProperty.kt");
         }
 
-        @TestMetadata("Trait.kt")
-        public void testTrait() throws Exception {
-            runTest("testData/copyPaste/imports/Trait.kt");
-        }
-
         @TestMetadata("TypeArgForUnresolvedCall.kt")
         public void testTypeArgForUnresolvedCall() throws Exception {
             runTest("testData/copyPaste/imports/TypeArgForUnresolvedCall.kt");
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/LineMarkersTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/LineMarkersTestGenerated.java
index 40454bebb7c4..aa90dd07a884 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/LineMarkersTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/LineMarkersTestGenerated.java
@@ -107,14 +107,19 @@ public abstract class LineMarkersTestGenerated extends AbstractLineMarkersTest {
             runTest("testData/codeInsight/lineMarker/overrideImplement/FakeOverrideProperty.kt");
         }
 
-        @TestMetadata("FakeOverrideToStringInTrait.kt")
-        public void testFakeOverrideToStringInTrait() throws Exception {
-            runTest("testData/codeInsight/lineMarker/overrideImplement/FakeOverrideToStringInTrait.kt");
+        @TestMetadata("FakeOverrideToStringInInterface.kt")
+        public void testFakeOverrideToStringInInterface() throws Exception {
+            runTest("testData/codeInsight/lineMarker/overrideImplement/FakeOverrideToStringInInterface.kt");
         }
 
-        @TestMetadata("FakeOverridesForTraitFunWithImpl.kt")
-        public void testFakeOverridesForTraitFunWithImpl() throws Exception {
-            runTest("testData/codeInsight/lineMarker/overrideImplement/FakeOverridesForTraitFunWithImpl.kt");
+        @TestMetadata("FakeOverridesForInterfaceFunWithImpl.kt")
+        public void testFakeOverridesForInterfaceFunWithImpl() throws Exception {
+            runTest("testData/codeInsight/lineMarker/overrideImplement/FakeOverridesForInterfaceFunWithImpl.kt");
+        }
+
+        @TestMetadata("Interface.kt")
+        public void testInterface() throws Exception {
+            runTest("testData/codeInsight/lineMarker/overrideImplement/Interface.kt");
         }
 
         @TestMetadata("NavigateFromPrivateAbstractClass.kt")
@@ -127,9 +132,9 @@ public abstract class LineMarkersTestGenerated extends AbstractLineMarkersTest {
             runTest("testData/codeInsight/lineMarker/overrideImplement/NavigateToSeveralSuperElements.kt");
         }
 
-        @TestMetadata("NoOverridingMarkerOnDefaultTraitImpl.kt")
-        public void testNoOverridingMarkerOnDefaultTraitImpl() throws Exception {
-            runTest("testData/codeInsight/lineMarker/overrideImplement/NoOverridingMarkerOnDefaultTraitImpl.kt");
+        @TestMetadata("NoOverridingMarkerOnDefaultInterfaceImpl.kt")
+        public void testNoOverridingMarkerOnDefaultInterfaceImpl() throws Exception {
+            runTest("testData/codeInsight/lineMarker/overrideImplement/NoOverridingMarkerOnDefaultInterfaceImpl.kt");
         }
 
         @TestMetadata("Overloads.kt")
@@ -152,14 +157,14 @@ public abstract class LineMarkersTestGenerated extends AbstractLineMarkersTest {
             runTest("testData/codeInsight/lineMarker/overrideImplement/OverrideMemberOfAbstractClass.kt");
         }
 
-        @TestMetadata("OverridenTraitDeclarations.kt")
-        public void testOverridenTraitDeclarations() throws Exception {
-            runTest("testData/codeInsight/lineMarker/overrideImplement/OverridenTraitDeclarations.kt");
+        @TestMetadata("OverridenInterfaceDeclarations.kt")
+        public void testOverridenInterfaceDeclarations() throws Exception {
+            runTest("testData/codeInsight/lineMarker/overrideImplement/OverridenInterfaceDeclarations.kt");
         }
 
-        @TestMetadata("OverridingTooltipOnDefaultTraitImpl.kt")
-        public void testOverridingTooltipOnDefaultTraitImpl() throws Exception {
-            runTest("testData/codeInsight/lineMarker/overrideImplement/OverridingTooltipOnDefaultTraitImpl.kt");
+        @TestMetadata("OverridingTooltipOnDefaultInterfaceImpl.kt")
+        public void testOverridingTooltipOnDefaultInterfaceImpl() throws Exception {
+            runTest("testData/codeInsight/lineMarker/overrideImplement/OverridingTooltipOnDefaultInterfaceImpl.kt");
         }
 
         @TestMetadata("PrimaryConstructorOpen.kt")
@@ -182,14 +187,9 @@ public abstract class LineMarkersTestGenerated extends AbstractLineMarkersTest {
             runTest("testData/codeInsight/lineMarker/overrideImplement/SealedClass.kt");
         }
 
-        @TestMetadata("ToStringInTrait.kt")
-        public void testToStringInTrait() throws Exception {
-            runTest("testData/codeInsight/lineMarker/overrideImplement/ToStringInTrait.kt");
-        }
-
-        @TestMetadata("Trait.kt")
-        public void testTrait() throws Exception {
-            runTest("testData/codeInsight/lineMarker/overrideImplement/Trait.kt");
+        @TestMetadata("ToStringInInterface.kt")
+        public void testToStringInInterface() throws Exception {
+            runTest("testData/codeInsight/lineMarker/overrideImplement/ToStringInInterface.kt");
         }
     }
 
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.kt
index 26acd949a02a..a71bf7d9d5f7 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.kt
@@ -63,8 +63,8 @@ abstract class OverrideImplementTest<T : ClassMember> : AbstractOverrideImplemen
         doImplementDirectoryTest()
     }
 
-   open fun testFunctionFromTraitInJava() {
-        doImplementJavaDirectoryTest("foo.KotlinTrait", "bar")
+   open fun testFunctionFromInterfaceInJava() {
+        doImplementJavaDirectoryTest("foo.KotlinInterface", "bar")
     }
 
    open fun testGenericMethod() {
@@ -79,7 +79,7 @@ abstract class OverrideImplementTest<T : ClassMember> : AbstractOverrideImplemen
         doImplementFileTest()
     }
 
-   open fun testTraitGenericImplement() {
+   open fun testInterfaceGenericImplement() {
         doImplementFileTest()
     }
 
@@ -95,7 +95,7 @@ abstract class OverrideImplementTest<T : ClassMember> : AbstractOverrideImplemen
         doMultiImplementFileTest()
     }
 
-   open fun testTraitNullableFunction() {
+   open fun testInterfaceNullableFunction() {
         doImplementFileTest()
     }
 
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/hierarchy/HierarchyTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/hierarchy/HierarchyTestGenerated.java
index d2a6b95214e7..662b1ec997af 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/hierarchy/HierarchyTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/hierarchy/HierarchyTestGenerated.java
@@ -188,9 +188,9 @@ public abstract class HierarchyTestGenerated extends AbstractHierarchyTest {
             runTest("testData/hierarchy/class/super/MultiTypeAlias/");
         }
 
-        @TestMetadata("TwoTraits")
-        public void testTwoTraits() throws Exception {
-            runTest("testData/hierarchy/class/super/TwoTraits/");
+        @TestMetadata("TwoInterfaces")
+        public void testTwoInterfaces() throws Exception {
+            runTest("testData/hierarchy/class/super/TwoInterfaces/");
         }
 
         @TestMetadata("TypeAlias")
@@ -211,9 +211,9 @@ public abstract class HierarchyTestGenerated extends AbstractHierarchyTest {
             runTest("testData/hierarchy/class/sub/AllFromClass/");
         }
 
-        @TestMetadata("AllFromTrait")
-        public void testAllFromTrait() throws Exception {
-            runTest("testData/hierarchy/class/sub/AllFromTrait/");
+        @TestMetadata("AllFromInterface")
+        public void testAllFromInterface() throws Exception {
+            runTest("testData/hierarchy/class/sub/AllFromInterface/");
         }
 
         @TestMetadata("ClassFromClass")
@@ -221,9 +221,9 @@ public abstract class HierarchyTestGenerated extends AbstractHierarchyTest {
             runTest("testData/hierarchy/class/sub/ClassFromClass/");
         }
 
-        @TestMetadata("ClassFromTrait")
-        public void testClassFromTrait() throws Exception {
-            runTest("testData/hierarchy/class/sub/ClassFromTrait/");
+        @TestMetadata("ClassFromInterface")
+        public void testClassFromInterface() throws Exception {
+            runTest("testData/hierarchy/class/sub/ClassFromInterface/");
         }
 
         @TestMetadata("ConstructorCallCaretAfter")
@@ -236,6 +236,16 @@ public abstract class HierarchyTestGenerated extends AbstractHierarchyTest {
             runTest("testData/hierarchy/class/sub/ConstructorCallCaretBefore/");
         }
 
+        @TestMetadata("InterfaceFromClass")
+        public void testInterfaceFromClass() throws Exception {
+            runTest("testData/hierarchy/class/sub/InterfaceFromClass/");
+        }
+
+        @TestMetadata("InterfaceFromInterface")
+        public void testInterfaceFromInterface() throws Exception {
+            runTest("testData/hierarchy/class/sub/InterfaceFromInterface/");
+        }
+
         @TestMetadata("MultiTypeAlias")
         public void testMultiTypeAlias() throws Exception {
             runTest("testData/hierarchy/class/sub/MultiTypeAlias/");
@@ -246,9 +256,9 @@ public abstract class HierarchyTestGenerated extends AbstractHierarchyTest {
             runTest("testData/hierarchy/class/sub/ObjectFromClass/");
         }
 
-        @TestMetadata("ObjectFromTrait")
-        public void testObjectFromTrait() throws Exception {
-            runTest("testData/hierarchy/class/sub/ObjectFromTrait/");
+        @TestMetadata("ObjectFromInterface")
+        public void testObjectFromInterface() throws Exception {
+            runTest("testData/hierarchy/class/sub/ObjectFromInterface/");
         }
 
         @TestMetadata("SecondaryConstructorCallCaretAfter")
@@ -261,16 +271,6 @@ public abstract class HierarchyTestGenerated extends AbstractHierarchyTest {
             runTest("testData/hierarchy/class/sub/SecondaryConstructorCallCaretBefore/");
         }
 
-        @TestMetadata("TraitFromClass")
-        public void testTraitFromClass() throws Exception {
-            runTest("testData/hierarchy/class/sub/TraitFromClass/");
-        }
-
-        @TestMetadata("TraitFromTrait")
-        public void testTraitFromTrait() throws Exception {
-            runTest("testData/hierarchy/class/sub/TraitFromTrait/");
-        }
-
         @TestMetadata("TypeAlias")
         public void testTypeAlias() throws Exception {
             runTest("testData/hierarchy/class/sub/TypeAlias/");
@@ -518,9 +518,9 @@ public abstract class HierarchyTestGenerated extends AbstractHierarchyTest {
             runTest("testData/hierarchy/overrides/kotlinFunctionInClass/");
         }
 
-        @TestMetadata("kotlinFunctionInTrait")
-        public void testKotlinFunctionInTrait() throws Exception {
-            runTest("testData/hierarchy/overrides/kotlinFunctionInTrait/");
+        @TestMetadata("kotlinFunctionInInterface")
+        public void testKotlinFunctionInInterface() throws Exception {
+            runTest("testData/hierarchy/overrides/kotlinFunctionInInterface/");
         }
 
         @TestMetadata("kotlinPropertyInClass")
@@ -528,9 +528,9 @@ public abstract class HierarchyTestGenerated extends AbstractHierarchyTest {
             runTest("testData/hierarchy/overrides/kotlinPropertyInClass/");
         }
 
-        @TestMetadata("kotlinPropertyInTrait")
-        public void testKotlinPropertyInTrait() throws Exception {
-            runTest("testData/hierarchy/overrides/kotlinPropertyInTrait/");
+        @TestMetadata("kotlinPropertyInInterface")
+        public void testKotlinPropertyInInterface() throws Exception {
+            runTest("testData/hierarchy/overrides/kotlinPropertyInInterface/");
         }
 
         @TestMetadata("kotlinTopLevelFunction")
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/HighlightingTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/HighlightingTestGenerated.java
index 75c52bf11616..d71cb36fb0b5 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/HighlightingTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/HighlightingTestGenerated.java
@@ -66,6 +66,11 @@ public abstract class HighlightingTestGenerated extends AbstractHighlightingTest
             runTest("testData/highlighter/deprecated/Inc.kt");
         }
 
+        @TestMetadata("Interface.kt")
+        public void testInterface() throws Exception {
+            runTest("testData/highlighter/deprecated/Interface.kt");
+        }
+
         @TestMetadata("Invalid.kt")
         public void testInvalid() throws Exception {
             runTest("testData/highlighter/deprecated/Invalid.kt");
@@ -105,11 +110,6 @@ public abstract class HighlightingTestGenerated extends AbstractHighlightingTest
         public void testSuperCall() throws Exception {
             runTest("testData/highlighter/deprecated/SuperCall.kt");
         }
-
-        @TestMetadata("Trait.kt")
-        public void testTrait() throws Exception {
-            runTest("testData/highlighter/deprecated/Trait.kt");
-        }
     }
 
     @RunWith(JUnit3RunnerWithInners.class)
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/intentions/K1IntentionTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/intentions/K1IntentionTestGenerated.java
index 5c3fa8d264e1..c36d89e6f42a 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/intentions/K1IntentionTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/intentions/K1IntentionTestGenerated.java
@@ -15507,9 +15507,9 @@ public abstract class K1IntentionTestGenerated extends AbstractK1IntentionTest {
             runTest("testData/intentions/removeExplicitType/onOverride.kt");
         }
 
-        @TestMetadata("onOverrideInTrait.kt")
-        public void testOnOverrideInTrait() throws Exception {
-            runTest("testData/intentions/removeExplicitType/onOverrideInTrait.kt");
+        @TestMetadata("onOverrideInInterface.kt")
+        public void testOnOverrideInInterface() throws Exception {
+            runTest("testData/intentions/removeExplicitType/onOverrideInInterface.kt");
         }
 
         @TestMetadata("onPropertyAccessor.kt")
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/javaFacade/KotlinJavaFacadeTest.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/javaFacade/KotlinJavaFacadeTest.java
index 9211a83f9fbd..73b2f7e16d83 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/javaFacade/KotlinJavaFacadeTest.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/javaFacade/KotlinJavaFacadeTest.java
@@ -79,11 +79,11 @@ public class KotlinJavaFacadeTest extends KotlinLightCodeInsightFixtureTestCase
         doTestWrapMethod(true);
     }
 
-    public void testWrapFunWithImplInTrait() {
+    public void testWrapFunWithImplInInterface() {
         doTestWrapMethod(true);
     }
 
-    public void testWrapFunWithoutImplInTrait() {
+    public void testWrapFunWithoutImplInInterface() {
         doTestWrapMethod(true);
     }
 
@@ -123,7 +123,7 @@ public class KotlinJavaFacadeTest extends KotlinLightCodeInsightFixtureTestCase
         doTestWrapProperty(true, true);
     }
 
-    public void testWrapVarPropertyWithAccessorsInTrait() {
+    public void testWrapVarPropertyWithAccessorsInInterface() {
         doTestWrapProperty(true, true);
     }
 
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/navigation/GotoSuperTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/navigation/GotoSuperTestGenerated.java
index d52f5c985715..cc2cfbc27489 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/navigation/GotoSuperTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/navigation/GotoSuperTestGenerated.java
@@ -63,6 +63,11 @@ public class GotoSuperTestGenerated extends AbstractGotoSuperTest {
         runTest("testData/navigation/gotoSuper/FunctionSimple.test");
     }
 
+    @TestMetadata("InterfaceSimple.test")
+    public void testInterfaceSimple() throws Exception {
+        runTest("testData/navigation/gotoSuper/InterfaceSimple.test");
+    }
+
     @TestMetadata("ObjectSimple.test")
     public void testObjectSimple() throws Exception {
         runTest("testData/navigation/gotoSuper/ObjectSimple.test");
@@ -78,11 +83,6 @@ public class GotoSuperTestGenerated extends AbstractGotoSuperTest {
         runTest("testData/navigation/gotoSuper/SuperWithNativeToGenericMapping.test");
     }
 
-    @TestMetadata("TraitSimple.test")
-    public void testTraitSimple() throws Exception {
-        runTest("testData/navigation/gotoSuper/TraitSimple.test");
-    }
-
     @TestMetadata("TypeAliasInSuperType.test")
     public void testTypeAliasInSuperType() throws Exception {
         runTest("testData/navigation/gotoSuper/TypeAliasInSuperType.test");
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/navigation/KotlinGotoImplementationMultifileTest.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/navigation/KotlinGotoImplementationMultifileTest.java
index ae2ca312b734..e88fbcd54b2c 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/navigation/KotlinGotoImplementationMultifileTest.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/navigation/KotlinGotoImplementationMultifileTest.java
@@ -28,7 +28,7 @@ public class KotlinGotoImplementationMultifileTest extends KotlinLightCodeInsigh
         doKotlinJavaTest();
     }
 
-    public void testImplementKotlinTraitInJava() {
+    public void testImplementKotlinInterfaceInJava() {
         doKotlinJavaTest();
     }
 
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/navigation/KotlinGotoImplementationTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/navigation/KotlinGotoImplementationTestGenerated.java
index 7c7709afbf2b..5f8e73c22259 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/navigation/KotlinGotoImplementationTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/navigation/KotlinGotoImplementationTestGenerated.java
@@ -103,6 +103,11 @@ public class KotlinGotoImplementationTestGenerated extends AbstractKotlinGotoImp
         runTest("testData/navigation/implementations/ImplementsInInlineClass.kt");
     }
 
+    @TestMetadata("InterfaceImplementorsWithDeclaration.kt")
+    public void testInterfaceImplementorsWithDeclaration() throws Exception {
+        runTest("testData/navigation/implementations/InterfaceImplementorsWithDeclaration.kt");
+    }
+
     @TestMetadata("ObjectImported.kt")
     public void testObjectImported() throws Exception {
         runTest("testData/navigation/implementations/ObjectImported.kt");
@@ -122,9 +127,4 @@ public class KotlinGotoImplementationTestGenerated extends AbstractKotlinGotoImp
     public void testPropertyOverriddenNavigation() throws Exception {
         runTest("testData/navigation/implementations/PropertyOverriddenNavigation.kt");
     }
-
-    @TestMetadata("TraitImplementorsWithDeclaration.kt")
-    public void testTraitImplementorsWithDeclaration() throws Exception {
-        runTest("testData/navigation/implementations/TraitImplementorsWithDeclaration.kt");
-    }
 }
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/navigation/KotlinGotoTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/navigation/KotlinGotoTestGenerated.java
index 5845606b0001..e2fdcfa6dffd 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/navigation/KotlinGotoTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/navigation/KotlinGotoTestGenerated.java
@@ -50,14 +50,19 @@ public abstract class KotlinGotoTestGenerated extends AbstractKotlinGotoTest {
             runTest("testData/navigation/gotoClass/innerClass.kt");
         }
 
+        @TestMetadata("interfaceWithFunImplement.kt")
+        public void testInterfaceWithFunImplement() throws Exception {
+            runTest("testData/navigation/gotoClass/interfaceWithFunImplement.kt");
+        }
+
         @TestMetadata("localDeclarations.kt")
         public void testLocalDeclarations() throws Exception {
             runTest("testData/navigation/gotoClass/localDeclarations.kt");
         }
 
-        @TestMetadata("noImplementationTrait.kt")
-        public void testNoImplementationTrait() throws Exception {
-            runTest("testData/navigation/gotoClass/noImplementationTrait.kt");
+        @TestMetadata("noImplementationInterface.kt")
+        public void testNoImplementationInterface() throws Exception {
+            runTest("testData/navigation/gotoClass/noImplementationInterface.kt");
         }
 
         @TestMetadata("simpleClass.kt")
@@ -70,11 +75,6 @@ public abstract class KotlinGotoTestGenerated extends AbstractKotlinGotoTest {
             runTest("testData/navigation/gotoClass/simpleObject.kt");
         }
 
-        @TestMetadata("traitWithFunImplement.kt")
-        public void testTraitWithFunImplement() throws Exception {
-            runTest("testData/navigation/gotoClass/traitWithFunImplement.kt");
-        }
-
         @TestMetadata("typealias.kt")
         public void testTypealias() throws Exception {
             runTest("testData/navigation/gotoClass/typealias.kt");
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java
index a297508d1c77..2c6d25d8249f 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java
@@ -463,6 +463,11 @@ public abstract class QuickFixMultiFileTestGenerated extends AbstractQuickFixMul
                 runTest("testData/quickfix/autoImports/importInFirstPartInUserType.test");
             }
 
+            @TestMetadata("importInterface.before.Main.kt")
+            public void testImportInterface() throws Exception {
+                runTest("testData/quickfix/autoImports/importInterface.before.Main.kt");
+            }
+
             @TestMetadata("importKotlinCompanionPropertyAsFieldFromJava.test")
             public void testImportKotlinCompanionPropertyAsFieldFromJava() throws Exception {
                 runTest("testData/quickfix/autoImports/importKotlinCompanionPropertyAsFieldFromJava.test");
@@ -523,9 +528,9 @@ public abstract class QuickFixMultiFileTestGenerated extends AbstractQuickFixMul
                 runTest("testData/quickfix/autoImports/importKotlinStaticPropertyOverloadedSetterFromJava.test");
             }
 
-            @TestMetadata("importNullableTraitWithGenerics.before.Main.kt")
-            public void testImportNullableTraitWithGenerics() throws Exception {
-                runTest("testData/quickfix/autoImports/importNullableTraitWithGenerics.before.Main.kt");
+            @TestMetadata("importNullableInterfaceWithGenerics.before.Main.kt")
+            public void testImportNullableInterfaceWithGenerics() throws Exception {
+                runTest("testData/quickfix/autoImports/importNullableInterfaceWithGenerics.before.Main.kt");
             }
 
             @TestMetadata("ImportOperatorInvokeWithConvention.before.Main.kt")
@@ -533,11 +538,6 @@ public abstract class QuickFixMultiFileTestGenerated extends AbstractQuickFixMul
                 runTest("testData/quickfix/autoImports/ImportOperatorInvokeWithConvention.before.Main.kt");
             }
 
-            @TestMetadata("importTrait.before.Main.kt")
-            public void testImportTrait() throws Exception {
-                runTest("testData/quickfix/autoImports/importTrait.before.Main.kt");
-            }
-
             @TestMetadata("indexCallExtensionGet.test")
             public void testIndexCallExtensionGet() throws Exception {
                 runTest("testData/quickfix/autoImports/indexCallExtensionGet.test");
@@ -1143,6 +1143,11 @@ public abstract class QuickFixMultiFileTestGenerated extends AbstractQuickFixMul
                         runTest("testData/quickfix/createFromUsage/createClass/callExpression/callWithJavaQualifierInMemberValDelegate.before.Main.kt");
                     }
 
+                    @TestMetadata("callWithSuperInterfaceAndJavaReceiver.before.Main.kt")
+                    public void testCallWithSuperInterfaceAndJavaReceiver() throws Exception {
+                        runTest("testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperInterfaceAndJavaReceiver.before.Main.kt");
+                    }
+
                     @TestMetadata("callWithSuperclassAndJavaReceiverNoConstructorParams.before.Main.kt")
                     public void testCallWithSuperclassAndJavaReceiverNoConstructorParams() throws Exception {
                         runTest("testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassAndJavaReceiverNoConstructorParams.before.Main.kt");
@@ -1152,11 +1157,6 @@ public abstract class QuickFixMultiFileTestGenerated extends AbstractQuickFixMul
                     public void testCallWithSuperclassConstructorParamsAndJavaReceiver() throws Exception {
                         runTest("testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassConstructorParamsAndJavaReceiver.before.Main.kt");
                     }
-
-                    @TestMetadata("callWithSupertraitAndJavaReceiver.before.Main.kt")
-                    public void testCallWithSupertraitAndJavaReceiver() throws Exception {
-                        runTest("testData/quickfix/createFromUsage/createClass/callExpression/callWithSupertraitAndJavaReceiver.before.Main.kt");
-                    }
                 }
             }
 
@@ -1177,14 +1177,14 @@ public abstract class QuickFixMultiFileTestGenerated extends AbstractQuickFixMul
                     runTest("testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToNestedJavaSupercallWithParamNames.before.Main.kt");
                 }
 
-                @TestMetadata("traitDelegatorToNestedGroovySuperclass.before.Main.kt")
-                public void testTraitDelegatorToNestedGroovySuperclass() throws Exception {
-                    runTest("testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToNestedGroovySuperclass.before.Main.kt");
+                @TestMetadata("interfaceDelegatorToNestedGroovySuperclass.before.Main.kt")
+                public void testInterfaceDelegatorToNestedGroovySuperclass() throws Exception {
+                    runTest("testData/quickfix/createFromUsage/createClass/delegationSpecifier/interfaceDelegatorToNestedGroovySuperclass.before.Main.kt");
                 }
 
-                @TestMetadata("traitDelegatorToNestedJavaSuperclass.before.Main.kt")
-                public void testTraitDelegatorToNestedJavaSuperclass() throws Exception {
-                    runTest("testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToNestedJavaSuperclass.before.Main.kt");
+                @TestMetadata("interfaceDelegatorToNestedJavaSuperclass.before.Main.kt")
+                public void testInterfaceDelegatorToNestedJavaSuperclass() throws Exception {
+                    runTest("testData/quickfix/createFromUsage/createClass/delegationSpecifier/interfaceDelegatorToNestedJavaSuperclass.before.Main.kt");
                 }
             }
 
@@ -1220,15 +1220,15 @@ public abstract class QuickFixMultiFileTestGenerated extends AbstractQuickFixMul
                     runTest("testData/quickfix/createFromUsage/createClass/importDirective/enumWithJavaQualifier.before.Main.kt");
                 }
 
+                @TestMetadata("interfaceWithJavaQualifier.before.Main.kt")
+                public void testInterfaceWithJavaQualifier() throws Exception {
+                    runTest("testData/quickfix/createFromUsage/createClass/importDirective/interfaceWithJavaQualifier.before.Main.kt");
+                }
+
                 @TestMetadata("objectWithJavaQualifier.before.Main.kt")
                 public void testObjectWithJavaQualifier() throws Exception {
                     runTest("testData/quickfix/createFromUsage/createClass/importDirective/objectWithJavaQualifier.before.Main.kt");
                 }
-
-                @TestMetadata("traitWithJavaQualifier.before.Main.kt")
-                public void testTraitWithJavaQualifier() throws Exception {
-                    runTest("testData/quickfix/createFromUsage/createClass/importDirective/traitWithJavaQualifier.before.Main.kt");
-                }
             }
 
             @RunWith(JUnit3RunnerWithInners.class)
@@ -1273,15 +1273,15 @@ public abstract class QuickFixMultiFileTestGenerated extends AbstractQuickFixMul
                     runTest("testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumSuperclass.before.Main.kt");
                 }
 
+                @TestMetadata("interfaceByNestedJavaQualifier.before.Main.kt")
+                public void testInterfaceByNestedJavaQualifier() throws Exception {
+                    runTest("testData/quickfix/createFromUsage/createClass/referenceExpression/interfaceByNestedJavaQualifier.before.Main.kt");
+                }
+
                 @TestMetadata("objectWithJavaQualifier.before.Main.kt")
                 public void testObjectWithJavaQualifier() throws Exception {
                     runTest("testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithJavaQualifier.before.Main.kt");
                 }
-
-                @TestMetadata("traitByNestedJavaQualifier.before.Main.kt")
-                public void testTraitByNestedJavaQualifier() throws Exception {
-                    runTest("testData/quickfix/createFromUsage/createClass/referenceExpression/traitByNestedJavaQualifier.before.Main.kt");
-                }
             }
 
             @RunWith(JUnit3RunnerWithInners.class)
@@ -1316,9 +1316,9 @@ public abstract class QuickFixMultiFileTestGenerated extends AbstractQuickFixMul
                     runTest("testData/quickfix/createFromUsage/createClass/typeReference/enumJavaTypeReceiver.before.Main.kt");
                 }
 
-                @TestMetadata("traitJavaTypeReceiver.before.Main.kt")
-                public void testTraitJavaTypeReceiver() throws Exception {
-                    runTest("testData/quickfix/createFromUsage/createClass/typeReference/traitJavaTypeReceiver.before.Main.kt");
+                @TestMetadata("interfaceJavaTypeReceiver.before.Main.kt")
+                public void testInterfaceJavaTypeReceiver() throws Exception {
+                    runTest("testData/quickfix/createFromUsage/createClass/typeReference/interfaceJavaTypeReceiver.before.Main.kt");
                 }
             }
         }
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
index f067271d7109..14448894475b 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
@@ -4017,6 +4017,11 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
                         runTest("testData/quickfix/createFromUsage/createClass/callExpression/callWithReceiver.kt");
                     }
 
+                    @TestMetadata("callWithSuperInterface.kt")
+                    public void testCallWithSuperInterface() throws Exception {
+                        runTest("testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperInterface.kt");
+                    }
+
                     @TestMetadata("callWithSuperclassNoConstructorParams.kt")
                     public void testCallWithSuperclassNoConstructorParams() throws Exception {
                         runTest("testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassNoConstructorParams.kt");
@@ -4027,11 +4032,6 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
                         runTest("testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassWithConstructorParams.kt");
                     }
 
-                    @TestMetadata("callWithSupertrait.kt")
-                    public void testCallWithSupertrait() throws Exception {
-                        runTest("testData/quickfix/createFromUsage/createClass/callExpression/callWithSupertrait.kt");
-                    }
-
                     @TestMetadata("callWithThisReceiverInClass.kt")
                     public void testCallWithThisReceiverInClass() throws Exception {
                         runTest("testData/quickfix/createFromUsage/createClass/callExpression/callWithThisReceiverInClass.kt");
@@ -4191,14 +4191,14 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
                     runTest("testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithTypeParams.kt");
                 }
 
-                @TestMetadata("traitDelegatorToSuperclass.kt")
-                public void testTraitDelegatorToSuperclass() throws Exception {
-                    runTest("testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToSuperclass.kt");
+                @TestMetadata("interfaceDelegatorToSuperclass.kt")
+                public void testInterfaceDelegatorToSuperclass() throws Exception {
+                    runTest("testData/quickfix/createFromUsage/createClass/delegationSpecifier/interfaceDelegatorToSuperclass.kt");
                 }
 
-                @TestMetadata("traitDelegatorToSuperclass2.kt")
-                public void testTraitDelegatorToSuperclass2() throws Exception {
-                    runTest("testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToSuperclass2.kt");
+                @TestMetadata("interfaceDelegatorToSuperclass2.kt")
+                public void testInterfaceDelegatorToSuperclass2() throws Exception {
+                    runTest("testData/quickfix/createFromUsage/createClass/delegationSpecifier/interfaceDelegatorToSuperclass2.kt");
                 }
             }
 
@@ -4290,6 +4290,16 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
                         runTest("testData/quickfix/createFromUsage/createClass/importDirective/enumWithQualifier.kt");
                     }
 
+                    @TestMetadata("interfaceInPackage.kt")
+                    public void testInterfaceInPackage() throws Exception {
+                        runTest("testData/quickfix/createFromUsage/createClass/importDirective/interfaceInPackage.kt");
+                    }
+
+                    @TestMetadata("interfaceWithQualifier.kt")
+                    public void testInterfaceWithQualifier() throws Exception {
+                        runTest("testData/quickfix/createFromUsage/createClass/importDirective/interfaceWithQualifier.kt");
+                    }
+
                     @TestMetadata("objectInPackage.kt")
                     public void testObjectInPackage() throws Exception {
                         runTest("testData/quickfix/createFromUsage/createClass/importDirective/objectInPackage.kt");
@@ -4299,16 +4309,6 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
                     public void testObjectWithQualifier() throws Exception {
                         runTest("testData/quickfix/createFromUsage/createClass/importDirective/objectWithQualifier.kt");
                     }
-
-                    @TestMetadata("traitInPackage.kt")
-                    public void testTraitInPackage() throws Exception {
-                        runTest("testData/quickfix/createFromUsage/createClass/importDirective/traitInPackage.kt");
-                    }
-
-                    @TestMetadata("traitWithQualifier.kt")
-                    public void testTraitWithQualifier() throws Exception {
-                        runTest("testData/quickfix/createFromUsage/createClass/importDirective/traitWithQualifier.kt");
-                    }
                 }
             }
 
@@ -4469,6 +4469,16 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
                     runTest("testData/quickfix/createFromUsage/createClass/referenceExpression/interfaceByClassLiteral.kt");
                 }
 
+                @TestMetadata("interfaceByQualifier.kt")
+                public void testInterfaceByQualifier() throws Exception {
+                    runTest("testData/quickfix/createFromUsage/createClass/referenceExpression/interfaceByQualifier.kt");
+                }
+
+                @TestMetadata("interfaceNoReceiver.kt")
+                public void testInterfaceNoReceiver() throws Exception {
+                    runTest("testData/quickfix/createFromUsage/createClass/referenceExpression/interfaceNoReceiver.kt");
+                }
+
                 @TestMetadata("objectByClassLiteral.kt")
                 public void testObjectByClassLiteral() throws Exception {
                     runTest("testData/quickfix/createFromUsage/createClass/referenceExpression/objectByClassLiteral.kt");
@@ -4519,9 +4529,9 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
                     runTest("testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithSuperclass.kt");
                 }
 
-                @TestMetadata("objectWithSupertrait.kt")
-                public void testObjectWithSupertrait() throws Exception {
-                    runTest("testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithSupertrait.kt");
+                @TestMetadata("objectWithSuperinterface.kt")
+                public void testObjectWithSuperinterface() throws Exception {
+                    runTest("testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithSuperinterface.kt");
                 }
 
                 @TestMetadata("recursiveBound.kt")
@@ -4529,16 +4539,6 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
                     runTest("testData/quickfix/createFromUsage/createClass/referenceExpression/recursiveBound.kt");
                 }
 
-                @TestMetadata("traitByQualifier.kt")
-                public void testTraitByQualifier() throws Exception {
-                    runTest("testData/quickfix/createFromUsage/createClass/referenceExpression/traitByQualifier.kt");
-                }
-
-                @TestMetadata("traitNoReceiver.kt")
-                public void testTraitNoReceiver() throws Exception {
-                    runTest("testData/quickfix/createFromUsage/createClass/referenceExpression/traitNoReceiver.kt");
-                }
-
                 @TestMetadata("unusedReference.kt")
                 public void testUnusedReference() throws Exception {
                     runTest("testData/quickfix/createFromUsage/createClass/referenceExpression/unusedReference.kt");
@@ -4642,6 +4642,11 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
                     runTest("testData/quickfix/createFromUsage/createClass/typeReference/enumNotQualifierWithTypeArgs.kt");
                 }
 
+                @TestMetadata("interfaceNotQualifierNoTypeArgs.kt")
+                public void testInterfaceNotQualifierNoTypeArgs() throws Exception {
+                    runTest("testData/quickfix/createFromUsage/createClass/typeReference/interfaceNotQualifierNoTypeArgs.kt");
+                }
+
                 @TestMetadata("nestedClassByTypeArgumentRefNoBody.kt")
                 public void testNestedClassByTypeArgumentRefNoBody() throws Exception {
                     runTest("testData/quickfix/createFromUsage/createClass/typeReference/nestedClassByTypeArgumentRefNoBody.kt");
@@ -4697,11 +4702,6 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
                     runTest("testData/quickfix/createFromUsage/createClass/typeReference/objectQualifierNoTypeArgs.kt");
                 }
 
-                @TestMetadata("traitNotQualifierNoTypeArgs.kt")
-                public void testTraitNotQualifierNoTypeArgs() throws Exception {
-                    runTest("testData/quickfix/createFromUsage/createClass/typeReference/traitNotQualifierNoTypeArgs.kt");
-                }
-
                 @TestMetadata("typeArgumentWithBound.kt")
                 public void testTypeArgumentWithBound() throws Exception {
                     runTest("testData/quickfix/createFromUsage/createClass/typeReference/typeArgumentWithBound.kt");
@@ -5064,9 +5064,9 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
                         runTest("testData/quickfix/createFromUsage/createFunction/call/extensionFunOnClassNoClassObject2.kt");
                     }
 
-                    @TestMetadata("extensionFunOnTrait.kt")
-                    public void testExtensionFunOnTrait() throws Exception {
-                        runTest("testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTrait.kt");
+                    @TestMetadata("extensionFunOnInterface.kt")
+                    public void testExtensionFunOnInterface() throws Exception {
+                        runTest("testData/quickfix/createFromUsage/createFunction/call/extensionFunOnInterface.kt");
                     }
 
                     @TestMetadata("extensionRefInImport.kt")
@@ -5129,6 +5129,11 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
                         runTest("testData/quickfix/createFromUsage/createFunction/call/funOnEnumClass2.kt");
                     }
 
+                    @TestMetadata("funOnInterface.kt")
+                    public void testFunOnInterface() throws Exception {
+                        runTest("testData/quickfix/createFromUsage/createFunction/call/funOnInterface.kt");
+                    }
+
                     @TestMetadata("funOnLibObject.kt")
                     public void testFunOnLibObject() throws Exception {
                         runTest("testData/quickfix/createFromUsage/createFunction/call/funOnLibObject.kt");
@@ -5139,11 +5144,6 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
                         runTest("testData/quickfix/createFromUsage/createFunction/call/funOnLibType.kt");
                     }
 
-                    @TestMetadata("funOnTrait.kt")
-                    public void testFunOnTrait() throws Exception {
-                        runTest("testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt");
-                    }
-
                     @TestMetadata("funOnUserObject.kt")
                     public void testFunOnUserObject() throws Exception {
                         runTest("testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt");
@@ -6198,16 +6198,16 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
                     runTest("testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInGenClass.kt");
                 }
 
+                @TestMetadata("inAccessorInInterface.kt")
+                public void testInAccessorInInterface() throws Exception {
+                    runTest("testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInInterface.kt");
+                }
+
                 @TestMetadata("inAccessorInObject.kt")
                 public void testInAccessorInObject() throws Exception {
                     runTest("testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInObject.kt");
                 }
 
-                @TestMetadata("inAccessorInTrait.kt")
-                public void testInAccessorInTrait() throws Exception {
-                    runTest("testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInTrait.kt");
-                }
-
                 @TestMetadata("inAccessorNoClass.kt")
                 public void testInAccessorNoClass() throws Exception {
                     runTest("testData/quickfix/createFromUsage/createVariable/parameter/inAccessorNoClass.kt");
@@ -10041,9 +10041,9 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
                 runTest("testData/quickfix/modifiers/addOpenToClassDeclaration/finalUpperBound.kt");
             }
 
-            @TestMetadata("implementTraitFinalSupertype.kt")
-            public void testImplementTraitFinalSupertype() throws Exception {
-                runTest("testData/quickfix/modifiers/addOpenToClassDeclaration/implementTraitFinalSupertype.kt");
+            @TestMetadata("implementInterfaceFinalSupertype.kt")
+            public void testImplementInterfaceFinalSupertype() throws Exception {
+                runTest("testData/quickfix/modifiers/addOpenToClassDeclaration/implementInterfaceFinalSupertype.kt");
             }
 
             @TestMetadata("nestedFinalClass.kt")
@@ -10182,9 +10182,9 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
                 runTest("testData/quickfix/modifiers/cannotMakeClassAnnotation.kt");
             }
 
-            @TestMetadata("finalTrait.kt")
-            public void testFinalTrait() throws Exception {
-                runTest("testData/quickfix/modifiers/finalTrait.kt");
+            @TestMetadata("finalInterface.kt")
+            public void testFinalInterface() throws Exception {
+                runTest("testData/quickfix/modifiers/finalInterface.kt");
             }
 
             @TestMetadata("illegalEnumAnnotation1.kt")
@@ -10387,9 +10387,9 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
                 runTest("testData/quickfix/modifiers/removeIncompatibleModifier.kt");
             }
 
-            @TestMetadata("removeInnerForClassInTrait.kt")
-            public void testRemoveInnerForClassInTrait() throws Exception {
-                runTest("testData/quickfix/modifiers/removeInnerForClassInTrait.kt");
+            @TestMetadata("removeInnerForClassInInterface.kt")
+            public void testRemoveInnerForClassInInterface() throws Exception {
+                runTest("testData/quickfix/modifiers/removeInnerForClassInInterface.kt");
             }
 
             @TestMetadata("removeModifierFromForbiddenOperatorMod.kt")
@@ -11035,6 +11035,11 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
                 runTest("testData/quickfix/override/nothingToOverride/addFunctionInLocalDeclaration.kt");
             }
 
+            @TestMetadata("addFunctionInterface.kt")
+            public void testAddFunctionInterface() throws Exception {
+                runTest("testData/quickfix/override/nothingToOverride/addFunctionInterface.kt");
+            }
+
             @TestMetadata("addFunctionNoBody.kt")
             public void testAddFunctionNoBody() throws Exception {
                 runTest("testData/quickfix/override/nothingToOverride/addFunctionNoBody.kt");
@@ -11060,9 +11065,9 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
                 runTest("testData/quickfix/override/nothingToOverride/addFunctionToReadOnlySupertype.kt");
             }
 
-            @TestMetadata("addFunctionTrait.kt")
-            public void testAddFunctionTrait() throws Exception {
-                runTest("testData/quickfix/override/nothingToOverride/addFunctionTrait.kt");
+            @TestMetadata("addFunctionTwoInterfaces.kt")
+            public void testAddFunctionTwoInterfaces() throws Exception {
+                runTest("testData/quickfix/override/nothingToOverride/addFunctionTwoInterfaces.kt");
             }
 
             @TestMetadata("addFunctionTwoSuperclasses.kt")
@@ -11070,11 +11075,6 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
                 runTest("testData/quickfix/override/nothingToOverride/addFunctionTwoSuperclasses.kt");
             }
 
-            @TestMetadata("addFunctionTwoTraits.kt")
-            public void testAddFunctionTwoTraits() throws Exception {
-                runTest("testData/quickfix/override/nothingToOverride/addFunctionTwoTraits.kt");
-            }
-
             @TestMetadata("addFunctionWithAnnotations.kt")
             public void testAddFunctionWithAnnotations() throws Exception {
                 runTest("testData/quickfix/override/nothingToOverride/addFunctionWithAnnotations.kt");
@@ -11105,9 +11105,9 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
                 runTest("testData/quickfix/override/nothingToOverride/addParameterPreserveVisibility.kt");
             }
 
-            @TestMetadata("addParameterTwoSupertraits.kt")
-            public void testAddParameterTwoSupertraits() throws Exception {
-                runTest("testData/quickfix/override/nothingToOverride/addParameterTwoSupertraits.kt");
+            @TestMetadata("addParameterTwoSuperinterfaces.kt")
+            public void testAddParameterTwoSuperinterfaces() throws Exception {
+                runTest("testData/quickfix/override/nothingToOverride/addParameterTwoSuperinterfaces.kt");
             }
 
             @TestMetadata("addParameterTwoSupertypes.kt")
@@ -11165,9 +11165,9 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
                 runTest("testData/quickfix/override/nothingToOverride/changeParameterTypeDefinitelyNotNull.kt");
             }
 
-            @TestMetadata("changeParameterTypeInTrait.kt")
-            public void testChangeParameterTypeInTrait() throws Exception {
-                runTest("testData/quickfix/override/nothingToOverride/changeParameterTypeInTrait.kt");
+            @TestMetadata("changeParameterTypeInInterface.kt")
+            public void testChangeParameterTypeInInterface() throws Exception {
+                runTest("testData/quickfix/override/nothingToOverride/changeParameterTypeInInterface.kt");
             }
 
             @TestMetadata("changeParameterTypeMatchNames.kt")
@@ -11190,9 +11190,9 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
                 runTest("testData/quickfix/override/nothingToOverride/changeParameterTypeSingleExpressionFunction.kt");
             }
 
-            @TestMetadata("changeParameterTypeSuperTrait.kt")
-            public void testChangeParameterTypeSuperTrait() throws Exception {
-                runTest("testData/quickfix/override/nothingToOverride/changeParameterTypeSuperTrait.kt");
+            @TestMetadata("changeParameterTypeSuperInterface.kt")
+            public void testChangeParameterTypeSuperInterface() throws Exception {
+                runTest("testData/quickfix/override/nothingToOverride/changeParameterTypeSuperInterface.kt");
             }
 
             @TestMetadata("changeReturnType.kt")
@@ -11240,9 +11240,9 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
                 runTest("testData/quickfix/override/nothingToOverride/removeParameter.kt");
             }
 
-            @TestMetadata("removeParameterTwoTraits.kt")
-            public void testRemoveParameterTwoTraits() throws Exception {
-                runTest("testData/quickfix/override/nothingToOverride/removeParameterTwoTraits.kt");
+            @TestMetadata("removeParameterTwoInterfaces.kt")
+            public void testRemoveParameterTwoInterfaces() throws Exception {
+                runTest("testData/quickfix/override/nothingToOverride/removeParameterTwoInterfaces.kt");
             }
 
             @TestMetadata("removeTypeParameter.kt")
@@ -13821,6 +13821,11 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
                 runTest("testData/quickfix/suppress/declarationKinds/fun.kt");
             }
 
+            @TestMetadata("interface.kt")
+            public void testInterface() throws Exception {
+                runTest("testData/quickfix/suppress/declarationKinds/interface.kt");
+            }
+
             @TestMetadata("multiVal.kt")
             public void testMultiVal() throws Exception {
                 runTest("testData/quickfix/suppress/declarationKinds/multiVal.kt");
@@ -13846,11 +13851,6 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
                 runTest("testData/quickfix/suppress/declarationKinds/secondaryConstructor.kt");
             }
 
-            @TestMetadata("trait.kt")
-            public void testTrait() throws Exception {
-                runTest("testData/quickfix/suppress/declarationKinds/trait.kt");
-            }
-
             @TestMetadata("val.kt")
             public void testVal() throws Exception {
                 runTest("testData/quickfix/suppress/declarationKinds/val.kt");
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/introduce/ExtractionTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/introduce/ExtractionTestGenerated.java
index 35aa984a68be..349bbb81fcac 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/introduce/ExtractionTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/introduce/ExtractionTestGenerated.java
@@ -855,6 +855,11 @@ public abstract class ExtractionTestGenerated extends AbstractExtractionTest {
                 runTest("testData/refactoring/extractFunction/basic/inlineReified2.kt");
             }
 
+            @TestMetadata("interfaceFunction.kt")
+            public void testInterfaceFunction() throws Exception {
+                runTest("testData/refactoring/extractFunction/basic/interfaceFunction.kt");
+            }
+
             @TestMetadata("invisibleType.kt")
             public void testInvisibleType() throws Exception {
                 runTest("testData/refactoring/extractFunction/basic/invisibleType.kt");
@@ -1010,11 +1015,6 @@ public abstract class ExtractionTestGenerated extends AbstractExtractionTest {
                 runTest("testData/refactoring/extractFunction/basic/topLevelValUnderSmartCast.kt");
             }
 
-            @TestMetadata("traitFunction.kt")
-            public void testTraitFunction() throws Exception {
-                runTest("testData/refactoring/extractFunction/basic/traitFunction.kt");
-            }
-
             @TestMetadata("unnecessaryNullabilityAnnotation.kt")
             public void testUnnecessaryNullabilityAnnotation() throws Exception {
                 runTest("testData/refactoring/extractFunction/basic/unnecessaryNullabilityAnnotation.kt");
@@ -2807,9 +2807,9 @@ public abstract class ExtractionTestGenerated extends AbstractExtractionTest {
                 runTest("testData/refactoring/introduceProperty/extractLazyToFile.kt");
             }
 
-            @TestMetadata("extractLazyToTrait.kt")
-            public void testExtractLazyToTrait() throws Exception {
-                runTest("testData/refactoring/introduceProperty/extractLazyToTrait.kt");
+            @TestMetadata("extractLazyToInterface.kt")
+            public void testExtractLazyToInterface() throws Exception {
+                runTest("testData/refactoring/introduceProperty/extractLazyToInterface.kt");
             }
 
             @TestMetadata("extractLazyWithBlock.kt")
@@ -2862,9 +2862,9 @@ public abstract class ExtractionTestGenerated extends AbstractExtractionTest {
                 runTest("testData/refactoring/introduceProperty/extractWithGetterToFile.kt");
             }
 
-            @TestMetadata("extractWithGetterToTrait.kt")
-            public void testExtractWithGetterToTrait() throws Exception {
-                runTest("testData/refactoring/introduceProperty/extractWithGetterToTrait.kt");
+            @TestMetadata("extractWithGetterToInterface.kt")
+            public void testExtractWithGetterToInterface() throws Exception {
+                runTest("testData/refactoring/introduceProperty/extractWithGetterToInterface.kt");
             }
 
             @TestMetadata("extractWithInitializerAndBlock.kt")
@@ -2897,9 +2897,9 @@ public abstract class ExtractionTestGenerated extends AbstractExtractionTest {
                 runTest("testData/refactoring/introduceProperty/extractWithInitializerToFile.kt");
             }
 
-            @TestMetadata("extractWithInitializerToTrait.kt")
-            public void testExtractWithInitializerToTrait() throws Exception {
-                runTest("testData/refactoring/introduceProperty/extractWithInitializerToTrait.kt");
+            @TestMetadata("extractWithInitializerToInterface.kt")
+            public void testExtractWithInitializerToInterface() throws Exception {
+                runTest("testData/refactoring/introduceProperty/extractWithInitializerToInterface.kt");
             }
 
             @TestMetadata("extractWithParams.kt")
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/safeDelete/SafeDeleteTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/safeDelete/SafeDeleteTestGenerated.java
index cd3fea896e92..f4cd31de4561 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/safeDelete/SafeDeleteTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/safeDelete/SafeDeleteTestGenerated.java
@@ -55,6 +55,16 @@ public abstract class SafeDeleteTestGenerated extends AbstractSafeDeleteTest {
             runTest("testData/refactoring/safeDelete/deleteClass/kotlinClass/enumEntry.kt");
         }
 
+        @TestMetadata("interface1.kt")
+        public void testInterface1() throws Exception {
+            runTest("testData/refactoring/safeDelete/deleteClass/kotlinClass/interface1.kt");
+        }
+
+        @TestMetadata("interface2.kt")
+        public void testInterface2() throws Exception {
+            runTest("testData/refactoring/safeDelete/deleteClass/kotlinClass/interface2.kt");
+        }
+
         @TestMetadata("localClass1.kt")
         public void testLocalClass1() throws Exception {
             runTest("testData/refactoring/safeDelete/deleteClass/kotlinClass/localClass1.kt");
@@ -80,16 +90,6 @@ public abstract class SafeDeleteTestGenerated extends AbstractSafeDeleteTest {
             runTest("testData/refactoring/safeDelete/deleteClass/kotlinClass/noUsages.kt");
         }
 
-        @TestMetadata("trait1.kt")
-        public void testTrait1() throws Exception {
-            runTest("testData/refactoring/safeDelete/deleteClass/kotlinClass/trait1.kt");
-        }
-
-        @TestMetadata("trait2.kt")
-        public void testTrait2() throws Exception {
-            runTest("testData/refactoring/safeDelete/deleteClass/kotlinClass/trait2.kt");
-        }
-
         @TestMetadata("unsafeImport.kt")
         public void testUnsafeImport() throws Exception {
             runTest("testData/refactoring/safeDelete/deleteClass/kotlinClass/unsafeImport.kt");
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/resolve/ReferenceResolveInJavaTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/resolve/ReferenceResolveInJavaTestGenerated.java
index 817ce67bf309..19f8a06c3236 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/resolve/ReferenceResolveInJavaTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/resolve/ReferenceResolveInJavaTestGenerated.java
@@ -108,14 +108,14 @@ public abstract class ReferenceResolveInJavaTestGenerated extends AbstractRefere
             runTest("testData/resolve/referenceInJava/sourceOnly/ClassObjectStaticField.java");
         }
 
-        @TestMetadata("DelegatedMethodFromTraitNoImpl.java")
-        public void testDelegatedMethodFromTraitNoImpl() throws Exception {
-            runTest("testData/resolve/referenceInJava/sourceOnly/DelegatedMethodFromTraitNoImpl.java");
+        @TestMetadata("DelegatedMethodFromInterfaceNoImpl.java")
+        public void testDelegatedMethodFromInterfaceNoImpl() throws Exception {
+            runTest("testData/resolve/referenceInJava/sourceOnly/DelegatedMethodFromInterfaceNoImpl.java");
         }
 
-        @TestMetadata("DelegatedMethodFromTraitWithImpl.java")
-        public void testDelegatedMethodFromTraitWithImpl() throws Exception {
-            runTest("testData/resolve/referenceInJava/sourceOnly/DelegatedMethodFromTraitWithImpl.java");
+        @TestMetadata("DelegatedMethodFromInterfaceWithImpl.java")
+        public void testDelegatedMethodFromInterfaceWithImpl() throws Exception {
+            runTest("testData/resolve/referenceInJava/sourceOnly/DelegatedMethodFromInterfaceWithImpl.java");
         }
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/checker/Abstract.fir.kt b/plugins/kotlin/idea/tests/testData/checker/Abstract.fir.kt
index 18acaf89d36b..baf442da7f9c 100644
--- a/plugins/kotlin/idea/tests/testData/checker/Abstract.fir.kt
+++ b/plugins/kotlin/idea/tests/testData/checker/Abstract.fir.kt
@@ -62,7 +62,7 @@ abstract class MyAbstractClass() {
     <error descr="[ABSTRACT_FUNCTION_WITH_BODY] A function 'j' with body cannot be abstract">abstract</error> fun j() {}
 }
 
-interface MyTrait {
+interface MyInterface {
     //properties
 
     val a: Int
diff --git a/plugins/kotlin/idea/tests/testData/checker/Abstract.kt b/plugins/kotlin/idea/tests/testData/checker/Abstract.kt
index d73175cbd5ca..a26c1a78b74b 100644
--- a/plugins/kotlin/idea/tests/testData/checker/Abstract.kt
+++ b/plugins/kotlin/idea/tests/testData/checker/Abstract.kt
@@ -62,7 +62,7 @@ abstract class MyAbstractClass() {
     <error>abstract</error> fun j() {}
 }
 
-interface MyTrait {
+interface MyInterface {
     //properties
 
     val a: Int
diff --git a/plugins/kotlin/idea/tests/testData/checker/TraitSupertypeList.fir.kt b/plugins/kotlin/idea/tests/testData/checker/InterfaceSupertypeList.fir.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/checker/TraitSupertypeList.fir.kt
rename to plugins/kotlin/idea/tests/testData/checker/InterfaceSupertypeList.fir.kt
diff --git a/plugins/kotlin/idea/tests/testData/checker/TraitSupertypeList.kt b/plugins/kotlin/idea/tests/testData/checker/InterfaceSupertypeList.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/checker/TraitSupertypeList.kt
rename to plugins/kotlin/idea/tests/testData/checker/InterfaceSupertypeList.kt
diff --git a/plugins/kotlin/idea/tests/testData/checker/Override.fir.kt b/plugins/kotlin/idea/tests/testData/checker/Override.fir.kt
index ab97b6850f9a..3781eaba80ea 100644
--- a/plugins/kotlin/idea/tests/testData/checker/Override.fir.kt
+++ b/plugins/kotlin/idea/tests/testData/checker/Override.fir.kt
@@ -1,6 +1,6 @@
 package override
 
-    interface MyTrait {
+    interface MyInterface {
         fun foo()
     }
 
@@ -8,25 +8,25 @@ package override
         abstract fun bar()
     }
 
-    open class MyClass : MyTrait, MyAbstractClass() {
+    open class MyClass : MyInterface, MyAbstractClass() {
         override fun foo() {}
         override fun bar() {}
     }
 
     class MyChildClass : MyClass() {}
 
-    <error descr="[ABSTRACT_MEMBER_NOT_IMPLEMENTED] Class MyIllegalClass is not abstract and does not implement abstract member foo">class MyIllegalClass</error> : MyTrait, MyAbstractClass() {}
+    <error descr="[ABSTRACT_MEMBER_NOT_IMPLEMENTED] Class MyIllegalClass is not abstract and does not implement abstract member foo">class MyIllegalClass</error> : MyInterface, MyAbstractClass() {}
 
-    <error descr="[ABSTRACT_CLASS_MEMBER_NOT_IMPLEMENTED] Class MyIllegalClass2 is not abstract and does not implement abstract base class member bar">class MyIllegalClass2</error> : MyTrait, MyAbstractClass() {
+    <error descr="[ABSTRACT_CLASS_MEMBER_NOT_IMPLEMENTED] Class MyIllegalClass2 is not abstract and does not implement abstract base class member bar">class MyIllegalClass2</error> : MyInterface, MyAbstractClass() {
         override fun foo() {}
     }
 
-    <error descr="[ABSTRACT_MEMBER_NOT_IMPLEMENTED] Class MyIllegalClass3 is not abstract and does not implement abstract member foo">class MyIllegalClass3</error> : MyTrait, MyAbstractClass() {
+    <error descr="[ABSTRACT_MEMBER_NOT_IMPLEMENTED] Class MyIllegalClass3 is not abstract and does not implement abstract member foo">class MyIllegalClass3</error> : MyInterface, MyAbstractClass() {
         override fun bar() {}
     }
 
-    <error descr="[ABSTRACT_CLASS_MEMBER_NOT_IMPLEMENTED] Class MyIllegalClass4 is not abstract and does not implement abstract base class member bar">class MyIllegalClass4</error> : MyTrait, MyAbstractClass() {
-        fun <error descr="[VIRTUAL_MEMBER_HIDDEN] 'foo' hides member of supertype 'MyTrait' and needs 'override' modifier">foo</error>() {}
+    <error descr="[ABSTRACT_CLASS_MEMBER_NOT_IMPLEMENTED] Class MyIllegalClass4 is not abstract and does not implement abstract base class member bar">class MyIllegalClass4</error> : MyInterface, MyAbstractClass() {
+        fun <error descr="[VIRTUAL_MEMBER_HIDDEN] 'foo' hides member of supertype 'MyInterface' and needs 'override' modifier">foo</error>() {}
         override fun other() {}
     }
 
diff --git a/plugins/kotlin/idea/tests/testData/checker/Override.kt b/plugins/kotlin/idea/tests/testData/checker/Override.kt
index 970478854fd8..bdcab7647799 100644
--- a/plugins/kotlin/idea/tests/testData/checker/Override.kt
+++ b/plugins/kotlin/idea/tests/testData/checker/Override.kt
@@ -1,6 +1,6 @@
 package override
 
-    interface MyTrait {
+    interface MyInterface {
         fun foo()
     }
 
@@ -8,24 +8,24 @@ package override
         abstract fun bar()
     }
 
-    open class MyClass : MyTrait, MyAbstractClass() {
+    open class MyClass : MyInterface, MyAbstractClass() {
         override fun foo() {}
         override fun bar() {}
     }
 
     class MyChildClass : MyClass() {}
 
-    <error>class MyIllegalClass</error> : MyTrait, MyAbstractClass() {}
+    <error>class MyIllegalClass</error> : MyInterface, MyAbstractClass() {}
 
-    <error>class MyIllegalClass2</error> : MyTrait, MyAbstractClass() {
+    <error>class MyIllegalClass2</error> : MyInterface, MyAbstractClass() {
         override fun foo() {}
     }
 
-    <error>class MyIllegalClass3</error> : MyTrait, MyAbstractClass() {
+    <error>class MyIllegalClass3</error> : MyInterface, MyAbstractClass() {
         override fun bar() {}
     }
 
-    <error>class MyIllegalClass4</error> : MyTrait, MyAbstractClass() {
+    <error>class MyIllegalClass4</error> : MyInterface, MyAbstractClass() {
         fun <error>foo</error>() {}
         <error>override</error> fun other() {}
     }
diff --git a/plugins/kotlin/idea/tests/testData/checker/OverridesAndGenerics.fir.kt b/plugins/kotlin/idea/tests/testData/checker/OverridesAndGenerics.fir.kt
index 4180c4bcb7da..df74951dea3e 100644
--- a/plugins/kotlin/idea/tests/testData/checker/OverridesAndGenerics.fir.kt
+++ b/plugins/kotlin/idea/tests/testData/checker/OverridesAndGenerics.fir.kt
@@ -1,4 +1,4 @@
-    interface MyTrait<T> {
+    interface MyInterface<T> {
         fun foo(t: T) : T
     }
 
@@ -6,7 +6,7 @@
         abstract fun bar(t: T) : T
     }
 
-    open class MyGenericClass<T> : MyTrait<T>, MyAbstractClass<T>() {
+    open class MyGenericClass<T> : MyInterface<T>, MyAbstractClass<T>() {
         override fun foo(t: T) = t
         override fun bar(t: T) = t
     }
@@ -18,18 +18,18 @@
         override fun bar(t: T) = t
     }
 
-    open class MyClass : MyTrait<Int>, MyAbstractClass<String>() {
+    open class MyClass : MyInterface<Int>, MyAbstractClass<String>() {
         override fun foo(t: Int) = t
         override fun bar(t: String) = t
     }
 
-    <error descr="[ABSTRACT_MEMBER_NOT_IMPLEMENTED] Class MyIllegalGenericClass1 is not abstract and does not implement abstract member foo">class MyIllegalGenericClass1</error><T> : MyTrait<T>, MyAbstractClass<T>() {}
-    <error descr="[ABSTRACT_MEMBER_NOT_IMPLEMENTED] Class MyIllegalGenericClass2 is not abstract and does not implement abstract member foo">class MyIllegalGenericClass2</error><T, R> : MyTrait<T>, MyAbstractClass<R>() {
+    <error descr="[ABSTRACT_MEMBER_NOT_IMPLEMENTED] Class MyIllegalGenericClass1 is not abstract and does not implement abstract member foo">class MyIllegalGenericClass1</error><T> : MyInterface<T>, MyAbstractClass<T>() {}
+    <error descr="[ABSTRACT_MEMBER_NOT_IMPLEMENTED] Class MyIllegalGenericClass2 is not abstract and does not implement abstract member foo">class MyIllegalGenericClass2</error><T, R> : MyInterface<T>, MyAbstractClass<R>() {
         override fun foo(r: R) = r
     }
-    <error descr="[ABSTRACT_MEMBER_NOT_IMPLEMENTED] Class MyIllegalClass1 is not abstract and does not implement abstract member foo">class MyIllegalClass1</error> : MyTrait<Int>, MyAbstractClass<String>() {}
+    <error descr="[ABSTRACT_MEMBER_NOT_IMPLEMENTED] Class MyIllegalClass1 is not abstract and does not implement abstract member foo">class MyIllegalClass1</error> : MyInterface<Int>, MyAbstractClass<String>() {}
 
-    <error descr="[ABSTRACT_MEMBER_NOT_IMPLEMENTED] Class MyIllegalClass2 is not abstract and does not implement abstract member foo">class MyIllegalClass2</error><T> : MyTrait<Int>, MyAbstractClass<Int>() {
+    <error descr="[ABSTRACT_MEMBER_NOT_IMPLEMENTED] Class MyIllegalClass2 is not abstract and does not implement abstract member foo">class MyIllegalClass2</error><T> : MyInterface<Int>, MyAbstractClass<Int>() {
         fun foo(t: T) = t
         fun bar(t: T) = t
     }
diff --git a/plugins/kotlin/idea/tests/testData/checker/OverridesAndGenerics.kt b/plugins/kotlin/idea/tests/testData/checker/OverridesAndGenerics.kt
index cc07db6345c0..c7fb8c3cbcda 100644
--- a/plugins/kotlin/idea/tests/testData/checker/OverridesAndGenerics.kt
+++ b/plugins/kotlin/idea/tests/testData/checker/OverridesAndGenerics.kt
@@ -1,4 +1,4 @@
-    interface MyTrait<T> {
+    interface MyInterface<T> {
         fun foo(t: T) : T
     }
 
@@ -6,7 +6,7 @@
         abstract fun bar(t: T) : T
     }
 
-    open class MyGenericClass<T> : MyTrait<T>, MyAbstractClass<T>() {
+    open class MyGenericClass<T> : MyInterface<T>, MyAbstractClass<T>() {
         override fun foo(t: T) = t
         override fun bar(t: T) = t
     }
@@ -18,18 +18,18 @@
         override fun bar(t: T) = t
     }
 
-    open class MyClass : MyTrait<Int>, MyAbstractClass<String>() {
+    open class MyClass : MyInterface<Int>, MyAbstractClass<String>() {
         override fun foo(t: Int) = t
         override fun bar(t: String) = t
     }
 
-    <error>class MyIllegalGenericClass1</error><T> : MyTrait<T>, MyAbstractClass<T>() {}
-    <error>class MyIllegalGenericClass2</error><T, R> : MyTrait<T>, MyAbstractClass<R>() {
+    <error>class MyIllegalGenericClass1</error><T> : MyInterface<T>, MyAbstractClass<T>() {}
+    <error>class MyIllegalGenericClass2</error><T, R> : MyInterface<T>, MyAbstractClass<R>() {
         <error>override</error> fun foo(r: R) = r
     }
-    <error>class MyIllegalClass1</error> : MyTrait<Int>, MyAbstractClass<String>() {}
+    <error>class MyIllegalClass1</error> : MyInterface<Int>, MyAbstractClass<String>() {}
 
-    <error>class MyIllegalClass2</error><T> : MyTrait<Int>, MyAbstractClass<Int>() {
+    <error>class MyIllegalClass2</error><T> : MyInterface<Int>, MyAbstractClass<Int>() {
         fun foo(t: T) = t
         fun bar(t: T) = t
     }
diff --git a/plugins/kotlin/idea/tests/testData/checker/duplicateJvmSignature/functionAndProperty/trait.kt b/plugins/kotlin/idea/tests/testData/checker/duplicateJvmSignature/functionAndProperty/interface.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/checker/duplicateJvmSignature/functionAndProperty/trait.kt
rename to plugins/kotlin/idea/tests/testData/checker/duplicateJvmSignature/functionAndProperty/interface.kt
diff --git a/plugins/kotlin/idea/tests/testData/checker/duplicateJvmSignature/traitImpl/twoTraits.kt b/plugins/kotlin/idea/tests/testData/checker/duplicateJvmSignature/interfaceImpl/twoInterfaces.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/checker/duplicateJvmSignature/traitImpl/twoTraits.kt
rename to plugins/kotlin/idea/tests/testData/checker/duplicateJvmSignature/interfaceImpl/twoInterfaces.kt
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/ClassObjectInStaticNestedClass.kt b/plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/ClassObjectInStaticNestedClass.kt
index 503598fd1c9d..f8cb7a7be0b6 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/ClassObjectInStaticNestedClass.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/ClassObjectInStaticNestedClass.kt
@@ -1,11 +1,11 @@
-interface <lineMarker>TestTrait</lineMarker> {
+interface <lineMarker>TestInterface</lineMarker> {
     fun <lineMarker>test</lineMarker>()
 }
 
 class A {
     class B {
-        companion object : TestTrait { // TODO: No line marker
-            override fun <lineMarker descr="Implements function in 'TestTrait'">test</lineMarker>() {
+        companion object : TestInterface { // TODO: No line marker
+            override fun <lineMarker descr="Implements function in 'TestInterface'">test</lineMarker>() {
             }
         }
     }
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideToStringInTrait.kt b/plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideToStringInInterface.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideToStringInTrait.kt
rename to plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideToStringInInterface.kt
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/FakeOverridesForTraitFunWithImpl.kt b/plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/FakeOverridesForInterfaceFunWithImpl.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/FakeOverridesForTraitFunWithImpl.kt
rename to plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/FakeOverridesForInterfaceFunWithImpl.kt
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/Trait.kt b/plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/Interface.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/Trait.kt
rename to plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/Interface.kt
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/NoOverridingMarkerOnDefaultTraitImpl.kt b/plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/NoOverridingMarkerOnDefaultInterfaceImpl.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/NoOverridingMarkerOnDefaultTraitImpl.kt
rename to plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/NoOverridingMarkerOnDefaultInterfaceImpl.kt
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/OverridenTraitDeclarations.kt b/plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/OverridenInterfaceDeclarations.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/OverridenTraitDeclarations.kt
rename to plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/OverridenInterfaceDeclarations.kt
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/OverridingTooltipOnDefaultTraitImpl.kt b/plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/OverridingTooltipOnDefaultInterfaceImpl.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/OverridingTooltipOnDefaultTraitImpl.kt
rename to plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/OverridingTooltipOnDefaultInterfaceImpl.kt
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/ToStringInTrait.kt b/plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/ToStringInInterface.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/ToStringInTrait.kt
rename to plugins/kotlin/idea/tests/testData/codeInsight/lineMarker/overrideImplement/ToStringInInterface.kt
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionFromTraitInJava/foo/JavaClass.java b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionFromInterfaceInJava/foo/JavaClass.java
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionFromTraitInJava/foo/JavaClass.java
rename to plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionFromInterfaceInJava/foo/JavaClass.java
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionFromTraitInJava/foo/JavaClass.java.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionFromInterfaceInJava/foo/JavaClass.java.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionFromTraitInJava/foo/JavaClass.java.after
rename to plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionFromInterfaceInJava/foo/JavaClass.java.after
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionFromTraitInJava/foo/KotlinTrait.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionFromInterfaceInJava/foo/KotlinInterface.kt
similarity index 78%
rename from plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionFromTraitInJava/foo/KotlinTrait.kt
rename to plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionFromInterfaceInJava/foo/KotlinInterface.kt
index b947689f5db9..38017b03a158 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionFromTraitInJava/foo/KotlinTrait.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionFromInterfaceInJava/foo/KotlinInterface.kt
@@ -1,6 +1,6 @@
 package foo
 
-interface KotlinTrait {
+interface KotlinInterface {
     fun bar(price : String?)
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt
index 9a74ed914908..5eada3b48c76 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt
@@ -1,8 +1,8 @@
 // FIR_IDENTICAL
-interface Trait {
+interface Interface {
     fun <A, B : Runnable, E : Map.Entry<A, B>> foo() where B : Cloneable, B : Comparable<B>
 }
 
-class TraitImpl : Trait {
+class InterfaceImpl : Interface {
     <caret>
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt.after
index d5f939c8e46c..1d4a1c68ee0d 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt.after
@@ -1,9 +1,9 @@
 // FIR_IDENTICAL
-interface Trait {
+interface Interface {
     fun <A, B : Runnable, E : Map.Entry<A, B>> foo() where B : Cloneable, B : Comparable<B>
 }
 
-class TraitImpl : Trait {
+class InterfaceImpl : Interface {
     override fun <A, B : Runnable, E : Map.Entry<A, B>> foo() where B : Cloneable, B : Comparable<B> {
         <selection><caret>TODO("Not yet implemented")</selection>
     }
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/traitGenericImplement.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/interfaceGenericImplement.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/traitGenericImplement.kt
rename to plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/interfaceGenericImplement.kt
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/traitGenericImplement.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/interfaceGenericImplement.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/traitGenericImplement.kt.after
rename to plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/interfaceGenericImplement.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/traitNullableFunction.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/interfaceNullableFunction.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/traitNullableFunction.kt
rename to plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/interfaceNullableFunction.kt
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/traitNullableFunction.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/interfaceNullableFunction.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/traitNullableFunction.kt.after
rename to plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/interfaceNullableFunction.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/copyPaste/imports/AlreadyImportedViaStar.expected.kt b/plugins/kotlin/idea/tests/testData/copyPaste/imports/AlreadyImportedViaStar.expected.kt
index ebef273b4fb9..c2406e0c8643 100644
--- a/plugins/kotlin/idea/tests/testData/copyPaste/imports/AlreadyImportedViaStar.expected.kt
+++ b/plugins/kotlin/idea/tests/testData/copyPaste/imports/AlreadyImportedViaStar.expected.kt
@@ -10,6 +10,6 @@ fun f(p: A, t: T) {
     E.ENTRY
 }
 
-fun f2(i: Outer.Inner, n: Outer.Nested, e: Outer.NestedEnum, o: Outer.NestedObj, t: Outer.NestedTrait, a: Outer.NestedAnnotation) {
+fun f2(i: Outer.Inner, n: Outer.Nested, e: Outer.NestedEnum, o: Outer.NestedObj, t: Outer.NestedInterface, a: Outer.NestedAnnotation) {
     ClassObject
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/copyPaste/imports/AlreadyImportedViaStar.expected.names b/plugins/kotlin/idea/tests/testData/copyPaste/imports/AlreadyImportedViaStar.expected.names
index 6faa818b6eae..243634958abb 100644
--- a/plugins/kotlin/idea/tests/testData/copyPaste/imports/AlreadyImportedViaStar.expected.names
+++ b/plugins/kotlin/idea/tests/testData/copyPaste/imports/AlreadyImportedViaStar.expected.names
@@ -3,5 +3,5 @@ a.Outer.Inner
 a.Outer.Nested
 a.Outer.NestedAnnotation
 a.Outer.NestedEnum
+a.Outer.NestedInterface
 a.Outer.NestedObj
-a.Outer.NestedTrait
diff --git a/plugins/kotlin/idea/tests/testData/copyPaste/imports/AlreadyImportedViaStar.kt b/plugins/kotlin/idea/tests/testData/copyPaste/imports/AlreadyImportedViaStar.kt
index cff68a00a82e..631c69a20e12 100644
--- a/plugins/kotlin/idea/tests/testData/copyPaste/imports/AlreadyImportedViaStar.kt
+++ b/plugins/kotlin/idea/tests/testData/copyPaste/imports/AlreadyImportedViaStar.kt
@@ -34,7 +34,7 @@ class Outer {
     }
     object NestedObj {
     }
-    interface NestedTrait {
+    interface NestedInterface {
     }
     annotation class NestedAnnotation
 }
@@ -51,6 +51,6 @@ class ClassObject {
     ENTRY
 }
 
-fun f2(i: Inner, n: Nested, e: NestedEnum, o: NestedObj, t: NestedTrait, a: NestedAnnotation) {
+fun f2(i: Inner, n: Nested, e: NestedEnum, o: NestedObj, t: NestedInterface, a: NestedAnnotation) {
     ClassObject
 }</selection>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/copyPaste/imports/ClassObjectInner.expected.kt b/plugins/kotlin/idea/tests/testData/copyPaste/imports/ClassObjectInner.expected.kt
index 4042ea579446..c071f8eef1ba 100644
--- a/plugins/kotlin/idea/tests/testData/copyPaste/imports/ClassObjectInner.expected.kt
+++ b/plugins/kotlin/idea/tests/testData/copyPaste/imports/ClassObjectInner.expected.kt
@@ -2,5 +2,5 @@ package to
 
 import a.Outer
 
-fun f(n: Outer.Companion.Nested, e: Outer.Companion.NestedEnum, o: Outer.Companion.NestedObj, t: Outer.Companion.NestedTrait, a: Outer.Companion.NestedAnnotation) {
+fun f(n: Outer.Companion.Nested, e: Outer.Companion.NestedEnum, o: Outer.Companion.NestedObj, t: Outer.Companion.NestedInterface, a: Outer.Companion.NestedAnnotation) {
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/copyPaste/imports/ClassObjectInner.expected.names b/plugins/kotlin/idea/tests/testData/copyPaste/imports/ClassObjectInner.expected.names
index 59d1571744d1..8c75433e2175 100644
--- a/plugins/kotlin/idea/tests/testData/copyPaste/imports/ClassObjectInner.expected.names
+++ b/plugins/kotlin/idea/tests/testData/copyPaste/imports/ClassObjectInner.expected.names
@@ -1,5 +1,5 @@
 a.Outer.Companion.Nested
 a.Outer.Companion.NestedAnnotation
 a.Outer.Companion.NestedEnum
+a.Outer.Companion.NestedInterface
 a.Outer.Companion.NestedObj
-a.Outer.Companion.NestedTrait
diff --git a/plugins/kotlin/idea/tests/testData/copyPaste/imports/ClassObjectInner.kt b/plugins/kotlin/idea/tests/testData/copyPaste/imports/ClassObjectInner.kt
index 29811208d46f..8efb94b80a5e 100644
--- a/plugins/kotlin/idea/tests/testData/copyPaste/imports/ClassObjectInner.kt
+++ b/plugins/kotlin/idea/tests/testData/copyPaste/imports/ClassObjectInner.kt
@@ -3,7 +3,7 @@ package a
 import a.Outer.Companion.Nested
 import a.Outer.Companion.NestedEnum
 import a.Outer.Companion.NestedObj
-import a.Outer.Companion.NestedTrait
+import a.Outer.Companion.NestedInterface
 import a.Outer.Companion.NestedAnnotation
 
 class Outer {
@@ -14,11 +14,11 @@ class Outer {
         }
         object NestedObj {
         }
-        interface NestedTrait {
+        interface NestedInterface {
         }
         annotation class NestedAnnotation
     }
 }
 
-<selection>fun f(n: Nested, e: NestedEnum, o: NestedObj, t: NestedTrait, a: NestedAnnotation) {
+<selection>fun f(n: Nested, e: NestedEnum, o: NestedObj, t: NestedInterface, a: NestedAnnotation) {
 }</selection>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/copyPaste/imports/DependencyOnKotlinLibrary.expected.kt b/plugins/kotlin/idea/tests/testData/copyPaste/imports/DependencyOnKotlinLibrary.expected.kt
index d7e34714f502..ba2d445daab4 100644
--- a/plugins/kotlin/idea/tests/testData/copyPaste/imports/DependencyOnKotlinLibrary.expected.kt
+++ b/plugins/kotlin/idea/tests/testData/copyPaste/imports/DependencyOnKotlinLibrary.expected.kt
@@ -19,6 +19,6 @@ fun f(a: A, t: T) {
     E.ENTRY
 }
 
-fun f2(i: Outer.Inner, n: Outer.Nested, e: Outer.NestedEnum, o: Outer.NestedObj, t: Outer.NestedTrait, a: Outer.NestedAnnotation) {
+fun f2(i: Outer.Inner, n: Outer.Nested, e: Outer.NestedEnum, o: Outer.NestedObj, t: Outer.NestedInterface, a: Outer.NestedAnnotation) {
     ClassObject
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/copyPaste/imports/DependencyOnKotlinLibrary.expected.names b/plugins/kotlin/idea/tests/testData/copyPaste/imports/DependencyOnKotlinLibrary.expected.names
index 8e958503a944..414f9bde1c75 100644
--- a/plugins/kotlin/idea/tests/testData/copyPaste/imports/DependencyOnKotlinLibrary.expected.names
+++ b/plugins/kotlin/idea/tests/testData/copyPaste/imports/DependencyOnKotlinLibrary.expected.names
@@ -7,8 +7,8 @@ d.Outer.Inner
 d.Outer.Nested
 d.Outer.NestedAnnotation
 d.Outer.NestedEnum
+d.Outer.NestedInterface
 d.Outer.NestedObj
-d.Outer.NestedTrait
 d.T
 d.c
 d.ext
diff --git a/plugins/kotlin/idea/tests/testData/copyPaste/imports/DependencyOnKotlinLibrary.kt b/plugins/kotlin/idea/tests/testData/copyPaste/imports/DependencyOnKotlinLibrary.kt
index 623bb00c09e9..e96e51c5c1d4 100644
--- a/plugins/kotlin/idea/tests/testData/copyPaste/imports/DependencyOnKotlinLibrary.kt
+++ b/plugins/kotlin/idea/tests/testData/copyPaste/imports/DependencyOnKotlinLibrary.kt
@@ -13,6 +13,6 @@ import d.Outer.*
     ENTRY
 }
 
-fun f2(i: Inner, n: Nested, e: NestedEnum, o: NestedObj, t: NestedTrait, a: NestedAnnotation) {
+fun f2(i: Inner, n: Nested, e: NestedEnum, o: NestedObj, t: NestedInterface, a: NestedAnnotation) {
     ClassObject
 }</selection>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/copyPaste/imports/ImportDependency.dependency.kt b/plugins/kotlin/idea/tests/testData/copyPaste/imports/ImportDependency.dependency.kt
index a0018009b4da..e5062ddb63db 100644
--- a/plugins/kotlin/idea/tests/testData/copyPaste/imports/ImportDependency.dependency.kt
+++ b/plugins/kotlin/idea/tests/testData/copyPaste/imports/ImportDependency.dependency.kt
@@ -31,7 +31,7 @@ class Outer {
     }
     object NestedObj {
     }
-    interface NestedTrait {
+    interface NestedInterface {
     }
     annotation class NestedAnnotation
 }
diff --git a/plugins/kotlin/idea/tests/testData/copyPaste/imports/ImportDependency.expected.kt b/plugins/kotlin/idea/tests/testData/copyPaste/imports/ImportDependency.expected.kt
index d7e34714f502..ba2d445daab4 100644
--- a/plugins/kotlin/idea/tests/testData/copyPaste/imports/ImportDependency.expected.kt
+++ b/plugins/kotlin/idea/tests/testData/copyPaste/imports/ImportDependency.expected.kt
@@ -19,6 +19,6 @@ fun f(a: A, t: T) {
     E.ENTRY
 }
 
-fun f2(i: Outer.Inner, n: Outer.Nested, e: Outer.NestedEnum, o: Outer.NestedObj, t: Outer.NestedTrait, a: Outer.NestedAnnotation) {
+fun f2(i: Outer.Inner, n: Outer.Nested, e: Outer.NestedEnum, o: Outer.NestedObj, t: Outer.NestedInterface, a: Outer.NestedAnnotation) {
     ClassObject
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/copyPaste/imports/ImportDependency.expected.names b/plugins/kotlin/idea/tests/testData/copyPaste/imports/ImportDependency.expected.names
index 8e958503a944..414f9bde1c75 100644
--- a/plugins/kotlin/idea/tests/testData/copyPaste/imports/ImportDependency.expected.names
+++ b/plugins/kotlin/idea/tests/testData/copyPaste/imports/ImportDependency.expected.names
@@ -7,8 +7,8 @@ d.Outer.Inner
 d.Outer.Nested
 d.Outer.NestedAnnotation
 d.Outer.NestedEnum
+d.Outer.NestedInterface
 d.Outer.NestedObj
-d.Outer.NestedTrait
 d.T
 d.c
 d.ext
diff --git a/plugins/kotlin/idea/tests/testData/copyPaste/imports/ImportDependency.kt b/plugins/kotlin/idea/tests/testData/copyPaste/imports/ImportDependency.kt
index f0ee3525651b..ad6546a23a3a 100644
--- a/plugins/kotlin/idea/tests/testData/copyPaste/imports/ImportDependency.kt
+++ b/plugins/kotlin/idea/tests/testData/copyPaste/imports/ImportDependency.kt
@@ -11,6 +11,6 @@ import d.Outer.*
     ENTRY
 }
 
-fun f2(i: Inner, n: Nested, e: NestedEnum, o: NestedObj, t: NestedTrait, a: NestedAnnotation) {
+fun f2(i: Inner, n: Nested, e: NestedEnum, o: NestedObj, t: NestedInterface, a: NestedAnnotation) {
     ClassObject
 }</selection>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/copyPaste/imports/ImportedElementCopied.expected.kt b/plugins/kotlin/idea/tests/testData/copyPaste/imports/ImportedElementCopied.expected.kt
index 8863764d7323..70ab245283f1 100644
--- a/plugins/kotlin/idea/tests/testData/copyPaste/imports/ImportedElementCopied.expected.kt
+++ b/plugins/kotlin/idea/tests/testData/copyPaste/imports/ImportedElementCopied.expected.kt
@@ -2,7 +2,7 @@
 // ERROR: Unresolved reference: Nested
 // ERROR: Unresolved reference: NestedEnum
 // ERROR: Unresolved reference: NestedObj
-// ERROR: Unresolved reference: NestedTrait
+// ERROR: Unresolved reference: NestedInterface
 // ERROR: Unresolved reference: NestedAnnotation
 package to
 
@@ -15,7 +15,7 @@ class Outer {
     }
     object NestedObj {
     }
-    interface NestedTrait {
+    interface NestedInterface {
     }
     annotation class NestedAnnotation
 }
@@ -24,5 +24,5 @@ enum class E {
     ENTRY
 }
 
-fun f2(i: Inner, n: Nested, e: NestedEnum, o: NestedObj, t: NestedTrait, a: NestedAnnotation) {
+fun f2(i: Inner, n: Nested, e: NestedEnum, o: NestedObj, t: NestedInterface, a: NestedAnnotation) {
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/copyPaste/imports/ImportedElementCopied.kt b/plugins/kotlin/idea/tests/testData/copyPaste/imports/ImportedElementCopied.kt
index 4cb4a04dc717..ce413de1c5f4 100644
--- a/plugins/kotlin/idea/tests/testData/copyPaste/imports/ImportedElementCopied.kt
+++ b/plugins/kotlin/idea/tests/testData/copyPaste/imports/ImportedElementCopied.kt
@@ -16,7 +16,7 @@ import a.E.ENTRY
     }
     object NestedObj {
     }
-    interface NestedTrait {
+    interface NestedInterface {
     }
     annotation class NestedAnnotation
 }
@@ -25,5 +25,5 @@ enum class E {
     ENTRY
 }
 
-fun f2(i: Inner, n: Nested, e: NestedEnum, o: NestedObj, t: NestedTrait, a: NestedAnnotation) {
+fun f2(i: Inner, n: Nested, e: NestedEnum, o: NestedObj, t: NestedInterface, a: NestedAnnotation) {
 }</selection>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/copyPaste/imports/Inner.expected.kt b/plugins/kotlin/idea/tests/testData/copyPaste/imports/Inner.expected.kt
index 4bcad78bb9f2..c30e432dc289 100644
--- a/plugins/kotlin/idea/tests/testData/copyPaste/imports/Inner.expected.kt
+++ b/plugins/kotlin/idea/tests/testData/copyPaste/imports/Inner.expected.kt
@@ -2,6 +2,6 @@ package to
 
 import a.Outer
 
-fun f(i: Outer.Inner, n: Outer.Nested, e: Outer.NestedEnum, o: Outer.NestedObj, t: Outer.NestedTrait, aa: Outer.NestedAnnotation) {
+fun f(i: Outer.Inner, n: Outer.Nested, e: Outer.NestedEnum, o: Outer.NestedObj, t: Outer.NestedInterface, aa: Outer.NestedAnnotation) {
     Outer().Inner2()
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/copyPaste/imports/Inner.expected.names b/plugins/kotlin/idea/tests/testData/copyPaste/imports/Inner.expected.names
index 9113f6c10b3c..436c699fda8d 100644
--- a/plugins/kotlin/idea/tests/testData/copyPaste/imports/Inner.expected.names
+++ b/plugins/kotlin/idea/tests/testData/copyPaste/imports/Inner.expected.names
@@ -3,5 +3,5 @@ a.Outer.Inner
 a.Outer.Nested
 a.Outer.NestedAnnotation
 a.Outer.NestedEnum
+a.Outer.NestedInterface
 a.Outer.NestedObj
-a.Outer.NestedTrait
diff --git a/plugins/kotlin/idea/tests/testData/copyPaste/imports/Inner.kt b/plugins/kotlin/idea/tests/testData/copyPaste/imports/Inner.kt
index b51d9ea6b8f9..09d91a0bbe38 100644
--- a/plugins/kotlin/idea/tests/testData/copyPaste/imports/Inner.kt
+++ b/plugins/kotlin/idea/tests/testData/copyPaste/imports/Inner.kt
@@ -13,11 +13,11 @@ class Outer {
     }
     object NestedObj {
     }
-    interface NestedTrait {
+    interface NestedInterface {
     }
     annotation class NestedAnnotation
 }
 
-<selection>fun f(i: Inner, n: Nested, e: NestedEnum, o: NestedObj, t: NestedTrait, aa: NestedAnnotation) {
+<selection>fun f(i: Inner, n: Nested, e: NestedEnum, o: NestedObj, t: NestedInterface, aa: NestedAnnotation) {
     Outer().Inner2()
 }</selection>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/copyPaste/imports/Trait.expected.kt b/plugins/kotlin/idea/tests/testData/copyPaste/imports/Interface.expected.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/copyPaste/imports/Trait.expected.kt
rename to plugins/kotlin/idea/tests/testData/copyPaste/imports/Interface.expected.kt
diff --git a/plugins/kotlin/idea/tests/testData/copyPaste/imports/Trait.expected.names b/plugins/kotlin/idea/tests/testData/copyPaste/imports/Interface.expected.names
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/copyPaste/imports/Trait.expected.names
rename to plugins/kotlin/idea/tests/testData/copyPaste/imports/Interface.expected.names
diff --git a/plugins/kotlin/idea/tests/testData/copyPaste/imports/Trait.kt b/plugins/kotlin/idea/tests/testData/copyPaste/imports/Interface.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/copyPaste/imports/Trait.kt
rename to plugins/kotlin/idea/tests/testData/copyPaste/imports/Interface.kt
diff --git a/plugins/kotlin/idea/tests/testData/copyPaste/imports/KotlinLibrary/Dependency.kt b/plugins/kotlin/idea/tests/testData/copyPaste/imports/KotlinLibrary/Dependency.kt
index 888bbb3f059f..2cfffa7f90b7 100644
--- a/plugins/kotlin/idea/tests/testData/copyPaste/imports/KotlinLibrary/Dependency.kt
+++ b/plugins/kotlin/idea/tests/testData/copyPaste/imports/KotlinLibrary/Dependency.kt
@@ -32,7 +32,7 @@ class Outer {
     }
     object NestedObj {
     }
-    interface NestedTrait {
+    interface NestedInterface {
     }
     annotation class NestedAnnotation
 }
diff --git a/plugins/kotlin/idea/tests/testData/copyPaste/imports/NoImportForSamePackage.expected.kt b/plugins/kotlin/idea/tests/testData/copyPaste/imports/NoImportForSamePackage.expected.kt
index 7083caefe837..a948584fc775 100644
--- a/plugins/kotlin/idea/tests/testData/copyPaste/imports/NoImportForSamePackage.expected.kt
+++ b/plugins/kotlin/idea/tests/testData/copyPaste/imports/NoImportForSamePackage.expected.kt
@@ -8,6 +8,6 @@ private fun f(p: A, t: T) {
     E.ENTRY
 }
 
-private fun f2(i: Outer.Inner, n: Outer.Nested, e: Outer.NestedEnum, o: Outer.NestedObj, t: Outer.NestedTrait, a: Outer.NestedAnnotation) {
+private fun f2(i: Outer.Inner, n: Outer.Nested, e: Outer.NestedEnum, o: Outer.NestedObj, t: Outer.NestedInterface, a: Outer.NestedAnnotation) {
     ClassObject
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/copyPaste/imports/NoImportForSamePackage.expected.names b/plugins/kotlin/idea/tests/testData/copyPaste/imports/NoImportForSamePackage.expected.names
index 6faa818b6eae..243634958abb 100644
--- a/plugins/kotlin/idea/tests/testData/copyPaste/imports/NoImportForSamePackage.expected.names
+++ b/plugins/kotlin/idea/tests/testData/copyPaste/imports/NoImportForSamePackage.expected.names
@@ -3,5 +3,5 @@ a.Outer.Inner
 a.Outer.Nested
 a.Outer.NestedAnnotation
 a.Outer.NestedEnum
+a.Outer.NestedInterface
 a.Outer.NestedObj
-a.Outer.NestedTrait
diff --git a/plugins/kotlin/idea/tests/testData/copyPaste/imports/NoImportForSamePackage.kt b/plugins/kotlin/idea/tests/testData/copyPaste/imports/NoImportForSamePackage.kt
index 2aabd1ed3558..184c219820bc 100644
--- a/plugins/kotlin/idea/tests/testData/copyPaste/imports/NoImportForSamePackage.kt
+++ b/plugins/kotlin/idea/tests/testData/copyPaste/imports/NoImportForSamePackage.kt
@@ -34,7 +34,7 @@ class Outer {
     }
     object NestedObj {
     }
-    interface NestedTrait {
+    interface NestedInterface {
     }
     annotation class NestedAnnotation
 }
@@ -51,6 +51,6 @@ class ClassObject {
     ENTRY
 }
 
-private fun f2(i: Inner, n: Nested, e: NestedEnum, o: NestedObj, t: NestedTrait, a: NestedAnnotation) {
+private fun f2(i: Inner, n: Nested, e: NestedEnum, o: NestedObj, t: NestedInterface, a: NestedAnnotation) {
     ClassObject
 }</selection>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/decompiler/navigation/library/main.kt b/plugins/kotlin/idea/tests/testData/decompiler/navigation/library/main.kt
index b9733de164ee..f4fe8b156de3 100644
--- a/plugins/kotlin/idea/tests/testData/decompiler/navigation/library/main.kt
+++ b/plugins/kotlin/idea/tests/testData/decompiler/navigation/library/main.kt
@@ -1,12 +1,12 @@
 package testData.libraries
 
-public interface SimpleTrait {
+public interface SimpleInterface {
 }
 
 public class SimpleClass {
 }
 
-public class SimpleTraitImpl : SimpleTrait {
+public class SimpleInterfaceImpl : SimpleInterface {
 }
 
 public class WithInnerAndObject {
@@ -22,8 +22,8 @@ public class WithInnerAndObject {
     }
 }
 
-public class WithTraitClassObject {
-    companion object : SimpleTrait
+public class WithInterfaceClassObject {
+    companion object : SimpleInterface
 }
 
 public abstract class AbstractClass {
diff --git a/plugins/kotlin/idea/tests/testData/decompiler/stubBuilder/InheritingClasses/InheritingClasses.kt b/plugins/kotlin/idea/tests/testData/decompiler/stubBuilder/InheritingClasses/InheritingClasses.kt
index 861b907c8cb3..8f8c5287afaf 100644
--- a/plugins/kotlin/idea/tests/testData/decompiler/stubBuilder/InheritingClasses/InheritingClasses.kt
+++ b/plugins/kotlin/idea/tests/testData/decompiler/stubBuilder/InheritingClasses/InheritingClasses.kt
@@ -28,18 +28,18 @@ class InheritingClasses {
 
 
     class InheritAny {
-        interface SomeTrait
-        interface SomeTrait2
+        interface SomeInterface
+        interface SomeInterface2
 
         class ImplicitAny
 
         class ExplicitAny : Any()
 
-        class OnlyTrait : SomeTrait
-        class OnlyTraits : SomeTrait, SomeTrait2
+        class OnlyInterface : SomeInterface
+        class OnlyInterfaces : SomeInterface, SomeInterface2
 
-        class TraitWithExplicitAny : Any(), SomeTrait
-        class TraitsWithExplicitAny : SomeTrait2, Any(), SomeTrait
+        class InterfaceWithExplicitAny : Any(), SomeInterface
+        class InterfacesWithExplicitAny : SomeInterface2, Any(), SomeInterface
     }
 
     abstract class InheritFunctionType : ((Int, String) -> Int)
diff --git a/plugins/kotlin/idea/tests/testData/decompiler/stubBuilder/InheritingClasses/InheritingClasses.txt b/plugins/kotlin/idea/tests/testData/decompiler/stubBuilder/InheritingClasses/InheritingClasses.txt
index 7a332259b73e..72465bc7daaa 100644
--- a/plugins/kotlin/idea/tests/testData/decompiler/stubBuilder/InheritingClasses/InheritingClasses.txt
+++ b/plugins/kotlin/idea/tests/testData/decompiler/stubBuilder/InheritingClasses/InheritingClasses.txt
@@ -209,7 +209,7 @@ PsiJetFileStubImpl[package=a]
               MODIFIER_LIST[public]
               VALUE_PARAMETER_LIST
             CLASS_BODY
-          CLASS[classId=a/InheritingClasses.InheritAny.OnlyTrait, fqName=a.InheritingClasses.InheritAny.OnlyTrait, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=OnlyTrait, superNames=[SomeTrait]]
+          CLASS[classId=a/InheritingClasses.InheritAny.OnlyInterface, fqName=a.InheritingClasses.InheritAny.OnlyInterface, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=OnlyInterface, superNames=[SomeInterface]]
             MODIFIER_LIST[public final]
             PRIMARY_CONSTRUCTOR
               MODIFIER_LIST[public]
@@ -224,9 +224,9 @@ PsiJetFileStubImpl[package=a]
                           REFERENCE_EXPRESSION[referencedName=a]
                         REFERENCE_EXPRESSION[referencedName=InheritingClasses]
                       REFERENCE_EXPRESSION[referencedName=InheritAny]
-                    REFERENCE_EXPRESSION[referencedName=SomeTrait]
+                    REFERENCE_EXPRESSION[referencedName=SomeInterface]
             CLASS_BODY
-          CLASS[classId=a/InheritingClasses.InheritAny.OnlyTraits, fqName=a.InheritingClasses.InheritAny.OnlyTraits, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=OnlyTraits, superNames=[SomeTrait, SomeTrait2]]
+          CLASS[classId=a/InheritingClasses.InheritAny.OnlyInterfaces, fqName=a.InheritingClasses.InheritAny.OnlyInterfaces, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=OnlyInterfaces, superNames=[SomeInterface, SomeInterface2]]
             MODIFIER_LIST[public final]
             PRIMARY_CONSTRUCTOR
               MODIFIER_LIST[public]
@@ -241,7 +241,7 @@ PsiJetFileStubImpl[package=a]
                           REFERENCE_EXPRESSION[referencedName=a]
                         REFERENCE_EXPRESSION[referencedName=InheritingClasses]
                       REFERENCE_EXPRESSION[referencedName=InheritAny]
-                    REFERENCE_EXPRESSION[referencedName=SomeTrait]
+                    REFERENCE_EXPRESSION[referencedName=SomeInterface]
               SUPER_TYPE_ENTRY
                 TYPE_REFERENCE
                   USER_TYPE
@@ -251,15 +251,15 @@ PsiJetFileStubImpl[package=a]
                           REFERENCE_EXPRESSION[referencedName=a]
                         REFERENCE_EXPRESSION[referencedName=InheritingClasses]
                       REFERENCE_EXPRESSION[referencedName=InheritAny]
-                    REFERENCE_EXPRESSION[referencedName=SomeTrait2]
+                    REFERENCE_EXPRESSION[referencedName=SomeInterface2]
             CLASS_BODY
-          CLASS[classId=a/InheritingClasses.InheritAny.SomeTrait, fqName=a.InheritingClasses.InheritAny.SomeTrait, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=false, name=SomeTrait, superNames=[]]
+          CLASS[classId=a/InheritingClasses.InheritAny.SomeInterface, fqName=a.InheritingClasses.InheritAny.SomeInterface, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=false, name=SomeInterface, superNames=[]]
             MODIFIER_LIST[public]
             CLASS_BODY
-          CLASS[classId=a/InheritingClasses.InheritAny.SomeTrait2, fqName=a.InheritingClasses.InheritAny.SomeTrait2, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=false, name=SomeTrait2, superNames=[]]
+          CLASS[classId=a/InheritingClasses.InheritAny.SomeInterface2, fqName=a.InheritingClasses.InheritAny.SomeInterface2, isEnumEntry=false, isInterface=true, isLocal=false, isTopLevel=false, name=SomeInterface2, superNames=[]]
             MODIFIER_LIST[public]
             CLASS_BODY
-          CLASS[classId=a/InheritingClasses.InheritAny.TraitWithExplicitAny, fqName=a.InheritingClasses.InheritAny.TraitWithExplicitAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=TraitWithExplicitAny, superNames=[Any, SomeTrait]]
+          CLASS[classId=a/InheritingClasses.InheritAny.InterfaceWithExplicitAny, fqName=a.InheritingClasses.InheritAny.InterfaceWithExplicitAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=InterfaceWithExplicitAny, superNames=[Any, SomeInterface]]
             MODIFIER_LIST[public final]
             PRIMARY_CONSTRUCTOR
               MODIFIER_LIST[public]
@@ -280,9 +280,9 @@ PsiJetFileStubImpl[package=a]
                           REFERENCE_EXPRESSION[referencedName=a]
                         REFERENCE_EXPRESSION[referencedName=InheritingClasses]
                       REFERENCE_EXPRESSION[referencedName=InheritAny]
-                    REFERENCE_EXPRESSION[referencedName=SomeTrait]
+                    REFERENCE_EXPRESSION[referencedName=SomeInterface]
             CLASS_BODY
-          CLASS[classId=a/InheritingClasses.InheritAny.TraitsWithExplicitAny, fqName=a.InheritingClasses.InheritAny.TraitsWithExplicitAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=TraitsWithExplicitAny, superNames=[SomeTrait2, Any, SomeTrait]]
+          CLASS[classId=a/InheritingClasses.InheritAny.InterfacesWithExplicitAny, fqName=a.InheritingClasses.InheritAny.InterfacesWithExplicitAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=InterfacesWithExplicitAny, superNames=[SomeInterface2, Any, SomeInterface]]
             MODIFIER_LIST[public final]
             PRIMARY_CONSTRUCTOR
               MODIFIER_LIST[public]
@@ -297,7 +297,7 @@ PsiJetFileStubImpl[package=a]
                           REFERENCE_EXPRESSION[referencedName=a]
                         REFERENCE_EXPRESSION[referencedName=InheritingClasses]
                       REFERENCE_EXPRESSION[referencedName=InheritAny]
-                    REFERENCE_EXPRESSION[referencedName=SomeTrait2]
+                    REFERENCE_EXPRESSION[referencedName=SomeInterface2]
               SUPER_TYPE_ENTRY
                 TYPE_REFERENCE
                   USER_TYPE
@@ -313,7 +313,7 @@ PsiJetFileStubImpl[package=a]
                           REFERENCE_EXPRESSION[referencedName=a]
                         REFERENCE_EXPRESSION[referencedName=InheritingClasses]
                       REFERENCE_EXPRESSION[referencedName=InheritAny]
-                    REFERENCE_EXPRESSION[referencedName=SomeTrait]
+                    REFERENCE_EXPRESSION[referencedName=SomeInterface]
             CLASS_BODY
       CLASS[classId=a/InheritingClasses.InheritFunctionType, fqName=a.InheritingClasses.InheritFunctionType, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=InheritFunctionType, superNames=[]]
         MODIFIER_LIST[abstract public]
diff --git a/plugins/kotlin/idea/tests/testData/hierarchy/class/sub/AllFromTrait/AllFromTrait_verification.xml b/plugins/kotlin/idea/tests/testData/hierarchy/class/sub/AllFromInterface/AllFromInterface_verification.xml
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/hierarchy/class/sub/AllFromTrait/AllFromTrait_verification.xml
rename to plugins/kotlin/idea/tests/testData/hierarchy/class/sub/AllFromInterface/AllFromInterface_verification.xml
diff --git a/plugins/kotlin/idea/tests/testData/hierarchy/class/sub/AllFromTrait/main.kt b/plugins/kotlin/idea/tests/testData/hierarchy/class/sub/AllFromInterface/main.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/hierarchy/class/sub/AllFromTrait/main.kt
rename to plugins/kotlin/idea/tests/testData/hierarchy/class/sub/AllFromInterface/main.kt
diff --git a/plugins/kotlin/idea/tests/testData/hierarchy/class/sub/ClassFromTrait/ClassFromTrait_verification.xml b/plugins/kotlin/idea/tests/testData/hierarchy/class/sub/ClassFromInterface/ClassFromInterface_verification.xml
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/hierarchy/class/sub/ClassFromTrait/ClassFromTrait_verification.xml
rename to plugins/kotlin/idea/tests/testData/hierarchy/class/sub/ClassFromInterface/ClassFromInterface_verification.xml
diff --git a/plugins/kotlin/idea/tests/testData/hierarchy/class/sub/ClassFromTrait/main.kt b/plugins/kotlin/idea/tests/testData/hierarchy/class/sub/ClassFromInterface/main.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/hierarchy/class/sub/ClassFromTrait/main.kt
rename to plugins/kotlin/idea/tests/testData/hierarchy/class/sub/ClassFromInterface/main.kt
diff --git a/plugins/kotlin/idea/tests/testData/hierarchy/class/sub/TraitFromClass/TraitFromClass_verification.xml b/plugins/kotlin/idea/tests/testData/hierarchy/class/sub/InterfaceFromClass/InterfaceFromClass_verification.xml
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/hierarchy/class/sub/TraitFromClass/TraitFromClass_verification.xml
rename to plugins/kotlin/idea/tests/testData/hierarchy/class/sub/InterfaceFromClass/InterfaceFromClass_verification.xml
diff --git a/plugins/kotlin/idea/tests/testData/hierarchy/class/sub/TraitFromClass/main.kt b/plugins/kotlin/idea/tests/testData/hierarchy/class/sub/InterfaceFromClass/main.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/hierarchy/class/sub/TraitFromClass/main.kt
rename to plugins/kotlin/idea/tests/testData/hierarchy/class/sub/InterfaceFromClass/main.kt
diff --git a/plugins/kotlin/idea/tests/testData/hierarchy/class/sub/TraitFromTrait/TraitFromTrait_verification.xml b/plugins/kotlin/idea/tests/testData/hierarchy/class/sub/InterfaceFromInterface/InterfaceFromInterface_verification.xml
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/hierarchy/class/sub/TraitFromTrait/TraitFromTrait_verification.xml
rename to plugins/kotlin/idea/tests/testData/hierarchy/class/sub/InterfaceFromInterface/InterfaceFromInterface_verification.xml
diff --git a/plugins/kotlin/idea/tests/testData/hierarchy/class/sub/TraitFromTrait/main.kt b/plugins/kotlin/idea/tests/testData/hierarchy/class/sub/InterfaceFromInterface/main.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/hierarchy/class/sub/TraitFromTrait/main.kt
rename to plugins/kotlin/idea/tests/testData/hierarchy/class/sub/InterfaceFromInterface/main.kt
diff --git a/plugins/kotlin/idea/tests/testData/hierarchy/class/sub/ObjectFromTrait/ObjectFromTrait_verification.xml b/plugins/kotlin/idea/tests/testData/hierarchy/class/sub/ObjectFromInterface/ObjectFromInterface_verification.xml
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/hierarchy/class/sub/ObjectFromTrait/ObjectFromTrait_verification.xml
rename to plugins/kotlin/idea/tests/testData/hierarchy/class/sub/ObjectFromInterface/ObjectFromInterface_verification.xml
diff --git a/plugins/kotlin/idea/tests/testData/hierarchy/class/sub/ObjectFromTrait/main.kt b/plugins/kotlin/idea/tests/testData/hierarchy/class/sub/ObjectFromInterface/main.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/hierarchy/class/sub/ObjectFromTrait/main.kt
rename to plugins/kotlin/idea/tests/testData/hierarchy/class/sub/ObjectFromInterface/main.kt
diff --git a/plugins/kotlin/idea/tests/testData/hierarchy/class/super/TwoTraits/TwoTraits_verification.xml b/plugins/kotlin/idea/tests/testData/hierarchy/class/super/TwoInterfaces/TwoInterfaces_verification.xml
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/hierarchy/class/super/TwoTraits/TwoTraits_verification.xml
rename to plugins/kotlin/idea/tests/testData/hierarchy/class/super/TwoInterfaces/TwoInterfaces_verification.xml
diff --git a/plugins/kotlin/idea/tests/testData/hierarchy/class/super/TwoTraits/main.kt b/plugins/kotlin/idea/tests/testData/hierarchy/class/super/TwoInterfaces/main.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/hierarchy/class/super/TwoTraits/main.kt
rename to plugins/kotlin/idea/tests/testData/hierarchy/class/super/TwoInterfaces/main.kt
diff --git a/plugins/kotlin/idea/tests/testData/hierarchy/overrides/kotlinFunctionInTrait/KotlinFunctionInTrait_verification.xml b/plugins/kotlin/idea/tests/testData/hierarchy/overrides/kotlinFunctionInInterface/KotlinFunctionInInterface_verification.xml
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/hierarchy/overrides/kotlinFunctionInTrait/KotlinFunctionInTrait_verification.xml
rename to plugins/kotlin/idea/tests/testData/hierarchy/overrides/kotlinFunctionInInterface/KotlinFunctionInInterface_verification.xml
diff --git a/plugins/kotlin/idea/tests/testData/hierarchy/overrides/kotlinFunctionInTrait/main0.kt b/plugins/kotlin/idea/tests/testData/hierarchy/overrides/kotlinFunctionInInterface/main0.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/hierarchy/overrides/kotlinFunctionInTrait/main0.kt
rename to plugins/kotlin/idea/tests/testData/hierarchy/overrides/kotlinFunctionInInterface/main0.kt
diff --git a/plugins/kotlin/idea/tests/testData/hierarchy/overrides/kotlinFunctionInTrait/main1.java b/plugins/kotlin/idea/tests/testData/hierarchy/overrides/kotlinFunctionInInterface/main1.java
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/hierarchy/overrides/kotlinFunctionInTrait/main1.java
rename to plugins/kotlin/idea/tests/testData/hierarchy/overrides/kotlinFunctionInInterface/main1.java
diff --git a/plugins/kotlin/idea/tests/testData/hierarchy/overrides/kotlinPropertyInTrait/KotlinPropertyInTrait_verification.xml b/plugins/kotlin/idea/tests/testData/hierarchy/overrides/kotlinPropertyInInterface/KotlinPropertyInInterface_verification.xml
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/hierarchy/overrides/kotlinPropertyInTrait/KotlinPropertyInTrait_verification.xml
rename to plugins/kotlin/idea/tests/testData/hierarchy/overrides/kotlinPropertyInInterface/KotlinPropertyInInterface_verification.xml
diff --git a/plugins/kotlin/idea/tests/testData/hierarchy/overrides/kotlinPropertyInTrait/main0.kt b/plugins/kotlin/idea/tests/testData/hierarchy/overrides/kotlinPropertyInInterface/main0.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/hierarchy/overrides/kotlinPropertyInTrait/main0.kt
rename to plugins/kotlin/idea/tests/testData/hierarchy/overrides/kotlinPropertyInInterface/main0.kt
diff --git a/plugins/kotlin/idea/tests/testData/hierarchy/overrides/kotlinPropertyInTrait/main1.java b/plugins/kotlin/idea/tests/testData/hierarchy/overrides/kotlinPropertyInInterface/main1.java
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/hierarchy/overrides/kotlinPropertyInTrait/main1.java
rename to plugins/kotlin/idea/tests/testData/hierarchy/overrides/kotlinPropertyInInterface/main1.java
diff --git a/plugins/kotlin/idea/tests/testData/highlighter/TypesAndAnnotations.kt b/plugins/kotlin/idea/tests/testData/highlighter/TypesAndAnnotations.kt
index a982ae3ef532..0997da56ddd2 100644
--- a/plugins/kotlin/idea/tests/testData/highlighter/TypesAndAnnotations.kt
+++ b/plugins/kotlin/idea/tests/testData/highlighter/TypesAndAnnotations.kt
@@ -1,7 +1,7 @@
-interface <info textAttributesKey="KOTLIN_TRAIT">TheTrait</info> {
+interface <info textAttributesKey="KOTLIN_TRAIT">TheInterface</info> {
 }
 
-class <info textAttributesKey="KOTLIN_CLASS">TheClass</info> : <info textAttributesKey="KOTLIN_TRAIT">TheTrait</info> {
+class <info textAttributesKey="KOTLIN_CLASS">TheClass</info> : <info textAttributesKey="KOTLIN_TRAIT">TheInterface</info> {
 }
 
 <info textAttributesKey="KOTLIN_BUILTIN_ANNOTATION">annotation</info> class <info textAttributesKey="KOTLIN_ANNOTATION">magnificent</info>
diff --git a/plugins/kotlin/idea/tests/testData/highlighter/deprecated/ClassObject.kt b/plugins/kotlin/idea/tests/testData/highlighter/deprecated/ClassObject.kt
index 61ec78da6bf7..abd0f9845f41 100644
--- a/plugins/kotlin/idea/tests/testData/highlighter/deprecated/ClassObject.kt
+++ b/plugins/kotlin/idea/tests/testData/highlighter/deprecated/ClassObject.kt
@@ -2,23 +2,23 @@ fun test() {
    <warning descr="[DEPRECATION] 'companion object of MyClass' is deprecated. Use A instead">MyClass</warning>.test
    MyClass()
    val a: MyClass? = null
-   val b: MyTrait? = null
-   <warning descr="[DEPRECATION] 'companion object of MyTrait' is deprecated. Use A instead">MyTrait</warning>.test
-   MyTrait.<warning descr="[DEPRECATION] 'companion object of MyTrait' is deprecated. Use A instead">Companion</warning>
-   <warning descr="[DEPRECATION] 'companion object of MyTrait' is deprecated. Use A instead">MyTrait</warning>
+   val b: MyInterface? = null
+   <warning descr="[DEPRECATION] 'companion object of MyInterface' is deprecated. Use A instead">MyInterface</warning>.test
+   MyInterface.<warning descr="[DEPRECATION] 'companion object of MyInterface' is deprecated. Use A instead">Companion</warning>
+   <warning descr="[DEPRECATION] 'companion object of MyInterface' is deprecated. Use A instead">MyInterface</warning>
    MyClass.<warning descr="[DEPRECATION] 'companion object of MyClass' is deprecated. Use A instead">Companion</warning>
    MyClass.<warning descr="[DEPRECATION] 'companion object of MyClass' is deprecated. Use A instead">Companion</warning>.test
 
    a == b
 }
 
-class MyClass(): MyTrait {
+class MyClass(): MyInterface {
     @Deprecated("Use A instead") companion object {
         val test: String = ""
     }
 }
 
-interface MyTrait {
+interface MyInterface {
     @Deprecated("Use A instead") companion object {
         val test: String = ""
     }
diff --git a/plugins/kotlin/idea/tests/testData/highlighter/deprecated/Interface.kt b/plugins/kotlin/idea/tests/testData/highlighter/deprecated/Interface.kt
new file mode 100644
index 000000000000..c8d85f7a75ec
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/highlighter/deprecated/Interface.kt
@@ -0,0 +1,14 @@
+@Deprecated("Use A instead") interface MyInterface { }
+
+fun test() {
+   val a: <warning descr="[DEPRECATION] 'MyInterface' is deprecated. Use A instead">MyInterface</warning>? = null
+   val b: List<<warning descr="[DEPRECATION] 'MyInterface' is deprecated. Use A instead">MyInterface</warning>>? = null
+   a == b
+}
+
+class Test(): <warning descr="[DEPRECATION] 'MyInterface' is deprecated. Use A instead">MyInterface</warning> { }
+
+class Test2(<warning descr="[UNUSED_PARAMETER] Parameter 'param' is never used">param</warning>: <warning descr="[DEPRECATION] 'MyInterface' is deprecated. Use A instead">MyInterface</warning>) {}
+
+// NO_CHECK_INFOS
+// NO_CHECK_WEAK_WARNINGS
diff --git a/plugins/kotlin/idea/tests/testData/highlighter/deprecated/Trait.kt b/plugins/kotlin/idea/tests/testData/highlighter/deprecated/Trait.kt
deleted file mode 100644
index 30175ebf3f91..000000000000
--- a/plugins/kotlin/idea/tests/testData/highlighter/deprecated/Trait.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-@Deprecated("Use A instead") interface MyTrait { }
-
-fun test() {
-   val a: <warning descr="[DEPRECATION] 'MyTrait' is deprecated. Use A instead">MyTrait</warning>? = null
-   val b: List<<warning descr="[DEPRECATION] 'MyTrait' is deprecated. Use A instead">MyTrait</warning>>? = null
-   a == b
-}
-
-class Test(): <warning descr="[DEPRECATION] 'MyTrait' is deprecated. Use A instead">MyTrait</warning> { }
-
-class Test2(<warning descr="[UNUSED_PARAMETER] Parameter 'param' is never used">param</warning>: <warning descr="[DEPRECATION] 'MyTrait' is deprecated. Use A instead">MyTrait</warning>) {}
-
-// NO_CHECK_INFOS
-// NO_CHECK_WEAK_WARNINGS
diff --git a/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/TypesAndAnnotations.kt b/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/TypesAndAnnotations.kt
index 1a9232a3949c..84ae4423c7da 100644
--- a/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/TypesAndAnnotations.kt
+++ b/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/TypesAndAnnotations.kt
@@ -1,8 +1,8 @@
 // FIR_IDENTICAL
-interface TheTrait {
+interface TheInterface {
 }
 
-class TheClass : TheTrait {
+class TheClass : TheInterface {
 }
 
 annotation class magnificent
diff --git a/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/TypesAndAnnotations.kt.highlighting b/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/TypesAndAnnotations.kt.highlighting
index 80d8fbd20158..c7f5b21671f7 100644
--- a/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/TypesAndAnnotations.kt.highlighting
+++ b/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/TypesAndAnnotations.kt.highlighting
@@ -1,8 +1,8 @@
 // FIR_IDENTICAL
-interface <!HIGHLIGHTING("textAttributesKey='KOTLIN_TRAIT'")!>TheTrait<!> {
+interface <!HIGHLIGHTING("textAttributesKey='KOTLIN_TRAIT'")!>TheInterface<!> {
 }
 
-class <!HIGHLIGHTING("textAttributesKey='KOTLIN_CLASS'")!>TheClass<!> : <!HIGHLIGHTING("textAttributesKey='KOTLIN_TRAIT'")!>TheTrait<!> {
+class <!HIGHLIGHTING("textAttributesKey='KOTLIN_CLASS'")!>TheClass<!> : <!HIGHLIGHTING("textAttributesKey='KOTLIN_TRAIT'")!>TheInterface<!> {
 }
 
 <!HIGHLIGHTING("textAttributesKey='KOTLIN_BUILTIN_ANNOTATION'")!>annotation<!> class <!HIGHLIGHTING("textAttributesKey='KOTLIN_ANNOTATION'")!>magnificent<!>
diff --git a/plugins/kotlin/idea/tests/testData/inspections/unusedSymbol/parameter/paramPropertyOverride.kt b/plugins/kotlin/idea/tests/testData/inspections/unusedSymbol/parameter/paramPropertyOverride.kt
index e4bbca1d2044..e696411d7476 100644
--- a/plugins/kotlin/idea/tests/testData/inspections/unusedSymbol/parameter/paramPropertyOverride.kt
+++ b/plugins/kotlin/idea/tests/testData/inspections/unusedSymbol/parameter/paramPropertyOverride.kt
@@ -1,10 +1,10 @@
-interface Trait {
+interface Interface {
     val member: String
 }
 
 class Klass(override val member: String)
 
 fun main(args: Array<String>) {
-    val t: Trait = Klass()
+    val t: Interface = Klass()
     println(t.member)
 }
diff --git a/plugins/kotlin/idea/tests/testData/inspections/unusedSymbol/property/classMemberOverride.kt b/plugins/kotlin/idea/tests/testData/inspections/unusedSymbol/property/classMemberOverride.kt
index 789d370c29b6..a83eb2eda78d 100644
--- a/plugins/kotlin/idea/tests/testData/inspections/unusedSymbol/property/classMemberOverride.kt
+++ b/plugins/kotlin/idea/tests/testData/inspections/unusedSymbol/property/classMemberOverride.kt
@@ -1,12 +1,12 @@
-interface Trait {
+interface Interface {
     val member: String
 }
 
-class Klass: Trait {
+class Klass: Interface {
     override val member: String = ":)"
 }
 
 fun main(args: Array<String>) {
-    val t: Trait = Klass()
+    val t: Interface = Klass()
     println(t.member)
 }
diff --git a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/onOverrideInTrait.kt b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/onOverrideInInterface.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/onOverrideInTrait.kt
rename to plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/onOverrideInInterface.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/WrapFunWithImplInTrait.kt b/plugins/kotlin/idea/tests/testData/javaFacade/WrapFunWithImplInInterface.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/WrapFunWithImplInTrait.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/WrapFunWithImplInInterface.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/WrapFunWithoutImplInTrait.kt b/plugins/kotlin/idea/tests/testData/javaFacade/WrapFunWithoutImplInInterface.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/WrapFunWithoutImplInTrait.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/WrapFunWithoutImplInInterface.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/WrapVarPropertyWithAccessorsInTrait.kt b/plugins/kotlin/idea/tests/testData/javaFacade/WrapVarPropertyWithAccessorsInInterface.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/WrapVarPropertyWithAccessorsInTrait.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/WrapVarPropertyWithAccessorsInInterface.kt
diff --git a/plugins/kotlin/idea/tests/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignKotlinClassToObjectInJava.java b/plugins/kotlin/idea/tests/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignKotlinClassToObjectInJava.java
index e24a5b5a0ac1..9728fce0c9e0 100644
--- a/plugins/kotlin/idea/tests/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignKotlinClassToObjectInJava.java
+++ b/plugins/kotlin/idea/tests/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignKotlinClassToObjectInJava.java
@@ -1,8 +1,8 @@
 // KT-4355 IDEA complains when assigning Kotlin objects where java.lang.Object is expected
 class AssignKotlinClassToObjectInJava {
-    void test(KotlinTrait trait) {
+    void test(KotlinInterface i) {
         Object kotlinClass = new KotlinClass();
-        Object kotlinTrait = trait;
+        Object kotlinInterface = i;
 
         KotlinClass foo = null;
         foo.equals(foo);
diff --git a/plugins/kotlin/idea/tests/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignKotlinClassToObjectInJava.kt b/plugins/kotlin/idea/tests/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignKotlinClassToObjectInJava.kt
index 160755275e83..7b8ff97190c2 100644
--- a/plugins/kotlin/idea/tests/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignKotlinClassToObjectInJava.kt
+++ b/plugins/kotlin/idea/tests/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignKotlinClassToObjectInJava.kt
@@ -1,2 +1,2 @@
 class KotlinClass
-interface KotlinTrait
+interface KotlinInterface
diff --git a/plugins/kotlin/idea/tests/testData/kotlinAndJavaChecker/javaAgainstKotlin/ImplementedMethodsFromTraits.java b/plugins/kotlin/idea/tests/testData/kotlinAndJavaChecker/javaAgainstKotlin/ImplementedMethodsFromInterfaces.java
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/kotlinAndJavaChecker/javaAgainstKotlin/ImplementedMethodsFromTraits.java
rename to plugins/kotlin/idea/tests/testData/kotlinAndJavaChecker/javaAgainstKotlin/ImplementedMethodsFromInterfaces.java
diff --git a/plugins/kotlin/idea/tests/testData/kotlinAndJavaChecker/javaAgainstKotlin/ImplementedMethodsFromTraits.kt b/plugins/kotlin/idea/tests/testData/kotlinAndJavaChecker/javaAgainstKotlin/ImplementedMethodsFromInterfaces.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/kotlinAndJavaChecker/javaAgainstKotlin/ImplementedMethodsFromTraits.kt
rename to plugins/kotlin/idea/tests/testData/kotlinAndJavaChecker/javaAgainstKotlin/ImplementedMethodsFromInterfaces.kt
diff --git a/plugins/kotlin/idea/tests/testData/kotlinAndJavaChecker/javaAgainstKotlin/UseKotlinSubclassesOfMappedTypes.java b/plugins/kotlin/idea/tests/testData/kotlinAndJavaChecker/javaAgainstKotlin/UseKotlinSubclassesOfMappedTypes.java
index ae60682d178f..5f771f4946ad 100644
--- a/plugins/kotlin/idea/tests/testData/kotlinAndJavaChecker/javaAgainstKotlin/UseKotlinSubclassesOfMappedTypes.java
+++ b/plugins/kotlin/idea/tests/testData/kotlinAndJavaChecker/javaAgainstKotlin/UseKotlinSubclassesOfMappedTypes.java
@@ -1,6 +1,6 @@
 class UseKotlinSubclassesOfMappedTypes {
     void test() {
-        Iterable<String> iterable = new KotlinIterableTraitTest();
+        Iterable<String> iterable = new KotlinIterableInterfaceTest();
         Comparable<Integer> comparable = new KotlinComparableTest();
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/kotlinAndJavaChecker/javaAgainstKotlin/UseKotlinSubclassesOfMappedTypes.kt b/plugins/kotlin/idea/tests/testData/kotlinAndJavaChecker/javaAgainstKotlin/UseKotlinSubclassesOfMappedTypes.kt
index f9b67eb5266c..51fc3027829f 100644
--- a/plugins/kotlin/idea/tests/testData/kotlinAndJavaChecker/javaAgainstKotlin/UseKotlinSubclassesOfMappedTypes.kt
+++ b/plugins/kotlin/idea/tests/testData/kotlinAndJavaChecker/javaAgainstKotlin/UseKotlinSubclassesOfMappedTypes.kt
@@ -4,7 +4,7 @@ class KotlinComparableTest : Comparable<Int> {
     }
 }
 
-class KotlinIterableTraitTest : Iterable<String> {
+class KotlinIterableInterfaceTest : Iterable<String> {
     override fun iterator(): Iterator<String> {
         throw UnsupportedOperationException()
     }
diff --git a/plugins/kotlin/idea/tests/testData/navigation/gotoClass/inClassObject.kt b/plugins/kotlin/idea/tests/testData/navigation/gotoClass/inClassObject.kt
index c55c7401ef43..8a811f35cda7 100644
--- a/plugins/kotlin/idea/tests/testData/navigation/gotoClass/inClassObject.kt
+++ b/plugins/kotlin/idea/tests/testData/navigation/gotoClass/inClassObject.kt
@@ -4,9 +4,9 @@ class InClassObject {
     companion object {
         class ClassObjectClass {}
 
-        interface ClassObjectTrait {}
+        interface ClassObjectInterface {}
 
-        interface ClassObjectTraitWithImpl {
+        interface ClassObjectInterfaceWithImpl {
             fun foo() {}
         }
 
@@ -16,6 +16,6 @@ class InClassObject {
 
 // SEARCH_TEXT: ClassObject
 // REF: (in test.InClassObject.Companion).ClassObjectClass
+// REF: (in test.InClassObject.Companion).ClassObjectInterface
+// REF: (in test.InClassObject.Companion).ClassObjectInterfaceWithImpl
 // REF: (in test.InClassObject.Companion).ClassObjectObject
-// REF: (in test.InClassObject.Companion).ClassObjectTrait
-// REF: (in test.InClassObject.Companion).ClassObjectTraitWithImpl
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/navigation/gotoClass/interfaceWithFunImplement.kt b/plugins/kotlin/idea/tests/testData/navigation/gotoClass/interfaceWithFunImplement.kt
new file mode 100644
index 000000000000..c68e6c1f4814
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/navigation/gotoClass/interfaceWithFunImplement.kt
@@ -0,0 +1,10 @@
+package test
+
+interface InterfaceWithFunImplement {
+    fun foo(): Int {
+        return 12;
+    }
+}
+
+// SEARCH_TEXT: Interface
+// REF: (test).InterfaceWithFunImplement
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/navigation/gotoClass/localDeclarations.kt b/plugins/kotlin/idea/tests/testData/navigation/gotoClass/localDeclarations.kt
index dc7ab5927c6d..53a06d5a4997 100644
--- a/plugins/kotlin/idea/tests/testData/navigation/gotoClass/localDeclarations.kt
+++ b/plugins/kotlin/idea/tests/testData/navigation/gotoClass/localDeclarations.kt
@@ -1,9 +1,9 @@
 fun foo() {
     class LocalClass {}
 
-    interface LocalTrait {}
+    interface LocalInterface {}
 
-    interface LocalTraitWithImpl {
+    interface LocalInterfaceWithImpl {
         fun foo() {}
     }
 
@@ -12,6 +12,6 @@ fun foo() {
 
 // SEARCH_TEXT: Local
 // REF: (in foo).LocalClass
+// REF: (in foo).LocalInterface
+// REF: (in foo).LocalInterfaceWithImpl
 // REF: (in foo).LocalObject
-// REF: (in foo).LocalTrait
-// REF: (in foo).LocalTraitWithImpl
diff --git a/plugins/kotlin/idea/tests/testData/navigation/gotoClass/noImplementationTrait.kt b/plugins/kotlin/idea/tests/testData/navigation/gotoClass/noImplementationInterface.kt
similarity index 52%
rename from plugins/kotlin/idea/tests/testData/navigation/gotoClass/noImplementationTrait.kt
rename to plugins/kotlin/idea/tests/testData/navigation/gotoClass/noImplementationInterface.kt
index e1d70b2f78a7..18fe2f41631f 100644
--- a/plugins/kotlin/idea/tests/testData/navigation/gotoClass/noImplementationTrait.kt
+++ b/plugins/kotlin/idea/tests/testData/navigation/gotoClass/noImplementationInterface.kt
@@ -1,9 +1,9 @@
 package test
 
-interface NoImplementationTrait {
+interface NoImplementationInterface {
     fun foo(): Int
     fun some(): String
 }
 
 // SEARCH_TEXT: NoImplemen
-// REF: (test).NoImplementationTrait
\ No newline at end of file
+// REF: (test).NoImplementationInterface
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/navigation/gotoClass/traitWithFunImplement.kt b/plugins/kotlin/idea/tests/testData/navigation/gotoClass/traitWithFunImplement.kt
deleted file mode 100644
index 6fd391986d8a..000000000000
--- a/plugins/kotlin/idea/tests/testData/navigation/gotoClass/traitWithFunImplement.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package test
-
-interface TraitWithFunImplement {
-    fun foo(): Int {
-        return 12;
-    }
-}
-
-// SEARCH_TEXT: Trait
-// REF: (test).TraitWithFunImplement
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/navigation/gotoClass/typealias.kt b/plugins/kotlin/idea/tests/testData/navigation/gotoClass/typealias.kt
index b28286d4b9e3..1f0029e89ea0 100644
--- a/plugins/kotlin/idea/tests/testData/navigation/gotoClass/typealias.kt
+++ b/plugins/kotlin/idea/tests/testData/navigation/gotoClass/typealias.kt
@@ -4,8 +4,8 @@ fun some() {
     typealias TestInFun = Any
 }
 
-interface SomeTrait {
-    typealias TestInTrait = Any
+interface SomeInterface {
+    typealias TestInInterface = Any
 }
 
 class Some() {
@@ -20,4 +20,4 @@ class Some() {
 // REF: (<root>).TestGlobal
 // REF: (in Some).TestInClass
 // REF: (in Some.Companion).TestInClassObject
-// REF: (in SomeTrait).TestInTrait
\ No newline at end of file
+// REF: (in SomeInterface).TestInInterface
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/navigation/gotoSuper/TraitSimple.test b/plugins/kotlin/idea/tests/testData/navigation/gotoSuper/InterfaceSimple.test
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/navigation/gotoSuper/TraitSimple.test
rename to plugins/kotlin/idea/tests/testData/navigation/gotoSuper/InterfaceSimple.test
diff --git a/plugins/kotlin/idea/tests/testData/navigation/gotoSymbol/properties.kt b/plugins/kotlin/idea/tests/testData/navigation/gotoSymbol/properties.kt
index 8e61c4e96a3a..632a662a726a 100644
--- a/plugins/kotlin/idea/tests/testData/navigation/gotoSymbol/properties.kt
+++ b/plugins/kotlin/idea/tests/testData/navigation/gotoSymbol/properties.kt
@@ -4,8 +4,8 @@ fun some() {
   val testInFun = 12
 }
 
-interface SomeTrait {
-  val testInTrait
+interface SomeInterface {
+  val testInInterface
 }
 
 class Some() {
@@ -22,5 +22,5 @@ class SomePrimary(val testInPrimary: Int)
 // REF: (<root>).testGlobal
 // REF: (in Some).testInClass
 // REF: (in Some.Companion).testInClassObject
-// REF: (in SomePrimary).testInPrimary
-// REF: (in SomeTrait).testInTrait
\ No newline at end of file
+// REF: (in SomeInterface).testInInterface
+// REF: (in SomePrimary).testInPrimary
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/navigation/gotoSymbol/typealias.kt b/plugins/kotlin/idea/tests/testData/navigation/gotoSymbol/typealias.kt
index f30942d792a6..791b39e8c7d0 100644
--- a/plugins/kotlin/idea/tests/testData/navigation/gotoSymbol/typealias.kt
+++ b/plugins/kotlin/idea/tests/testData/navigation/gotoSymbol/typealias.kt
@@ -4,8 +4,8 @@ fun some() {
     typealias testInFun = Any
 }
 
-interface SomeTrait {
-    typealias testInTrait = Any
+interface SomeInterface {
+    typealias testInInterface = Any
 }
 
 class Some() {
@@ -20,4 +20,4 @@ class Some() {
 // REF: (<root>).testGlobal
 // REF: (in Some).testInClass
 // REF: (in Some.Companion).testInClassObject
-// REF: (in SomeTrait).testInTrait
\ No newline at end of file
+// REF: (in SomeInterface).testInInterface
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/navigation/implementations/TraitImplementorsWithDeclaration.kt b/plugins/kotlin/idea/tests/testData/navigation/implementations/InterfaceImplementorsWithDeclaration.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/navigation/implementations/TraitImplementorsWithDeclaration.kt
rename to plugins/kotlin/idea/tests/testData/navigation/implementations/InterfaceImplementorsWithDeclaration.kt
diff --git a/plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/ImplementJavaInterfaceInKotlin/ImplementJavaInterfaceInKotlin.kt b/plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/ImplementJavaInterfaceInKotlin/ImplementJavaInterfaceInKotlin.kt
index cc2654912baa..4828a6dac7f4 100644
--- a/plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/ImplementJavaInterfaceInKotlin/ImplementJavaInterfaceInKotlin.kt
+++ b/plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/ImplementJavaInterfaceInKotlin/ImplementJavaInterfaceInKotlin.kt
@@ -1,6 +1,6 @@
-interface KotlinTrait: <caret>JavaBase
+interface KotlinInterface: <caret>JavaBase
 
 class KotlinClass : JavaBase
 
 // REF: (<root>).KotlinClass
-// REF: (<root>).KotlinTrait
\ No newline at end of file
+// REF: (<root>).KotlinInterface
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/ImplementKotlinTraitInJava/ImplementKotlinTraitInJava.java b/plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/ImplementKotlinInterfaceInJava/ImplementKotlinInterfaceInJava.java
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/ImplementKotlinTraitInJava/ImplementKotlinTraitInJava.java
rename to plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/ImplementKotlinInterfaceInJava/ImplementKotlinInterfaceInJava.java
diff --git a/plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/ImplementKotlinTraitInJava/ImplementKotlinTraitInJava.kt b/plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/ImplementKotlinInterfaceInJava/ImplementKotlinInterfaceInJava.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/ImplementKotlinTraitInJava/ImplementKotlinTraitInJava.kt
rename to plugins/kotlin/idea/tests/testData/navigation/implementations/multifile/ImplementKotlinInterfaceInJava/ImplementKotlinInterfaceInJava.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importInterface.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importInterface.after.kt
new file mode 100644
index 000000000000..3e07da20dd59
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importInterface.after.kt
@@ -0,0 +1,9 @@
+import importInterface.data.TestInterface
+
+// "Import class 'TestInterface'" "true"
+// ERROR: Unresolved reference: TestInterface
+
+fun test() {
+    val a = <caret>TestInterface
+}
+/* IGNORE_FIR */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importInterface.before.Dependency.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importInterface.before.Dependency.kt
new file mode 100644
index 000000000000..3413920ac4f4
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importInterface.before.Dependency.kt
@@ -0,0 +1,3 @@
+package importInterface.data
+
+interface TestInterface
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importInterface.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importInterface.before.Main.kt
new file mode 100644
index 000000000000..df082bfb7de0
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importInterface.before.Main.kt
@@ -0,0 +1,7 @@
+// "Import class 'TestInterface'" "true"
+// ERROR: Unresolved reference: TestInterface
+
+fun test() {
+    val a = <caret>TestInterface
+}
+/* IGNORE_FIR */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importNullableInterfaceWithGenerics.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importNullableInterfaceWithGenerics.after.kt
new file mode 100644
index 000000000000..1d69359da011
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importNullableInterfaceWithGenerics.after.kt
@@ -0,0 +1,9 @@
+import importInterface.data.TestInterface
+
+// "Import class 'TestInterface'" "true"
+// ERROR: Unresolved reference: TestInterface
+
+fun test() {
+    val a: TestInterface<String, Int>? = null
+}
+/* IGNORE_FIR */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importNullableInterfaceWithGenerics.before.Dependency.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importNullableInterfaceWithGenerics.before.Dependency.kt
new file mode 100644
index 000000000000..2fb6672a8da2
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importNullableInterfaceWithGenerics.before.Dependency.kt
@@ -0,0 +1,3 @@
+package importInterface.data
+
+interface TestInterface<A, B>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importNullableInterfaceWithGenerics.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importNullableInterfaceWithGenerics.before.Main.kt
new file mode 100644
index 000000000000..796b5aa4aa23
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importNullableInterfaceWithGenerics.before.Main.kt
@@ -0,0 +1,7 @@
+// "Import class 'TestInterface'" "true"
+// ERROR: Unresolved reference: TestInterface
+
+fun test() {
+    val a: <caret>TestInterface<String, Int>? = null
+}
+/* IGNORE_FIR */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importNullableTraitWithGenerics.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importNullableTraitWithGenerics.after.kt
deleted file mode 100644
index 52a41f3e8430..000000000000
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importNullableTraitWithGenerics.after.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-import importTrait.data.TestTrait
-
-// "Import class 'TestTrait'" "true"
-// ERROR: Unresolved reference: TestTrait
-
-fun test() {
-    val a: TestTrait<String, Int>? = null
-}
-/* IGNORE_FIR */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importNullableTraitWithGenerics.before.Dependency.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importNullableTraitWithGenerics.before.Dependency.kt
deleted file mode 100644
index 4ed12093d851..000000000000
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importNullableTraitWithGenerics.before.Dependency.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package importTrait.data
-
-interface TestTrait<A, B>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importNullableTraitWithGenerics.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importNullableTraitWithGenerics.before.Main.kt
deleted file mode 100644
index ba2c59d25961..000000000000
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importNullableTraitWithGenerics.before.Main.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-// "Import class 'TestTrait'" "true"
-// ERROR: Unresolved reference: TestTrait
-
-fun test() {
-    val a: <caret>TestTrait<String, Int>? = null
-}
-/* IGNORE_FIR */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importTrait.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importTrait.after.kt
deleted file mode 100644
index 2fce846e0ac7..000000000000
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importTrait.after.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-import importTrait.data.TestTrait
-
-// "Import class 'TestTrait'" "true"
-// ERROR: Unresolved reference: TestTrait
-
-fun test() {
-    val a = <caret>TestTrait
-}
-/* IGNORE_FIR */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importTrait.before.Dependency.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importTrait.before.Dependency.kt
deleted file mode 100644
index e23ed8c32c3e..000000000000
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importTrait.before.Dependency.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package importTrait.data
-
-interface TestTrait
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importTrait.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importTrait.before.Main.kt
deleted file mode 100644
index c92ce0ddb2de..000000000000
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importTrait.before.Main.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-// "Import class 'TestTrait'" "true"
-// ERROR: Unresolved reference: TestTrait
-
-fun test() {
-    val a = <caret>TestTrait
-}
-/* IGNORE_FIR */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithSupertrait.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperInterface.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithSupertrait.kt
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperInterface.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithSupertrait.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperInterface.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithSupertrait.kt.after
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperInterface.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithSupertraitAndJavaReceiver.after.Dependency.java b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperInterfaceAndJavaReceiver.after.Dependency.java
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithSupertraitAndJavaReceiver.after.Dependency.java
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperInterfaceAndJavaReceiver.after.Dependency.java
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithSupertraitAndJavaReceiver.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperInterfaceAndJavaReceiver.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithSupertraitAndJavaReceiver.after.kt
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperInterfaceAndJavaReceiver.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithSupertraitAndJavaReceiver.before.Dependency.java b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperInterfaceAndJavaReceiver.before.Dependency.java
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithSupertraitAndJavaReceiver.before.Dependency.java
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperInterfaceAndJavaReceiver.before.Dependency.java
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithSupertraitAndJavaReceiver.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperInterfaceAndJavaReceiver.before.Main.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithSupertraitAndJavaReceiver.before.Main.kt
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperInterfaceAndJavaReceiver.before.Main.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToNestedGroovySuperclass.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/interfaceDelegatorToNestedGroovySuperclass.before.Main.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToNestedGroovySuperclass.before.Main.kt
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/interfaceDelegatorToNestedGroovySuperclass.before.Main.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToNestedGroovySuperclass.before.data.Sample.groovy b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/interfaceDelegatorToNestedGroovySuperclass.before.data.Sample.groovy
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToNestedGroovySuperclass.before.data.Sample.groovy
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/interfaceDelegatorToNestedGroovySuperclass.before.data.Sample.groovy
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToNestedJavaSuperclass.after.Dependency.java b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/interfaceDelegatorToNestedJavaSuperclass.after.Dependency.java
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToNestedJavaSuperclass.after.Dependency.java
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/interfaceDelegatorToNestedJavaSuperclass.after.Dependency.java
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToNestedJavaSuperclass.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/interfaceDelegatorToNestedJavaSuperclass.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToNestedJavaSuperclass.after.kt
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/interfaceDelegatorToNestedJavaSuperclass.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToNestedJavaSuperclass.before.Dependency.java b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/interfaceDelegatorToNestedJavaSuperclass.before.Dependency.java
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToNestedJavaSuperclass.before.Dependency.java
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/interfaceDelegatorToNestedJavaSuperclass.before.Dependency.java
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToNestedJavaSuperclass.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/interfaceDelegatorToNestedJavaSuperclass.before.Main.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToNestedJavaSuperclass.before.Main.kt
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/interfaceDelegatorToNestedJavaSuperclass.before.Main.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToSuperclass.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/interfaceDelegatorToSuperclass.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToSuperclass.kt
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/interfaceDelegatorToSuperclass.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToSuperclass.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/interfaceDelegatorToSuperclass.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToSuperclass.kt.after
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/interfaceDelegatorToSuperclass.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToSuperclass2.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/interfaceDelegatorToSuperclass2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToSuperclass2.kt
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/interfaceDelegatorToSuperclass2.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToSuperclass2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/interfaceDelegatorToSuperclass2.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToSuperclass2.kt.after
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/delegationSpecifier/interfaceDelegatorToSuperclass2.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/traitInPackage.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/interfaceInPackage.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/traitInPackage.kt
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/interfaceInPackage.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/traitInPackage.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/interfaceInPackage.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/traitInPackage.kt.after
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/interfaceInPackage.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/traitWithJavaQualifier.after.Dependency.java b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/interfaceWithJavaQualifier.after.Dependency.java
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/traitWithJavaQualifier.after.Dependency.java
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/interfaceWithJavaQualifier.after.Dependency.java
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/traitWithJavaQualifier.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/interfaceWithJavaQualifier.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/traitWithJavaQualifier.after.kt
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/interfaceWithJavaQualifier.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/traitWithJavaQualifier.before.Dependency.java b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/interfaceWithJavaQualifier.before.Dependency.java
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/traitWithJavaQualifier.before.Dependency.java
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/interfaceWithJavaQualifier.before.Dependency.java
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/traitWithJavaQualifier.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/interfaceWithJavaQualifier.before.Main.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/traitWithJavaQualifier.before.Main.kt
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/interfaceWithJavaQualifier.before.Main.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/traitWithQualifier.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/interfaceWithQualifier.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/traitWithQualifier.kt
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/interfaceWithQualifier.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/traitWithQualifier.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/interfaceWithQualifier.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/traitWithQualifier.kt.after
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/importDirective/interfaceWithQualifier.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/traitByNestedJavaQualifier.after.Dependency.java b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/interfaceByNestedJavaQualifier.after.Dependency.java
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/traitByNestedJavaQualifier.after.Dependency.java
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/interfaceByNestedJavaQualifier.after.Dependency.java
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/traitByNestedJavaQualifier.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/interfaceByNestedJavaQualifier.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/traitByNestedJavaQualifier.after.kt
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/interfaceByNestedJavaQualifier.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/traitByNestedJavaQualifier.before.Dependency.java b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/interfaceByNestedJavaQualifier.before.Dependency.java
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/traitByNestedJavaQualifier.before.Dependency.java
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/interfaceByNestedJavaQualifier.before.Dependency.java
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/traitByNestedJavaQualifier.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/interfaceByNestedJavaQualifier.before.Main.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/traitByNestedJavaQualifier.before.Main.kt
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/interfaceByNestedJavaQualifier.before.Main.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/traitByQualifier.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/interfaceByQualifier.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/traitByQualifier.kt
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/interfaceByQualifier.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/traitByQualifier.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/interfaceByQualifier.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/traitByQualifier.kt.after
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/interfaceByQualifier.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/traitNoReceiver.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/interfaceNoReceiver.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/traitNoReceiver.kt
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/interfaceNoReceiver.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithSupertrait.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithSuperinterface.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithSupertrait.kt
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithSuperinterface.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithSupertrait.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithSuperinterface.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithSupertrait.kt.after
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithSuperinterface.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/traitJavaTypeReceiver.after.Dependency.java b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/interfaceJavaTypeReceiver.after.Dependency.java
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/traitJavaTypeReceiver.after.Dependency.java
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/interfaceJavaTypeReceiver.after.Dependency.java
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/traitJavaTypeReceiver.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/interfaceJavaTypeReceiver.after.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/traitJavaTypeReceiver.after.kt
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/interfaceJavaTypeReceiver.after.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/traitJavaTypeReceiver.before.Dependency.java b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/interfaceJavaTypeReceiver.before.Dependency.java
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/traitJavaTypeReceiver.before.Dependency.java
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/interfaceJavaTypeReceiver.before.Dependency.java
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/traitJavaTypeReceiver.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/interfaceJavaTypeReceiver.before.Main.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/traitJavaTypeReceiver.before.Main.kt
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/interfaceJavaTypeReceiver.before.Main.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/traitNotQualifierNoTypeArgs.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/interfaceNotQualifierNoTypeArgs.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/traitNotQualifierNoTypeArgs.kt
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/interfaceNotQualifierNoTypeArgs.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/traitNotQualifierNoTypeArgs.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/interfaceNotQualifierNoTypeArgs.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/traitNotQualifierNoTypeArgs.kt.after
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/typeReference/interfaceNotQualifierNoTypeArgs.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTrait.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnInterface.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTrait.kt
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnInterface.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTrait.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnInterface.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTrait.kt.after
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnInterface.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnInterface.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnInterface.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnInterface.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt.after
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnInterface.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInTrait.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInInterface.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInTrait.kt
rename to plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInInterface.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/addOpenToClassDeclaration/implementTraitFinalSupertype.kt b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/addOpenToClassDeclaration/implementInterfaceFinalSupertype.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/modifiers/addOpenToClassDeclaration/implementTraitFinalSupertype.kt
rename to plugins/kotlin/idea/tests/testData/quickfix/modifiers/addOpenToClassDeclaration/implementInterfaceFinalSupertype.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/addOpenToClassDeclaration/implementTraitFinalSupertype.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/addOpenToClassDeclaration/implementInterfaceFinalSupertype.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/modifiers/addOpenToClassDeclaration/implementTraitFinalSupertype.kt.after
rename to plugins/kotlin/idea/tests/testData/quickfix/modifiers/addOpenToClassDeclaration/implementInterfaceFinalSupertype.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/finalTrait.kt b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/finalInterface.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/modifiers/finalTrait.kt
rename to plugins/kotlin/idea/tests/testData/quickfix/modifiers/finalInterface.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/finalTrait.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/finalInterface.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/modifiers/finalTrait.kt.after
rename to plugins/kotlin/idea/tests/testData/quickfix/modifiers/finalInterface.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeInnerForClassInTrait.kt b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeInnerForClassInInterface.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeInnerForClassInTrait.kt
rename to plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeInnerForClassInInterface.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeInnerForClassInTrait.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeInnerForClassInInterface.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeInnerForClassInTrait.kt.after
rename to plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeInnerForClassInInterface.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/addFunctionTrait.kt b/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/addFunctionInterface.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/addFunctionTrait.kt
rename to plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/addFunctionInterface.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/addFunctionTrait.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/addFunctionInterface.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/addFunctionTrait.kt.after
rename to plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/addFunctionInterface.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/addFunctionTwoTraits.kt b/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/addFunctionTwoInterfaces.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/addFunctionTwoTraits.kt
rename to plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/addFunctionTwoInterfaces.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/addFunctionTwoTraits.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/addFunctionTwoInterfaces.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/addFunctionTwoTraits.kt.after
rename to plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/addFunctionTwoInterfaces.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/addParameterTwoSupertraits.kt b/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/addParameterTwoSuperinterfaces.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/addParameterTwoSupertraits.kt
rename to plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/addParameterTwoSuperinterfaces.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/addParameterTwoSupertraits.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/addParameterTwoSuperinterfaces.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/addParameterTwoSupertraits.kt.after
rename to plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/addParameterTwoSuperinterfaces.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/changeParameterTypeInTrait.kt b/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/changeParameterTypeInInterface.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/changeParameterTypeInTrait.kt
rename to plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/changeParameterTypeInInterface.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/changeParameterTypeInTrait.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/changeParameterTypeInInterface.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/changeParameterTypeInTrait.kt.after
rename to plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/changeParameterTypeInInterface.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/changeParameterTypeSuperTrait.kt b/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/changeParameterTypeSuperInterface.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/changeParameterTypeSuperTrait.kt
rename to plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/changeParameterTypeSuperInterface.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/changeParameterTypeSuperTrait.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/changeParameterTypeSuperInterface.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/changeParameterTypeSuperTrait.kt.after
rename to plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/changeParameterTypeSuperInterface.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/removeParameterTwoTraits.kt b/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/removeParameterTwoInterfaces.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/removeParameterTwoTraits.kt
rename to plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/removeParameterTwoInterfaces.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/removeParameterTwoTraits.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/removeParameterTwoInterfaces.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/removeParameterTwoTraits.kt.after
rename to plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/removeParameterTwoInterfaces.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/suppress/declarationKinds/trait.kt b/plugins/kotlin/idea/tests/testData/quickfix/suppress/declarationKinds/interface.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/suppress/declarationKinds/trait.kt
rename to plugins/kotlin/idea/tests/testData/quickfix/suppress/declarationKinds/interface.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/suppress/declarationKinds/trait.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/suppress/declarationKinds/interface.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/quickfix/suppress/declarationKinds/trait.kt.after
rename to plugins/kotlin/idea/tests/testData/quickfix/suppress/declarationKinds/interface.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/traitFunction.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/interfaceFunction.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/traitFunction.kt
rename to plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/interfaceFunction.kt
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/traitFunction.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/interfaceFunction.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/traitFunction.kt.after
rename to plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/interfaceFunction.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/introduceProperty/extractLazyToTrait.kt b/plugins/kotlin/idea/tests/testData/refactoring/introduceProperty/extractLazyToInterface.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/refactoring/introduceProperty/extractLazyToTrait.kt
rename to plugins/kotlin/idea/tests/testData/refactoring/introduceProperty/extractLazyToInterface.kt
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/introduceProperty/extractLazyToTrait.kt.conflicts b/plugins/kotlin/idea/tests/testData/refactoring/introduceProperty/extractLazyToInterface.kt.conflicts
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/refactoring/introduceProperty/extractLazyToTrait.kt.conflicts
rename to plugins/kotlin/idea/tests/testData/refactoring/introduceProperty/extractLazyToInterface.kt.conflicts
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/introduceProperty/extractWithGetterToTrait.kt b/plugins/kotlin/idea/tests/testData/refactoring/introduceProperty/extractWithGetterToInterface.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/refactoring/introduceProperty/extractWithGetterToTrait.kt
rename to plugins/kotlin/idea/tests/testData/refactoring/introduceProperty/extractWithGetterToInterface.kt
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/introduceProperty/extractWithGetterToTrait.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/introduceProperty/extractWithGetterToInterface.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/refactoring/introduceProperty/extractWithGetterToTrait.kt.after
rename to plugins/kotlin/idea/tests/testData/refactoring/introduceProperty/extractWithGetterToInterface.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/introduceProperty/extractWithInitializerToTrait.kt b/plugins/kotlin/idea/tests/testData/refactoring/introduceProperty/extractWithInitializerToInterface.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/refactoring/introduceProperty/extractWithInitializerToTrait.kt
rename to plugins/kotlin/idea/tests/testData/refactoring/introduceProperty/extractWithInitializerToInterface.kt
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/introduceProperty/extractWithInitializerToTrait.kt.conflicts b/plugins/kotlin/idea/tests/testData/refactoring/introduceProperty/extractWithInitializerToInterface.kt.conflicts
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/refactoring/introduceProperty/extractWithInitializerToTrait.kt.conflicts
rename to plugins/kotlin/idea/tests/testData/refactoring/introduceProperty/extractWithInitializerToInterface.kt.conflicts
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/rename/automaticRenamerParameter/after/main.kt b/plugins/kotlin/idea/tests/testData/refactoring/rename/automaticRenamerParameter/after/main.kt
index 13b208b9d488..44b32d4cae33 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/rename/automaticRenamerParameter/after/main.kt
+++ b/plugins/kotlin/idea/tests/testData/refactoring/rename/automaticRenamerParameter/after/main.kt
@@ -1,6 +1,6 @@
 package testing
 
-interface Trait {
+interface Interface {
     open fun foo(a: Int, b: String) {
     }
 }
@@ -10,7 +10,7 @@ open class Super {
     }
 }
 
-open class Middle : Super(), Trait {
+open class Middle : Super(), Interface {
     override fun foo(aa: Int, b: String) {
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/rename/automaticRenamerParameter/before/main.kt b/plugins/kotlin/idea/tests/testData/refactoring/rename/automaticRenamerParameter/before/main.kt
index 2f5d8ab78ca7..f2b11e3e8508 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/rename/automaticRenamerParameter/before/main.kt
+++ b/plugins/kotlin/idea/tests/testData/refactoring/rename/automaticRenamerParameter/before/main.kt
@@ -1,6 +1,6 @@
 package testing
 
-interface Trait {
+interface Interface {
     open fun foo(a: Int, b: String) {
     }
 }
@@ -10,7 +10,7 @@ open class Super {
     }
 }
 
-open class Middle : Super(), Trait {
+open class Middle : Super(), Interface {
     override fun foo(/*rename*/a: Int, b: String) {
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/rename/automaticRenamerParameterInExtension/after/main.kt b/plugins/kotlin/idea/tests/testData/refactoring/rename/automaticRenamerParameterInExtension/after/main.kt
index e1b7e1c7a7d0..87b1fd4e853f 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/rename/automaticRenamerParameterInExtension/after/main.kt
+++ b/plugins/kotlin/idea/tests/testData/refactoring/rename/automaticRenamerParameterInExtension/after/main.kt
@@ -1,6 +1,6 @@
 package testing
 
-interface Trait {
+interface Interface {
     open fun Int.foo(a: Int, b: String) {
     }
 }
@@ -10,7 +10,7 @@ open class Super {
     }
 }
 
-open class Middle : Super(), Trait {
+open class Middle : Super(), Interface {
     override fun Int.foo(aa: Int, b: String) {
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/rename/automaticRenamerParameterInExtension/before/main.kt b/plugins/kotlin/idea/tests/testData/refactoring/rename/automaticRenamerParameterInExtension/before/main.kt
index cb980b4bf470..3d65963ce182 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/rename/automaticRenamerParameterInExtension/before/main.kt
+++ b/plugins/kotlin/idea/tests/testData/refactoring/rename/automaticRenamerParameterInExtension/before/main.kt
@@ -1,6 +1,6 @@
 package testing
 
-interface Trait {
+interface Interface {
     open fun Int.foo(a: Int, b: String) {
     }
 }
@@ -10,7 +10,7 @@ open class Super {
     }
 }
 
-open class Middle : Super(), Trait {
+open class Middle : Super(), Interface {
     override fun Int.foo(/*rename*/a: Int, b: String) {
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/safeDelete/deleteClass/kotlinClass/trait1.kt b/plugins/kotlin/idea/tests/testData/refactoring/safeDelete/deleteClass/kotlinClass/interface1.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/refactoring/safeDelete/deleteClass/kotlinClass/trait1.kt
rename to plugins/kotlin/idea/tests/testData/refactoring/safeDelete/deleteClass/kotlinClass/interface1.kt
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/safeDelete/deleteClass/kotlinClass/trait1.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/safeDelete/deleteClass/kotlinClass/interface1.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/refactoring/safeDelete/deleteClass/kotlinClass/trait1.kt.after
rename to plugins/kotlin/idea/tests/testData/refactoring/safeDelete/deleteClass/kotlinClass/interface1.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/safeDelete/deleteClass/kotlinClass/trait2.kt b/plugins/kotlin/idea/tests/testData/refactoring/safeDelete/deleteClass/kotlinClass/interface2.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/refactoring/safeDelete/deleteClass/kotlinClass/trait2.kt
rename to plugins/kotlin/idea/tests/testData/refactoring/safeDelete/deleteClass/kotlinClass/interface2.kt
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/safeDelete/deleteClass/kotlinClass/trait2.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/safeDelete/deleteClass/kotlinClass/interface2.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/refactoring/safeDelete/deleteClass/kotlinClass/trait2.kt.after
rename to plugins/kotlin/idea/tests/testData/refactoring/safeDelete/deleteClass/kotlinClass/interface2.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/safeDelete/deleteClass/kotlinClass/trait2.kt.messages b/plugins/kotlin/idea/tests/testData/refactoring/safeDelete/deleteClass/kotlinClass/interface2.kt.messages
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/refactoring/safeDelete/deleteClass/kotlinClass/trait2.kt.messages
rename to plugins/kotlin/idea/tests/testData/refactoring/safeDelete/deleteClass/kotlinClass/interface2.kt.messages
diff --git a/plugins/kotlin/idea/tests/testData/resolve/referenceInJava/dependency/dependencies.kt b/plugins/kotlin/idea/tests/testData/resolve/referenceInJava/dependency/dependencies.kt
index 58aaf43f0de7..2a72e578384d 100644
--- a/plugins/kotlin/idea/tests/testData/resolve/referenceInJava/dependency/dependencies.kt
+++ b/plugins/kotlin/idea/tests/testData/resolve/referenceInJava/dependency/dependencies.kt
@@ -43,7 +43,7 @@ public object KotlinObject {
     fun f() = 1
 }
 
-public interface StaticFieldInClassObjectInTrait {
+public interface StaticFieldInClassObjectInInterface {
     companion object {
         public const val XX: String = "xx"
     }
@@ -55,17 +55,17 @@ object PlatformStaticFun {
     }
 }
 
-interface TraitNoImpl {
+interface InterfaceNoImpl {
     fun foo()
 }
 
-public class TraitWithDelegatedNoImpl(f: TraitNoImpl): TraitNoImpl by f
+public class InterfaceWithDelegatedNoImpl(f: InterfaceNoImpl): InterfaceNoImpl by f
 
-interface TraitWithImpl {
+interface InterfaceWithImpl {
     fun foo() = 1
 }
 
-public class TraitWithDelegatedWithImpl(f: TraitWithImpl) : TraitWithImpl by f
+public class InterfaceWithDelegatedWithImpl(f: InterfaceWithImpl) : InterfaceWithImpl by f
 
 @kotlin.jvm.JvmOverloads
 public fun withJvmOverloads(i: Int, b: Boolean = false, s: String="hello") {}
diff --git a/plugins/kotlin/idea/tests/testData/resolve/referenceInJava/sourceOnly/ClassObjectStaticField.java b/plugins/kotlin/idea/tests/testData/resolve/referenceInJava/sourceOnly/ClassObjectStaticField.java
index 9310335e9cfa..4d5af3caef4d 100644
--- a/plugins/kotlin/idea/tests/testData/resolve/referenceInJava/sourceOnly/ClassObjectStaticField.java
+++ b/plugins/kotlin/idea/tests/testData/resolve/referenceInJava/sourceOnly/ClassObjectStaticField.java
@@ -1,9 +1,9 @@
-import k.StaticFieldInClassObjectInTrait;
+import k.StaticFieldInClassObjectInInterface;
 
 public class ClassObjectField {
     public static void foo() {
-        Object object = StaticFieldInClassObjectInTrait.<caret>XX;
+        Object object = StaticFieldInClassObjectInInterface.<caret>XX;
     }
 }
 
-// REF: (in k.StaticFieldInClassObjectInTrait.Companion).XX
\ No newline at end of file
+// REF: (in k.StaticFieldInClassObjectInInterface.Companion).XX
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/resolve/referenceInJava/sourceOnly/DelegatedMethodFromInterfaceNoImpl.java b/plugins/kotlin/idea/tests/testData/resolve/referenceInJava/sourceOnly/DelegatedMethodFromInterfaceNoImpl.java
new file mode 100644
index 000000000000..7d90a40c4d0f
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/resolve/referenceInJava/sourceOnly/DelegatedMethodFromInterfaceNoImpl.java
@@ -0,0 +1,9 @@
+import k.*;
+
+public class Test {
+    public static void bar(InterfaceWithDelegatedNoImpl some) {
+        some.<caret>foo();
+    }
+}
+
+// REF: (in k.InterfaceNoImpl).foo()
diff --git a/plugins/kotlin/idea/tests/testData/resolve/referenceInJava/sourceOnly/DelegatedMethodFromInterfaceWithImpl.java b/plugins/kotlin/idea/tests/testData/resolve/referenceInJava/sourceOnly/DelegatedMethodFromInterfaceWithImpl.java
new file mode 100644
index 000000000000..ff71bd18758f
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/resolve/referenceInJava/sourceOnly/DelegatedMethodFromInterfaceWithImpl.java
@@ -0,0 +1,9 @@
+import k.*;
+
+public class Test {
+    public static void bar(InterfaceWithDelegatedWithImpl some) {
+        some.<caret>foo();
+    }
+}
+
+// REF: (in k.InterfaceWithImpl).foo()
diff --git a/plugins/kotlin/idea/tests/testData/resolve/referenceInJava/sourceOnly/DelegatedMethodFromTraitNoImpl.java b/plugins/kotlin/idea/tests/testData/resolve/referenceInJava/sourceOnly/DelegatedMethodFromTraitNoImpl.java
deleted file mode 100644
index df5ff3542862..000000000000
--- a/plugins/kotlin/idea/tests/testData/resolve/referenceInJava/sourceOnly/DelegatedMethodFromTraitNoImpl.java
+++ /dev/null
@@ -1,9 +0,0 @@
-import k.*;
-
-public class Test {
-    public static void bar(TraitWithDelegatedNoImpl some) {
-        some.<caret>foo();
-    }
-}
-
-// REF: (in k.TraitNoImpl).foo()
diff --git a/plugins/kotlin/idea/tests/testData/resolve/referenceInJava/sourceOnly/DelegatedMethodFromTraitWithImpl.java b/plugins/kotlin/idea/tests/testData/resolve/referenceInJava/sourceOnly/DelegatedMethodFromTraitWithImpl.java
deleted file mode 100644
index 766cb22ff65d..000000000000
--- a/plugins/kotlin/idea/tests/testData/resolve/referenceInJava/sourceOnly/DelegatedMethodFromTraitWithImpl.java
+++ /dev/null
@@ -1,9 +0,0 @@
-import k.*;
-
-public class Test {
-    public static void bar(TraitWithDelegatedWithImpl some) {
-        some.<caret>foo();
-    }
-}
-
-// REF: (in k.TraitWithImpl).foo()
diff --git a/plugins/kotlin/idea/tests/testData/resolve/references/DefaultObjectAsReceiverForExtensionFunctionOnSuperType.kt b/plugins/kotlin/idea/tests/testData/resolve/references/DefaultObjectAsReceiverForExtensionFunctionOnSuperType.kt
index aefbac44d3c1..34443c12f3ab 100644
--- a/plugins/kotlin/idea/tests/testData/resolve/references/DefaultObjectAsReceiverForExtensionFunctionOnSuperType.kt
+++ b/plugins/kotlin/idea/tests/testData/resolve/references/DefaultObjectAsReceiverForExtensionFunctionOnSuperType.kt
@@ -1,14 +1,14 @@
 package t
 
-interface Trait
+interface Interface
 
 open class A {
-    companion object Companion : Trait {
+    companion object Companion : Interface {
 
     }
 }
 
-fun Trait.foo() {}
+fun Interface.foo() {}
 
 fun test() {
     <caret>A.foo()
diff --git a/plugins/kotlin/idea/tests/testData/resolve/references/DefaultObjectAsReceiverForMemberPropertyInSuperType.kt b/plugins/kotlin/idea/tests/testData/resolve/references/DefaultObjectAsReceiverForMemberPropertyInSuperType.kt
index 060eb3a9d31e..a92a7bad3c6e 100644
--- a/plugins/kotlin/idea/tests/testData/resolve/references/DefaultObjectAsReceiverForMemberPropertyInSuperType.kt
+++ b/plugins/kotlin/idea/tests/testData/resolve/references/DefaultObjectAsReceiverForMemberPropertyInSuperType.kt
@@ -1,11 +1,11 @@
 package t
 
-interface Trait {
+interface Interface {
     val some : Int get() = 1
 }
 
 open class A {
-    companion object Companion : Trait {
+    companion object Companion : Interface {
 
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/structureView/fileStructure/Render.after b/plugins/kotlin/idea/tests/testData/structureView/fileStructure/Render.after
index fab5f88a8ee4..7236549a38fe 100644
--- a/plugins/kotlin/idea/tests/testData/structureView/fileStructure/Render.after
+++ b/plugins/kotlin/idea/tests/testData/structureView/fileStructure/Render.after
@@ -29,6 +29,8 @@
   SECOND
  extension1() on String: Unit
  extension2() on Comparable<T>: Unit
+ Interface
+ Interface1
  test1(): Unit
  test2(String?): Unit
  test3(T, U): Unit
@@ -37,9 +39,7 @@
  test6(): Comparable<String>
  TestWithWhere
  testWithWhere(): Unit
- Trait
- Trait1
  withDefaulArgs(Int = ..., String = ...): Unit
  -WithDefaultArgs
   a: Int
-  constructor WithDefaultArgs(Int = ..., String = ...)
+  constructor WithDefaultArgs(Int = ..., String = ...)
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/structureView/fileStructure/Render.kt b/plugins/kotlin/idea/tests/testData/structureView/fileStructure/Render.kt
index 26586d075fcb..189cdca5f0c9 100644
--- a/plugins/kotlin/idea/tests/testData/structureView/fileStructure/Render.kt
+++ b/plugins/kotlin/idea/tests/testData/structureView/fileStructure/Render.kt
@@ -42,8 +42,8 @@ enum class Enum1 {
     SECOND
 }
 
-interface Trait
-interface Trait1: Trait
+interface Interface
+interface Interface1: Interface
 
 class TestWithWhere<T> where T: Any?
 fun <T> testWithWhere() where T: String {}
diff --git a/plugins/kotlin/j2k/new/tests/test/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterSingleFileTestGenerated.java b/plugins/kotlin/j2k/new/tests/test/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterSingleFileTestGenerated.java
index 1c3886ec7954..97f87d4c2993 100644
--- a/plugins/kotlin/j2k/new/tests/test/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterSingleFileTestGenerated.java
+++ b/plugins/kotlin/j2k/new/tests/test/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterSingleFileTestGenerated.java
@@ -5661,6 +5661,11 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
             runTest("testData/newJ2k/typeParameters/genericParam-settings.java");
         }
 
+        @TestMetadata("interfaceDoubleParametrizationWithTwoBoundsWithExtending.java")
+        public void testInterfaceDoubleParametrizationWithTwoBoundsWithExtending() throws Exception {
+            runTest("testData/newJ2k/typeParameters/interfaceDoubleParametrizationWithTwoBoundsWithExtending.java");
+        }
+
         @TestMetadata("manyGenericParams.java")
         public void testManyGenericParams() throws Exception {
             runTest("testData/newJ2k/typeParameters/manyGenericParams.java");
@@ -5681,11 +5686,6 @@ public abstract class NewJavaToKotlinConverterSingleFileTestGenerated extends Ab
             runTest("testData/newJ2k/typeParameters/rawTypeCast.java");
         }
 
-        @TestMetadata("traitDoubleParametrizationWithTwoBoundsWithExtending.java")
-        public void testTraitDoubleParametrizationWithTwoBoundsWithExtending() throws Exception {
-            runTest("testData/newJ2k/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.java");
-        }
-
         @TestMetadata("typeFromOtherFile.java")
         public void testTypeFromOtherFile() throws Exception {
             runTest("testData/newJ2k/typeParameters/typeFromOtherFile.java");
diff --git a/plugins/kotlin/j2k/new/tests/testData/newJ2k/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.java b/plugins/kotlin/j2k/new/tests/testData/newJ2k/typeParameters/interfaceDoubleParametrizationWithTwoBoundsWithExtending.java
similarity index 100%
rename from plugins/kotlin/j2k/new/tests/testData/newJ2k/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.java
rename to plugins/kotlin/j2k/new/tests/testData/newJ2k/typeParameters/interfaceDoubleParametrizationWithTwoBoundsWithExtending.java
diff --git a/plugins/kotlin/j2k/new/tests/testData/newJ2k/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.kt b/plugins/kotlin/j2k/new/tests/testData/newJ2k/typeParameters/interfaceDoubleParametrizationWithTwoBoundsWithExtending.kt
similarity index 100%
rename from plugins/kotlin/j2k/new/tests/testData/newJ2k/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.kt
rename to plugins/kotlin/j2k/new/tests/testData/newJ2k/typeParameters/interfaceDoubleParametrizationWithTwoBoundsWithExtending.kt
diff --git a/plugins/kotlin/jvm-debugger/test/k2/test/org/jetbrains/kotlin/idea/k2/debugger/test/cases/K2IrKotlinSteppingTestGenerated.java b/plugins/kotlin/jvm-debugger/test/k2/test/org/jetbrains/kotlin/idea/k2/debugger/test/cases/K2IrKotlinSteppingTestGenerated.java
index 26f2df18c50e..449bd33ee42b 100644
--- a/plugins/kotlin/jvm-debugger/test/k2/test/org/jetbrains/kotlin/idea/k2/debugger/test/cases/K2IrKotlinSteppingTestGenerated.java
+++ b/plugins/kotlin/jvm-debugger/test/k2/test/org/jetbrains/kotlin/idea/k2/debugger/test/cases/K2IrKotlinSteppingTestGenerated.java
@@ -241,6 +241,11 @@ public abstract class K2IrKotlinSteppingTestGenerated extends AbstractK2IrKotlin
             runTest("../testData/stepping/stepInto/inlineOnly.kt");
         }
 
+        @TestMetadata("interfaces.kt")
+        public void testInterfaces() throws Exception {
+            runTest("../testData/stepping/stepInto/interfaces.kt");
+        }
+
         @TestMetadata("oneLineSuspendFunWithInline.kt")
         public void testOneLineSuspendFunWithInline() throws Exception {
             runTest("../testData/stepping/stepInto/oneLineSuspendFunWithInline.kt");
@@ -316,11 +321,6 @@ public abstract class K2IrKotlinSteppingTestGenerated extends AbstractK2IrKotlin
             runTest("../testData/stepping/stepInto/syntheticMethodsSkip.kt");
         }
 
-        @TestMetadata("traits.kt")
-        public void testTraits() throws Exception {
-            runTest("../testData/stepping/stepInto/traits.kt");
-        }
-
         @TestMetadata("whenExpr.kt")
         public void testWhenExpr() throws Exception {
             runTest("../testData/stepping/stepInto/whenExpr.kt");
diff --git a/plugins/kotlin/jvm-debugger/test/k2/test/org/jetbrains/kotlin/idea/k2/debugger/test/cases/K2PositionManagerTestGenerated.java b/plugins/kotlin/jvm-debugger/test/k2/test/org/jetbrains/kotlin/idea/k2/debugger/test/cases/K2PositionManagerTestGenerated.java
index dcdd038f8345..62b2ac255ff0 100644
--- a/plugins/kotlin/jvm-debugger/test/k2/test/org/jetbrains/kotlin/idea/k2/debugger/test/cases/K2PositionManagerTestGenerated.java
+++ b/plugins/kotlin/jvm-debugger/test/k2/test/org/jetbrains/kotlin/idea/k2/debugger/test/cases/K2PositionManagerTestGenerated.java
@@ -70,6 +70,11 @@ public abstract class K2PositionManagerTestGenerated extends AbstractK2PositionM
             runTest("../testData/positionManager/innerClass.kt");
         }
 
+        @TestMetadata("interface.kt")
+        public void testInterface() throws Exception {
+            runTest("../testData/positionManager/interface.kt");
+        }
+
         @TestMetadata("JvmNameAnnotation.kt")
         public void testJvmNameAnnotation() throws Exception {
             runTest("../testData/positionManager/JvmNameAnnotation.kt");
@@ -110,11 +115,6 @@ public abstract class K2PositionManagerTestGenerated extends AbstractK2PositionM
             runTest("../testData/positionManager/topLevelPropertyInitializer.kt");
         }
 
-        @TestMetadata("trait.kt")
-        public void testTrait() throws Exception {
-            runTest("../testData/positionManager/trait.kt");
-        }
-
         @TestMetadata("twoClasses.kt")
         public void testTwoClasses() throws Exception {
             runTest("../testData/positionManager/twoClasses.kt");
diff --git a/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/IrKotlinEvaluateExpressionTestGenerated.java b/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/IrKotlinEvaluateExpressionTestGenerated.java
index 00a67f883afa..f185d28be1fc 100644
--- a/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/IrKotlinEvaluateExpressionTestGenerated.java
+++ b/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/IrKotlinEvaluateExpressionTestGenerated.java
@@ -1072,9 +1072,9 @@ public abstract class IrKotlinEvaluateExpressionTestGenerated extends AbstractIr
                 runTest("testData/evaluation/singleBreakpoint/extractThis.kt");
             }
 
-            @TestMetadata("extractThisInTrait.kt")
-            public void testExtractThisInTrait() throws Exception {
-                runTest("testData/evaluation/singleBreakpoint/extractThisInTrait.kt");
+            @TestMetadata("extractThisInInterface.kt")
+            public void testExtractThisInInterface() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/extractThisInInterface.kt");
             }
 
             @TestMetadata("extractVariablesFromCall.kt")
diff --git a/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/IrKotlinEvaluateExpressionWithIRFragmentCompilerTestGenerated.java b/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/IrKotlinEvaluateExpressionWithIRFragmentCompilerTestGenerated.java
index 2b1a33c35d47..598a7c31f774 100644
--- a/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/IrKotlinEvaluateExpressionWithIRFragmentCompilerTestGenerated.java
+++ b/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/IrKotlinEvaluateExpressionWithIRFragmentCompilerTestGenerated.java
@@ -1072,9 +1072,9 @@ public abstract class IrKotlinEvaluateExpressionWithIRFragmentCompilerTestGenera
                 runTest("testData/evaluation/singleBreakpoint/extractThis.kt");
             }
 
-            @TestMetadata("extractThisInTrait.kt")
-            public void testExtractThisInTrait() throws Exception {
-                runTest("testData/evaluation/singleBreakpoint/extractThisInTrait.kt");
+            @TestMetadata("extractThisInInterface.kt")
+            public void testExtractThisInInterface() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/extractThisInInterface.kt");
             }
 
             @TestMetadata("extractVariablesFromCall.kt")
diff --git a/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/IrKotlinSteppingTestGenerated.java b/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/IrKotlinSteppingTestGenerated.java
index d7b9daa54cf5..f9988e36fb32 100644
--- a/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/IrKotlinSteppingTestGenerated.java
+++ b/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/IrKotlinSteppingTestGenerated.java
@@ -241,6 +241,11 @@ public abstract class IrKotlinSteppingTestGenerated extends AbstractIrKotlinStep
             runTest("testData/stepping/stepInto/inlineOnly.kt");
         }
 
+        @TestMetadata("interfaces.kt")
+        public void testInterfaces() throws Exception {
+            runTest("testData/stepping/stepInto/interfaces.kt");
+        }
+
         @TestMetadata("oneLineSuspendFunWithInline.kt")
         public void testOneLineSuspendFunWithInline() throws Exception {
             runTest("testData/stepping/stepInto/oneLineSuspendFunWithInline.kt");
@@ -316,11 +321,6 @@ public abstract class IrKotlinSteppingTestGenerated extends AbstractIrKotlinStep
             runTest("testData/stepping/stepInto/syntheticMethodsSkip.kt");
         }
 
-        @TestMetadata("traits.kt")
-        public void testTraits() throws Exception {
-            runTest("testData/stepping/stepInto/traits.kt");
-        }
-
         @TestMetadata("whenExpr.kt")
         public void testWhenExpr() throws Exception {
             runTest("testData/stepping/stepInto/whenExpr.kt");
diff --git a/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/KotlinEvaluateExpressionInMppTestGenerated.java b/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/KotlinEvaluateExpressionInMppTestGenerated.java
index 70fdb9d67730..f3d61f27f5ce 100644
--- a/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/KotlinEvaluateExpressionInMppTestGenerated.java
+++ b/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/KotlinEvaluateExpressionInMppTestGenerated.java
@@ -1072,9 +1072,9 @@ public abstract class KotlinEvaluateExpressionInMppTestGenerated extends Abstrac
                 runTest("testData/evaluation/singleBreakpoint/extractThis.kt");
             }
 
-            @TestMetadata("extractThisInTrait.kt")
-            public void testExtractThisInTrait() throws Exception {
-                runTest("testData/evaluation/singleBreakpoint/extractThisInTrait.kt");
+            @TestMetadata("extractThisInInterface.kt")
+            public void testExtractThisInInterface() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/extractThisInInterface.kt");
             }
 
             @TestMetadata("extractVariablesFromCall.kt")
diff --git a/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/KotlinEvaluateExpressionTestGenerated.java b/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/KotlinEvaluateExpressionTestGenerated.java
index 7b3082019cae..dbcb1d5b23f7 100644
--- a/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/KotlinEvaluateExpressionTestGenerated.java
+++ b/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/KotlinEvaluateExpressionTestGenerated.java
@@ -1072,9 +1072,9 @@ public abstract class KotlinEvaluateExpressionTestGenerated extends AbstractKotl
                 runTest("testData/evaluation/singleBreakpoint/extractThis.kt");
             }
 
-            @TestMetadata("extractThisInTrait.kt")
-            public void testExtractThisInTrait() throws Exception {
-                runTest("testData/evaluation/singleBreakpoint/extractThisInTrait.kt");
+            @TestMetadata("extractThisInInterface.kt")
+            public void testExtractThisInInterface() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/extractThisInInterface.kt");
             }
 
             @TestMetadata("extractVariablesFromCall.kt")
diff --git a/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/KotlinSteppingTestGenerated.java b/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/KotlinSteppingTestGenerated.java
index 24a0424147bb..a5e5e08cb6c3 100644
--- a/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/KotlinSteppingTestGenerated.java
+++ b/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/KotlinSteppingTestGenerated.java
@@ -241,6 +241,11 @@ public abstract class KotlinSteppingTestGenerated extends AbstractKotlinStepping
             runTest("testData/stepping/stepInto/inlineOnly.kt");
         }
 
+        @TestMetadata("interfaces.kt")
+        public void testInterfaces() throws Exception {
+            runTest("testData/stepping/stepInto/interfaces.kt");
+        }
+
         @TestMetadata("oneLineSuspendFunWithInline.kt")
         public void testOneLineSuspendFunWithInline() throws Exception {
             runTest("testData/stepping/stepInto/oneLineSuspendFunWithInline.kt");
@@ -316,11 +321,6 @@ public abstract class KotlinSteppingTestGenerated extends AbstractKotlinStepping
             runTest("testData/stepping/stepInto/syntheticMethodsSkip.kt");
         }
 
-        @TestMetadata("traits.kt")
-        public void testTraits() throws Exception {
-            runTest("testData/stepping/stepInto/traits.kt");
-        }
-
         @TestMetadata("whenExpr.kt")
         public void testWhenExpr() throws Exception {
             runTest("testData/stepping/stepInto/whenExpr.kt");
diff --git a/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/PositionManagerTestGenerated.java b/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/PositionManagerTestGenerated.java
index 2c2df7e1c1a0..f2b12b0811f6 100644
--- a/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/PositionManagerTestGenerated.java
+++ b/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/PositionManagerTestGenerated.java
@@ -70,6 +70,11 @@ public abstract class PositionManagerTestGenerated extends AbstractPositionManag
             runTest("testData/positionManager/innerClass.kt");
         }
 
+        @TestMetadata("interface.kt")
+        public void testInterface() throws Exception {
+            runTest("testData/positionManager/interface.kt");
+        }
+
         @TestMetadata("JvmNameAnnotation.kt")
         public void testJvmNameAnnotation() throws Exception {
             runTest("testData/positionManager/JvmNameAnnotation.kt");
@@ -110,11 +115,6 @@ public abstract class PositionManagerTestGenerated extends AbstractPositionManag
             runTest("testData/positionManager/topLevelPropertyInitializer.kt");
         }
 
-        @TestMetadata("trait.kt")
-        public void testTrait() throws Exception {
-            runTest("testData/positionManager/trait.kt");
-        }
-
         @TestMetadata("twoClasses.kt")
         public void testTwoClasses() throws Exception {
             runTest("testData/positionManager/twoClasses.kt");
diff --git a/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/extractThisInTrait.kt b/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/extractThisInInterface.kt
similarity index 89%
rename from plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/extractThisInTrait.kt
rename to plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/extractThisInInterface.kt
index 76959e025c39..056322b54a46 100644
--- a/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/extractThisInTrait.kt
+++ b/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/extractThisInInterface.kt
@@ -1,4 +1,4 @@
-package extractThisInTrait
+package extractThisInInterface
 
 fun main(args: Array<String>) {
     TImpl().foo()
diff --git a/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/extractThisInTrait.out b/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/extractThisInInterface.out
similarity index 65%
rename from plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/extractThisInTrait.out
rename to plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/extractThisInInterface.out
index f505c357d3f1..45a215bd9597 100644
--- a/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/extractThisInTrait.out
+++ b/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/extractThisInInterface.out
@@ -1,7 +1,7 @@
-LineBreakpoint created at extractThisInTrait.kt:10
+LineBreakpoint created at extractThisInInterface.kt:10
 Run Java
 Connected to the target VM
-extractThisInTrait.kt:10
+extractThisInInterface.kt:10
 Compile bytecode for prop
 Compile bytecode for this.prop
 Disconnected from the target VM
diff --git a/plugins/kotlin/jvm-debugger/test/testData/positionManager/trait.kt b/plugins/kotlin/jvm-debugger/test/testData/positionManager/interface.kt
similarity index 100%
rename from plugins/kotlin/jvm-debugger/test/testData/positionManager/trait.kt
rename to plugins/kotlin/jvm-debugger/test/testData/positionManager/interface.kt
diff --git a/plugins/kotlin/jvm-debugger/test/testData/stepping/stepInto/traits.kt b/plugins/kotlin/jvm-debugger/test/testData/stepping/stepInto/interfaces.kt
similarity index 98%
rename from plugins/kotlin/jvm-debugger/test/testData/stepping/stepInto/traits.kt
rename to plugins/kotlin/jvm-debugger/test/testData/stepping/stepInto/interfaces.kt
index dba8519cd005..18f74a564fbd 100644
--- a/plugins/kotlin/jvm-debugger/test/testData/stepping/stepInto/traits.kt
+++ b/plugins/kotlin/jvm-debugger/test/testData/stepping/stepInto/interfaces.kt
@@ -1,4 +1,4 @@
-package traits
+package interfaces
 
 fun main(args: Array<String>) {
     //Breakpoint!
diff --git a/plugins/kotlin/jvm-debugger/test/testData/stepping/stepInto/interfaces.out b/plugins/kotlin/jvm-debugger/test/testData/stepping/stepInto/interfaces.out
new file mode 100644
index 000000000000..386e26538221
--- /dev/null
+++ b/plugins/kotlin/jvm-debugger/test/testData/stepping/stepInto/interfaces.out
@@ -0,0 +1,34 @@
+LineBreakpoint created at interfaces.kt:5
+Run Java
+Connected to the target VM
+interfaces.kt:5
+interfaces.kt:6
+interfaces.kt:41
+interfaces.kt:27
+interfaces.kt:6
+interfaces.kt:7
+interfaces.kt:31
+interfaces.kt:7
+interfaces.kt:8
+interfaces.kt:43
+interfaces.kt:8
+interfaces.kt:9
+interfaces.kt:47
+interfaces.kt:9
+interfaces.kt:11
+interfaces.kt:19
+interfaces.kt:27
+interfaces.kt:19
+interfaces.kt:20
+interfaces.kt:31
+interfaces.kt:20
+interfaces.kt:21
+interfaces.kt:13
+interfaces.kt:21
+interfaces.kt:22
+interfaces.kt:17
+interfaces.kt:22
+interfaces.kt:23
+Disconnected from the target VM
+
+Process finished with exit code 0
diff --git a/plugins/kotlin/jvm-debugger/test/testData/stepping/stepInto/traits.out b/plugins/kotlin/jvm-debugger/test/testData/stepping/stepInto/traits.out
deleted file mode 100644
index 81644fb07529..000000000000
--- a/plugins/kotlin/jvm-debugger/test/testData/stepping/stepInto/traits.out
+++ /dev/null
@@ -1,34 +0,0 @@
-LineBreakpoint created at traits.kt:5
-Run Java
-Connected to the target VM
-traits.kt:5
-traits.kt:6
-traits.kt:41
-traits.kt:27
-traits.kt:6
-traits.kt:7
-traits.kt:31
-traits.kt:7
-traits.kt:8
-traits.kt:43
-traits.kt:8
-traits.kt:9
-traits.kt:47
-traits.kt:9
-traits.kt:11
-traits.kt:19
-traits.kt:27
-traits.kt:19
-traits.kt:20
-traits.kt:31
-traits.kt:20
-traits.kt:21
-traits.kt:13
-traits.kt:21
-traits.kt:22
-traits.kt:17
-traits.kt:22
-traits.kt:23
-Disconnected from the target VM
-
-Process finished with exit code 0
diff --git a/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/synthetic/PerformanceHighlightingTestGenerated.java b/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/synthetic/PerformanceHighlightingTestGenerated.java
index 7ca9bc784c3d..37e9e5c4f708 100644
--- a/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/synthetic/PerformanceHighlightingTestGenerated.java
+++ b/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/synthetic/PerformanceHighlightingTestGenerated.java
@@ -66,6 +66,11 @@ public abstract class PerformanceHighlightingTestGenerated extends AbstractPerfo
             runTest("../idea/tests/testData/highlighter/deprecated/Inc.kt");
         }
 
+        @TestMetadata("Interface.kt")
+        public void testInterface() throws Exception {
+            runTest("../idea/tests/testData/highlighter/deprecated/Interface.kt");
+        }
+
         @TestMetadata("Invalid.kt")
         public void testInvalid() throws Exception {
             runTest("../idea/tests/testData/highlighter/deprecated/Invalid.kt");
@@ -105,11 +110,6 @@ public abstract class PerformanceHighlightingTestGenerated extends AbstractPerfo
         public void testSuperCall() throws Exception {
             runTest("../idea/tests/testData/highlighter/deprecated/SuperCall.kt");
         }
-
-        @TestMetadata("Trait.kt")
-        public void testTrait() throws Exception {
-            runTest("../idea/tests/testData/highlighter/deprecated/Trait.kt");
-        }
     }
 
     @RunWith(JUnit3RunnerWithInners.class)
diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.tests.k2/test/org/jetbrains/kotlin/idea/k2/refactoring/safeDelete/K2SafeDeleteTestGenerated.java b/plugins/kotlin/refactorings/kotlin.refactorings.tests.k2/test/org/jetbrains/kotlin/idea/k2/refactoring/safeDelete/K2SafeDeleteTestGenerated.java
index e66e37413421..9586489d11dc 100644
--- a/plugins/kotlin/refactorings/kotlin.refactorings.tests.k2/test/org/jetbrains/kotlin/idea/k2/refactoring/safeDelete/K2SafeDeleteTestGenerated.java
+++ b/plugins/kotlin/refactorings/kotlin.refactorings.tests.k2/test/org/jetbrains/kotlin/idea/k2/refactoring/safeDelete/K2SafeDeleteTestGenerated.java
@@ -55,6 +55,16 @@ public abstract class K2SafeDeleteTestGenerated extends AbstractK2SafeDeleteTest
             runTest("../../idea/tests/testData/refactoring/safeDelete/deleteClass/kotlinClass/enumEntry.kt");
         }
 
+        @TestMetadata("interface1.kt")
+        public void testInterface1() throws Exception {
+            runTest("../../idea/tests/testData/refactoring/safeDelete/deleteClass/kotlinClass/interface1.kt");
+        }
+
+        @TestMetadata("interface2.kt")
+        public void testInterface2() throws Exception {
+            runTest("../../idea/tests/testData/refactoring/safeDelete/deleteClass/kotlinClass/interface2.kt");
+        }
+
         @TestMetadata("localClass1.kt")
         public void testLocalClass1() throws Exception {
             runTest("../../idea/tests/testData/refactoring/safeDelete/deleteClass/kotlinClass/localClass1.kt");
@@ -80,16 +90,6 @@ public abstract class K2SafeDeleteTestGenerated extends AbstractK2SafeDeleteTest
             runTest("../../idea/tests/testData/refactoring/safeDelete/deleteClass/kotlinClass/noUsages.kt");
         }
 
-        @TestMetadata("trait1.kt")
-        public void testTrait1() throws Exception {
-            runTest("../../idea/tests/testData/refactoring/safeDelete/deleteClass/kotlinClass/trait1.kt");
-        }
-
-        @TestMetadata("trait2.kt")
-        public void testTrait2() throws Exception {
-            runTest("../../idea/tests/testData/refactoring/safeDelete/deleteClass/kotlinClass/trait2.kt");
-        }
-
         @TestMetadata("unsafeImport.kt")
         public void testUnsafeImport() throws Exception {
             runTest("../../idea/tests/testData/refactoring/safeDelete/deleteClass/kotlinClass/unsafeImport.kt");