diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index cdaf580a565..4bf9042216d 100644
--- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -349,7 +349,7 @@ fun main(args: Array<String>) {
         }
 
         testClass(javaClass<AbstractQuickFixTest>()) {
-            model("quickfix", pattern = "^before(\\w+)\\.kt$")
+            model("quickfix", pattern = "^(\\w+)\\.kt$")
         }
 
         testClass(javaClass<AbstractGotoSuperTest>()) {
diff --git a/idea/testData/quickfix/abstract/beforeAbstractFunctionInNonAbstractClass.kt b/idea/testData/quickfix/abstract/abstractFunctionInNonAbstractClass.kt
similarity index 100%
rename from idea/testData/quickfix/abstract/beforeAbstractFunctionInNonAbstractClass.kt
rename to idea/testData/quickfix/abstract/abstractFunctionInNonAbstractClass.kt
diff --git a/idea/testData/quickfix/abstract/afterAbstractFunctionInNonAbstractClass.kt b/idea/testData/quickfix/abstract/abstractFunctionInNonAbstractClass.kt.after
similarity index 100%
rename from idea/testData/quickfix/abstract/afterAbstractFunctionInNonAbstractClass.kt
rename to idea/testData/quickfix/abstract/abstractFunctionInNonAbstractClass.kt.after
diff --git a/idea/testData/quickfix/abstract/beforeAbstractFunctionWithBody.kt b/idea/testData/quickfix/abstract/abstractFunctionWithBody.kt
similarity index 100%
rename from idea/testData/quickfix/abstract/beforeAbstractFunctionWithBody.kt
rename to idea/testData/quickfix/abstract/abstractFunctionWithBody.kt
diff --git a/idea/testData/quickfix/abstract/afterAbstractFunctionWithBody.kt b/idea/testData/quickfix/abstract/abstractFunctionWithBody.kt.after
similarity index 100%
rename from idea/testData/quickfix/abstract/afterAbstractFunctionWithBody.kt
rename to idea/testData/quickfix/abstract/abstractFunctionWithBody.kt.after
diff --git a/idea/testData/quickfix/abstract/beforeAbstractFunctionWithBody2.kt b/idea/testData/quickfix/abstract/abstractFunctionWithBody2.kt
similarity index 100%
rename from idea/testData/quickfix/abstract/beforeAbstractFunctionWithBody2.kt
rename to idea/testData/quickfix/abstract/abstractFunctionWithBody2.kt
diff --git a/idea/testData/quickfix/abstract/afterAbstractFunctionWithBody2.kt b/idea/testData/quickfix/abstract/abstractFunctionWithBody2.kt.after
similarity index 100%
rename from idea/testData/quickfix/abstract/afterAbstractFunctionWithBody2.kt
rename to idea/testData/quickfix/abstract/abstractFunctionWithBody2.kt.after
diff --git a/idea/testData/quickfix/abstract/beforeAbstractFunctionWithBody3.kt b/idea/testData/quickfix/abstract/abstractFunctionWithBody3.kt
similarity index 100%
rename from idea/testData/quickfix/abstract/beforeAbstractFunctionWithBody3.kt
rename to idea/testData/quickfix/abstract/abstractFunctionWithBody3.kt
diff --git a/idea/testData/quickfix/abstract/afterAbstractFunctionWithBody3.kt b/idea/testData/quickfix/abstract/abstractFunctionWithBody3.kt.after
similarity index 100%
rename from idea/testData/quickfix/abstract/afterAbstractFunctionWithBody3.kt
rename to idea/testData/quickfix/abstract/abstractFunctionWithBody3.kt.after
diff --git a/idea/testData/quickfix/abstract/beforeAbstractPropertyInNonAbstractClass1.kt b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass1.kt
similarity index 100%
rename from idea/testData/quickfix/abstract/beforeAbstractPropertyInNonAbstractClass1.kt
rename to idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass1.kt
diff --git a/idea/testData/quickfix/abstract/afterAbstractPropertyInNonAbstractClass1.kt b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass1.kt.after
similarity index 100%
rename from idea/testData/quickfix/abstract/afterAbstractPropertyInNonAbstractClass1.kt
rename to idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass1.kt.after
diff --git a/idea/testData/quickfix/abstract/beforeAbstractPropertyInNonAbstractClass2.kt b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass2.kt
similarity index 100%
rename from idea/testData/quickfix/abstract/beforeAbstractPropertyInNonAbstractClass2.kt
rename to idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass2.kt
diff --git a/idea/testData/quickfix/abstract/afterAbstractPropertyInNonAbstractClass2.kt b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass2.kt.after
similarity index 100%
rename from idea/testData/quickfix/abstract/afterAbstractPropertyInNonAbstractClass2.kt
rename to idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass2.kt.after
diff --git a/idea/testData/quickfix/abstract/beforeAbstractPropertyInNonAbstractClass3.kt b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass3.kt
similarity index 100%
rename from idea/testData/quickfix/abstract/beforeAbstractPropertyInNonAbstractClass3.kt
rename to idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass3.kt
diff --git a/idea/testData/quickfix/abstract/afterAbstractPropertyInNonAbstractClass3.kt b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass3.kt.after
similarity index 100%
rename from idea/testData/quickfix/abstract/afterAbstractPropertyInNonAbstractClass3.kt
rename to idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass3.kt.after
diff --git a/idea/testData/quickfix/abstract/beforeAbstractPropertyInPrimaryConstructorParameters.kt b/idea/testData/quickfix/abstract/abstractPropertyInPrimaryConstructorParameters.kt
similarity index 100%
rename from idea/testData/quickfix/abstract/beforeAbstractPropertyInPrimaryConstructorParameters.kt
rename to idea/testData/quickfix/abstract/abstractPropertyInPrimaryConstructorParameters.kt
diff --git a/idea/testData/quickfix/abstract/afterAbstractPropertyInPrimaryConstructorParameters.kt b/idea/testData/quickfix/abstract/abstractPropertyInPrimaryConstructorParameters.kt.after
similarity index 100%
rename from idea/testData/quickfix/abstract/afterAbstractPropertyInPrimaryConstructorParameters.kt
rename to idea/testData/quickfix/abstract/abstractPropertyInPrimaryConstructorParameters.kt.after
diff --git a/idea/testData/quickfix/abstract/beforeAbstractPropertyNotInClass.kt b/idea/testData/quickfix/abstract/abstractPropertyNotInClass.kt
similarity index 100%
rename from idea/testData/quickfix/abstract/beforeAbstractPropertyNotInClass.kt
rename to idea/testData/quickfix/abstract/abstractPropertyNotInClass.kt
diff --git a/idea/testData/quickfix/abstract/afterAbstractPropertyNotInClass.kt b/idea/testData/quickfix/abstract/abstractPropertyNotInClass.kt.after
similarity index 100%
rename from idea/testData/quickfix/abstract/afterAbstractPropertyNotInClass.kt
rename to idea/testData/quickfix/abstract/abstractPropertyNotInClass.kt.after
diff --git a/idea/testData/quickfix/abstract/beforeAbstractPropertyWIthInitializer2.kt b/idea/testData/quickfix/abstract/abstractPropertyWIthInitializer2.kt
similarity index 100%
rename from idea/testData/quickfix/abstract/beforeAbstractPropertyWIthInitializer2.kt
rename to idea/testData/quickfix/abstract/abstractPropertyWIthInitializer2.kt
diff --git a/idea/testData/quickfix/abstract/afterAbstractPropertyWIthInitializer2.kt b/idea/testData/quickfix/abstract/abstractPropertyWIthInitializer2.kt.after
similarity index 100%
rename from idea/testData/quickfix/abstract/afterAbstractPropertyWIthInitializer2.kt
rename to idea/testData/quickfix/abstract/abstractPropertyWIthInitializer2.kt.after
diff --git a/idea/testData/quickfix/abstract/beforeAbstractPropertyWIthInitializer3.kt b/idea/testData/quickfix/abstract/abstractPropertyWIthInitializer3.kt
similarity index 100%
rename from idea/testData/quickfix/abstract/beforeAbstractPropertyWIthInitializer3.kt
rename to idea/testData/quickfix/abstract/abstractPropertyWIthInitializer3.kt
diff --git a/idea/testData/quickfix/abstract/afterAbstractPropertyWIthInitializer3.kt b/idea/testData/quickfix/abstract/abstractPropertyWIthInitializer3.kt.after
similarity index 100%
rename from idea/testData/quickfix/abstract/afterAbstractPropertyWIthInitializer3.kt
rename to idea/testData/quickfix/abstract/abstractPropertyWIthInitializer3.kt.after
diff --git a/idea/testData/quickfix/abstract/beforeAbstractPropertyWithGetter1.kt b/idea/testData/quickfix/abstract/abstractPropertyWithGetter1.kt
similarity index 100%
rename from idea/testData/quickfix/abstract/beforeAbstractPropertyWithGetter1.kt
rename to idea/testData/quickfix/abstract/abstractPropertyWithGetter1.kt
diff --git a/idea/testData/quickfix/abstract/afterAbstractPropertyWithGetter1.kt b/idea/testData/quickfix/abstract/abstractPropertyWithGetter1.kt.after
similarity index 100%
rename from idea/testData/quickfix/abstract/afterAbstractPropertyWithGetter1.kt
rename to idea/testData/quickfix/abstract/abstractPropertyWithGetter1.kt.after
diff --git a/idea/testData/quickfix/abstract/beforeAbstractPropertyWithGetter2.kt b/idea/testData/quickfix/abstract/abstractPropertyWithGetter2.kt
similarity index 100%
rename from idea/testData/quickfix/abstract/beforeAbstractPropertyWithGetter2.kt
rename to idea/testData/quickfix/abstract/abstractPropertyWithGetter2.kt
diff --git a/idea/testData/quickfix/abstract/afterAbstractPropertyWithGetter2.kt b/idea/testData/quickfix/abstract/abstractPropertyWithGetter2.kt.after
similarity index 100%
rename from idea/testData/quickfix/abstract/afterAbstractPropertyWithGetter2.kt
rename to idea/testData/quickfix/abstract/abstractPropertyWithGetter2.kt.after
diff --git a/idea/testData/quickfix/abstract/beforeAbstractPropertyWithInitializer1.kt b/idea/testData/quickfix/abstract/abstractPropertyWithInitializer1.kt
similarity index 100%
rename from idea/testData/quickfix/abstract/beforeAbstractPropertyWithInitializer1.kt
rename to idea/testData/quickfix/abstract/abstractPropertyWithInitializer1.kt
diff --git a/idea/testData/quickfix/abstract/afterAbstractPropertyWithInitializer1.kt b/idea/testData/quickfix/abstract/abstractPropertyWithInitializer1.kt.after
similarity index 100%
rename from idea/testData/quickfix/abstract/afterAbstractPropertyWithInitializer1.kt
rename to idea/testData/quickfix/abstract/abstractPropertyWithInitializer1.kt.after
diff --git a/idea/testData/quickfix/abstract/beforeAbstractPropertyWithSetter.kt b/idea/testData/quickfix/abstract/abstractPropertyWithSetter.kt
similarity index 100%
rename from idea/testData/quickfix/abstract/beforeAbstractPropertyWithSetter.kt
rename to idea/testData/quickfix/abstract/abstractPropertyWithSetter.kt
diff --git a/idea/testData/quickfix/abstract/afterAbstractPropertyWithSetter.kt b/idea/testData/quickfix/abstract/abstractPropertyWithSetter.kt.after
similarity index 100%
rename from idea/testData/quickfix/abstract/afterAbstractPropertyWithSetter.kt
rename to idea/testData/quickfix/abstract/abstractPropertyWithSetter.kt.after
diff --git a/idea/testData/quickfix/abstract/beforeMustBeInitializedOrBeAbstract.kt b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstract.kt
similarity index 100%
rename from idea/testData/quickfix/abstract/beforeMustBeInitializedOrBeAbstract.kt
rename to idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstract.kt
diff --git a/idea/testData/quickfix/abstract/afterMustBeInitializedOrBeAbstract.kt b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstract.kt.after
similarity index 100%
rename from idea/testData/quickfix/abstract/afterMustBeInitializedOrBeAbstract.kt
rename to idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstract.kt.after
diff --git a/idea/testData/quickfix/abstract/beforeNonAbstractFunctionWithNoBody.kt b/idea/testData/quickfix/abstract/nonAbstractFunctionWithNoBody.kt
similarity index 100%
rename from idea/testData/quickfix/abstract/beforeNonAbstractFunctionWithNoBody.kt
rename to idea/testData/quickfix/abstract/nonAbstractFunctionWithNoBody.kt
diff --git a/idea/testData/quickfix/abstract/afterNonAbstractFunctionWithNoBody.kt b/idea/testData/quickfix/abstract/nonAbstractFunctionWithNoBody.kt.after
similarity index 100%
rename from idea/testData/quickfix/abstract/afterNonAbstractFunctionWithNoBody.kt
rename to idea/testData/quickfix/abstract/nonAbstractFunctionWithNoBody.kt.after
diff --git a/idea/testData/quickfix/abstract/beforeNonMemberAbstractFunction.kt b/idea/testData/quickfix/abstract/nonMemberAbstractFunction.kt
similarity index 100%
rename from idea/testData/quickfix/abstract/beforeNonMemberAbstractFunction.kt
rename to idea/testData/quickfix/abstract/nonMemberAbstractFunction.kt
diff --git a/idea/testData/quickfix/abstract/afterNonMemberAbstractFunction.kt b/idea/testData/quickfix/abstract/nonMemberAbstractFunction.kt.after
similarity index 100%
rename from idea/testData/quickfix/abstract/afterNonMemberAbstractFunction.kt
rename to idea/testData/quickfix/abstract/nonMemberAbstractFunction.kt.after
diff --git a/idea/testData/quickfix/abstract/beforeNonMemberFunctionNoBody.kt b/idea/testData/quickfix/abstract/nonMemberFunctionNoBody.kt
similarity index 100%
rename from idea/testData/quickfix/abstract/beforeNonMemberFunctionNoBody.kt
rename to idea/testData/quickfix/abstract/nonMemberFunctionNoBody.kt
diff --git a/idea/testData/quickfix/abstract/afterNonMemberFunctionNoBody.kt b/idea/testData/quickfix/abstract/nonMemberFunctionNoBody.kt.after
similarity index 100%
rename from idea/testData/quickfix/abstract/afterNonMemberFunctionNoBody.kt
rename to idea/testData/quickfix/abstract/nonMemberFunctionNoBody.kt.after
diff --git a/idea/testData/quickfix/abstract/beforeRedundantAbstract.kt b/idea/testData/quickfix/abstract/redundantAbstract.kt
similarity index 100%
rename from idea/testData/quickfix/abstract/beforeRedundantAbstract.kt
rename to idea/testData/quickfix/abstract/redundantAbstract.kt
diff --git a/idea/testData/quickfix/abstract/afterRedundantAbstract.kt b/idea/testData/quickfix/abstract/redundantAbstract.kt.after
similarity index 100%
rename from idea/testData/quickfix/abstract/afterRedundantAbstract.kt
rename to idea/testData/quickfix/abstract/redundantAbstract.kt.after
diff --git a/idea/testData/quickfix/abstract/beforeReplaceOpen.kt b/idea/testData/quickfix/abstract/replaceOpen.kt
similarity index 100%
rename from idea/testData/quickfix/abstract/beforeReplaceOpen.kt
rename to idea/testData/quickfix/abstract/replaceOpen.kt
diff --git a/idea/testData/quickfix/abstract/afterReplaceOpen.kt b/idea/testData/quickfix/abstract/replaceOpen.kt.after
similarity index 100%
rename from idea/testData/quickfix/abstract/afterReplaceOpen.kt
rename to idea/testData/quickfix/abstract/replaceOpen.kt.after
diff --git a/idea/testData/quickfix/addStarProjections/cast/beforeChangeToStarProjection.kt b/idea/testData/quickfix/addStarProjections/cast/changeToStarProjection.kt
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/cast/beforeChangeToStarProjection.kt
rename to idea/testData/quickfix/addStarProjections/cast/changeToStarProjection.kt
diff --git a/idea/testData/quickfix/addStarProjections/cast/afterChangeToStarProjection.kt b/idea/testData/quickfix/addStarProjections/cast/changeToStarProjection.kt.after
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/cast/afterChangeToStarProjection.kt
rename to idea/testData/quickfix/addStarProjections/cast/changeToStarProjection.kt.after
diff --git a/idea/testData/quickfix/addStarProjections/cast/beforeChangeToStarProjectionNullable.kt b/idea/testData/quickfix/addStarProjections/cast/changeToStarProjectionNullable.kt
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/cast/beforeChangeToStarProjectionNullable.kt
rename to idea/testData/quickfix/addStarProjections/cast/changeToStarProjectionNullable.kt
diff --git a/idea/testData/quickfix/addStarProjections/cast/afterChangeToStarProjectionNullable.kt b/idea/testData/quickfix/addStarProjections/cast/changeToStarProjectionNullable.kt.after
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/cast/afterChangeToStarProjectionNullable.kt
rename to idea/testData/quickfix/addStarProjections/cast/changeToStarProjectionNullable.kt.after
diff --git a/idea/testData/quickfix/addStarProjections/checkType/beforeChangeToStarProjectionMultipleParameters.kt b/idea/testData/quickfix/addStarProjections/checkType/changeToStarProjectionMultipleParameters.kt
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/checkType/beforeChangeToStarProjectionMultipleParameters.kt
rename to idea/testData/quickfix/addStarProjections/checkType/changeToStarProjectionMultipleParameters.kt
diff --git a/idea/testData/quickfix/addStarProjections/checkType/afterChangeToStarProjectionMultipleParameters.kt b/idea/testData/quickfix/addStarProjections/checkType/changeToStarProjectionMultipleParameters.kt.after
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/checkType/afterChangeToStarProjectionMultipleParameters.kt
rename to idea/testData/quickfix/addStarProjections/checkType/changeToStarProjectionMultipleParameters.kt.after
diff --git a/idea/testData/quickfix/addStarProjections/checkType/beforeChangeToStarProjectionNullable.kt b/idea/testData/quickfix/addStarProjections/checkType/changeToStarProjectionNullable.kt
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/checkType/beforeChangeToStarProjectionNullable.kt
rename to idea/testData/quickfix/addStarProjections/checkType/changeToStarProjectionNullable.kt
diff --git a/idea/testData/quickfix/addStarProjections/checkType/afterChangeToStarProjectionNullable.kt b/idea/testData/quickfix/addStarProjections/checkType/changeToStarProjectionNullable.kt.after
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/checkType/afterChangeToStarProjectionNullable.kt
rename to idea/testData/quickfix/addStarProjections/checkType/changeToStarProjectionNullable.kt.after
diff --git a/idea/testData/quickfix/addStarProjections/checkType/beforeChangeToStarProjectionSingleParameter.kt b/idea/testData/quickfix/addStarProjections/checkType/changeToStarProjectionSingleParameter.kt
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/checkType/beforeChangeToStarProjectionSingleParameter.kt
rename to idea/testData/quickfix/addStarProjections/checkType/changeToStarProjectionSingleParameter.kt
diff --git a/idea/testData/quickfix/addStarProjections/checkType/afterChangeToStarProjectionSingleParameter.kt b/idea/testData/quickfix/addStarProjections/checkType/changeToStarProjectionSingleParameter.kt.after
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/checkType/afterChangeToStarProjectionSingleParameter.kt
rename to idea/testData/quickfix/addStarProjections/checkType/changeToStarProjectionSingleParameter.kt.after
diff --git a/idea/testData/quickfix/addStarProjections/javaClass/afterFooOfC2.kt b/idea/testData/quickfix/addStarProjections/javaClass/fooOfC2.kt
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/javaClass/afterFooOfC2.kt
rename to idea/testData/quickfix/addStarProjections/javaClass/fooOfC2.kt
diff --git a/idea/testData/quickfix/addStarProjections/javaClass/beforeFooOfC2.kt b/idea/testData/quickfix/addStarProjections/javaClass/fooOfC2.kt.after
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/javaClass/beforeFooOfC2.kt
rename to idea/testData/quickfix/addStarProjections/javaClass/fooOfC2.kt.after
diff --git a/idea/testData/quickfix/addStarProjections/javaClass/beforeJavaClassOfC1Runtime.kt b/idea/testData/quickfix/addStarProjections/javaClass/javaClassOfC1Runtime.kt
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/javaClass/beforeJavaClassOfC1Runtime.kt
rename to idea/testData/quickfix/addStarProjections/javaClass/javaClassOfC1Runtime.kt
diff --git a/idea/testData/quickfix/addStarProjections/javaClass/afterJavaClassOfC1Runtime.kt b/idea/testData/quickfix/addStarProjections/javaClass/javaClassOfC1Runtime.kt.after
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/javaClass/afterJavaClassOfC1Runtime.kt
rename to idea/testData/quickfix/addStarProjections/javaClass/javaClassOfC1Runtime.kt.after
diff --git a/idea/testData/quickfix/addStarProjections/javaClass/beforeJavaClassOfC2Runtime.kt b/idea/testData/quickfix/addStarProjections/javaClass/javaClassOfC2Runtime.kt
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/javaClass/beforeJavaClassOfC2Runtime.kt
rename to idea/testData/quickfix/addStarProjections/javaClass/javaClassOfC2Runtime.kt
diff --git a/idea/testData/quickfix/addStarProjections/javaClass/afterJavaClassOfC2Runtime.kt b/idea/testData/quickfix/addStarProjections/javaClass/javaClassOfC2Runtime.kt.after
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/javaClass/afterJavaClassOfC2Runtime.kt
rename to idea/testData/quickfix/addStarProjections/javaClass/javaClassOfC2Runtime.kt.after
diff --git a/idea/testData/quickfix/addStarProjections/javaClass/beforeJavaClassOfCRuntime.kt b/idea/testData/quickfix/addStarProjections/javaClass/javaClassOfCRuntime.kt
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/javaClass/beforeJavaClassOfCRuntime.kt
rename to idea/testData/quickfix/addStarProjections/javaClass/javaClassOfCRuntime.kt
diff --git a/idea/testData/quickfix/addStarProjections/javaClass/afterJavaClassOfCRuntime.kt b/idea/testData/quickfix/addStarProjections/javaClass/javaClassOfCRuntime.kt.after
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/javaClass/afterJavaClassOfCRuntime.kt
rename to idea/testData/quickfix/addStarProjections/javaClass/javaClassOfCRuntime.kt.after
diff --git a/idea/testData/quickfix/addStarProjections/beforeQualifiedArrayList.kt b/idea/testData/quickfix/addStarProjections/qualifiedArrayList.kt
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/beforeQualifiedArrayList.kt
rename to idea/testData/quickfix/addStarProjections/qualifiedArrayList.kt
diff --git a/idea/testData/quickfix/addStarProjections/afterQualifiedArrayList.kt b/idea/testData/quickfix/addStarProjections/qualifiedArrayList.kt.after
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/afterQualifiedArrayList.kt
rename to idea/testData/quickfix/addStarProjections/qualifiedArrayList.kt.after
diff --git a/idea/testData/quickfix/addStarProjections/beforeQualifiedList.kt b/idea/testData/quickfix/addStarProjections/qualifiedList.kt
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/beforeQualifiedList.kt
rename to idea/testData/quickfix/addStarProjections/qualifiedList.kt
diff --git a/idea/testData/quickfix/addStarProjections/afterQualifiedList.kt b/idea/testData/quickfix/addStarProjections/qualifiedList.kt.after
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/afterQualifiedList.kt
rename to idea/testData/quickfix/addStarProjections/qualifiedList.kt.after
diff --git a/idea/testData/quickfix/addStarProjections/beforeQualifiedMap.kt b/idea/testData/quickfix/addStarProjections/qualifiedMap.kt
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/beforeQualifiedMap.kt
rename to idea/testData/quickfix/addStarProjections/qualifiedMap.kt
diff --git a/idea/testData/quickfix/addStarProjections/afterQualifiedMap.kt b/idea/testData/quickfix/addStarProjections/qualifiedMap.kt.after
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/afterQualifiedMap.kt
rename to idea/testData/quickfix/addStarProjections/qualifiedMap.kt.after
diff --git a/idea/testData/quickfix/addStarProjections/beforeUnqualifiedList.kt b/idea/testData/quickfix/addStarProjections/unqualifiedList.kt
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/beforeUnqualifiedList.kt
rename to idea/testData/quickfix/addStarProjections/unqualifiedList.kt
diff --git a/idea/testData/quickfix/addStarProjections/afterUnqualifiedList.kt b/idea/testData/quickfix/addStarProjections/unqualifiedList.kt.after
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/afterUnqualifiedList.kt
rename to idea/testData/quickfix/addStarProjections/unqualifiedList.kt.after
diff --git a/idea/testData/quickfix/addStarProjections/beforeUnqualifiedMap.kt b/idea/testData/quickfix/addStarProjections/unqualifiedMap.kt
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/beforeUnqualifiedMap.kt
rename to idea/testData/quickfix/addStarProjections/unqualifiedMap.kt
diff --git a/idea/testData/quickfix/addStarProjections/afterUnqualifiedMap.kt b/idea/testData/quickfix/addStarProjections/unqualifiedMap.kt.after
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/afterUnqualifiedMap.kt
rename to idea/testData/quickfix/addStarProjections/unqualifiedMap.kt.after
diff --git a/idea/testData/quickfix/addStarProjections/beforeUnqualifiedMapOneArg.kt b/idea/testData/quickfix/addStarProjections/unqualifiedMapOneArg.kt
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/beforeUnqualifiedMapOneArg.kt
rename to idea/testData/quickfix/addStarProjections/unqualifiedMapOneArg.kt
diff --git a/idea/testData/quickfix/addStarProjections/afterUnqualifiedMapOneArg.kt b/idea/testData/quickfix/addStarProjections/unqualifiedMapOneArg.kt.after
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/afterUnqualifiedMapOneArg.kt
rename to idea/testData/quickfix/addStarProjections/unqualifiedMapOneArg.kt.after
diff --git a/idea/testData/quickfix/addStarProjections/when/beforeQualifiedArrayList.kt b/idea/testData/quickfix/addStarProjections/when/qualifiedArrayList.kt
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/when/beforeQualifiedArrayList.kt
rename to idea/testData/quickfix/addStarProjections/when/qualifiedArrayList.kt
diff --git a/idea/testData/quickfix/addStarProjections/when/afterQualifiedArrayList.kt b/idea/testData/quickfix/addStarProjections/when/qualifiedArrayList.kt.after
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/when/afterQualifiedArrayList.kt
rename to idea/testData/quickfix/addStarProjections/when/qualifiedArrayList.kt.after
diff --git a/idea/testData/quickfix/addStarProjections/when/beforeQualifiedList.kt b/idea/testData/quickfix/addStarProjections/when/qualifiedList.kt
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/when/beforeQualifiedList.kt
rename to idea/testData/quickfix/addStarProjections/when/qualifiedList.kt
diff --git a/idea/testData/quickfix/addStarProjections/when/afterQualifiedList.kt b/idea/testData/quickfix/addStarProjections/when/qualifiedList.kt.after
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/when/afterQualifiedList.kt
rename to idea/testData/quickfix/addStarProjections/when/qualifiedList.kt.after
diff --git a/idea/testData/quickfix/addStarProjections/when/beforeQualifiedMap.kt b/idea/testData/quickfix/addStarProjections/when/qualifiedMap.kt
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/when/beforeQualifiedMap.kt
rename to idea/testData/quickfix/addStarProjections/when/qualifiedMap.kt
diff --git a/idea/testData/quickfix/addStarProjections/when/afterQualifiedMap.kt b/idea/testData/quickfix/addStarProjections/when/qualifiedMap.kt.after
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/when/afterQualifiedMap.kt
rename to idea/testData/quickfix/addStarProjections/when/qualifiedMap.kt.after
diff --git a/idea/testData/quickfix/addStarProjections/when/beforeUnqualifiedList.kt b/idea/testData/quickfix/addStarProjections/when/unqualifiedList.kt
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/when/beforeUnqualifiedList.kt
rename to idea/testData/quickfix/addStarProjections/when/unqualifiedList.kt
diff --git a/idea/testData/quickfix/addStarProjections/when/afterUnqualifiedList.kt b/idea/testData/quickfix/addStarProjections/when/unqualifiedList.kt.after
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/when/afterUnqualifiedList.kt
rename to idea/testData/quickfix/addStarProjections/when/unqualifiedList.kt.after
diff --git a/idea/testData/quickfix/addStarProjections/when/beforeUnqualifiedMap.kt b/idea/testData/quickfix/addStarProjections/when/unqualifiedMap.kt
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/when/beforeUnqualifiedMap.kt
rename to idea/testData/quickfix/addStarProjections/when/unqualifiedMap.kt
diff --git a/idea/testData/quickfix/addStarProjections/when/afterUnqualifiedMap.kt b/idea/testData/quickfix/addStarProjections/when/unqualifiedMap.kt.after
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/when/afterUnqualifiedMap.kt
rename to idea/testData/quickfix/addStarProjections/when/unqualifiedMap.kt.after
diff --git a/idea/testData/quickfix/addStarProjections/when/beforeUnqualifiedMapOneArg.kt b/idea/testData/quickfix/addStarProjections/when/unqualifiedMapOneArg.kt
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/when/beforeUnqualifiedMapOneArg.kt
rename to idea/testData/quickfix/addStarProjections/when/unqualifiedMapOneArg.kt
diff --git a/idea/testData/quickfix/addStarProjections/when/afterUnqualifiedMapOneArg.kt b/idea/testData/quickfix/addStarProjections/when/unqualifiedMapOneArg.kt.after
similarity index 100%
rename from idea/testData/quickfix/addStarProjections/when/afterUnqualifiedMapOneArg.kt
rename to idea/testData/quickfix/addStarProjections/when/unqualifiedMapOneArg.kt.after
diff --git a/idea/testData/quickfix/beforeAnonymousObject.kt b/idea/testData/quickfix/anonymousObject.kt
similarity index 100%
rename from idea/testData/quickfix/beforeAnonymousObject.kt
rename to idea/testData/quickfix/anonymousObject.kt
diff --git a/idea/testData/quickfix/autoImports/beforeCheckNoStackOverflowInImportInnerClassInCurrentFile.kt b/idea/testData/quickfix/autoImports/checkNoStackOverflowInImportInnerClassInCurrentFile.kt
similarity index 100%
rename from idea/testData/quickfix/autoImports/beforeCheckNoStackOverflowInImportInnerClassInCurrentFile.kt
rename to idea/testData/quickfix/autoImports/checkNoStackOverflowInImportInnerClassInCurrentFile.kt
diff --git a/idea/testData/quickfix/autoImports/afterCheckNoStackOverflowInImportInnerClassInCurrentFile.kt b/idea/testData/quickfix/autoImports/checkNoStackOverflowInImportInnerClassInCurrentFile.kt.after
similarity index 100%
rename from idea/testData/quickfix/autoImports/afterCheckNoStackOverflowInImportInnerClassInCurrentFile.kt
rename to idea/testData/quickfix/autoImports/checkNoStackOverflowInImportInnerClassInCurrentFile.kt.after
diff --git a/idea/testData/quickfix/autoImports/beforeLibraryClassJsRuntime.kt b/idea/testData/quickfix/autoImports/libraryClassJsRuntime.kt
similarity index 100%
rename from idea/testData/quickfix/autoImports/beforeLibraryClassJsRuntime.kt
rename to idea/testData/quickfix/autoImports/libraryClassJsRuntime.kt
diff --git a/idea/testData/quickfix/autoImports/afterLibraryClassJsRuntime.kt b/idea/testData/quickfix/autoImports/libraryClassJsRuntime.kt.after
similarity index 100%
rename from idea/testData/quickfix/autoImports/afterLibraryClassJsRuntime.kt
rename to idea/testData/quickfix/autoImports/libraryClassJsRuntime.kt.after
diff --git a/idea/testData/quickfix/autoImports/beforeLibraryPropertyJsRuntime.kt b/idea/testData/quickfix/autoImports/libraryPropertyJsRuntime.kt
similarity index 100%
rename from idea/testData/quickfix/autoImports/beforeLibraryPropertyJsRuntime.kt
rename to idea/testData/quickfix/autoImports/libraryPropertyJsRuntime.kt
diff --git a/idea/testData/quickfix/autoImports/afterLibraryPropertyJsRuntime.kt b/idea/testData/quickfix/autoImports/libraryPropertyJsRuntime.kt.after
similarity index 100%
rename from idea/testData/quickfix/autoImports/afterLibraryPropertyJsRuntime.kt
rename to idea/testData/quickfix/autoImports/libraryPropertyJsRuntime.kt.after
diff --git a/idea/testData/quickfix/autoImports/beforeLibraryPropertyRuntime.kt b/idea/testData/quickfix/autoImports/libraryPropertyRuntime.kt
similarity index 100%
rename from idea/testData/quickfix/autoImports/beforeLibraryPropertyRuntime.kt
rename to idea/testData/quickfix/autoImports/libraryPropertyRuntime.kt
diff --git a/idea/testData/quickfix/autoImports/afterLibraryPropertyRuntime.kt b/idea/testData/quickfix/autoImports/libraryPropertyRuntime.kt.after
similarity index 100%
rename from idea/testData/quickfix/autoImports/afterLibraryPropertyRuntime.kt
rename to idea/testData/quickfix/autoImports/libraryPropertyRuntime.kt.after
diff --git a/idea/testData/quickfix/autoImports/beforeLibraryTopLevelFunctionImportJsRuntime.kt b/idea/testData/quickfix/autoImports/libraryTopLevelFunctionImportJsRuntime.kt
similarity index 100%
rename from idea/testData/quickfix/autoImports/beforeLibraryTopLevelFunctionImportJsRuntime.kt
rename to idea/testData/quickfix/autoImports/libraryTopLevelFunctionImportJsRuntime.kt
diff --git a/idea/testData/quickfix/autoImports/afterLibraryTopLevelFunctionImportJsRuntime.kt b/idea/testData/quickfix/autoImports/libraryTopLevelFunctionImportJsRuntime.kt.after
similarity index 100%
rename from idea/testData/quickfix/autoImports/afterLibraryTopLevelFunctionImportJsRuntime.kt
rename to idea/testData/quickfix/autoImports/libraryTopLevelFunctionImportJsRuntime.kt.after
diff --git a/idea/testData/quickfix/autoImports/beforeLibraryTopLevelFunctionImportRuntime.kt b/idea/testData/quickfix/autoImports/libraryTopLevelFunctionImportRuntime.kt
similarity index 100%
rename from idea/testData/quickfix/autoImports/beforeLibraryTopLevelFunctionImportRuntime.kt
rename to idea/testData/quickfix/autoImports/libraryTopLevelFunctionImportRuntime.kt
diff --git a/idea/testData/quickfix/autoImports/afterLibraryTopLevelFunctionImportRuntime.kt b/idea/testData/quickfix/autoImports/libraryTopLevelFunctionImportRuntime.kt.after
similarity index 100%
rename from idea/testData/quickfix/autoImports/afterLibraryTopLevelFunctionImportRuntime.kt
rename to idea/testData/quickfix/autoImports/libraryTopLevelFunctionImportRuntime.kt.after
diff --git a/idea/testData/quickfix/autoImports/beforeNamelessClass.kt b/idea/testData/quickfix/autoImports/namelessClass.kt
similarity index 100%
rename from idea/testData/quickfix/autoImports/beforeNamelessClass.kt
rename to idea/testData/quickfix/autoImports/namelessClass.kt
diff --git a/idea/testData/quickfix/autoImports/beforeNamelessFunction.kt b/idea/testData/quickfix/autoImports/namelessFunction.kt
similarity index 100%
rename from idea/testData/quickfix/autoImports/beforeNamelessFunction.kt
rename to idea/testData/quickfix/autoImports/namelessFunction.kt
diff --git a/idea/testData/quickfix/autoImports/beforeNamelessObject.kt b/idea/testData/quickfix/autoImports/namelessObject.kt
similarity index 100%
rename from idea/testData/quickfix/autoImports/beforeNamelessObject.kt
rename to idea/testData/quickfix/autoImports/namelessObject.kt
diff --git a/idea/testData/quickfix/autoImports/beforeNamelessParameter.kt b/idea/testData/quickfix/autoImports/namelessParameter.kt
similarity index 100%
rename from idea/testData/quickfix/autoImports/beforeNamelessParameter.kt
rename to idea/testData/quickfix/autoImports/namelessParameter.kt
diff --git a/idea/testData/quickfix/autoImports/beforeNamelessProperty.kt b/idea/testData/quickfix/autoImports/namelessProperty.kt
similarity index 100%
rename from idea/testData/quickfix/autoImports/beforeNamelessProperty.kt
rename to idea/testData/quickfix/autoImports/namelessProperty.kt
diff --git a/idea/testData/quickfix/autoImports/afterNoImportAlreadyImported.kt b/idea/testData/quickfix/autoImports/noImportAlreadyImported.kt.after
similarity index 100%
rename from idea/testData/quickfix/autoImports/afterNoImportAlreadyImported.kt
rename to idea/testData/quickfix/autoImports/noImportAlreadyImported.kt.after
diff --git a/idea/testData/quickfix/autoImports/beforeNoImportForAlreadyImported.kt b/idea/testData/quickfix/autoImports/noImportForAlreadyImported.kt
similarity index 100%
rename from idea/testData/quickfix/autoImports/beforeNoImportForAlreadyImported.kt
rename to idea/testData/quickfix/autoImports/noImportForAlreadyImported.kt
diff --git a/idea/testData/quickfix/autoImports/beforeNoImportForIndex.kt b/idea/testData/quickfix/autoImports/noImportForIndex.kt
similarity index 100%
rename from idea/testData/quickfix/autoImports/beforeNoImportForIndex.kt
rename to idea/testData/quickfix/autoImports/noImportForIndex.kt
diff --git a/idea/testData/quickfix/autoImports/afterNoImportForIndex.kt b/idea/testData/quickfix/autoImports/noImportForIndex.kt.after
similarity index 100%
rename from idea/testData/quickfix/autoImports/afterNoImportForIndex.kt
rename to idea/testData/quickfix/autoImports/noImportForIndex.kt.after
diff --git a/idea/testData/quickfix/autoImports/beforeSAMConstructorFromLambda.kt b/idea/testData/quickfix/autoImports/sAMConstructorFromLambda.kt
similarity index 100%
rename from idea/testData/quickfix/autoImports/beforeSAMConstructorFromLambda.kt
rename to idea/testData/quickfix/autoImports/sAMConstructorFromLambda.kt
diff --git a/idea/testData/quickfix/autoImports/afterSAMConstructorFromLambda.kt b/idea/testData/quickfix/autoImports/sAMConstructorFromLambda.kt.after
similarity index 100%
rename from idea/testData/quickfix/autoImports/afterSAMConstructorFromLambda.kt
rename to idea/testData/quickfix/autoImports/sAMConstructorFromLambda.kt.after
diff --git a/idea/testData/quickfix/autoImports/beforeUnresolvedReferenceInCall.kt b/idea/testData/quickfix/autoImports/unresolvedReferenceInCall.kt
similarity index 100%
rename from idea/testData/quickfix/autoImports/beforeUnresolvedReferenceInCall.kt
rename to idea/testData/quickfix/autoImports/unresolvedReferenceInCall.kt
diff --git a/idea/testData/quickfix/autoImports/afterUnresolvedReferenceInCall.kt b/idea/testData/quickfix/autoImports/unresolvedReferenceInCall.kt.after
similarity index 100%
rename from idea/testData/quickfix/autoImports/afterUnresolvedReferenceInCall.kt
rename to idea/testData/quickfix/autoImports/unresolvedReferenceInCall.kt.after
diff --git a/idea/testData/quickfix/changeSignature/beforeAddConstructorParameter.kt b/idea/testData/quickfix/changeSignature/addConstructorParameter.kt
similarity index 100%
rename from idea/testData/quickfix/changeSignature/beforeAddConstructorParameter.kt
rename to idea/testData/quickfix/changeSignature/addConstructorParameter.kt
diff --git a/idea/testData/quickfix/changeSignature/afterAddConstructorParameter.kt b/idea/testData/quickfix/changeSignature/addConstructorParameter.kt.after
similarity index 100%
rename from idea/testData/quickfix/changeSignature/afterAddConstructorParameter.kt
rename to idea/testData/quickfix/changeSignature/addConstructorParameter.kt.after
diff --git a/idea/testData/quickfix/changeSignature/beforeAddFunctionParameter.kt b/idea/testData/quickfix/changeSignature/addFunctionParameter.kt
similarity index 100%
rename from idea/testData/quickfix/changeSignature/beforeAddFunctionParameter.kt
rename to idea/testData/quickfix/changeSignature/addFunctionParameter.kt
diff --git a/idea/testData/quickfix/changeSignature/afterAddFunctionParameter.kt b/idea/testData/quickfix/changeSignature/addFunctionParameter.kt.after
similarity index 100%
rename from idea/testData/quickfix/changeSignature/afterAddFunctionParameter.kt
rename to idea/testData/quickfix/changeSignature/addFunctionParameter.kt.after
diff --git a/idea/testData/quickfix/changeSignature/beforeAddFunctionParameterAndChangeTypes.kt b/idea/testData/quickfix/changeSignature/addFunctionParameterAndChangeTypes.kt
similarity index 100%
rename from idea/testData/quickfix/changeSignature/beforeAddFunctionParameterAndChangeTypes.kt
rename to idea/testData/quickfix/changeSignature/addFunctionParameterAndChangeTypes.kt
diff --git a/idea/testData/quickfix/changeSignature/afterAddFunctionParameterAndChangeTypes.kt b/idea/testData/quickfix/changeSignature/addFunctionParameterAndChangeTypes.kt.after
similarity index 100%
rename from idea/testData/quickfix/changeSignature/afterAddFunctionParameterAndChangeTypes.kt
rename to idea/testData/quickfix/changeSignature/addFunctionParameterAndChangeTypes.kt.after
diff --git a/idea/testData/quickfix/changeSignature/beforeAddFunctionParameterLongNameRuntime.kt b/idea/testData/quickfix/changeSignature/addFunctionParameterLongNameRuntime.kt
similarity index 100%
rename from idea/testData/quickfix/changeSignature/beforeAddFunctionParameterLongNameRuntime.kt
rename to idea/testData/quickfix/changeSignature/addFunctionParameterLongNameRuntime.kt
diff --git a/idea/testData/quickfix/changeSignature/afterAddFunctionParameterLongNameRuntime.kt b/idea/testData/quickfix/changeSignature/addFunctionParameterLongNameRuntime.kt.after
similarity index 100%
rename from idea/testData/quickfix/changeSignature/afterAddFunctionParameterLongNameRuntime.kt
rename to idea/testData/quickfix/changeSignature/addFunctionParameterLongNameRuntime.kt.after
diff --git a/idea/testData/quickfix/changeSignature/beforeAddParameterNotAvailableForBuiltins.kt b/idea/testData/quickfix/changeSignature/addParameterNotAvailableForBuiltins.kt
similarity index 100%
rename from idea/testData/quickfix/changeSignature/beforeAddParameterNotAvailableForBuiltins.kt
rename to idea/testData/quickfix/changeSignature/addParameterNotAvailableForBuiltins.kt
diff --git a/idea/testData/quickfix/changeSignature/beforeAddParameterNotAvailableForLibrary.kt b/idea/testData/quickfix/changeSignature/addParameterNotAvailableForLibrary.kt
similarity index 100%
rename from idea/testData/quickfix/changeSignature/beforeAddParameterNotAvailableForLibrary.kt
rename to idea/testData/quickfix/changeSignature/addParameterNotAvailableForLibrary.kt
diff --git a/idea/testData/quickfix/changeSignature/beforeAddParameterToFakeOverride.kt b/idea/testData/quickfix/changeSignature/addParameterToFakeOverride.kt
similarity index 100%
rename from idea/testData/quickfix/changeSignature/beforeAddParameterToFakeOverride.kt
rename to idea/testData/quickfix/changeSignature/addParameterToFakeOverride.kt
diff --git a/idea/testData/quickfix/changeSignature/afterAddParameterToFakeOverride.kt b/idea/testData/quickfix/changeSignature/addParameterToFakeOverride.kt.after
similarity index 100%
rename from idea/testData/quickfix/changeSignature/afterAddParameterToFakeOverride.kt
rename to idea/testData/quickfix/changeSignature/addParameterToFakeOverride.kt.after
diff --git a/idea/testData/quickfix/changeSignature/beforeChangeFunctionLiteralParameters1.kt b/idea/testData/quickfix/changeSignature/changeFunctionLiteralParameters1.kt
similarity index 100%
rename from idea/testData/quickfix/changeSignature/beforeChangeFunctionLiteralParameters1.kt
rename to idea/testData/quickfix/changeSignature/changeFunctionLiteralParameters1.kt
diff --git a/idea/testData/quickfix/changeSignature/afterChangeFunctionLiteralParameters1.kt b/idea/testData/quickfix/changeSignature/changeFunctionLiteralParameters1.kt.after
similarity index 100%
rename from idea/testData/quickfix/changeSignature/afterChangeFunctionLiteralParameters1.kt
rename to idea/testData/quickfix/changeSignature/changeFunctionLiteralParameters1.kt.after
diff --git a/idea/testData/quickfix/changeSignature/beforeChangeFunctionLiteralParameters2.kt b/idea/testData/quickfix/changeSignature/changeFunctionLiteralParameters2.kt
similarity index 100%
rename from idea/testData/quickfix/changeSignature/beforeChangeFunctionLiteralParameters2.kt
rename to idea/testData/quickfix/changeSignature/changeFunctionLiteralParameters2.kt
diff --git a/idea/testData/quickfix/changeSignature/afterChangeFunctionLiteralParameters2.kt b/idea/testData/quickfix/changeSignature/changeFunctionLiteralParameters2.kt.after
similarity index 100%
rename from idea/testData/quickfix/changeSignature/afterChangeFunctionLiteralParameters2.kt
rename to idea/testData/quickfix/changeSignature/changeFunctionLiteralParameters2.kt.after
diff --git a/idea/testData/quickfix/changeSignature/beforeComplexHierarchy.kt b/idea/testData/quickfix/changeSignature/complexHierarchy.kt
similarity index 100%
rename from idea/testData/quickfix/changeSignature/beforeComplexHierarchy.kt
rename to idea/testData/quickfix/changeSignature/complexHierarchy.kt
diff --git a/idea/testData/quickfix/changeSignature/afterComplexHierarchy.kt b/idea/testData/quickfix/changeSignature/complexHierarchy.kt.after
similarity index 100%
rename from idea/testData/quickfix/changeSignature/afterComplexHierarchy.kt
rename to idea/testData/quickfix/changeSignature/complexHierarchy.kt.after
diff --git a/idea/testData/quickfix/changeSignature/beforeComplexHierarchyHead.kt b/idea/testData/quickfix/changeSignature/complexHierarchyHead.kt
similarity index 100%
rename from idea/testData/quickfix/changeSignature/beforeComplexHierarchyHead.kt
rename to idea/testData/quickfix/changeSignature/complexHierarchyHead.kt
diff --git a/idea/testData/quickfix/changeSignature/afterComplexHierarchyHead.kt b/idea/testData/quickfix/changeSignature/complexHierarchyHead.kt.after
similarity index 100%
rename from idea/testData/quickfix/changeSignature/afterComplexHierarchyHead.kt
rename to idea/testData/quickfix/changeSignature/complexHierarchyHead.kt.after
diff --git a/idea/testData/quickfix/changeSignature/beforeComplexHierarchyTail.kt b/idea/testData/quickfix/changeSignature/complexHierarchyTail.kt
similarity index 100%
rename from idea/testData/quickfix/changeSignature/beforeComplexHierarchyTail.kt
rename to idea/testData/quickfix/changeSignature/complexHierarchyTail.kt
diff --git a/idea/testData/quickfix/changeSignature/afterComplexHierarchyTail.kt b/idea/testData/quickfix/changeSignature/complexHierarchyTail.kt.after
similarity index 100%
rename from idea/testData/quickfix/changeSignature/afterComplexHierarchyTail.kt
rename to idea/testData/quickfix/changeSignature/complexHierarchyTail.kt.after
diff --git a/idea/testData/quickfix/changeSignature/beforeFixExtensionLambdaSignature.kt b/idea/testData/quickfix/changeSignature/fixExtensionLambdaSignature.kt
similarity index 100%
rename from idea/testData/quickfix/changeSignature/beforeFixExtensionLambdaSignature.kt
rename to idea/testData/quickfix/changeSignature/fixExtensionLambdaSignature.kt
diff --git a/idea/testData/quickfix/changeSignature/afterFixExtensionLambdaSignature.kt b/idea/testData/quickfix/changeSignature/fixExtensionLambdaSignature.kt.after
similarity index 100%
rename from idea/testData/quickfix/changeSignature/afterFixExtensionLambdaSignature.kt
rename to idea/testData/quickfix/changeSignature/fixExtensionLambdaSignature.kt.after
diff --git a/idea/testData/quickfix/changeSignature/beforeLinearHierarchy.kt b/idea/testData/quickfix/changeSignature/linearHierarchy.kt
similarity index 100%
rename from idea/testData/quickfix/changeSignature/beforeLinearHierarchy.kt
rename to idea/testData/quickfix/changeSignature/linearHierarchy.kt
diff --git a/idea/testData/quickfix/changeSignature/afterLinearHierarchy.kt b/idea/testData/quickfix/changeSignature/linearHierarchy.kt.after
similarity index 100%
rename from idea/testData/quickfix/changeSignature/afterLinearHierarchy.kt
rename to idea/testData/quickfix/changeSignature/linearHierarchy.kt.after
diff --git a/idea/testData/quickfix/changeSignature/beforeNotAvailableForSynthesized.kt b/idea/testData/quickfix/changeSignature/notAvailableForSynthesized.kt
similarity index 100%
rename from idea/testData/quickfix/changeSignature/beforeNotAvailableForSynthesized.kt
rename to idea/testData/quickfix/changeSignature/notAvailableForSynthesized.kt
diff --git a/idea/testData/quickfix/changeSignature/afterNotAvailableForSynthesized.kt b/idea/testData/quickfix/changeSignature/notAvailableForSynthesized.kt.after
similarity index 100%
rename from idea/testData/quickfix/changeSignature/afterNotAvailableForSynthesized.kt
rename to idea/testData/quickfix/changeSignature/notAvailableForSynthesized.kt.after
diff --git a/idea/testData/quickfix/changeSignature/beforeNotEditable.kt b/idea/testData/quickfix/changeSignature/notEditable.kt
similarity index 100%
rename from idea/testData/quickfix/changeSignature/beforeNotEditable.kt
rename to idea/testData/quickfix/changeSignature/notEditable.kt
diff --git a/idea/testData/quickfix/changeSignature/beforeRemoveConstructorParameter.kt b/idea/testData/quickfix/changeSignature/removeConstructorParameter.kt
similarity index 100%
rename from idea/testData/quickfix/changeSignature/beforeRemoveConstructorParameter.kt
rename to idea/testData/quickfix/changeSignature/removeConstructorParameter.kt
diff --git a/idea/testData/quickfix/changeSignature/afterRemoveConstructorParameter.kt b/idea/testData/quickfix/changeSignature/removeConstructorParameter.kt.after
similarity index 100%
rename from idea/testData/quickfix/changeSignature/afterRemoveConstructorParameter.kt
rename to idea/testData/quickfix/changeSignature/removeConstructorParameter.kt.after
diff --git a/idea/testData/quickfix/changeSignature/beforeRemoveFunctionFirstParameter.kt b/idea/testData/quickfix/changeSignature/removeFunctionFirstParameter.kt
similarity index 100%
rename from idea/testData/quickfix/changeSignature/beforeRemoveFunctionFirstParameter.kt
rename to idea/testData/quickfix/changeSignature/removeFunctionFirstParameter.kt
diff --git a/idea/testData/quickfix/changeSignature/afterRemoveFunctionFirstParameter.kt b/idea/testData/quickfix/changeSignature/removeFunctionFirstParameter.kt.after
similarity index 100%
rename from idea/testData/quickfix/changeSignature/afterRemoveFunctionFirstParameter.kt
rename to idea/testData/quickfix/changeSignature/removeFunctionFirstParameter.kt.after
diff --git a/idea/testData/quickfix/changeSignature/beforeRemoveFunctionSecondParameter1.kt b/idea/testData/quickfix/changeSignature/removeFunctionSecondParameter1.kt
similarity index 100%
rename from idea/testData/quickfix/changeSignature/beforeRemoveFunctionSecondParameter1.kt
rename to idea/testData/quickfix/changeSignature/removeFunctionSecondParameter1.kt
diff --git a/idea/testData/quickfix/changeSignature/afterRemoveFunctionSecondParameter1.kt b/idea/testData/quickfix/changeSignature/removeFunctionSecondParameter1.kt.after
similarity index 100%
rename from idea/testData/quickfix/changeSignature/afterRemoveFunctionSecondParameter1.kt
rename to idea/testData/quickfix/changeSignature/removeFunctionSecondParameter1.kt.after
diff --git a/idea/testData/quickfix/changeSignature/beforeRemoveFunctionSecondParameter2.kt b/idea/testData/quickfix/changeSignature/removeFunctionSecondParameter2.kt
similarity index 100%
rename from idea/testData/quickfix/changeSignature/beforeRemoveFunctionSecondParameter2.kt
rename to idea/testData/quickfix/changeSignature/removeFunctionSecondParameter2.kt
diff --git a/idea/testData/quickfix/changeSignature/afterRemoveFunctionSecondParameter2.kt b/idea/testData/quickfix/changeSignature/removeFunctionSecondParameter2.kt.after
similarity index 100%
rename from idea/testData/quickfix/changeSignature/afterRemoveFunctionSecondParameter2.kt
rename to idea/testData/quickfix/changeSignature/removeFunctionSecondParameter2.kt.after
diff --git a/idea/testData/quickfix/changeSignature/beforeRemoveNamedParameter.kt b/idea/testData/quickfix/changeSignature/removeNamedParameter.kt
similarity index 100%
rename from idea/testData/quickfix/changeSignature/beforeRemoveNamedParameter.kt
rename to idea/testData/quickfix/changeSignature/removeNamedParameter.kt
diff --git a/idea/testData/quickfix/changeSignature/afterRemoveNamedParameter.kt b/idea/testData/quickfix/changeSignature/removeNamedParameter.kt.after
similarity index 100%
rename from idea/testData/quickfix/changeSignature/afterRemoveNamedParameter.kt
rename to idea/testData/quickfix/changeSignature/removeNamedParameter.kt.after
diff --git a/idea/testData/quickfix/changeSignature/beforeRemoveParameterFromFakeOverride.kt b/idea/testData/quickfix/changeSignature/removeParameterFromFakeOverride.kt
similarity index 100%
rename from idea/testData/quickfix/changeSignature/beforeRemoveParameterFromFakeOverride.kt
rename to idea/testData/quickfix/changeSignature/removeParameterFromFakeOverride.kt
diff --git a/idea/testData/quickfix/changeSignature/afterRemoveParameterFromFakeOverride.kt b/idea/testData/quickfix/changeSignature/removeParameterFromFakeOverride.kt.after
similarity index 100%
rename from idea/testData/quickfix/changeSignature/afterRemoveParameterFromFakeOverride.kt
rename to idea/testData/quickfix/changeSignature/removeParameterFromFakeOverride.kt.after
diff --git a/idea/testData/quickfix/changeSignature/beforeRemoveParameterNotAvailableForBuiltins.kt b/idea/testData/quickfix/changeSignature/removeParameterNotAvailableForBuiltins.kt
similarity index 100%
rename from idea/testData/quickfix/changeSignature/beforeRemoveParameterNotAvailableForBuiltins.kt
rename to idea/testData/quickfix/changeSignature/removeParameterNotAvailableForBuiltins.kt
diff --git a/idea/testData/quickfix/changeSignature/beforeRemoveUnusedExtensionParameter.kt b/idea/testData/quickfix/changeSignature/removeUnusedExtensionParameter.kt
similarity index 100%
rename from idea/testData/quickfix/changeSignature/beforeRemoveUnusedExtensionParameter.kt
rename to idea/testData/quickfix/changeSignature/removeUnusedExtensionParameter.kt
diff --git a/idea/testData/quickfix/changeSignature/afterRemoveUnusedExtensionParameter.kt b/idea/testData/quickfix/changeSignature/removeUnusedExtensionParameter.kt.after
similarity index 100%
rename from idea/testData/quickfix/changeSignature/afterRemoveUnusedExtensionParameter.kt
rename to idea/testData/quickfix/changeSignature/removeUnusedExtensionParameter.kt.after
diff --git a/idea/testData/quickfix/changeSignature/beforeRemoveUnusedParameter.kt b/idea/testData/quickfix/changeSignature/removeUnusedParameter.kt
similarity index 100%
rename from idea/testData/quickfix/changeSignature/beforeRemoveUnusedParameter.kt
rename to idea/testData/quickfix/changeSignature/removeUnusedParameter.kt
diff --git a/idea/testData/quickfix/changeSignature/afterRemoveUnusedParameter.kt b/idea/testData/quickfix/changeSignature/removeUnusedParameter.kt.after
similarity index 100%
rename from idea/testData/quickfix/changeSignature/afterRemoveUnusedParameter.kt
rename to idea/testData/quickfix/changeSignature/removeUnusedParameter.kt.after
diff --git a/idea/testData/quickfix/checkArguments/beforeInvokeOnString.kt b/idea/testData/quickfix/checkArguments/invokeOnString.kt
similarity index 100%
rename from idea/testData/quickfix/checkArguments/beforeInvokeOnString.kt
rename to idea/testData/quickfix/checkArguments/invokeOnString.kt
diff --git a/idea/testData/quickfix/checkArguments/afterInvokeOnString.kt b/idea/testData/quickfix/checkArguments/invokeOnString.kt.after
similarity index 100%
rename from idea/testData/quickfix/checkArguments/afterInvokeOnString.kt
rename to idea/testData/quickfix/checkArguments/invokeOnString.kt.after
diff --git a/idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArguments.kt b/idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArguments.kt
similarity index 100%
rename from idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArguments.kt
rename to idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArguments.kt
diff --git a/idea/testData/quickfix/checkArguments/afterMixedNamedAndPositionalArguments.kt b/idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArguments.kt.after
similarity index 100%
rename from idea/testData/quickfix/checkArguments/afterMixedNamedAndPositionalArguments.kt
rename to idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArguments.kt.after
diff --git a/idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArgumentsConstructor.kt b/idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsConstructor.kt
similarity index 100%
rename from idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArgumentsConstructor.kt
rename to idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsConstructor.kt
diff --git a/idea/testData/quickfix/checkArguments/afterMixedNamedAndPositionalArgumentsConstructor.kt b/idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsConstructor.kt.after
similarity index 100%
rename from idea/testData/quickfix/checkArguments/afterMixedNamedAndPositionalArgumentsConstructor.kt
rename to idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsConstructor.kt.after
diff --git a/idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArgumentsMultiple.kt b/idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsMultiple.kt
similarity index 100%
rename from idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArgumentsMultiple.kt
rename to idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsMultiple.kt
diff --git a/idea/testData/quickfix/checkArguments/afterMixedNamedAndPositionalArgumentsMultiple.kt b/idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsMultiple.kt.after
similarity index 100%
rename from idea/testData/quickfix/checkArguments/afterMixedNamedAndPositionalArgumentsMultiple.kt
rename to idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsMultiple.kt.after
diff --git a/idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArgumentsSubtype.kt b/idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsSubtype.kt
similarity index 100%
rename from idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArgumentsSubtype.kt
rename to idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsSubtype.kt
diff --git a/idea/testData/quickfix/checkArguments/afterMixedNamedAndPositionalArgumentsSubtype.kt b/idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsSubtype.kt.after
similarity index 100%
rename from idea/testData/quickfix/checkArguments/afterMixedNamedAndPositionalArgumentsSubtype.kt
rename to idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsSubtype.kt.after
diff --git a/idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArgumentsUsedNamed.kt b/idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsUsedNamed.kt
similarity index 100%
rename from idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArgumentsUsedNamed.kt
rename to idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsUsedNamed.kt
diff --git a/idea/testData/quickfix/checkArguments/afterMixedNamedAndPositionalArgumentsUsedNamed.kt b/idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsUsedNamed.kt.after
similarity index 100%
rename from idea/testData/quickfix/checkArguments/afterMixedNamedAndPositionalArgumentsUsedNamed.kt
rename to idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsUsedNamed.kt.after
diff --git a/idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArgumentsUsedPositional.kt b/idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsUsedPositional.kt
similarity index 100%
rename from idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArgumentsUsedPositional.kt
rename to idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsUsedPositional.kt
diff --git a/idea/testData/quickfix/checkArguments/afterMixedNamedAndPositionalArgumentsUsedPositional.kt b/idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsUsedPositional.kt.after
similarity index 100%
rename from idea/testData/quickfix/checkArguments/afterMixedNamedAndPositionalArgumentsUsedPositional.kt
rename to idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsUsedPositional.kt.after
diff --git a/idea/testData/quickfix/checkArguments/beforeNonVarargSpread.kt b/idea/testData/quickfix/checkArguments/nonVarargSpread.kt
similarity index 100%
rename from idea/testData/quickfix/checkArguments/beforeNonVarargSpread.kt
rename to idea/testData/quickfix/checkArguments/nonVarargSpread.kt
diff --git a/idea/testData/quickfix/checkArguments/afterNonVarargSpread.kt b/idea/testData/quickfix/checkArguments/nonVarargSpread.kt.after
similarity index 100%
rename from idea/testData/quickfix/checkArguments/afterNonVarargSpread.kt
rename to idea/testData/quickfix/checkArguments/nonVarargSpread.kt.after
diff --git a/idea/testData/quickfix/conflictingImports/beforeRemoveConflictingImport.kt b/idea/testData/quickfix/conflictingImports/removeConflictingImport.kt
similarity index 100%
rename from idea/testData/quickfix/conflictingImports/beforeRemoveConflictingImport.kt
rename to idea/testData/quickfix/conflictingImports/removeConflictingImport.kt
diff --git a/idea/testData/quickfix/conflictingImports/afterRemoveConflictingImport.kt b/idea/testData/quickfix/conflictingImports/removeConflictingImport.kt.after
similarity index 100%
rename from idea/testData/quickfix/conflictingImports/afterRemoveConflictingImport.kt
rename to idea/testData/quickfix/conflictingImports/removeConflictingImport.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/beforeAnnotationNoBrackets.kt b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationNoBrackets.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/annotationEntry/beforeAnnotationNoBrackets.kt
rename to idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationNoBrackets.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterAnnotationNoBrackets.kt b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationNoBrackets.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterAnnotationNoBrackets.kt
rename to idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationNoBrackets.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/beforeAnnotationNoParamList.kt b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationNoParamList.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/annotationEntry/beforeAnnotationNoParamList.kt
rename to idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationNoParamList.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterAnnotationNoParamList.kt b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationNoParamList.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterAnnotationNoParamList.kt
rename to idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationNoParamList.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/beforeAnnotationNoParams.kt b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationNoParams.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/annotationEntry/beforeAnnotationNoParams.kt
rename to idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationNoParams.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterAnnotationNoParams.kt b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationNoParams.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterAnnotationNoParams.kt
rename to idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationNoParams.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/beforeAnnotationWithParams.kt b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationWithParams.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/annotationEntry/beforeAnnotationWithParams.kt
rename to idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationWithParams.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterAnnotationWithParams.kt b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationWithParams.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterAnnotationWithParams.kt
rename to idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationWithParams.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/beforeAnnotationWithTypeParams.kt b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationWithTypeParams.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/annotationEntry/beforeAnnotationWithTypeParams.kt
rename to idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationWithTypeParams.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterAnnotationWithTypeParams.kt b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationWithTypeParams.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterAnnotationWithTypeParams.kt
rename to idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationWithTypeParams.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/beforeNotAnnotation.kt b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/notAnnotation.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/annotationEntry/beforeNotAnnotation.kt
rename to idea/testData/quickfix/createFromUsage/createClass/annotationEntry/notAnnotation.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/beforeSingleArgAnnotation.kt b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/singleArgAnnotation.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/annotationEntry/beforeSingleArgAnnotation.kt
rename to idea/testData/quickfix/createFromUsage/createClass/annotationEntry/singleArgAnnotation.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterSingleArgAnnotation.kt b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/singleArgAnnotation.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterSingleArgAnnotation.kt
rename to idea/testData/quickfix/createFromUsage/createClass/annotationEntry/singleArgAnnotation.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/beforeSingleNamedArgAnnotation.kt b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/singleNamedArgAnnotation.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/annotationEntry/beforeSingleNamedArgAnnotation.kt
rename to idea/testData/quickfix/createFromUsage/createClass/annotationEntry/singleNamedArgAnnotation.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterSingleNamedArgAnnotation.kt b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/singleNamedArgAnnotation.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/annotationEntry/afterSingleNamedArgAnnotation.kt
rename to idea/testData/quickfix/createFromUsage/createClass/annotationEntry/singleNamedArgAnnotation.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallInAnnotationEntry.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInAnnotationEntry.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallInAnnotationEntry.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callInAnnotationEntry.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallInAnnotationEntry.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInAnnotationEntry.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallInAnnotationEntry.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callInAnnotationEntry.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallInLambda.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInLambda.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallInLambda.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callInLambda.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallInLambda.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInLambda.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallInLambda.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callInLambda.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallInLocalFunNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInLocalFunNoReceiver.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallInLocalFunNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callInLocalFunNoReceiver.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallInLocalFunNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInLocalFunNoReceiver.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallInLocalFunNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callInLocalFunNoReceiver.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallInMemberFunNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberFunNoReceiver.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallInMemberFunNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberFunNoReceiver.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallInMemberFunNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberFunNoReceiver.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallInMemberFunNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberFunNoReceiver.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallInMemberValDelegateRuntime.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberValDelegateRuntime.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallInMemberValDelegateRuntime.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberValDelegateRuntime.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallInMemberValDelegateRuntime.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberValDelegateRuntime.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallInMemberValDelegateRuntime.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberValDelegateRuntime.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallInMemberVarDelegateRuntime.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberVarDelegateRuntime.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallInMemberVarDelegateRuntime.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberVarDelegateRuntime.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallInMemberVarDelegateRuntime.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberVarDelegateRuntime.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallInMemberVarDelegateRuntime.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberVarDelegateRuntime.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callNoReceiver.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callNoReceiver.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callNoReceiver.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callNoReceiver.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithClassQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithClassQualifier.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithClassQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithClassQualifier.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithClassQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithClassQualifier.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithClassQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithClassQualifier.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithExplicitParamNames.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithExplicitParamNames.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithExplicitParamNames.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithExplicitParamNames.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithExplicitParamNames.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithExplicitParamNames.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithExplicitParamNames.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithExplicitParamNames.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithExtraArgs.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithExtraArgs.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithExtraArgs.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithExtraArgs.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithFinalSupertype.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithFinalSupertype.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithFinalSupertype.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithFinalSupertype.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithGenericReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericReceiver.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithGenericReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericReceiver.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithGenericReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericReceiver.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithGenericReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericReceiver.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithLambdaArg.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithLambdaArg.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithLambdaArg.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithLambdaArg.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithLambdaArg.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithLambdaArg.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithLambdaArg.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithLambdaArg.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithLambdaArgOnly.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithLambdaArgOnly.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithLambdaArgOnly.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithLambdaArgOnly.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithLambdaArgOnly.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithLambdaArgOnly.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithLambdaArgOnly.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithLambdaArgOnly.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithLibClassQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithLibClassQualifier.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithLibClassQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithLibClassQualifier.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithMissingArgs.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithMissingArgs.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithMissingArgs.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithMissingArgs.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithObjectQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithObjectQualifier.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithObjectQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithObjectQualifier.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithObjectQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithObjectQualifier.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithObjectQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithObjectQualifier.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithPackageName.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithPackageName.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithPackageName.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithPackageName.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithPackageName.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithPackageName.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithPackageName.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithPackageName.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithReceiver.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithReceiver.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithReceiver.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithReceiver.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithSuperclassNoConstructorParams.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassNoConstructorParams.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithSuperclassNoConstructorParams.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassNoConstructorParams.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithSuperclassNoConstructorParams.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassNoConstructorParams.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithSuperclassNoConstructorParams.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassNoConstructorParams.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithSuperclassWithConstructorParams.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassWithConstructorParams.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithSuperclassWithConstructorParams.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassWithConstructorParams.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithSuperclassWithConstructorParams.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassWithConstructorParams.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithSuperclassWithConstructorParams.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassWithConstructorParams.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithSupertrait.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSupertrait.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithSupertrait.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSupertrait.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithSupertrait.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSupertrait.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithSupertrait.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSupertrait.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithThisReceiverInClass.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithThisReceiverInClass.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithThisReceiverInClass.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithThisReceiverInClass.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithThisReceiverInClass.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithThisReceiverInClass.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithThisReceiverInClass.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithThisReceiverInClass.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithThisReceiverInExtension.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithThisReceiverInExtension.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithThisReceiverInExtension.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithThisReceiverInExtension.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithThisReceiverInExtension.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithThisReceiverInExtension.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithThisReceiverInExtension.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithThisReceiverInExtension.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithThisReceiverInNestedClass1.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithThisReceiverInNestedClass1.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithThisReceiverInNestedClass1.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithThisReceiverInNestedClass1.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithThisReceiverInNestedClass1.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithThisReceiverInNestedClass1.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithThisReceiverInNestedClass1.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithThisReceiverInNestedClass1.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithThisReceiverInNestedClass2.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithThisReceiverInNestedClass2.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithThisReceiverInNestedClass2.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithThisReceiverInNestedClass2.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithThisReceiverInNestedClass2.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithThisReceiverInNestedClass2.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithThisReceiverInNestedClass2.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithThisReceiverInNestedClass2.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithTypeArgsInAnnotationEntry.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithTypeArgsInAnnotationEntry.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithTypeArgsInAnnotationEntry.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithTypeArgsInAnnotationEntry.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithTypeArgsInAnnotationEntry.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithTypeArgsInAnnotationEntry.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/afterCallWithTypeArgsInAnnotationEntry.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithTypeArgsInAnnotationEntry.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeSingleArgCallInAnnotationEntry.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/singleArgCallInAnnotationEntry.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeSingleArgCallInAnnotationEntry.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/singleArgCallInAnnotationEntry.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterSingleArgCallInAnnotationEntry.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/singleArgCallInAnnotationEntry.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/afterSingleArgCallInAnnotationEntry.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/singleArgCallInAnnotationEntry.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeSingleNamedArgCallInAnnotationEntry.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/singleNamedArgCallInAnnotationEntry.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeSingleNamedArgCallInAnnotationEntry.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/singleNamedArgCallInAnnotationEntry.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterSingleNamedArgCallInAnnotationEntry.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/singleNamedArgCallInAnnotationEntry.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/afterSingleNamedArgCallInAnnotationEntry.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/singleNamedArgCallInAnnotationEntry.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeCallWithStarProjection.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/callWithStarProjection.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeCallWithStarProjection.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/callWithStarProjection.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterCallWithStarProjection.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/callWithStarProjection.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterCallWithStarProjection.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/callWithStarProjection.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeClassMember.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMember.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeClassMember.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMember.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterClassMember.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMember.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterClassMember.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMember.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeClassMemberInner.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMemberInner.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeClassMemberInner.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMemberInner.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterClassMemberInner.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMemberInner.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterClassMemberInner.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMemberInner.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeClassMemberInnerPartialSubstitution.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMemberInnerPartialSubstitution.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeClassMemberInnerPartialSubstitution.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMemberInnerPartialSubstitution.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterClassMemberInnerPartialSubstitution.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMemberInnerPartialSubstitution.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterClassMemberInnerPartialSubstitution.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMemberInnerPartialSubstitution.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeClassMemberInnerWithReceiverArg.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMemberInnerWithReceiverArg.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeClassMemberInnerWithReceiverArg.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMemberInnerWithReceiverArg.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterClassMemberInnerWithReceiverArg.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMemberInnerWithReceiverArg.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterClassMemberInnerWithReceiverArg.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMemberInnerWithReceiverArg.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeClassMemberPartialSubstitution.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMemberPartialSubstitution.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeClassMemberPartialSubstitution.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMemberPartialSubstitution.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterClassMemberPartialSubstitution.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMemberPartialSubstitution.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterClassMemberPartialSubstitution.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMemberPartialSubstitution.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeExtension.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/extension.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeExtension.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/extension.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/noReceiver.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/noReceiver.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/noReceiver.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/noReceiver.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeNoReceiverExtraArgs.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/noReceiverExtraArgs.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeNoReceiverExtraArgs.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/noReceiverExtraArgs.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterNoReceiverExtraArgs.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/noReceiverExtraArgs.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterNoReceiverExtraArgs.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/noReceiverExtraArgs.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeNoReceiverLongName.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/noReceiverLongName.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeNoReceiverLongName.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/noReceiverLongName.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterNoReceiverLongName.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/noReceiverLongName.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterNoReceiverLongName.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/noReceiverLongName.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeNoReceiverPartialSubstitution.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/noReceiverPartialSubstitution.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeNoReceiverPartialSubstitution.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/noReceiverPartialSubstitution.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterNoReceiverPartialSubstitution.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/noReceiverPartialSubstitution.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterNoReceiverPartialSubstitution.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/noReceiverPartialSubstitution.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeWithExpectedTypeNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/withExpectedTypeNoReceiver.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeWithExpectedTypeNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/withExpectedTypeNoReceiver.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterWithExpectedTypeNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/withExpectedTypeNoReceiver.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/afterWithExpectedTypeNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/withExpectedTypeNoReceiver.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeUnusedCallResult.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/unusedCallResult.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeUnusedCallResult.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/unusedCallResult.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/afterUnusedCallResult.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/unusedCallResult.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/callExpression/afterUnusedCallResult.kt
rename to idea/testData/quickfix/createFromUsage/createClass/callExpression/unusedCallResult.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/beforeClassDelegatorToSuperclass.kt b/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/classDelegatorToSuperclass.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/beforeClassDelegatorToSuperclass.kt
rename to idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/classDelegatorToSuperclass.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/beforeDelegatorToSupercallNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallNoReceiver.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/beforeDelegatorToSupercallNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallNoReceiver.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterDelegatorToSupercallNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallNoReceiver.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterDelegatorToSupercallNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallNoReceiver.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/beforeDelegatorToSupercallWithClassQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithClassQualifier.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/beforeDelegatorToSupercallWithClassQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithClassQualifier.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterDelegatorToSupercallWithClassQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithClassQualifier.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterDelegatorToSupercallWithClassQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithClassQualifier.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/beforeDelegatorToSupercallWithPackageQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithPackageQualifier.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/beforeDelegatorToSupercallWithPackageQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithPackageQualifier.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterDelegatorToSupercallWithPackageQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithPackageQualifier.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterDelegatorToSupercallWithPackageQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithPackageQualifier.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/beforeDelegatorToSupercallWithParamNames.kt b/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithParamNames.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/beforeDelegatorToSupercallWithParamNames.kt
rename to idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithParamNames.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterDelegatorToSupercallWithParamNames.kt b/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithParamNames.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterDelegatorToSupercallWithParamNames.kt
rename to idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithParamNames.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/beforeDelegatorToSupercallWithTypeParams.kt b/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithTypeParams.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/beforeDelegatorToSupercallWithTypeParams.kt
rename to idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithTypeParams.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterDelegatorToSupercallWithTypeParams.kt b/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithTypeParams.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterDelegatorToSupercallWithTypeParams.kt
rename to idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithTypeParams.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/beforeTraitDelegatorToSuperclass.kt b/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToSuperclass.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/beforeTraitDelegatorToSuperclass.kt
rename to idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToSuperclass.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterTraitDelegatorToSuperclass.kt b/idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToSuperclass.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/afterTraitDelegatorToSuperclass.kt
rename to idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToSuperclass.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeAnnotationInPackage.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/annotationInPackage.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeAnnotationInPackage.kt
rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/annotationInPackage.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterAnnotationInPackage.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/annotationInPackage.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/afterAnnotationInPackage.kt
rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/annotationInPackage.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeAnnotationWithQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/annotationWithQualifier.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeAnnotationWithQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/annotationWithQualifier.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterAnnotationWithQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/annotationWithQualifier.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/afterAnnotationWithQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/annotationWithQualifier.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeClassInPackage.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/classInPackage.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeClassInPackage.kt
rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/classInPackage.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterClassInPackage.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/classInPackage.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/afterClassInPackage.kt
rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/classInPackage.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeClassWithQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/classWithQualifier.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeClassWithQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/classWithQualifier.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterClassWithQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/classWithQualifier.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/afterClassWithQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/classWithQualifier.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeEnumEntryInEnum.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/enumEntryInEnum.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeEnumEntryInEnum.kt
rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/enumEntryInEnum.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterEnumEntryInEnum.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/enumEntryInEnum.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/afterEnumEntryInEnum.kt
rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/enumEntryInEnum.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeEnumEntryInPackage.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/enumEntryInPackage.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeEnumEntryInPackage.kt
rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/enumEntryInPackage.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeEnumEntryWithQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/enumEntryWithQualifier.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeEnumEntryWithQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/enumEntryWithQualifier.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeEnumInPackage.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/enumInPackage.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeEnumInPackage.kt
rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/enumInPackage.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterEnumInPackage.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/enumInPackage.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/afterEnumInPackage.kt
rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/enumInPackage.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeEnumWithQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/enumWithQualifier.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeEnumWithQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/enumWithQualifier.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterEnumWithQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/enumWithQualifier.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/afterEnumWithQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/enumWithQualifier.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeObjectInPackage.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/objectInPackage.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeObjectInPackage.kt
rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/objectInPackage.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterObjectInPackage.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/objectInPackage.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/afterObjectInPackage.kt
rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/objectInPackage.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeObjectWithQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/objectWithQualifier.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeObjectWithQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/objectWithQualifier.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterObjectWithQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/objectWithQualifier.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/afterObjectWithQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/objectWithQualifier.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeTraitInPackage.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/traitInPackage.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeTraitInPackage.kt
rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/traitInPackage.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterTraitInPackage.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/traitInPackage.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/afterTraitInPackage.kt
rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/traitInPackage.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeTraitWithQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/traitWithQualifier.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeTraitWithQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/traitWithQualifier.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/importDirective/afterTraitWithQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/importDirective/traitWithQualifier.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/importDirective/afterTraitWithQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/importDirective/traitWithQualifier.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeAnnotationNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/annotationNoReceiver.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeAnnotationNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/annotationNoReceiver.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeClassByNestedQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classByNestedQualifier.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeClassByNestedQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classByNestedQualifier.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterClassByNestedQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classByNestedQualifier.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterClassByNestedQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classByNestedQualifier.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeClassByQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classByQualifier.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeClassByQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classByQualifier.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterClassByQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classByQualifier.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterClassByQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classByQualifier.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeClassInPackage.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classInPackage.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeClassInPackage.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classInPackage.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeClassNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classNoReceiver.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeClassNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classNoReceiver.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeClassWithQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classWithQualifier.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeClassWithQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classWithQualifier.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeClassWithReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classWithReceiver.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeClassWithReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classWithReceiver.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeEnumByQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumByQualifier.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeEnumByQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumByQualifier.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterEnumByQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumByQualifier.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterEnumByQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumByQualifier.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeEnumEntryNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryNoReceiver.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeEnumEntryNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryNoReceiver.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeEnumEntryWithEnumQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithEnumQualifier.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeEnumEntryWithEnumQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithEnumQualifier.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterEnumEntryWithEnumQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithEnumQualifier.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterEnumEntryWithEnumQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithEnumQualifier.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeEnumEntryWithEnumQualifierAndParams.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithEnumQualifierAndParams.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeEnumEntryWithEnumQualifierAndParams.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithEnumQualifierAndParams.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterEnumEntryWithEnumQualifierAndParams.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithEnumQualifierAndParams.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterEnumEntryWithEnumQualifierAndParams.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithEnumQualifierAndParams.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeEnumEntryWithEnumSuperclass.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithEnumSuperclass.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeEnumEntryWithEnumSuperclass.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithEnumSuperclass.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterEnumEntryWithEnumSuperclass.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithEnumSuperclass.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterEnumEntryWithEnumSuperclass.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithEnumSuperclass.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeEnumEntryWithQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithQualifier.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeEnumEntryWithQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithQualifier.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeEnumEntryWithReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithReceiver.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeEnumEntryWithReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithReceiver.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeEnumEntryWithSuperclass.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithSuperclass.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeEnumEntryWithSuperclass.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithSuperclass.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeEnumNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumNoReceiver.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeEnumNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumNoReceiver.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeObjectByQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectByQualifier.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeObjectByQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectByQualifier.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectByQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectByQualifier.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectByQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectByQualifier.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeObjectInPackage.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectInPackage.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeObjectInPackage.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectInPackage.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectInPackage.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectInPackage.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectInPackage.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectInPackage.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeObjectNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectNoReceiver.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeObjectNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectNoReceiver.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectNoReceiver.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectNoReceiver.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeObjectWithQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithQualifier.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeObjectWithQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithQualifier.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectWithQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithQualifier.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectWithQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithQualifier.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeObjectWithReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithReceiver.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeObjectWithReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithReceiver.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeObjectWithSuperclass.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithSuperclass.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeObjectWithSuperclass.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithSuperclass.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectWithSuperclass.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithSuperclass.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectWithSuperclass.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithSuperclass.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeObjectWithSupertrait.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithSupertrait.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeObjectWithSupertrait.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithSupertrait.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectWithSupertrait.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithSupertrait.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterObjectWithSupertrait.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithSupertrait.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeTraitByQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/traitByQualifier.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeTraitByQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/traitByQualifier.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterTraitByQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/traitByQualifier.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterTraitByQualifier.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/traitByQualifier.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeTraitNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/traitNoReceiver.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeTraitNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/traitNoReceiver.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeUnusedReference.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/unusedReference.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeUnusedReference.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/unusedReference.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterUnusedReference.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/unusedReference.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterUnusedReference.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/unusedReference.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeValDelegateExpressionRuntime.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/valDelegateExpressionRuntime.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeValDelegateExpressionRuntime.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/valDelegateExpressionRuntime.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterValDelegateExpressionRuntime.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/valDelegateExpressionRuntime.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterValDelegateExpressionRuntime.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/valDelegateExpressionRuntime.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeVarDelegateExpressionRuntime.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/varDelegateExpressionRuntime.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeVarDelegateExpressionRuntime.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/varDelegateExpressionRuntime.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterVarDelegateExpressionRuntime.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/varDelegateExpressionRuntime.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/referenceExpression/afterVarDelegateExpressionRuntime.kt
rename to idea/testData/quickfix/createFromUsage/createClass/referenceExpression/varDelegateExpressionRuntime.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeAnnotationNotQualifierNoTypeArgs.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/annotationNotQualifierNoTypeArgs.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeAnnotationNotQualifierNoTypeArgs.kt
rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/annotationNotQualifierNoTypeArgs.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterAnnotationNotQualifierNoTypeArgs.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/annotationNotQualifierNoTypeArgs.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/afterAnnotationNotQualifierNoTypeArgs.kt
rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/annotationNotQualifierNoTypeArgs.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeAnnotationNotQualifierWithTypeArgs.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/annotationNotQualifierWithTypeArgs.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeAnnotationNotQualifierWithTypeArgs.kt
rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/annotationNotQualifierWithTypeArgs.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeAnnotationQualifierNoTypeArgs.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/annotationQualifierNoTypeArgs.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeAnnotationQualifierNoTypeArgs.kt
rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/annotationQualifierNoTypeArgs.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeClassCurrentPackageReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/classCurrentPackageReceiver.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeClassCurrentPackageReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/classCurrentPackageReceiver.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassCurrentPackageReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/classCurrentPackageReceiver.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassCurrentPackageReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/classCurrentPackageReceiver.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeClassLibTypeReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/classLibTypeReceiver.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeClassLibTypeReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/classLibTypeReceiver.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeClassNotQualifierNoTypeArgs.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/classNotQualifierNoTypeArgs.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeClassNotQualifierNoTypeArgs.kt
rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/classNotQualifierNoTypeArgs.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassNotQualifierNoTypeArgs.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/classNotQualifierNoTypeArgs.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassNotQualifierNoTypeArgs.kt
rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/classNotQualifierNoTypeArgs.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeClassNotQualifierWithStarProjection.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/classNotQualifierWithStarProjection.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeClassNotQualifierWithStarProjection.kt
rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/classNotQualifierWithStarProjection.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassNotQualifierWithStarProjection.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/classNotQualifierWithStarProjection.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassNotQualifierWithStarProjection.kt
rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/classNotQualifierWithStarProjection.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeClassNotQualifierWithTypeArgs.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/classNotQualifierWithTypeArgs.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeClassNotQualifierWithTypeArgs.kt
rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/classNotQualifierWithTypeArgs.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassNotQualifierWithTypeArgs.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/classNotQualifierWithTypeArgs.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassNotQualifierWithTypeArgs.kt
rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/classNotQualifierWithTypeArgs.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeClassQualifierNoTypeArgs.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/classQualifierNoTypeArgs.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeClassQualifierNoTypeArgs.kt
rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/classQualifierNoTypeArgs.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassQualifierNoTypeArgs.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/classQualifierNoTypeArgs.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassQualifierNoTypeArgs.kt
rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/classQualifierNoTypeArgs.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeClassUserTypeReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/classUserTypeReceiver.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeClassUserTypeReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/classUserTypeReceiver.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassUserTypeReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/classUserTypeReceiver.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassUserTypeReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/classUserTypeReceiver.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeClassUserTypeReceiverNoBody.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/classUserTypeReceiverNoBody.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeClassUserTypeReceiverNoBody.kt
rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/classUserTypeReceiverNoBody.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassUserTypeReceiverNoBody.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/classUserTypeReceiverNoBody.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/afterClassUserTypeReceiverNoBody.kt
rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/classUserTypeReceiverNoBody.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeEnumEntryNotQualifierNoTypeArgs.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/enumEntryNotQualifierNoTypeArgs.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeEnumEntryNotQualifierNoTypeArgs.kt
rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/enumEntryNotQualifierNoTypeArgs.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeEnumNotQualifierNoTypeArgs.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/enumNotQualifierNoTypeArgs.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeEnumNotQualifierNoTypeArgs.kt
rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/enumNotQualifierNoTypeArgs.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterEnumNotQualifierNoTypeArgs.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/enumNotQualifierNoTypeArgs.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/afterEnumNotQualifierNoTypeArgs.kt
rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/enumNotQualifierNoTypeArgs.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeEnumNotQualifierWithTypeArgs.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/enumNotQualifierWithTypeArgs.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeEnumNotQualifierWithTypeArgs.kt
rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/enumNotQualifierWithTypeArgs.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeObjectNotQualifierNoTypeArgs.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/objectNotQualifierNoTypeArgs.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeObjectNotQualifierNoTypeArgs.kt
rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/objectNotQualifierNoTypeArgs.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeObjectNotQualifierWithTypeArgs.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/objectNotQualifierWithTypeArgs.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeObjectNotQualifierWithTypeArgs.kt
rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/objectNotQualifierWithTypeArgs.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeObjectQualifierNoTypeArgs.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/objectQualifierNoTypeArgs.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeObjectQualifierNoTypeArgs.kt
rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/objectQualifierNoTypeArgs.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterObjectQualifierNoTypeArgs.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/objectQualifierNoTypeArgs.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/afterObjectQualifierNoTypeArgs.kt
rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/objectQualifierNoTypeArgs.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeTraitNotQualifierNoTypeArgs.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/traitNotQualifierNoTypeArgs.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeTraitNotQualifierNoTypeArgs.kt
rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/traitNotQualifierNoTypeArgs.kt
diff --git a/idea/testData/quickfix/createFromUsage/createClass/typeReference/afterTraitNotQualifierNoTypeArgs.kt b/idea/testData/quickfix/createFromUsage/createClass/typeReference/traitNotQualifierNoTypeArgs.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createClass/typeReference/afterTraitNotQualifierNoTypeArgs.kt
rename to idea/testData/quickfix/createFromUsage/createClass/typeReference/traitNotQualifierNoTypeArgs.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforeCustomOperationOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforeCustomOperationOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterCustomOperationOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterCustomOperationOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforeGreaterOrEqualOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforeGreaterOrEqualOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterGreaterOrEqualOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterGreaterOrEqualOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforeInOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforeInOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterInOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterInOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforeLessOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforeLessOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterLessOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterLessOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforeNotInOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforeNotInOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterNotInOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterNotInOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforePlusAssignOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforePlusAssignOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusAssignOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusAssignOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforePlusExtraArgs.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforePlusExtraArgs.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusExtraArgs.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusExtraArgs.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforePlusForAssignmentOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforePlusForAssignmentOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusForAssignmentOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusForAssignmentOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforePlusMissingArgs.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforePlusMissingArgs.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusMissingArgs.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusMissingArgs.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforePlusOnLibType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnLibType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforePlusOnLibType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnLibType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusOnLibType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnLibType.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusOnLibType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnLibType.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforePlusOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforePlusOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforePlusOnUserTypeWithTypeParams.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforePlusOnUserTypeWithTypeParams.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusOnUserTypeWithTypeParams.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusOnUserTypeWithTypeParams.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforeWhenInOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforeWhenInOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterWhenInOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterWhenInOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforeWhenNotInOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforeWhenNotInOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterWhenNotInOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterWhenNotInOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeCallInAnnotationEntry.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/callInAnnotationEntry.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeCallInAnnotationEntry.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/callInAnnotationEntry.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeCallInStringTemplateRuntime.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/callInStringTemplateRuntime.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeCallInStringTemplateRuntime.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/callInStringTemplateRuntime.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterCallInStringTemplateRuntime.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/callInStringTemplateRuntime.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterCallInStringTemplateRuntime.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/callInStringTemplateRuntime.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeCallWithLambdaArg.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeCallWithLambdaArg.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterCallWithLambdaArg.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterCallWithLambdaArg.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeCallWithLambdaArgOnly.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeCallWithLambdaArgOnly.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterCallWithLambdaArgOnly.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterCallWithLambdaArgOnly.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeDoNotStripPrefix.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeDoNotStripPrefix.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterDoNotStripPrefix.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterDoNotStripPrefix.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeExtensionFunOnTrait.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTrait.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeExtensionFunOnTrait.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTrait.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterExtensionFunOnTrait.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTrait.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterExtensionFunOnTrait.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTrait.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeExtensionRefInImport.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionRefInImport.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeExtensionRefInImport.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/extensionRefInImport.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunExtraArgs.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunExtraArgs.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunExtraArgs.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterFunExtraArgs.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunMissingArgs.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunMissingArgs.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunMissingArgs.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterFunMissingArgs.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunOnClassNoClassObject.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassNoClassObject.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunOnClassNoClassObject.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassNoClassObject.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunOnClassObject.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunOnClassObject.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunOnClassObject.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterFunOnClassObject.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunOnLibObject.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibObject.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunOnLibObject.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibObject.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunOnLibObject.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibObject.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterFunOnLibObject.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibObject.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunOnLibType.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunOnLibType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunOnLibType.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibType.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterFunOnLibType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibType.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunOnTrait.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunOnTrait.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunOnTrait.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterFunOnTrait.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunOnUserObject.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunOnUserObject.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunOnUserObject.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterFunOnUserObject.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterFunOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunOnUserTypeWithDeclarations.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunOnUserTypeWithDeclarations.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunOnUserTypeWithDeclarations.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterFunOnUserTypeWithDeclarations.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunOnUserTypeWithTypeParams.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunOnUserTypeWithTypeParams.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunOnUserTypeWithTypeParams.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterFunOnUserTypeWithTypeParams.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunPlacement.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funPlacement.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunPlacement.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/funPlacement.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunPlacement.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funPlacement.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterFunPlacement.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/funPlacement.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunWithExplicitParamNamesOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunWithExplicitParamNamesOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunWithExplicitParamNamesOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterFunWithExplicitParamNamesOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunWithNullableParamType.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunWithNullableParamType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunWithNullableParamType.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterFunWithNullableParamType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunWithNullableType.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunWithNullableType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunWithNullableType.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterFunWithNullableType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunWithNullableTypeParameter.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunWithNullableTypeParameter.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunWithNullableTypeParameter.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterFunWithNullableTypeParameter.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunWithPackageName.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithPackageName.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunWithPackageName.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/funWithPackageName.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunWithPackageName.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithPackageName.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterFunWithPackageName.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/funWithPackageName.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeInLambda.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/inLambda.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeInLambda.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/inLambda.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterInLambda.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/inLambda.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterInLambda.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/inLambda.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeInconsistentTypes.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeInconsistentTypes.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterInconsistentTypes.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterInconsistentTypes.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeLocalFunNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/localFunNoReceiver.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeLocalFunNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/localFunNoReceiver.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterLocalFunNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/localFunNoReceiver.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterLocalFunNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/localFunNoReceiver.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeMemberFunNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/memberFunNoReceiver.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeMemberFunNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/memberFunNoReceiver.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterMemberFunNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/memberFunNoReceiver.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterMemberFunNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/memberFunNoReceiver.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeMemberValDelegateRuntime.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/memberValDelegateRuntime.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeMemberValDelegateRuntime.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/memberValDelegateRuntime.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterMemberValDelegateRuntime.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/memberValDelegateRuntime.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterMemberValDelegateRuntime.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/memberValDelegateRuntime.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeMemberVarDelegateRuntime.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/memberVarDelegateRuntime.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeMemberVarDelegateRuntime.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/memberVarDelegateRuntime.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterMemberVarDelegateRuntime.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/memberVarDelegateRuntime.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterMemberVarDelegateRuntime.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/memberVarDelegateRuntime.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeObjectMemberFunNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/objectMemberFunNoReceiver.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeObjectMemberFunNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/objectMemberFunNoReceiver.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterObjectMemberFunNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/objectMemberFunNoReceiver.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterObjectMemberFunNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/objectMemberFunNoReceiver.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforePrivateForMembers.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/privateForMembers.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforePrivateForMembers.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/privateForMembers.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterPrivateForMembers.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/privateForMembers.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterPrivateForMembers.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/privateForMembers.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforePropertyOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/propertyOnUserType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforePropertyOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/propertyOnUserType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeQualifiedCallInStringTemplateRuntime.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeQualifiedCallInStringTemplateRuntime.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterQualifiedCallInStringTemplateRuntime.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterQualifiedCallInStringTemplateRuntime.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeRefInImport.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/refInImport.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeRefInImport.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/refInImport.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeSmartCastWithIs.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/smartCastWithIs.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeSmartCastWithIs.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/smartCastWithIs.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterSmartCastWithIs.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/smartCastWithIs.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterSmartCastWithIs.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/smartCastWithIs.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeSmartCastWithNullCheck.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/smartCastWithNullCheck.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeSmartCastWithNullCheck.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/smartCastWithNullCheck.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterSmartCastWithNullCheck.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/smartCastWithNullCheck.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterSmartCastWithNullCheck.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/smartCastWithNullCheck.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeStripPrefix.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeStripPrefix.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterStripPrefix.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterStripPrefix.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeThisInClass.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeThisInClass.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterThisInClass.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterThisInClass.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeThisInExtension.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeThisInExtension.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterThisInExtension.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterThisInExtension.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeThisInNestedClass1.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeThisInNestedClass1.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterThisInNestedClass1.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterThisInNestedClass1.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeThisInNestedClass2.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeThisInNestedClass2.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterThisInNestedClass2.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterThisInNestedClass2.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeTopLevelFunNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/topLevelFunNoReceiver.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeTopLevelFunNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/topLevelFunNoReceiver.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterTopLevelFunNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/topLevelFunNoReceiver.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterTopLevelFunNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/topLevelFunNoReceiver.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeTopLevelFunPlacement.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/topLevelFunPlacement.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeTopLevelFunPlacement.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/topLevelFunPlacement.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterTopLevelFunPlacement.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/topLevelFunPlacement.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterTopLevelFunPlacement.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/topLevelFunPlacement.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeCallWithStarProjection.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/callWithStarProjection.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeCallWithStarProjection.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/callWithStarProjection.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterCallWithStarProjection.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/callWithStarProjection.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterCallWithStarProjection.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/callWithStarProjection.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeClassMember.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeClassMember.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterClassMember.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterClassMember.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeClassMemberPartialSubstitution.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeClassMemberPartialSubstitution.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterClassMemberPartialSubstitution.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterClassMemberPartialSubstitution.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeClassMemberWithReceiverArg.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeClassMemberWithReceiverArg.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterClassMemberWithReceiverArg.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterClassMemberWithReceiverArg.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeExtension.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extension.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeExtension.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extension.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterExtension.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extension.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterExtension.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extension.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeExtensionPartialSubstitution.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionPartialSubstitution.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeExtensionPartialSubstitution.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionPartialSubstitution.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterExtensionPartialSubstitution.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionPartialSubstitution.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterExtensionPartialSubstitution.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionPartialSubstitution.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeExtensionWithReceiverArg.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithReceiverArg.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeExtensionWithReceiverArg.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithReceiverArg.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterExtensionWithReceiverArg.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithReceiverArg.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterExtensionWithReceiverArg.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithReceiverArg.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiver.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiver.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiver.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiver.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeNoReceiverExtraArgs.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverExtraArgs.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeNoReceiverExtraArgs.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverExtraArgs.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiverExtraArgs.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverExtraArgs.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiverExtraArgs.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverExtraArgs.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeNoReceiverLongName.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverLongName.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeNoReceiverLongName.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverLongName.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiverLongName.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverLongName.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiverLongName.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverLongName.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeNoReceiverPartialSubstitution.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverPartialSubstitution.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeNoReceiverPartialSubstitution.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverPartialSubstitution.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiverPartialSubstitution.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverPartialSubstitution.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiverPartialSubstitution.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverPartialSubstitution.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeUnitFun.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/unitFun.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeUnitFun.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/unitFun.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterUnitFun.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/unitFun.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterUnitFun.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/unitFun.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeUnknownType.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeUnknownType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterUnknownType.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterUnknownType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeUnresolvedSupertype.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/beforeUnresolvedSupertype.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterUnresolvedSupertype.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/call/afterUnresolvedSupertype.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/component/beforeCreateComponentFromUsage1.kt b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/component/beforeCreateComponentFromUsage1.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/component/afterCreateComponentFromUsage1.kt b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/component/afterCreateComponentFromUsage1.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/component/beforeCreateComponentFromUsage2.kt b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/component/beforeCreateComponentFromUsage2.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/component/afterCreateComponentFromUsage2.kt b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/component/afterCreateComponentFromUsage2.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/component/beforeCreateComponentFromUsage3.kt b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage3.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/component/beforeCreateComponentFromUsage3.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage3.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/component/afterCreateComponentFromUsage3.kt b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage3.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/component/afterCreateComponentFromUsage3.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage3.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/beforeVal.kt b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/beforeVal.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/afterVal.kt b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/afterVal.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/beforeVar.kt b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/beforeVar.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/afterVar.kt b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/afterVar.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/beforeVarMissingGet.kt b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/beforeVarMissingGet.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/afterVarMissingGet.kt b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/afterVarMissingGet.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/beforeVarMissingSet.kt b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/beforeVarMissingSet.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/afterVarMissingSet.kt b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/afterVarMissingSet.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage1.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage1.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/afterCreateGetFromUsage1.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/get/afterCreateGetFromUsage1.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage10.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage10.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/afterCreateGetFromUsage10.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/get/afterCreateGetFromUsage10.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage11.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage11.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/afterCreateGetFromUsage11.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/get/afterCreateGetFromUsage11.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage12.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage12.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/afterCreateGetFromUsage12.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/get/afterCreateGetFromUsage12.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage13.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage13.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/afterCreateGetFromUsage13.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/get/afterCreateGetFromUsage13.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage2.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage2.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage2.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage2.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/afterCreateGetFromUsage2.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage2.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/get/afterCreateGetFromUsage2.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage2.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage3.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage3.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/afterCreateGetFromUsage3.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/get/afterCreateGetFromUsage3.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage4.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage4.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/afterCreateGetFromUsage4.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/get/afterCreateGetFromUsage4.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage5.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage5.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/afterCreateGetFromUsage5.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/get/afterCreateGetFromUsage5.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage7.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage7.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/afterCreateGetFromUsage7.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/get/afterCreateGetFromUsage7.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage8.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage8.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/afterCreateGetFromUsage8.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/get/afterCreateGetFromUsage8.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage9.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage9.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/afterCreateGetFromUsage9.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/get/afterCreateGetFromUsage9.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/hasNext/beforeCreateHasNextFromUsage1.kt b/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/hasNext/beforeCreateHasNextFromUsage1.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/hasNext/afterCreateHasNextFromUsage1.kt b/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/hasNext/afterCreateHasNextFromUsage1.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/hasNext/beforeCreateHasNextFromUsage2.kt b/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/hasNext/beforeCreateHasNextFromUsage2.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/hasNext/afterCreateHasNextFromUsage2.kt b/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/hasNext/afterCreateHasNextFromUsage2.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/invoke/beforeInvokeOnLibType.kt b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnLibType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/invoke/beforeInvokeOnLibType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnLibType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/invoke/afterInvokeOnLibType.kt b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnLibType.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/invoke/afterInvokeOnLibType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnLibType.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/invoke/beforeInvokeOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/invoke/beforeInvokeOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/invoke/afterInvokeOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/invoke/afterInvokeOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/invoke/beforeInvokeOnUserTypeWithTypeParams.kt b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/invoke/beforeInvokeOnUserTypeWithTypeParams.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/invoke/afterInvokeOnUserTypeWithTypeParams.kt b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/invoke/afterInvokeOnUserTypeWithTypeParams.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/invoke/beforeInvokeWithExplicitParamNamesOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/invoke/beforeInvokeWithExplicitParamNamesOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/invoke/afterInvokeWithExplicitParamNamesOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/invoke/afterInvokeWithExplicitParamNamesOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/iterator/beforeCreateIteratorFromUsage1.kt b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/iterator/beforeCreateIteratorFromUsage1.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/iterator/afterCreateIteratorFromUsage1.kt b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/iterator/afterCreateIteratorFromUsage1.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/iterator/beforeCreateIteratorFromUsage2.kt b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/iterator/beforeCreateIteratorFromUsage2.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/iterator/afterCreateIteratorFromUsage2.kt b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/iterator/afterCreateIteratorFromUsage2.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/iterator/beforeCreateIteratorFromUsage3.kt b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/iterator/beforeCreateIteratorFromUsage3.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/iterator/afterCreateIteratorFromUsage3.kt b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/iterator/afterCreateIteratorFromUsage3.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/next/beforeCreateNextFromUsage1.kt b/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/next/beforeCreateNextFromUsage1.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/next/afterCreateNextFromUsage1.kt b/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/next/afterCreateNextFromUsage1.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/next/beforeCreateNextFromUsage2.kt b/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/next/beforeCreateNextFromUsage2.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/next/afterCreateNextFromUsage2.kt b/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/next/afterCreateNextFromUsage2.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/set/beforeCreateSetFromUsage1.kt b/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/set/beforeCreateSetFromUsage1.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/set/afterCreateSetFromUsage1.kt b/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/set/afterCreateSetFromUsage1.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/set/beforeCreateSetFromUsage2.kt b/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/set/beforeCreateSetFromUsage2.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/set/afterCreateSetFromUsage2.kt b/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/set/afterCreateSetFromUsage2.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/set/beforeSetterForIncrement.kt b/idea/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/set/beforeSetterForIncrement.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/set/afterSetterForIncrement.kt b/idea/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/set/afterSetterForIncrement.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/beforeIncOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/beforeIncOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/afterIncOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/afterIncOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/beforeMinusMissingArgs.kt b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/beforeMinusMissingArgs.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/afterMinusMissingArgs.kt b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/afterMinusMissingArgs.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/beforeMinusOnLibType.kt b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnLibType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/beforeMinusOnLibType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnLibType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/afterMinusOnLibType.kt b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnLibType.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/afterMinusOnLibType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnLibType.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/beforeMinusOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/beforeMinusOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/afterMinusOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/afterMinusOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/beforeMinusOnUserTypeWithTypeParams.kt b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/beforeMinusOnUserTypeWithTypeParams.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/afterMinusOnUserTypeWithTypeParams.kt b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/afterMinusOnUserTypeWithTypeParams.kt
rename to idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/beforeCallWithExpectedType.kt b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/callWithExpectedType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createSecondaryConstructor/beforeCallWithExpectedType.kt
rename to idea/testData/quickfix/createFromUsage/createSecondaryConstructor/callWithExpectedType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/afterCallWithExpectedType.kt b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/callWithExpectedType.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createSecondaryConstructor/afterCallWithExpectedType.kt
rename to idea/testData/quickfix/createFromUsage/createSecondaryConstructor/callWithExpectedType.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/beforeCallWithTypeArguments.kt b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/callWithTypeArguments.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createSecondaryConstructor/beforeCallWithTypeArguments.kt
rename to idea/testData/quickfix/createFromUsage/createSecondaryConstructor/callWithTypeArguments.kt
diff --git a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/beforeClassWithBody.kt b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/classWithBody.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createSecondaryConstructor/beforeClassWithBody.kt
rename to idea/testData/quickfix/createFromUsage/createSecondaryConstructor/classWithBody.kt
diff --git a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/afterClassWithBody.kt b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/classWithBody.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createSecondaryConstructor/afterClassWithBody.kt
rename to idea/testData/quickfix/createFromUsage/createSecondaryConstructor/classWithBody.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/beforeClassWithoutBody.kt b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/classWithoutBody.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createSecondaryConstructor/beforeClassWithoutBody.kt
rename to idea/testData/quickfix/createFromUsage/createSecondaryConstructor/classWithoutBody.kt
diff --git a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/afterClassWithoutBody.kt b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/classWithoutBody.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createSecondaryConstructor/afterClassWithoutBody.kt
rename to idea/testData/quickfix/createFromUsage/createSecondaryConstructor/classWithoutBody.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/beforeDelegatorToSuperCall.kt b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/delegatorToSuperCall.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createSecondaryConstructor/beforeDelegatorToSuperCall.kt
rename to idea/testData/quickfix/createFromUsage/createSecondaryConstructor/delegatorToSuperCall.kt
diff --git a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/afterDelegatorToSuperCall.kt b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/delegatorToSuperCall.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createSecondaryConstructor/afterDelegatorToSuperCall.kt
rename to idea/testData/quickfix/createFromUsage/createSecondaryConstructor/delegatorToSuperCall.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/beforeDelegatorToSuperCallNoClass.kt b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/delegatorToSuperCallNoClass.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createSecondaryConstructor/beforeDelegatorToSuperCallNoClass.kt
rename to idea/testData/quickfix/createFromUsage/createSecondaryConstructor/delegatorToSuperCallNoClass.kt
diff --git a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/beforeSuperCall.kt b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/superCall.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createSecondaryConstructor/beforeSuperCall.kt
rename to idea/testData/quickfix/createFromUsage/createSecondaryConstructor/superCall.kt
diff --git a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/afterSuperCall.kt b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/superCall.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createSecondaryConstructor/afterSuperCall.kt
rename to idea/testData/quickfix/createFromUsage/createSecondaryConstructor/superCall.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/beforeSuperCallNoClass.kt b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/superCallNoClass.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createSecondaryConstructor/beforeSuperCallNoClass.kt
rename to idea/testData/quickfix/createFromUsage/createSecondaryConstructor/superCallNoClass.kt
diff --git a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/beforeThisCall.kt b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/thisCall.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createSecondaryConstructor/beforeThisCall.kt
rename to idea/testData/quickfix/createFromUsage/createSecondaryConstructor/thisCall.kt
diff --git a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/afterThisCall.kt b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/thisCall.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createSecondaryConstructor/afterThisCall.kt
rename to idea/testData/quickfix/createFromUsage/createSecondaryConstructor/thisCall.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/beforeWrongExpectedType.kt b/idea/testData/quickfix/createFromUsage/createSecondaryConstructor/wrongExpectedType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createSecondaryConstructor/beforeWrongExpectedType.kt
rename to idea/testData/quickfix/createFromUsage/createSecondaryConstructor/wrongExpectedType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeAssignedInFun.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/assignedInFun.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeAssignedInFun.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/localVariable/assignedInFun.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterAssignedInFun.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/assignedInFun.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterAssignedInFun.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/localVariable/assignedInFun.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeInAccessor.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/inAccessor.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeInAccessor.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/localVariable/inAccessor.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInAccessor.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/inAccessor.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInAccessor.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/localVariable/inAccessor.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeInAccessorWithExpressionBody.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/inAccessorWithExpressionBody.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeInAccessorWithExpressionBody.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/localVariable/inAccessorWithExpressionBody.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInAccessorWithExpressionBody.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/inAccessorWithExpressionBody.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInAccessorWithExpressionBody.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/localVariable/inAccessorWithExpressionBody.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeInClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/inClass.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeInClass.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/localVariable/inClass.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeInFun.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/inFun.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeInFun.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/localVariable/inFun.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInFun.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/inFun.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInFun.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/localVariable/inFun.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeInFunWithExpressionBody.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/inFunWithExpressionBody.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeInFunWithExpressionBody.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/localVariable/inFunWithExpressionBody.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInFunWithExpressionBody.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/inFunWithExpressionBody.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInFunWithExpressionBody.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/localVariable/inFunWithExpressionBody.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeInLambdaNoParams.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/inLambdaNoParams.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeInLambdaNoParams.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/localVariable/inLambdaNoParams.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInLambdaNoParams.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/inLambdaNoParams.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInLambdaNoParams.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/localVariable/inLambdaNoParams.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeInLambdaWithParams.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/inLambdaWithParams.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeInLambdaWithParams.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/localVariable/inLambdaWithParams.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInLambdaWithParams.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/inLambdaWithParams.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInLambdaWithParams.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/localVariable/inLambdaWithParams.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeInMultiLineLambdaNoParams.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/inMultiLineLambdaNoParams.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeInMultiLineLambdaNoParams.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/localVariable/inMultiLineLambdaNoParams.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInMultiLineLambdaNoParams.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/inMultiLineLambdaNoParams.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInMultiLineLambdaNoParams.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/localVariable/inMultiLineLambdaNoParams.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeInMultiLineLambdaWithParams.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/inMultiLineLambdaWithParams.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeInMultiLineLambdaWithParams.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/localVariable/inMultiLineLambdaWithParams.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInMultiLineLambdaWithParams.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/inMultiLineLambdaWithParams.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInMultiLineLambdaWithParams.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/localVariable/inMultiLineLambdaWithParams.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeInWhen.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/inWhen.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeInWhen.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/localVariable/inWhen.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInWhen.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/inWhen.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterInWhen.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/localVariable/inWhen.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeLocalWithPackageName.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/localWithPackageName.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeLocalWithPackageName.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/localVariable/localWithPackageName.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterLocalWithPackageName.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/localWithPackageName.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterLocalWithPackageName.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/localVariable/localWithPackageName.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeNullableType.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/nullableType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeNullableType.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/localVariable/nullableType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterNullableType.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/nullableType.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterNullableType.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/localVariable/nullableType.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeOnTopLevel.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/onTopLevel.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeOnTopLevel.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/localVariable/onTopLevel.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforePositionNextToUsage.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/positionNextToUsage.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforePositionNextToUsage.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/localVariable/positionNextToUsage.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterPositionNextToUsage.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/positionNextToUsage.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterPositionNextToUsage.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/localVariable/positionNextToUsage.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeQualifiedInFun.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/qualifiedInFun.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeQualifiedInFun.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/localVariable/qualifiedInFun.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeUnitTypedInFun.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/unitTypedInFun.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeUnitTypedInFun.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/localVariable/unitTypedInFun.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterUnitTypedInFun.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/unitTypedInFun.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/localVariable/afterUnitTypedInFun.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/localVariable/unitTypedInFun.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeAssignedInFun.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/assignedInFun.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeAssignedInFun.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/assignedInFun.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeAssignedInFunInClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/assignedInFunInClass.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeAssignedInFunInClass.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/assignedInFunInClass.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/afterAssignedInFunInClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/assignedInFunInClass.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/afterAssignedInFunInClass.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/assignedInFunInClass.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInAccessorInClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInClass.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInAccessorInClass.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInClass.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInAccessorInClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInClass.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInAccessorInClass.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInClass.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInAccessorInClassObject.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInClassObject.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInAccessorInClassObject.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInClassObject.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInAccessorInGenClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInGenClass.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInAccessorInGenClass.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInGenClass.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInAccessorInGenClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInGenClass.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInAccessorInGenClass.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInGenClass.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInAccessorInObject.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInObject.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInAccessorInObject.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInObject.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInAccessorInTrait.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInTrait.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInAccessorInTrait.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInTrait.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInAccessorNoClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorNoClass.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInAccessorNoClass.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorNoClass.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInAccessorWithExpressionBodyInClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorWithExpressionBodyInClass.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInAccessorWithExpressionBodyInClass.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorWithExpressionBodyInClass.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInAccessorWithExpressionBodyInClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorWithExpressionBodyInClass.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInAccessorWithExpressionBodyInClass.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorWithExpressionBodyInClass.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInClassInitializer.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inClassInitializer.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInClassInitializer.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inClassInitializer.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInClassInitializer.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inClassInitializer.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInClassInitializer.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inClassInitializer.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInClassObjectInitializer.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inClassObjectInitializer.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInClassObjectInitializer.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inClassObjectInitializer.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInFun.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inFun.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInFun.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inFun.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInFun.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inFun.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInFun.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inFun.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInFunInClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inFunInClass.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInFunInClass.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inFunInClass.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInFunInClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inFunInClass.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInFunInClass.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inFunInClass.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInFunInGenClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inFunInGenClass.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInFunInGenClass.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inFunInGenClass.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInFunInGenClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inFunInGenClass.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInFunInGenClass.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inFunInGenClass.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInGenAccessorInClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenAccessorInClass.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInGenAccessorInClass.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenAccessorInClass.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInGenAccessorInGenClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenAccessorInGenClass.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInGenAccessorInGenClass.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenAccessorInGenClass.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInGenFunInClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInClass.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInGenFunInClass.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInClass.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInGenFunInClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInClass.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInGenFunInClass.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInClass.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInGenFunInGenClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInGenClass.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInGenFunInGenClass.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInGenClass.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInGenFunInGenClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInGenClass.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInGenFunInGenClass.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInGenClass.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInGenPropertyInitializerInClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenPropertyInitializerInClass.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInGenPropertyInitializerInClass.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenPropertyInitializerInClass.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInGenPropertyInitializerInGenClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenPropertyInitializerInGenClass.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInGenPropertyInitializerInGenClass.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenPropertyInitializerInGenClass.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInLambdaNoParams.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inLambdaNoParams.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInLambdaNoParams.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inLambdaNoParams.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInLambdaNoParams.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inLambdaNoParams.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInLambdaNoParams.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inLambdaNoParams.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInLambdaWithIt.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inLambdaWithIt.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInLambdaWithIt.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inLambdaWithIt.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInLambdaWithIt.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inLambdaWithIt.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInLambdaWithIt.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inLambdaWithIt.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInLambdaWithParams.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inLambdaWithParams.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInLambdaWithParams.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inLambdaWithParams.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInLambdaWithParams.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inLambdaWithParams.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInLambdaWithParams.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inLambdaWithParams.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInLambdaWithTypedParams.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inLambdaWithTypedParams.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInLambdaWithTypedParams.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inLambdaWithTypedParams.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInLambdaWithTypedParams.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inLambdaWithTypedParams.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInLambdaWithTypedParams.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inLambdaWithTypedParams.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInMultiLineLambdaNoParams.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inMultiLineLambdaNoParams.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInMultiLineLambdaNoParams.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inMultiLineLambdaNoParams.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInMultiLineLambdaNoParams.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inMultiLineLambdaNoParams.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInMultiLineLambdaNoParams.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inMultiLineLambdaNoParams.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInPropertyInitializerInClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInClass.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInPropertyInitializerInClass.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInClass.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInPropertyInitializerInClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInClass.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInPropertyInitializerInClass.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInClass.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInPropertyInitializerInClassObject.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInClassObject.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInPropertyInitializerInClassObject.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInClassObject.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInPropertyInitializerInEnumClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInEnumClass.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInPropertyInitializerInEnumClass.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInEnumClass.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInPropertyInitializerInEnumClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInEnumClass.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInPropertyInitializerInEnumClass.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInEnumClass.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInPropertyInitializerInEnumEntry.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInEnumEntry.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInPropertyInitializerInEnumEntry.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInEnumEntry.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInPropertyInitializerInEnumEntry.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInEnumEntry.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInPropertyInitializerInEnumEntry.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInEnumEntry.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInPropertyInitializerInGenClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInGenClass.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInPropertyInitializerInGenClass.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInGenClass.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInPropertyInitializerInGenClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInGenClass.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInPropertyInitializerInGenClass.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInGenClass.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInPropertyInitializerInNestedClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInNestedClass.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInPropertyInitializerInNestedClass.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInNestedClass.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInPropertyInitializerInNestedClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInNestedClass.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInPropertyInitializerInNestedClass.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInNestedClass.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInPropertyInitializerInObject.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInObject.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInPropertyInitializerInObject.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInObject.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInPropertyInitializerNoClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerNoClass.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInPropertyInitializerNoClass.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerNoClass.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeNamedArgInConstructorCall.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/namedArgInConstructorCall.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeNamedArgInConstructorCall.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/namedArgInConstructorCall.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/afterNamedArgInConstructorCall.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/namedArgInConstructorCall.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/afterNamedArgInConstructorCall.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/namedArgInConstructorCall.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeNamedArgInFunctionCall.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/namedArgInFunctionCall.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeNamedArgInFunctionCall.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/namedArgInFunctionCall.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/afterNamedArgInFunctionCall.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/namedArgInFunctionCall.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/afterNamedArgInFunctionCall.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/namedArgInFunctionCall.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeNullableType.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/nullableType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeNullableType.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/nullableType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/afterNullableType.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/nullableType.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/afterNullableType.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/nullableType.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeParameterFromClassDelegationSpecifier.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/parameterFromClassDelegationSpecifier.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeParameterFromClassDelegationSpecifier.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/parameterFromClassDelegationSpecifier.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/afterParameterFromClassDelegationSpecifier.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/parameterFromClassDelegationSpecifier.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/afterParameterFromClassDelegationSpecifier.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/parameterFromClassDelegationSpecifier.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeParameterFromEnumEntryDelegationSpecifier.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/parameterFromEnumEntryDelegationSpecifier.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeParameterFromEnumEntryDelegationSpecifier.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/parameterFromEnumEntryDelegationSpecifier.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeParameterFromObjectDelegationSpecifier.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/parameterFromObjectDelegationSpecifier.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeParameterFromObjectDelegationSpecifier.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/parameterFromObjectDelegationSpecifier.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeQualifiedInFun.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/qualifiedInFun.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeQualifiedInFun.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/qualifiedInFun.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeWithPackageName.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/withPackageName.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeWithPackageName.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/withPackageName.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/afterWithPackageName.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/withPackageName.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/afterWithPackageName.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/withPackageName.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeWrongReceiver.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/wrongReceiver.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeWrongReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/wrongReceiver.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/afterWrongReceiver.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/wrongReceiver.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/parameter/afterWrongReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/parameter/wrongReceiver.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/beforeCallOnUserType.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/callOnUserType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/beforeCallOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/callOnUserType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/beforeExtensionRefInImport.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/extensionRefInImport.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/beforeExtensionRefInImport.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/extensionRefInImport.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/beforeInconsistentTypes.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/beforeInconsistentTypes.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterInconsistentTypes.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/afterInconsistentTypes.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/beforeLocalValNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/localValNoReceiver.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/beforeLocalValNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/localValNoReceiver.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterLocalValNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/localValNoReceiver.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/afterLocalValNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/localValNoReceiver.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/beforeMemberValDelegateRuntime.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/memberValDelegateRuntime.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/beforeMemberValDelegateRuntime.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/memberValDelegateRuntime.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterMemberValDelegateRuntime.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/memberValDelegateRuntime.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/afterMemberValDelegateRuntime.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/memberValDelegateRuntime.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/beforeMemberValNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/memberValNoReceiver.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/beforeMemberValNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/memberValNoReceiver.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterMemberValNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/memberValNoReceiver.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/afterMemberValNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/memberValNoReceiver.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/beforeMemberVarDelegateRuntime.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/memberVarDelegateRuntime.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/beforeMemberVarDelegateRuntime.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/memberVarDelegateRuntime.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterMemberVarDelegateRuntime.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/memberVarDelegateRuntime.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/afterMemberVarDelegateRuntime.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/memberVarDelegateRuntime.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/beforeObjectMemberValNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/objectMemberValNoReceiver.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/beforeObjectMemberValNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/objectMemberValNoReceiver.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterObjectMemberValNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/objectMemberValNoReceiver.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/afterObjectMemberValNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/objectMemberValNoReceiver.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/beforePrivateForMembers.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/privateForMembers.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/beforePrivateForMembers.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/privateForMembers.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterPrivateForMembers.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/privateForMembers.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/afterPrivateForMembers.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/privateForMembers.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/beforeQualifiedRefInStringTemplateRuntime.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/qualifiedRefInStringTemplateRuntime.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/beforeQualifiedRefInStringTemplateRuntime.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/qualifiedRefInStringTemplateRuntime.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterQualifiedRefInStringTemplateRuntime.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/qualifiedRefInStringTemplateRuntime.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/afterQualifiedRefInStringTemplateRuntime.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/qualifiedRefInStringTemplateRuntime.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/beforeRefInImport.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/refInImport.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/beforeRefInImport.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/refInImport.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/beforeRefInStringTemplateRuntime.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/refInStringTemplateRuntime.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/beforeRefInStringTemplateRuntime.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/refInStringTemplateRuntime.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterRefInStringTemplateRuntime.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/refInStringTemplateRuntime.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/afterRefInStringTemplateRuntime.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/refInStringTemplateRuntime.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/beforeThisInClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInClass.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/beforeThisInClass.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/thisInClass.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterThisInClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInClass.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/afterThisInClass.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/thisInClass.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/beforeThisInExtension.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInExtension.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/beforeThisInExtension.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/thisInExtension.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterThisInExtension.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInExtension.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/afterThisInExtension.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/thisInExtension.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/beforeThisInNestedClass1.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass1.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/beforeThisInNestedClass1.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass1.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterThisInNestedClass1.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass1.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/afterThisInNestedClass1.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass1.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/beforeThisInNestedClass2.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass2.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/beforeThisInNestedClass2.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass2.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterThisInNestedClass2.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass2.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/afterThisInNestedClass2.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass2.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/beforeTopLevelValNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/topLevelValNoReceiver.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/beforeTopLevelValNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/topLevelValNoReceiver.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterTopLevelValNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/topLevelValNoReceiver.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/afterTopLevelValNoReceiver.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/topLevelValNoReceiver.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/beforeTopLevelValWithPackageName.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/topLevelValWithPackageName.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/beforeTopLevelValWithPackageName.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/topLevelValWithPackageName.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterTopLevelValWithPackageName.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/topLevelValWithPackageName.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/afterTopLevelValWithPackageName.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/topLevelValWithPackageName.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/beforeValOnClassNoClassObject.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnClassNoClassObject.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/beforeValOnClassNoClassObject.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/valOnClassNoClassObject.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/beforeValOnClassObject.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnClassObject.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/beforeValOnClassObject.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/valOnClassObject.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnClassObject.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnClassObject.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnClassObject.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/valOnClassObject.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/beforeValOnLibObject.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibObject.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/beforeValOnLibObject.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibObject.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnLibObject.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibObject.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnLibObject.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibObject.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/beforeValOnLibType.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/beforeValOnLibType.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnLibType.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibType.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnLibType.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibType.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/beforeValOnUserObject.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserObject.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/beforeValOnUserObject.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserObject.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnUserObject.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserObject.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnUserObject.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserObject.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/beforeValOnUserType.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/beforeValOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnUserType.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserType.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserType.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/beforeValOnUserTypeWithTypeParams.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/beforeValOnUserTypeWithTypeParams.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnUserTypeWithTypeParams.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnUserTypeWithTypeParams.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/beforeValWithNullableType.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valWithNullableType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/beforeValWithNullableType.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/valWithNullableType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterValWithNullableType.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valWithNullableType.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/afterValWithNullableType.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/valWithNullableType.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/beforeVarOnLibType.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/varOnLibType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/beforeVarOnLibType.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/varOnLibType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterVarOnLibType.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/varOnLibType.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/afterVarOnLibType.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/varOnLibType.kt.after
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/beforeVarOnUserType.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/varOnUserType.kt
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/beforeVarOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/varOnUserType.kt
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterVarOnUserType.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/varOnUserType.kt.after
similarity index 100%
rename from idea/testData/quickfix/createFromUsage/createVariable/property/afterVarOnUserType.kt
rename to idea/testData/quickfix/createFromUsage/createVariable/property/varOnUserType.kt.after
diff --git a/idea/testData/quickfix/expressions/beforeRemoveStaticTypeAssertion.kt b/idea/testData/quickfix/expressions/removeStaticTypeAssertion.kt
similarity index 100%
rename from idea/testData/quickfix/expressions/beforeRemoveStaticTypeAssertion.kt
rename to idea/testData/quickfix/expressions/removeStaticTypeAssertion.kt
diff --git a/idea/testData/quickfix/expressions/afterRemoveStaticTypeAssertion.kt b/idea/testData/quickfix/expressions/removeStaticTypeAssertion.kt.after
similarity index 100%
rename from idea/testData/quickfix/expressions/afterRemoveStaticTypeAssertion.kt
rename to idea/testData/quickfix/expressions/removeStaticTypeAssertion.kt.after
diff --git a/idea/testData/quickfix/expressions/beforeRemoveUselessCast.kt b/idea/testData/quickfix/expressions/removeUselessCast.kt
similarity index 100%
rename from idea/testData/quickfix/expressions/beforeRemoveUselessCast.kt
rename to idea/testData/quickfix/expressions/removeUselessCast.kt
diff --git a/idea/testData/quickfix/expressions/afterRemoveUselessCast.kt b/idea/testData/quickfix/expressions/removeUselessCast.kt.after
similarity index 100%
rename from idea/testData/quickfix/expressions/afterRemoveUselessCast.kt
rename to idea/testData/quickfix/expressions/removeUselessCast.kt.after
diff --git a/idea/testData/quickfix/expressions/beforeRemoveUselessCastInParens.kt b/idea/testData/quickfix/expressions/removeUselessCastInParens.kt
similarity index 100%
rename from idea/testData/quickfix/expressions/beforeRemoveUselessCastInParens.kt
rename to idea/testData/quickfix/expressions/removeUselessCastInParens.kt
diff --git a/idea/testData/quickfix/expressions/afterRemoveUselessCastInParens.kt b/idea/testData/quickfix/expressions/removeUselessCastInParens.kt.after
similarity index 100%
rename from idea/testData/quickfix/expressions/afterRemoveUselessCastInParens.kt
rename to idea/testData/quickfix/expressions/removeUselessCastInParens.kt.after
diff --git a/idea/testData/quickfix/expressions/beforeRemoveUselessCastUnderSmartCast.kt b/idea/testData/quickfix/expressions/removeUselessCastUnderSmartCast.kt
similarity index 100%
rename from idea/testData/quickfix/expressions/beforeRemoveUselessCastUnderSmartCast.kt
rename to idea/testData/quickfix/expressions/removeUselessCastUnderSmartCast.kt
diff --git a/idea/testData/quickfix/expressions/afterRemoveUselessCastUnderSmartCast.kt b/idea/testData/quickfix/expressions/removeUselessCastUnderSmartCast.kt.after
similarity index 100%
rename from idea/testData/quickfix/expressions/afterRemoveUselessCastUnderSmartCast.kt
rename to idea/testData/quickfix/expressions/removeUselessCastUnderSmartCast.kt.after
diff --git a/idea/testData/quickfix/expressions/beforeUnnecessaryNonNullAssertion1.kt b/idea/testData/quickfix/expressions/unnecessaryNonNullAssertion1.kt
similarity index 100%
rename from idea/testData/quickfix/expressions/beforeUnnecessaryNonNullAssertion1.kt
rename to idea/testData/quickfix/expressions/unnecessaryNonNullAssertion1.kt
diff --git a/idea/testData/quickfix/expressions/afterUnnecessaryNonNullAssertion1.kt b/idea/testData/quickfix/expressions/unnecessaryNonNullAssertion1.kt.after
similarity index 100%
rename from idea/testData/quickfix/expressions/afterUnnecessaryNonNullAssertion1.kt
rename to idea/testData/quickfix/expressions/unnecessaryNonNullAssertion1.kt.after
diff --git a/idea/testData/quickfix/expressions/beforeUnnecessaryNonNullAssertion2.kt b/idea/testData/quickfix/expressions/unnecessaryNonNullAssertion2.kt
similarity index 100%
rename from idea/testData/quickfix/expressions/beforeUnnecessaryNonNullAssertion2.kt
rename to idea/testData/quickfix/expressions/unnecessaryNonNullAssertion2.kt
diff --git a/idea/testData/quickfix/expressions/afterUnnecessaryNonNullAssertion2.kt b/idea/testData/quickfix/expressions/unnecessaryNonNullAssertion2.kt.after
similarity index 100%
rename from idea/testData/quickfix/expressions/afterUnnecessaryNonNullAssertion2.kt
rename to idea/testData/quickfix/expressions/unnecessaryNonNullAssertion2.kt.after
diff --git a/idea/testData/quickfix/expressions/beforeUnnecessaryNonNullAssertion3.kt b/idea/testData/quickfix/expressions/unnecessaryNonNullAssertion3.kt
similarity index 100%
rename from idea/testData/quickfix/expressions/beforeUnnecessaryNonNullAssertion3.kt
rename to idea/testData/quickfix/expressions/unnecessaryNonNullAssertion3.kt
diff --git a/idea/testData/quickfix/expressions/afterUnnecessaryNonNullAssertion3.kt b/idea/testData/quickfix/expressions/unnecessaryNonNullAssertion3.kt.after
similarity index 100%
rename from idea/testData/quickfix/expressions/afterUnnecessaryNonNullAssertion3.kt
rename to idea/testData/quickfix/expressions/unnecessaryNonNullAssertion3.kt.after
diff --git a/idea/testData/quickfix/expressions/beforeUnnecessarySafeCall1.kt b/idea/testData/quickfix/expressions/unnecessarySafeCall1.kt
similarity index 100%
rename from idea/testData/quickfix/expressions/beforeUnnecessarySafeCall1.kt
rename to idea/testData/quickfix/expressions/unnecessarySafeCall1.kt
diff --git a/idea/testData/quickfix/expressions/afterUnnecessarySafeCall1.kt b/idea/testData/quickfix/expressions/unnecessarySafeCall1.kt.after
similarity index 100%
rename from idea/testData/quickfix/expressions/afterUnnecessarySafeCall1.kt
rename to idea/testData/quickfix/expressions/unnecessarySafeCall1.kt.after
diff --git a/idea/testData/quickfix/expressions/afterUnnecessarySafeCall2.kt b/idea/testData/quickfix/expressions/unnecessarySafeCall2.kt.after
similarity index 100%
rename from idea/testData/quickfix/expressions/afterUnnecessarySafeCall2.kt
rename to idea/testData/quickfix/expressions/unnecessarySafeCall2.kt.after
diff --git a/idea/testData/quickfix/expressions/beforeUnsafeCall1.kt b/idea/testData/quickfix/expressions/unsafeCall1.kt
similarity index 100%
rename from idea/testData/quickfix/expressions/beforeUnsafeCall1.kt
rename to idea/testData/quickfix/expressions/unsafeCall1.kt
diff --git a/idea/testData/quickfix/expressions/afterUnsafeCall1.kt b/idea/testData/quickfix/expressions/unsafeCall1.kt.after
similarity index 100%
rename from idea/testData/quickfix/expressions/afterUnsafeCall1.kt
rename to idea/testData/quickfix/expressions/unsafeCall1.kt.after
diff --git a/idea/testData/quickfix/expressions/beforeUnsafeCall2.kt b/idea/testData/quickfix/expressions/unsafeCall2.kt
similarity index 100%
rename from idea/testData/quickfix/expressions/beforeUnsafeCall2.kt
rename to idea/testData/quickfix/expressions/unsafeCall2.kt
diff --git a/idea/testData/quickfix/expressions/afterUnsafeCall2.kt b/idea/testData/quickfix/expressions/unsafeCall2.kt.after
similarity index 100%
rename from idea/testData/quickfix/expressions/afterUnsafeCall2.kt
rename to idea/testData/quickfix/expressions/unsafeCall2.kt.after
diff --git a/idea/testData/quickfix/expressions/beforeUnsafeCall3.kt b/idea/testData/quickfix/expressions/unsafeCall3.kt
similarity index 100%
rename from idea/testData/quickfix/expressions/beforeUnsafeCall3.kt
rename to idea/testData/quickfix/expressions/unsafeCall3.kt
diff --git a/idea/testData/quickfix/expressions/afterUnsafeCall3.kt b/idea/testData/quickfix/expressions/unsafeCall3.kt.after
similarity index 100%
rename from idea/testData/quickfix/expressions/afterUnsafeCall3.kt
rename to idea/testData/quickfix/expressions/unsafeCall3.kt.after
diff --git a/idea/testData/quickfix/expressions/beforeUselessCastStaticAssertIsFine.kt b/idea/testData/quickfix/expressions/uselessCastStaticAssertIsFine.kt
similarity index 100%
rename from idea/testData/quickfix/expressions/beforeUselessCastStaticAssertIsFine.kt
rename to idea/testData/quickfix/expressions/uselessCastStaticAssertIsFine.kt
diff --git a/idea/testData/quickfix/expressions/afterUselessCastStaticAssertIsFine.kt b/idea/testData/quickfix/expressions/uselessCastStaticAssertIsFine.kt.after
similarity index 100%
rename from idea/testData/quickfix/expressions/afterUselessCastStaticAssertIsFine.kt
rename to idea/testData/quickfix/expressions/uselessCastStaticAssertIsFine.kt.after
diff --git a/idea/testData/quickfix/expressions/beforeUselessElvis.kt b/idea/testData/quickfix/expressions/uselessElvis.kt
similarity index 100%
rename from idea/testData/quickfix/expressions/beforeUselessElvis.kt
rename to idea/testData/quickfix/expressions/uselessElvis.kt
diff --git a/idea/testData/quickfix/expressions/afterUselessElvis.kt b/idea/testData/quickfix/expressions/uselessElvis.kt.after
similarity index 100%
rename from idea/testData/quickfix/expressions/afterUselessElvis.kt
rename to idea/testData/quickfix/expressions/uselessElvis.kt.after
diff --git a/idea/testData/quickfix/insertDelegationCall/beforeNonApplicableInsertSuper.kt b/idea/testData/quickfix/insertDelegationCall/nonApplicableInsertSuper.kt
similarity index 100%
rename from idea/testData/quickfix/insertDelegationCall/beforeNonApplicableInsertSuper.kt
rename to idea/testData/quickfix/insertDelegationCall/nonApplicableInsertSuper.kt
diff --git a/idea/testData/quickfix/insertDelegationCall/afterNonApplicableInsertSuper.kt b/idea/testData/quickfix/insertDelegationCall/nonApplicableInsertSuper.kt.after
similarity index 100%
rename from idea/testData/quickfix/insertDelegationCall/afterNonApplicableInsertSuper.kt
rename to idea/testData/quickfix/insertDelegationCall/nonApplicableInsertSuper.kt.after
diff --git a/idea/testData/quickfix/insertDelegationCall/beforeNonApplicableInsertThis.kt b/idea/testData/quickfix/insertDelegationCall/nonApplicableInsertThis.kt
similarity index 100%
rename from idea/testData/quickfix/insertDelegationCall/beforeNonApplicableInsertThis.kt
rename to idea/testData/quickfix/insertDelegationCall/nonApplicableInsertThis.kt
diff --git a/idea/testData/quickfix/insertDelegationCall/afterNonApplicableInsertThis.kt b/idea/testData/quickfix/insertDelegationCall/nonApplicableInsertThis.kt.after
similarity index 100%
rename from idea/testData/quickfix/insertDelegationCall/afterNonApplicableInsertThis.kt
rename to idea/testData/quickfix/insertDelegationCall/nonApplicableInsertThis.kt.after
diff --git a/idea/testData/quickfix/insertDelegationCall/beforeNonApplicableOnEmpty.kt b/idea/testData/quickfix/insertDelegationCall/nonApplicableOnEmpty.kt
similarity index 100%
rename from idea/testData/quickfix/insertDelegationCall/beforeNonApplicableOnEmpty.kt
rename to idea/testData/quickfix/insertDelegationCall/nonApplicableOnEmpty.kt
diff --git a/idea/testData/quickfix/insertDelegationCall/afterNonApplicableOnEmpty.kt b/idea/testData/quickfix/insertDelegationCall/nonApplicableOnEmpty.kt.after
similarity index 100%
rename from idea/testData/quickfix/insertDelegationCall/afterNonApplicableOnEmpty.kt
rename to idea/testData/quickfix/insertDelegationCall/nonApplicableOnEmpty.kt.after
diff --git a/idea/testData/quickfix/insertDelegationCall/beforeNonApplicableWithOneConstructor.kt b/idea/testData/quickfix/insertDelegationCall/nonApplicableWithOneConstructor.kt
similarity index 100%
rename from idea/testData/quickfix/insertDelegationCall/beforeNonApplicableWithOneConstructor.kt
rename to idea/testData/quickfix/insertDelegationCall/nonApplicableWithOneConstructor.kt
diff --git a/idea/testData/quickfix/insertDelegationCall/beforePrimaryRequiredNoSuper.kt b/idea/testData/quickfix/insertDelegationCall/primaryRequiredNoSuper.kt
similarity index 100%
rename from idea/testData/quickfix/insertDelegationCall/beforePrimaryRequiredNoSuper.kt
rename to idea/testData/quickfix/insertDelegationCall/primaryRequiredNoSuper.kt
diff --git a/idea/testData/quickfix/insertDelegationCall/beforePrimaryRequiredParameterless.kt b/idea/testData/quickfix/insertDelegationCall/primaryRequiredParameterless.kt
similarity index 100%
rename from idea/testData/quickfix/insertDelegationCall/beforePrimaryRequiredParameterless.kt
rename to idea/testData/quickfix/insertDelegationCall/primaryRequiredParameterless.kt
diff --git a/idea/testData/quickfix/insertDelegationCall/afterPrimaryRequiredParameterless.kt b/idea/testData/quickfix/insertDelegationCall/primaryRequiredParameterless.kt.after
similarity index 100%
rename from idea/testData/quickfix/insertDelegationCall/afterPrimaryRequiredParameterless.kt
rename to idea/testData/quickfix/insertDelegationCall/primaryRequiredParameterless.kt.after
diff --git a/idea/testData/quickfix/insertDelegationCall/beforePrimaryRequiredWithBody.kt b/idea/testData/quickfix/insertDelegationCall/primaryRequiredWithBody.kt
similarity index 100%
rename from idea/testData/quickfix/insertDelegationCall/beforePrimaryRequiredWithBody.kt
rename to idea/testData/quickfix/insertDelegationCall/primaryRequiredWithBody.kt
diff --git a/idea/testData/quickfix/insertDelegationCall/afterPrimaryRequiredWithBody.kt b/idea/testData/quickfix/insertDelegationCall/primaryRequiredWithBody.kt.after
similarity index 100%
rename from idea/testData/quickfix/insertDelegationCall/afterPrimaryRequiredWithBody.kt
rename to idea/testData/quickfix/insertDelegationCall/primaryRequiredWithBody.kt.after
diff --git a/idea/testData/quickfix/insertDelegationCall/beforePrimaryRequiredWithParameter.kt b/idea/testData/quickfix/insertDelegationCall/primaryRequiredWithParameter.kt
similarity index 100%
rename from idea/testData/quickfix/insertDelegationCall/beforePrimaryRequiredWithParameter.kt
rename to idea/testData/quickfix/insertDelegationCall/primaryRequiredWithParameter.kt
diff --git a/idea/testData/quickfix/insertDelegationCall/afterPrimaryRequiredWithParameter.kt b/idea/testData/quickfix/insertDelegationCall/primaryRequiredWithParameter.kt.after
similarity index 100%
rename from idea/testData/quickfix/insertDelegationCall/afterPrimaryRequiredWithParameter.kt
rename to idea/testData/quickfix/insertDelegationCall/primaryRequiredWithParameter.kt.after
diff --git a/idea/testData/quickfix/migration/beforeAddOverrideToEqualsHashCodeToString.kt b/idea/testData/quickfix/migration/addOverrideToEqualsHashCodeToString.kt
similarity index 100%
rename from idea/testData/quickfix/migration/beforeAddOverrideToEqualsHashCodeToString.kt
rename to idea/testData/quickfix/migration/addOverrideToEqualsHashCodeToString.kt
diff --git a/idea/testData/quickfix/migration/afterAddOverrideToEqualsHashCodeToString.kt b/idea/testData/quickfix/migration/addOverrideToEqualsHashCodeToString.kt.after
similarity index 100%
rename from idea/testData/quickfix/migration/afterAddOverrideToEqualsHashCodeToString.kt
rename to idea/testData/quickfix/migration/addOverrideToEqualsHashCodeToString.kt.after
diff --git a/idea/testData/quickfix/migration/bracketsAnnotations/beforeBasic.kt b/idea/testData/quickfix/migration/bracketsAnnotations/basic.kt
similarity index 100%
rename from idea/testData/quickfix/migration/bracketsAnnotations/beforeBasic.kt
rename to idea/testData/quickfix/migration/bracketsAnnotations/basic.kt
diff --git a/idea/testData/quickfix/migration/bracketsAnnotations/afterBasic.kt b/idea/testData/quickfix/migration/bracketsAnnotations/basic.kt.after
similarity index 100%
rename from idea/testData/quickfix/migration/bracketsAnnotations/afterBasic.kt
rename to idea/testData/quickfix/migration/bracketsAnnotations/basic.kt.after
diff --git a/idea/testData/quickfix/migration/lambdaSyntax/beforeLabelInLiteralArgument.kt b/idea/testData/quickfix/migration/lambdaSyntax/labelInLiteralArgument.kt
similarity index 100%
rename from idea/testData/quickfix/migration/lambdaSyntax/beforeLabelInLiteralArgument.kt
rename to idea/testData/quickfix/migration/lambdaSyntax/labelInLiteralArgument.kt
diff --git a/idea/testData/quickfix/migration/lambdaSyntax/afterLabelInLiteralArgument.kt b/idea/testData/quickfix/migration/lambdaSyntax/labelInLiteralArgument.kt.after
similarity index 100%
rename from idea/testData/quickfix/migration/lambdaSyntax/afterLabelInLiteralArgument.kt
rename to idea/testData/quickfix/migration/lambdaSyntax/labelInLiteralArgument.kt.after
diff --git a/idea/testData/quickfix/migration/lambdaSyntax/beforeLabelInLiteralArgumentImplicitReceiverType.kt b/idea/testData/quickfix/migration/lambdaSyntax/labelInLiteralArgumentImplicitReceiverType.kt
similarity index 100%
rename from idea/testData/quickfix/migration/lambdaSyntax/beforeLabelInLiteralArgumentImplicitReceiverType.kt
rename to idea/testData/quickfix/migration/lambdaSyntax/labelInLiteralArgumentImplicitReceiverType.kt
diff --git a/idea/testData/quickfix/migration/lambdaSyntax/afterLabelInLiteralArgumentImplicitReceiverType.kt b/idea/testData/quickfix/migration/lambdaSyntax/labelInLiteralArgumentImplicitReceiverType.kt.after
similarity index 100%
rename from idea/testData/quickfix/migration/lambdaSyntax/afterLabelInLiteralArgumentImplicitReceiverType.kt
rename to idea/testData/quickfix/migration/lambdaSyntax/labelInLiteralArgumentImplicitReceiverType.kt.after
diff --git a/idea/testData/quickfix/migration/lambdaSyntax/beforeLabelInLiteralArgumentImplicitReturnType.kt b/idea/testData/quickfix/migration/lambdaSyntax/labelInLiteralArgumentImplicitReturnType.kt
similarity index 100%
rename from idea/testData/quickfix/migration/lambdaSyntax/beforeLabelInLiteralArgumentImplicitReturnType.kt
rename to idea/testData/quickfix/migration/lambdaSyntax/labelInLiteralArgumentImplicitReturnType.kt
diff --git a/idea/testData/quickfix/migration/lambdaSyntax/afterLabelInLiteralArgumentImplicitReturnType.kt b/idea/testData/quickfix/migration/lambdaSyntax/labelInLiteralArgumentImplicitReturnType.kt.after
similarity index 100%
rename from idea/testData/quickfix/migration/lambdaSyntax/afterLabelInLiteralArgumentImplicitReturnType.kt
rename to idea/testData/quickfix/migration/lambdaSyntax/labelInLiteralArgumentImplicitReturnType.kt.after
diff --git a/idea/testData/quickfix/migration/lambdaSyntax/beforeLabelInLiteralArgumentOneStatement.kt b/idea/testData/quickfix/migration/lambdaSyntax/labelInLiteralArgumentOneStatement.kt
similarity index 100%
rename from idea/testData/quickfix/migration/lambdaSyntax/beforeLabelInLiteralArgumentOneStatement.kt
rename to idea/testData/quickfix/migration/lambdaSyntax/labelInLiteralArgumentOneStatement.kt
diff --git a/idea/testData/quickfix/migration/lambdaSyntax/afterLabelInLiteralArgumentOneStatement.kt b/idea/testData/quickfix/migration/lambdaSyntax/labelInLiteralArgumentOneStatement.kt.after
similarity index 100%
rename from idea/testData/quickfix/migration/lambdaSyntax/afterLabelInLiteralArgumentOneStatement.kt
rename to idea/testData/quickfix/migration/lambdaSyntax/labelInLiteralArgumentOneStatement.kt.after
diff --git a/idea/testData/quickfix/migration/lambdaSyntax/beforeLambdaInFunctionArgument.kt b/idea/testData/quickfix/migration/lambdaSyntax/lambdaInFunctionArgument.kt
similarity index 100%
rename from idea/testData/quickfix/migration/lambdaSyntax/beforeLambdaInFunctionArgument.kt
rename to idea/testData/quickfix/migration/lambdaSyntax/lambdaInFunctionArgument.kt
diff --git a/idea/testData/quickfix/migration/lambdaSyntax/afterLambdaInFunctionArgument.kt b/idea/testData/quickfix/migration/lambdaSyntax/lambdaInFunctionArgument.kt.after
similarity index 100%
rename from idea/testData/quickfix/migration/lambdaSyntax/afterLambdaInFunctionArgument.kt
rename to idea/testData/quickfix/migration/lambdaSyntax/lambdaInFunctionArgument.kt.after
diff --git a/idea/testData/quickfix/migration/lambdaSyntax/beforeLambdaInsideLambda.kt b/idea/testData/quickfix/migration/lambdaSyntax/lambdaInsideLambda.kt
similarity index 100%
rename from idea/testData/quickfix/migration/lambdaSyntax/beforeLambdaInsideLambda.kt
rename to idea/testData/quickfix/migration/lambdaSyntax/lambdaInsideLambda.kt
diff --git a/idea/testData/quickfix/migration/lambdaSyntax/afterLambdaInsideLambda.kt b/idea/testData/quickfix/migration/lambdaSyntax/lambdaInsideLambda.kt.after
similarity index 100%
rename from idea/testData/quickfix/migration/lambdaSyntax/afterLambdaInsideLambda.kt
rename to idea/testData/quickfix/migration/lambdaSyntax/lambdaInsideLambda.kt.after
diff --git a/idea/testData/quickfix/migration/lambdaSyntax/beforeParanthesizedParameters.kt b/idea/testData/quickfix/migration/lambdaSyntax/paranthesizedParameters.kt
similarity index 100%
rename from idea/testData/quickfix/migration/lambdaSyntax/beforeParanthesizedParameters.kt
rename to idea/testData/quickfix/migration/lambdaSyntax/paranthesizedParameters.kt
diff --git a/idea/testData/quickfix/migration/lambdaSyntax/afterParanthesizedParameters.kt b/idea/testData/quickfix/migration/lambdaSyntax/paranthesizedParameters.kt.after
similarity index 100%
rename from idea/testData/quickfix/migration/lambdaSyntax/afterParanthesizedParameters.kt
rename to idea/testData/quickfix/migration/lambdaSyntax/paranthesizedParameters.kt.after
diff --git a/idea/testData/quickfix/migration/lambdaSyntax/beforeReceiverAndReturnInExpression.kt b/idea/testData/quickfix/migration/lambdaSyntax/receiverAndReturnInExpression.kt
similarity index 100%
rename from idea/testData/quickfix/migration/lambdaSyntax/beforeReceiverAndReturnInExpression.kt
rename to idea/testData/quickfix/migration/lambdaSyntax/receiverAndReturnInExpression.kt
diff --git a/idea/testData/quickfix/migration/lambdaSyntax/afterReceiverAndReturnInExpression.kt b/idea/testData/quickfix/migration/lambdaSyntax/receiverAndReturnInExpression.kt.after
similarity index 100%
rename from idea/testData/quickfix/migration/lambdaSyntax/afterReceiverAndReturnInExpression.kt
rename to idea/testData/quickfix/migration/lambdaSyntax/receiverAndReturnInExpression.kt.after
diff --git a/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/beforeArrayRuntime.kt b/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/arrayRuntime.kt
similarity index 100%
rename from idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/beforeArrayRuntime.kt
rename to idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/arrayRuntime.kt
diff --git a/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/afterArrayRuntime.kt b/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/arrayRuntime.kt.after
similarity index 100%
rename from idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/afterArrayRuntime.kt
rename to idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/arrayRuntime.kt.after
diff --git a/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/beforeBasicRuntime.kt b/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/basicRuntime.kt
similarity index 100%
rename from idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/beforeBasicRuntime.kt
rename to idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/basicRuntime.kt
diff --git a/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/afterBasicRuntime.kt b/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/basicRuntime.kt.after
similarity index 100%
rename from idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/afterBasicRuntime.kt
rename to idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/basicRuntime.kt.after
diff --git a/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/beforeDefaultRuntime.kt b/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/defaultRuntime.kt
similarity index 100%
rename from idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/beforeDefaultRuntime.kt
rename to idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/defaultRuntime.kt
diff --git a/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/afterDefaultRuntime.kt b/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/defaultRuntime.kt.after
similarity index 100%
rename from idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/afterDefaultRuntime.kt
rename to idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/defaultRuntime.kt.after
diff --git a/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/beforeUsageWithErrorRuntime.kt b/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/usageWithErrorRuntime.kt
similarity index 100%
rename from idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/beforeUsageWithErrorRuntime.kt
rename to idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/usageWithErrorRuntime.kt
diff --git a/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/afterUsageWithErrorRuntime.kt b/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/usageWithErrorRuntime.kt.after
similarity index 100%
rename from idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/afterUsageWithErrorRuntime.kt
rename to idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/usageWithErrorRuntime.kt.after
diff --git a/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/beforeVarargRuntime.kt b/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/varargRuntime.kt
similarity index 100%
rename from idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/beforeVarargRuntime.kt
rename to idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/varargRuntime.kt
diff --git a/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/afterVarargRuntime.kt b/idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/varargRuntime.kt.after
similarity index 100%
rename from idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/afterVarargRuntime.kt
rename to idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/varargRuntime.kt.after
diff --git a/idea/testData/quickfix/modifiers/beforeAbstractModifierInEnum.kt b/idea/testData/quickfix/modifiers/abstractModifierInEnum.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/beforeAbstractModifierInEnum.kt
rename to idea/testData/quickfix/modifiers/abstractModifierInEnum.kt
diff --git a/idea/testData/quickfix/modifiers/afterAbstractModifierInEnum.kt b/idea/testData/quickfix/modifiers/abstractModifierInEnum.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/afterAbstractModifierInEnum.kt
rename to idea/testData/quickfix/modifiers/abstractModifierInEnum.kt.after
diff --git a/idea/testData/quickfix/modifiers/beforeAddInnerModifier.kt b/idea/testData/quickfix/modifiers/addInnerModifier.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/beforeAddInnerModifier.kt
rename to idea/testData/quickfix/modifiers/addInnerModifier.kt
diff --git a/idea/testData/quickfix/modifiers/afterAddInnerModifier.kt b/idea/testData/quickfix/modifiers/addInnerModifier.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/afterAddInnerModifier.kt
rename to idea/testData/quickfix/modifiers/addInnerModifier.kt.after
diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeEnumSupertype.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/enumSupertype.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeEnumSupertype.kt
rename to idea/testData/quickfix/modifiers/addOpenToClassDeclaration/enumSupertype.kt
diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeEnumUpperBound.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/enumUpperBound.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeEnumUpperBound.kt
rename to idea/testData/quickfix/modifiers/addOpenToClassDeclaration/enumUpperBound.kt
diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeExplicitlyFinalSupertype.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/explicitlyFinalSupertype.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeExplicitlyFinalSupertype.kt
rename to idea/testData/quickfix/modifiers/addOpenToClassDeclaration/explicitlyFinalSupertype.kt
diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/afterExplicitlyFinalSupertype.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/explicitlyFinalSupertype.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/addOpenToClassDeclaration/afterExplicitlyFinalSupertype.kt
rename to idea/testData/quickfix/modifiers/addOpenToClassDeclaration/explicitlyFinalSupertype.kt.after
diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeExplicitlyFinalUpperBound.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/explicitlyFinalUpperBound.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeExplicitlyFinalUpperBound.kt
rename to idea/testData/quickfix/modifiers/addOpenToClassDeclaration/explicitlyFinalUpperBound.kt
diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/afterExplicitlyFinalUpperBound.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/explicitlyFinalUpperBound.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/addOpenToClassDeclaration/afterExplicitlyFinalUpperBound.kt
rename to idea/testData/quickfix/modifiers/addOpenToClassDeclaration/explicitlyFinalUpperBound.kt.after
diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalLibrarySupertype.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalLibrarySupertype.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalLibrarySupertype.kt
rename to idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalLibrarySupertype.kt
diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalLibraryUpperBound.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalLibraryUpperBound.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalLibraryUpperBound.kt
rename to idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalLibraryUpperBound.kt
diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalSupertype.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalSupertype.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalSupertype.kt
rename to idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalSupertype.kt
diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/afterFinalSupertype.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalSupertype.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/addOpenToClassDeclaration/afterFinalSupertype.kt
rename to idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalSupertype.kt.after
diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalUpperBound.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalUpperBound.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalUpperBound.kt
rename to idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalUpperBound.kt
diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/afterFinalUpperBound.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalUpperBound.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/addOpenToClassDeclaration/afterFinalUpperBound.kt
rename to idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalUpperBound.kt.after
diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeImplementTraitFinalSupertype.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/implementTraitFinalSupertype.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeImplementTraitFinalSupertype.kt
rename to idea/testData/quickfix/modifiers/addOpenToClassDeclaration/implementTraitFinalSupertype.kt
diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/afterImplementTraitFinalSupertype.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/implementTraitFinalSupertype.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/addOpenToClassDeclaration/afterImplementTraitFinalSupertype.kt
rename to idea/testData/quickfix/modifiers/addOpenToClassDeclaration/implementTraitFinalSupertype.kt.after
diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeSecondaryCtrDelegationInHeader.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/secondaryCtrDelegationInHeader.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeSecondaryCtrDelegationInHeader.kt
rename to idea/testData/quickfix/modifiers/addOpenToClassDeclaration/secondaryCtrDelegationInHeader.kt
diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/afterSecondaryCtrDelegationInHeader.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/secondaryCtrDelegationInHeader.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/addOpenToClassDeclaration/afterSecondaryCtrDelegationInHeader.kt
rename to idea/testData/quickfix/modifiers/addOpenToClassDeclaration/secondaryCtrDelegationInHeader.kt.after
diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeSecondaryCtrDelegationInSecondary.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/secondaryCtrDelegationInSecondary.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeSecondaryCtrDelegationInSecondary.kt
rename to idea/testData/quickfix/modifiers/addOpenToClassDeclaration/secondaryCtrDelegationInSecondary.kt
diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/afterSecondaryCtrDelegationInSecondary.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/secondaryCtrDelegationInSecondary.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/addOpenToClassDeclaration/afterSecondaryCtrDelegationInSecondary.kt
rename to idea/testData/quickfix/modifiers/addOpenToClassDeclaration/secondaryCtrDelegationInSecondary.kt.after
diff --git a/idea/testData/quickfix/modifiers/beforeCannotMakeClassAnnotation.kt b/idea/testData/quickfix/modifiers/cannotMakeClassAnnotation.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/beforeCannotMakeClassAnnotation.kt
rename to idea/testData/quickfix/modifiers/cannotMakeClassAnnotation.kt
diff --git a/idea/testData/quickfix/modifiers/beforeFinalTrait.kt b/idea/testData/quickfix/modifiers/finalTrait.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/beforeFinalTrait.kt
rename to idea/testData/quickfix/modifiers/finalTrait.kt
diff --git a/idea/testData/quickfix/modifiers/afterFinalTrait.kt b/idea/testData/quickfix/modifiers/finalTrait.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/afterFinalTrait.kt
rename to idea/testData/quickfix/modifiers/finalTrait.kt.after
diff --git a/idea/testData/quickfix/modifiers/beforeIllegalEnumAnnotation1.kt b/idea/testData/quickfix/modifiers/illegalEnumAnnotation1.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/beforeIllegalEnumAnnotation1.kt
rename to idea/testData/quickfix/modifiers/illegalEnumAnnotation1.kt
diff --git a/idea/testData/quickfix/modifiers/afterIllegalEnumAnnotation1.kt b/idea/testData/quickfix/modifiers/illegalEnumAnnotation1.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/afterIllegalEnumAnnotation1.kt
rename to idea/testData/quickfix/modifiers/illegalEnumAnnotation1.kt.after
diff --git a/idea/testData/quickfix/modifiers/beforeIllegalEnumAnnotation2.kt b/idea/testData/quickfix/modifiers/illegalEnumAnnotation2.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/beforeIllegalEnumAnnotation2.kt
rename to idea/testData/quickfix/modifiers/illegalEnumAnnotation2.kt
diff --git a/idea/testData/quickfix/modifiers/afterIllegalEnumAnnotation2.kt b/idea/testData/quickfix/modifiers/illegalEnumAnnotation2.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/afterIllegalEnumAnnotation2.kt
rename to idea/testData/quickfix/modifiers/illegalEnumAnnotation2.kt.after
diff --git a/idea/testData/quickfix/modifiers/beforeNestedClassNotAllowed.kt b/idea/testData/quickfix/modifiers/nestedClassNotAllowed.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/beforeNestedClassNotAllowed.kt
rename to idea/testData/quickfix/modifiers/nestedClassNotAllowed.kt
diff --git a/idea/testData/quickfix/modifiers/afterNestedClassNotAllowed.kt b/idea/testData/quickfix/modifiers/nestedClassNotAllowed.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/afterNestedClassNotAllowed.kt
rename to idea/testData/quickfix/modifiers/nestedClassNotAllowed.kt.after
diff --git a/idea/testData/quickfix/modifiers/beforeNotAnAnnotationClass.kt b/idea/testData/quickfix/modifiers/notAnAnnotationClass.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/beforeNotAnAnnotationClass.kt
rename to idea/testData/quickfix/modifiers/notAnAnnotationClass.kt
diff --git a/idea/testData/quickfix/modifiers/afterNotAnAnnotationClass.kt b/idea/testData/quickfix/modifiers/notAnAnnotationClass.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/afterNotAnAnnotationClass.kt
rename to idea/testData/quickfix/modifiers/notAnAnnotationClass.kt.after
diff --git a/idea/testData/quickfix/modifiers/beforeOpenMemberInFinalClass1.kt b/idea/testData/quickfix/modifiers/openMemberInFinalClass1.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/beforeOpenMemberInFinalClass1.kt
rename to idea/testData/quickfix/modifiers/openMemberInFinalClass1.kt
diff --git a/idea/testData/quickfix/modifiers/afterOpenMemberInFinalClass1.kt b/idea/testData/quickfix/modifiers/openMemberInFinalClass1.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/afterOpenMemberInFinalClass1.kt
rename to idea/testData/quickfix/modifiers/openMemberInFinalClass1.kt.after
diff --git a/idea/testData/quickfix/modifiers/beforeOpenMemberInFinalClass2.kt b/idea/testData/quickfix/modifiers/openMemberInFinalClass2.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/beforeOpenMemberInFinalClass2.kt
rename to idea/testData/quickfix/modifiers/openMemberInFinalClass2.kt
diff --git a/idea/testData/quickfix/modifiers/afterOpenMemberInFinalClass2.kt b/idea/testData/quickfix/modifiers/openMemberInFinalClass2.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/afterOpenMemberInFinalClass2.kt
rename to idea/testData/quickfix/modifiers/openMemberInFinalClass2.kt.after
diff --git a/idea/testData/quickfix/modifiers/beforeOpenMemberInFinalClass3.kt b/idea/testData/quickfix/modifiers/openMemberInFinalClass3.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/beforeOpenMemberInFinalClass3.kt
rename to idea/testData/quickfix/modifiers/openMemberInFinalClass3.kt
diff --git a/idea/testData/quickfix/modifiers/afterOpenMemberInFinalClass3.kt b/idea/testData/quickfix/modifiers/openMemberInFinalClass3.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/afterOpenMemberInFinalClass3.kt
rename to idea/testData/quickfix/modifiers/openMemberInFinalClass3.kt.after
diff --git a/idea/testData/quickfix/modifiers/beforeOpenMemberInFinalClass4.kt b/idea/testData/quickfix/modifiers/openMemberInFinalClass4.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/beforeOpenMemberInFinalClass4.kt
rename to idea/testData/quickfix/modifiers/openMemberInFinalClass4.kt
diff --git a/idea/testData/quickfix/modifiers/afterOpenMemberInFinalClass4.kt b/idea/testData/quickfix/modifiers/openMemberInFinalClass4.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/afterOpenMemberInFinalClass4.kt
rename to idea/testData/quickfix/modifiers/openMemberInFinalClass4.kt.after
diff --git a/idea/testData/quickfix/modifiers/beforeOpenModifierInEnum.kt b/idea/testData/quickfix/modifiers/openModifierInEnum.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/beforeOpenModifierInEnum.kt
rename to idea/testData/quickfix/modifiers/openModifierInEnum.kt
diff --git a/idea/testData/quickfix/modifiers/afterOpenModifierInEnum.kt b/idea/testData/quickfix/modifiers/openModifierInEnum.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/afterOpenModifierInEnum.kt
rename to idea/testData/quickfix/modifiers/openModifierInEnum.kt.after
diff --git a/idea/testData/quickfix/modifiers/beforePackageMemberCannotBeProtected.kt b/idea/testData/quickfix/modifiers/packageMemberCannotBeProtected.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/beforePackageMemberCannotBeProtected.kt
rename to idea/testData/quickfix/modifiers/packageMemberCannotBeProtected.kt
diff --git a/idea/testData/quickfix/modifiers/afterPackageMemberCannotBeProtected.kt b/idea/testData/quickfix/modifiers/packageMemberCannotBeProtected.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/afterPackageMemberCannotBeProtected.kt
rename to idea/testData/quickfix/modifiers/packageMemberCannotBeProtected.kt.after
diff --git a/idea/testData/quickfix/modifiers/beforeRemoveAbstractModifier.kt b/idea/testData/quickfix/modifiers/removeAbstractModifier.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/beforeRemoveAbstractModifier.kt
rename to idea/testData/quickfix/modifiers/removeAbstractModifier.kt
diff --git a/idea/testData/quickfix/modifiers/afterRemoveAbstractModifier.kt b/idea/testData/quickfix/modifiers/removeAbstractModifier.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/afterRemoveAbstractModifier.kt
rename to idea/testData/quickfix/modifiers/removeAbstractModifier.kt.after
diff --git a/idea/testData/quickfix/modifiers/beforeRemoveIncompatibleModifier.kt b/idea/testData/quickfix/modifiers/removeIncompatibleModifier.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/beforeRemoveIncompatibleModifier.kt
rename to idea/testData/quickfix/modifiers/removeIncompatibleModifier.kt
diff --git a/idea/testData/quickfix/modifiers/afterRemoveIncompatibleModifier.kt b/idea/testData/quickfix/modifiers/removeIncompatibleModifier.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/afterRemoveIncompatibleModifier.kt
rename to idea/testData/quickfix/modifiers/removeIncompatibleModifier.kt.after
diff --git a/idea/testData/quickfix/modifiers/beforeRemoveInnerForClassInTrait.kt b/idea/testData/quickfix/modifiers/removeInnerForClassInTrait.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/beforeRemoveInnerForClassInTrait.kt
rename to idea/testData/quickfix/modifiers/removeInnerForClassInTrait.kt
diff --git a/idea/testData/quickfix/modifiers/afterRemoveInnerForClassInTrait.kt b/idea/testData/quickfix/modifiers/removeInnerForClassInTrait.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/afterRemoveInnerForClassInTrait.kt
rename to idea/testData/quickfix/modifiers/removeInnerForClassInTrait.kt.after
diff --git a/idea/testData/quickfix/modifiers/beforeRemoveProtectedModifier.kt b/idea/testData/quickfix/modifiers/removeProtectedModifier.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/beforeRemoveProtectedModifier.kt
rename to idea/testData/quickfix/modifiers/removeProtectedModifier.kt
diff --git a/idea/testData/quickfix/modifiers/afterRemoveProtectedModifier.kt b/idea/testData/quickfix/modifiers/removeProtectedModifier.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/afterRemoveProtectedModifier.kt
rename to idea/testData/quickfix/modifiers/removeProtectedModifier.kt.after
diff --git a/idea/testData/quickfix/modifiers/beforeRemoveRedundantModifier1.kt b/idea/testData/quickfix/modifiers/removeRedundantModifier1.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/beforeRemoveRedundantModifier1.kt
rename to idea/testData/quickfix/modifiers/removeRedundantModifier1.kt
diff --git a/idea/testData/quickfix/modifiers/afterRemoveRedundantModifier1.kt b/idea/testData/quickfix/modifiers/removeRedundantModifier1.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/afterRemoveRedundantModifier1.kt
rename to idea/testData/quickfix/modifiers/removeRedundantModifier1.kt.after
diff --git a/idea/testData/quickfix/modifiers/beforeRemoveRedundantModifier2.kt b/idea/testData/quickfix/modifiers/removeRedundantModifier2.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/beforeRemoveRedundantModifier2.kt
rename to idea/testData/quickfix/modifiers/removeRedundantModifier2.kt
diff --git a/idea/testData/quickfix/modifiers/afterRemoveRedundantModifier2.kt b/idea/testData/quickfix/modifiers/removeRedundantModifier2.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/afterRemoveRedundantModifier2.kt
rename to idea/testData/quickfix/modifiers/removeRedundantModifier2.kt.after
diff --git a/idea/testData/quickfix/modifiers/beforeRemoveRedundantModifier3.kt b/idea/testData/quickfix/modifiers/removeRedundantModifier3.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/beforeRemoveRedundantModifier3.kt
rename to idea/testData/quickfix/modifiers/removeRedundantModifier3.kt
diff --git a/idea/testData/quickfix/modifiers/afterRemoveRedundantModifier3.kt b/idea/testData/quickfix/modifiers/removeRedundantModifier3.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/afterRemoveRedundantModifier3.kt
rename to idea/testData/quickfix/modifiers/removeRedundantModifier3.kt.after
diff --git a/idea/testData/quickfix/modifiers/beforeRemoveSupertype1.kt b/idea/testData/quickfix/modifiers/removeSupertype1.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/beforeRemoveSupertype1.kt
rename to idea/testData/quickfix/modifiers/removeSupertype1.kt
diff --git a/idea/testData/quickfix/modifiers/afterRemoveSupertype1.kt b/idea/testData/quickfix/modifiers/removeSupertype1.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/afterRemoveSupertype1.kt
rename to idea/testData/quickfix/modifiers/removeSupertype1.kt.after
diff --git a/idea/testData/quickfix/modifiers/beforeRemoveSupertype2.kt b/idea/testData/quickfix/modifiers/removeSupertype2.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/beforeRemoveSupertype2.kt
rename to idea/testData/quickfix/modifiers/removeSupertype2.kt
diff --git a/idea/testData/quickfix/modifiers/afterRemoveSupertype2.kt b/idea/testData/quickfix/modifiers/removeSupertype2.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/afterRemoveSupertype2.kt
rename to idea/testData/quickfix/modifiers/removeSupertype2.kt.after
diff --git a/idea/testData/quickfix/modifiers/beforeRemoveSupertype3.kt b/idea/testData/quickfix/modifiers/removeSupertype3.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/beforeRemoveSupertype3.kt
rename to idea/testData/quickfix/modifiers/removeSupertype3.kt
diff --git a/idea/testData/quickfix/modifiers/afterRemoveSupertype3.kt b/idea/testData/quickfix/modifiers/removeSupertype3.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/afterRemoveSupertype3.kt
rename to idea/testData/quickfix/modifiers/removeSupertype3.kt.after
diff --git a/idea/testData/quickfix/modifiers/beforeRemoveSupertype4.kt b/idea/testData/quickfix/modifiers/removeSupertype4.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/beforeRemoveSupertype4.kt
rename to idea/testData/quickfix/modifiers/removeSupertype4.kt
diff --git a/idea/testData/quickfix/modifiers/afterRemoveSupertype4.kt b/idea/testData/quickfix/modifiers/removeSupertype4.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/afterRemoveSupertype4.kt
rename to idea/testData/quickfix/modifiers/removeSupertype4.kt.after
diff --git a/idea/testData/quickfix/modifiers/beforeVisibilityModifer1.kt b/idea/testData/quickfix/modifiers/visibilityModifer1.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/beforeVisibilityModifer1.kt
rename to idea/testData/quickfix/modifiers/visibilityModifer1.kt
diff --git a/idea/testData/quickfix/modifiers/afterVisibilityModifer1.kt b/idea/testData/quickfix/modifiers/visibilityModifer1.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/afterVisibilityModifer1.kt
rename to idea/testData/quickfix/modifiers/visibilityModifer1.kt.after
diff --git a/idea/testData/quickfix/modifiers/beforeVisibilityModifer2.kt b/idea/testData/quickfix/modifiers/visibilityModifer2.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/beforeVisibilityModifer2.kt
rename to idea/testData/quickfix/modifiers/visibilityModifer2.kt
diff --git a/idea/testData/quickfix/modifiers/afterVisibilityModifer2.kt b/idea/testData/quickfix/modifiers/visibilityModifer2.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/afterVisibilityModifer2.kt
rename to idea/testData/quickfix/modifiers/visibilityModifer2.kt.after
diff --git a/idea/testData/quickfix/modifiers/beforeVisibilityModiferParameter.kt b/idea/testData/quickfix/modifiers/visibilityModiferParameter.kt
similarity index 100%
rename from idea/testData/quickfix/modifiers/beforeVisibilityModiferParameter.kt
rename to idea/testData/quickfix/modifiers/visibilityModiferParameter.kt
diff --git a/idea/testData/quickfix/modifiers/afterVisibilityModiferParameter.kt b/idea/testData/quickfix/modifiers/visibilityModiferParameter.kt.after
similarity index 100%
rename from idea/testData/quickfix/modifiers/afterVisibilityModiferParameter.kt
rename to idea/testData/quickfix/modifiers/visibilityModiferParameter.kt.after
diff --git a/idea/testData/quickfix/nullables/beforeRemoveRedundantNullable.kt b/idea/testData/quickfix/nullables/removeRedundantNullable.kt
similarity index 100%
rename from idea/testData/quickfix/nullables/beforeRemoveRedundantNullable.kt
rename to idea/testData/quickfix/nullables/removeRedundantNullable.kt
diff --git a/idea/testData/quickfix/nullables/afterRemoveRedundantNullable.kt b/idea/testData/quickfix/nullables/removeRedundantNullable.kt.after
similarity index 100%
rename from idea/testData/quickfix/nullables/afterRemoveRedundantNullable.kt
rename to idea/testData/quickfix/nullables/removeRedundantNullable.kt.after
diff --git a/idea/testData/quickfix/nullables/beforeRemoveSupertypeNullable1.kt b/idea/testData/quickfix/nullables/removeSupertypeNullable1.kt
similarity index 100%
rename from idea/testData/quickfix/nullables/beforeRemoveSupertypeNullable1.kt
rename to idea/testData/quickfix/nullables/removeSupertypeNullable1.kt
diff --git a/idea/testData/quickfix/nullables/afterRemoveSupertypeNullable1.kt b/idea/testData/quickfix/nullables/removeSupertypeNullable1.kt.after
similarity index 100%
rename from idea/testData/quickfix/nullables/afterRemoveSupertypeNullable1.kt
rename to idea/testData/quickfix/nullables/removeSupertypeNullable1.kt.after
diff --git a/idea/testData/quickfix/nullables/beforeRemoveSupertypeNullable2.kt b/idea/testData/quickfix/nullables/removeSupertypeNullable2.kt
similarity index 100%
rename from idea/testData/quickfix/nullables/beforeRemoveSupertypeNullable2.kt
rename to idea/testData/quickfix/nullables/removeSupertypeNullable2.kt
diff --git a/idea/testData/quickfix/nullables/afterRemoveSupertypeNullable2.kt b/idea/testData/quickfix/nullables/removeSupertypeNullable2.kt.after
similarity index 100%
rename from idea/testData/quickfix/nullables/afterRemoveSupertypeNullable2.kt
rename to idea/testData/quickfix/nullables/removeSupertypeNullable2.kt.after
diff --git a/idea/testData/quickfix/nullables/beforeRemoveUselessNullable.kt b/idea/testData/quickfix/nullables/removeUselessNullable.kt
similarity index 100%
rename from idea/testData/quickfix/nullables/beforeRemoveUselessNullable.kt
rename to idea/testData/quickfix/nullables/removeUselessNullable.kt
diff --git a/idea/testData/quickfix/nullables/afterRemoveUselessNullable.kt b/idea/testData/quickfix/nullables/removeUselessNullable.kt.after
similarity index 100%
rename from idea/testData/quickfix/nullables/afterRemoveUselessNullable.kt
rename to idea/testData/quickfix/nullables/removeUselessNullable.kt.after
diff --git a/idea/testData/quickfix/nullables/unsafeInfixCall/beforeUnsafeInfixCall.kt b/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeInfixCall.kt
similarity index 100%
rename from idea/testData/quickfix/nullables/unsafeInfixCall/beforeUnsafeInfixCall.kt
rename to idea/testData/quickfix/nullables/unsafeInfixCall/unsafeInfixCall.kt
diff --git a/idea/testData/quickfix/nullables/unsafeInfixCall/afterUnsafeInfixCall.kt b/idea/testData/quickfix/nullables/unsafeInfixCall/unsafeInfixCall.kt.after
similarity index 100%
rename from idea/testData/quickfix/nullables/unsafeInfixCall/afterUnsafeInfixCall.kt
rename to idea/testData/quickfix/nullables/unsafeInfixCall/unsafeInfixCall.kt.after
diff --git a/idea/testData/quickfix/override/beforeChangeToInvocation.kt b/idea/testData/quickfix/override/changeToInvocation.kt
similarity index 100%
rename from idea/testData/quickfix/override/beforeChangeToInvocation.kt
rename to idea/testData/quickfix/override/changeToInvocation.kt
diff --git a/idea/testData/quickfix/override/afterChangeToInvocation.kt b/idea/testData/quickfix/override/changeToInvocation.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/afterChangeToInvocation.kt
rename to idea/testData/quickfix/override/changeToInvocation.kt.after
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeAddFunction.kt b/idea/testData/quickfix/override/nothingToOverride/addFunction.kt
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/beforeAddFunction.kt
rename to idea/testData/quickfix/override/nothingToOverride/addFunction.kt
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterAddFunction.kt b/idea/testData/quickfix/override/nothingToOverride/addFunction.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/afterAddFunction.kt
rename to idea/testData/quickfix/override/nothingToOverride/addFunction.kt.after
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionAbstractClass.kt b/idea/testData/quickfix/override/nothingToOverride/addFunctionAbstractClass.kt
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionAbstractClass.kt
rename to idea/testData/quickfix/override/nothingToOverride/addFunctionAbstractClass.kt
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterAddFunctionAbstractClass.kt b/idea/testData/quickfix/override/nothingToOverride/addFunctionAbstractClass.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/afterAddFunctionAbstractClass.kt
rename to idea/testData/quickfix/override/nothingToOverride/addFunctionAbstractClass.kt.after
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionInLocalDeclaration.kt b/idea/testData/quickfix/override/nothingToOverride/addFunctionInLocalDeclaration.kt
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionInLocalDeclaration.kt
rename to idea/testData/quickfix/override/nothingToOverride/addFunctionInLocalDeclaration.kt
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterAddFunctionInLocalDeclaration.kt b/idea/testData/quickfix/override/nothingToOverride/addFunctionInLocalDeclaration.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/afterAddFunctionInLocalDeclaration.kt
rename to idea/testData/quickfix/override/nothingToOverride/addFunctionInLocalDeclaration.kt.after
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionNoBody.kt b/idea/testData/quickfix/override/nothingToOverride/addFunctionNoBody.kt
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionNoBody.kt
rename to idea/testData/quickfix/override/nothingToOverride/addFunctionNoBody.kt
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterAddFunctionNoBody.kt b/idea/testData/quickfix/override/nothingToOverride/addFunctionNoBody.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/afterAddFunctionNoBody.kt
rename to idea/testData/quickfix/override/nothingToOverride/addFunctionNoBody.kt.after
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionNonUnitReturnType.kt b/idea/testData/quickfix/override/nothingToOverride/addFunctionNonUnitReturnType.kt
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionNonUnitReturnType.kt
rename to idea/testData/quickfix/override/nothingToOverride/addFunctionNonUnitReturnType.kt
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterAddFunctionNonUnitReturnType.kt b/idea/testData/quickfix/override/nothingToOverride/addFunctionNonUnitReturnType.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/afterAddFunctionNonUnitReturnType.kt
rename to idea/testData/quickfix/override/nothingToOverride/addFunctionNonUnitReturnType.kt.after
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionTrait.kt b/idea/testData/quickfix/override/nothingToOverride/addFunctionTrait.kt
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionTrait.kt
rename to idea/testData/quickfix/override/nothingToOverride/addFunctionTrait.kt
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterAddFunctionTrait.kt b/idea/testData/quickfix/override/nothingToOverride/addFunctionTrait.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/afterAddFunctionTrait.kt
rename to idea/testData/quickfix/override/nothingToOverride/addFunctionTrait.kt.after
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionTwoSuperclasses.kt b/idea/testData/quickfix/override/nothingToOverride/addFunctionTwoSuperclasses.kt
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionTwoSuperclasses.kt
rename to idea/testData/quickfix/override/nothingToOverride/addFunctionTwoSuperclasses.kt
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterAddFunctionTwoSuperclasses.kt b/idea/testData/quickfix/override/nothingToOverride/addFunctionTwoSuperclasses.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/afterAddFunctionTwoSuperclasses.kt
rename to idea/testData/quickfix/override/nothingToOverride/addFunctionTwoSuperclasses.kt.after
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionTwoTraits.kt b/idea/testData/quickfix/override/nothingToOverride/addFunctionTwoTraits.kt
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionTwoTraits.kt
rename to idea/testData/quickfix/override/nothingToOverride/addFunctionTwoTraits.kt
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterAddFunctionTwoTraits.kt b/idea/testData/quickfix/override/nothingToOverride/addFunctionTwoTraits.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/afterAddFunctionTwoTraits.kt
rename to idea/testData/quickfix/override/nothingToOverride/addFunctionTwoTraits.kt.after
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeAddParameter.kt b/idea/testData/quickfix/override/nothingToOverride/addParameter.kt
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/beforeAddParameter.kt
rename to idea/testData/quickfix/override/nothingToOverride/addParameter.kt
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterAddParameter.kt b/idea/testData/quickfix/override/nothingToOverride/addParameter.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/afterAddParameter.kt
rename to idea/testData/quickfix/override/nothingToOverride/addParameter.kt.after
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeAddParameterGenericClass.kt b/idea/testData/quickfix/override/nothingToOverride/addParameterGenericClass.kt
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/beforeAddParameterGenericClass.kt
rename to idea/testData/quickfix/override/nothingToOverride/addParameterGenericClass.kt
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterAddParameterGenericClass.kt b/idea/testData/quickfix/override/nothingToOverride/addParameterGenericClass.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/afterAddParameterGenericClass.kt
rename to idea/testData/quickfix/override/nothingToOverride/addParameterGenericClass.kt.after
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeAddParameterMultiple.kt b/idea/testData/quickfix/override/nothingToOverride/addParameterMultiple.kt
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/beforeAddParameterMultiple.kt
rename to idea/testData/quickfix/override/nothingToOverride/addParameterMultiple.kt
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterAddParameterMultiple.kt b/idea/testData/quickfix/override/nothingToOverride/addParameterMultiple.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/afterAddParameterMultiple.kt
rename to idea/testData/quickfix/override/nothingToOverride/addParameterMultiple.kt.after
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeAddParameterPreserveVisibility.kt b/idea/testData/quickfix/override/nothingToOverride/addParameterPreserveVisibility.kt
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/beforeAddParameterPreserveVisibility.kt
rename to idea/testData/quickfix/override/nothingToOverride/addParameterPreserveVisibility.kt
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterAddParameterPreserveVisibility.kt b/idea/testData/quickfix/override/nothingToOverride/addParameterPreserveVisibility.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/afterAddParameterPreserveVisibility.kt
rename to idea/testData/quickfix/override/nothingToOverride/addParameterPreserveVisibility.kt.after
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeAddParameterTwoSupertraits.kt b/idea/testData/quickfix/override/nothingToOverride/addParameterTwoSupertraits.kt
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/beforeAddParameterTwoSupertraits.kt
rename to idea/testData/quickfix/override/nothingToOverride/addParameterTwoSupertraits.kt
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterAddParameterTwoSupertraits.kt b/idea/testData/quickfix/override/nothingToOverride/addParameterTwoSupertraits.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/afterAddParameterTwoSupertraits.kt
rename to idea/testData/quickfix/override/nothingToOverride/addParameterTwoSupertraits.kt.after
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeAddParameterTwoSupertypes.kt b/idea/testData/quickfix/override/nothingToOverride/addParameterTwoSupertypes.kt
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/beforeAddParameterTwoSupertypes.kt
rename to idea/testData/quickfix/override/nothingToOverride/addParameterTwoSupertypes.kt
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterAddParameterTwoSupertypes.kt b/idea/testData/quickfix/override/nothingToOverride/addParameterTwoSupertypes.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/afterAddParameterTwoSupertypes.kt
rename to idea/testData/quickfix/override/nothingToOverride/addParameterTwoSupertypes.kt.after
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterType.kt b/idea/testData/quickfix/override/nothingToOverride/changeParameterType.kt
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterType.kt
rename to idea/testData/quickfix/override/nothingToOverride/changeParameterType.kt
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterType.kt b/idea/testData/quickfix/override/nothingToOverride/changeParameterType.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/afterChangeParameterType.kt
rename to idea/testData/quickfix/override/nothingToOverride/changeParameterType.kt.after
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeAbstractSuperclass.kt b/idea/testData/quickfix/override/nothingToOverride/changeParameterTypeAbstractSuperclass.kt
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeAbstractSuperclass.kt
rename to idea/testData/quickfix/override/nothingToOverride/changeParameterTypeAbstractSuperclass.kt
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeAbstractSuperclass.kt b/idea/testData/quickfix/override/nothingToOverride/changeParameterTypeAbstractSuperclass.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeAbstractSuperclass.kt
rename to idea/testData/quickfix/override/nothingToOverride/changeParameterTypeAbstractSuperclass.kt.after
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeInTrait.kt b/idea/testData/quickfix/override/nothingToOverride/changeParameterTypeInTrait.kt
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeInTrait.kt
rename to idea/testData/quickfix/override/nothingToOverride/changeParameterTypeInTrait.kt
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeInTrait.kt b/idea/testData/quickfix/override/nothingToOverride/changeParameterTypeInTrait.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeInTrait.kt
rename to idea/testData/quickfix/override/nothingToOverride/changeParameterTypeInTrait.kt.after
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeMatchNames.kt b/idea/testData/quickfix/override/nothingToOverride/changeParameterTypeMatchNames.kt
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeMatchNames.kt
rename to idea/testData/quickfix/override/nothingToOverride/changeParameterTypeMatchNames.kt
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeMatchNames.kt b/idea/testData/quickfix/override/nothingToOverride/changeParameterTypeMatchNames.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeMatchNames.kt
rename to idea/testData/quickfix/override/nothingToOverride/changeParameterTypeMatchNames.kt.after
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeModifyOrder.kt b/idea/testData/quickfix/override/nothingToOverride/changeParameterTypeModifyOrder.kt
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeModifyOrder.kt
rename to idea/testData/quickfix/override/nothingToOverride/changeParameterTypeModifyOrder.kt
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeModifyOrder.kt b/idea/testData/quickfix/override/nothingToOverride/changeParameterTypeModifyOrder.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeModifyOrder.kt
rename to idea/testData/quickfix/override/nothingToOverride/changeParameterTypeModifyOrder.kt.after
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeOpenOverride.kt b/idea/testData/quickfix/override/nothingToOverride/changeParameterTypeOpenOverride.kt
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeOpenOverride.kt
rename to idea/testData/quickfix/override/nothingToOverride/changeParameterTypeOpenOverride.kt
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeOpenOverride.kt b/idea/testData/quickfix/override/nothingToOverride/changeParameterTypeOpenOverride.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeOpenOverride.kt
rename to idea/testData/quickfix/override/nothingToOverride/changeParameterTypeOpenOverride.kt.after
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeSingleExpressionFunction.kt b/idea/testData/quickfix/override/nothingToOverride/changeParameterTypeSingleExpressionFunction.kt
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeSingleExpressionFunction.kt
rename to idea/testData/quickfix/override/nothingToOverride/changeParameterTypeSingleExpressionFunction.kt
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeSingleExpressionFunction.kt b/idea/testData/quickfix/override/nothingToOverride/changeParameterTypeSingleExpressionFunction.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeSingleExpressionFunction.kt
rename to idea/testData/quickfix/override/nothingToOverride/changeParameterTypeSingleExpressionFunction.kt.after
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeSuperTrait.kt b/idea/testData/quickfix/override/nothingToOverride/changeParameterTypeSuperTrait.kt
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeSuperTrait.kt
rename to idea/testData/quickfix/override/nothingToOverride/changeParameterTypeSuperTrait.kt
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeSuperTrait.kt b/idea/testData/quickfix/override/nothingToOverride/changeParameterTypeSuperTrait.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeSuperTrait.kt
rename to idea/testData/quickfix/override/nothingToOverride/changeParameterTypeSuperTrait.kt.after
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeChangeReturnType.kt b/idea/testData/quickfix/override/nothingToOverride/changeReturnType.kt
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/beforeChangeReturnType.kt
rename to idea/testData/quickfix/override/nothingToOverride/changeReturnType.kt
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterChangeReturnType.kt b/idea/testData/quickfix/override/nothingToOverride/changeReturnType.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/afterChangeReturnType.kt
rename to idea/testData/quickfix/override/nothingToOverride/changeReturnType.kt.after
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeDoNotLooseAnnotations.kt b/idea/testData/quickfix/override/nothingToOverride/doNotLooseAnnotations.kt
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/beforeDoNotLooseAnnotations.kt
rename to idea/testData/quickfix/override/nothingToOverride/doNotLooseAnnotations.kt
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterDoNotLooseAnnotations.kt b/idea/testData/quickfix/override/nothingToOverride/doNotLooseAnnotations.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/afterDoNotLooseAnnotations.kt
rename to idea/testData/quickfix/override/nothingToOverride/doNotLooseAnnotations.kt.after
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeNoOpenSuperFunction.kt b/idea/testData/quickfix/override/nothingToOverride/noOpenSuperFunction.kt
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/beforeNoOpenSuperFunction.kt
rename to idea/testData/quickfix/override/nothingToOverride/noOpenSuperFunction.kt
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeOverrideJavaMethod.kt b/idea/testData/quickfix/override/nothingToOverride/overrideJavaMethod.kt
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/beforeOverrideJavaMethod.kt
rename to idea/testData/quickfix/override/nothingToOverride/overrideJavaMethod.kt
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterOverrideJavaMethod.kt b/idea/testData/quickfix/override/nothingToOverride/overrideJavaMethod.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/afterOverrideJavaMethod.kt
rename to idea/testData/quickfix/override/nothingToOverride/overrideJavaMethod.kt.after
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeRemoveOverride.kt b/idea/testData/quickfix/override/nothingToOverride/removeOverride.kt
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/beforeRemoveOverride.kt
rename to idea/testData/quickfix/override/nothingToOverride/removeOverride.kt
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterRemoveOverride.kt b/idea/testData/quickfix/override/nothingToOverride/removeOverride.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/afterRemoveOverride.kt
rename to idea/testData/quickfix/override/nothingToOverride/removeOverride.kt.after
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeRemoveParameter.kt b/idea/testData/quickfix/override/nothingToOverride/removeParameter.kt
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/beforeRemoveParameter.kt
rename to idea/testData/quickfix/override/nothingToOverride/removeParameter.kt
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterRemoveParameter.kt b/idea/testData/quickfix/override/nothingToOverride/removeParameter.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/afterRemoveParameter.kt
rename to idea/testData/quickfix/override/nothingToOverride/removeParameter.kt.after
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeRemoveParameterTwoTraits.kt b/idea/testData/quickfix/override/nothingToOverride/removeParameterTwoTraits.kt
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/beforeRemoveParameterTwoTraits.kt
rename to idea/testData/quickfix/override/nothingToOverride/removeParameterTwoTraits.kt
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterRemoveParameterTwoTraits.kt b/idea/testData/quickfix/override/nothingToOverride/removeParameterTwoTraits.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/afterRemoveParameterTwoTraits.kt
rename to idea/testData/quickfix/override/nothingToOverride/removeParameterTwoTraits.kt.after
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeSwapParametersGenericClass.kt b/idea/testData/quickfix/override/nothingToOverride/swapParametersGenericClass.kt
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/beforeSwapParametersGenericClass.kt
rename to idea/testData/quickfix/override/nothingToOverride/swapParametersGenericClass.kt
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterSwapParametersGenericClass.kt b/idea/testData/quickfix/override/nothingToOverride/swapParametersGenericClass.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/nothingToOverride/afterSwapParametersGenericClass.kt
rename to idea/testData/quickfix/override/nothingToOverride/swapParametersGenericClass.kt.after
diff --git a/idea/testData/quickfix/override/beforeOverriddingMultipleFinalMethods.kt b/idea/testData/quickfix/override/overriddingMultipleFinalMethods.kt
similarity index 100%
rename from idea/testData/quickfix/override/beforeOverriddingMultipleFinalMethods.kt
rename to idea/testData/quickfix/override/overriddingMultipleFinalMethods.kt
diff --git a/idea/testData/quickfix/override/afterOverriddingMultipleFinalMethods.kt b/idea/testData/quickfix/override/overriddingMultipleFinalMethods.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/afterOverriddingMultipleFinalMethods.kt
rename to idea/testData/quickfix/override/overriddingMultipleFinalMethods.kt.after
diff --git a/idea/testData/quickfix/override/beforeOverridingDelegatedMethod.kt b/idea/testData/quickfix/override/overridingDelegatedMethod.kt
similarity index 100%
rename from idea/testData/quickfix/override/beforeOverridingDelegatedMethod.kt
rename to idea/testData/quickfix/override/overridingDelegatedMethod.kt
diff --git a/idea/testData/quickfix/override/afterOverridingDelegatedMethod.kt b/idea/testData/quickfix/override/overridingDelegatedMethod.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/afterOverridingDelegatedMethod.kt
rename to idea/testData/quickfix/override/overridingDelegatedMethod.kt.after
diff --git a/idea/testData/quickfix/override/beforeOverridingFakeOverride.kt b/idea/testData/quickfix/override/overridingFakeOverride.kt
similarity index 100%
rename from idea/testData/quickfix/override/beforeOverridingFakeOverride.kt
rename to idea/testData/quickfix/override/overridingFakeOverride.kt
diff --git a/idea/testData/quickfix/override/afterOverridingFakeOverride.kt b/idea/testData/quickfix/override/overridingFakeOverride.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/afterOverridingFakeOverride.kt
rename to idea/testData/quickfix/override/overridingFakeOverride.kt.after
diff --git a/idea/testData/quickfix/override/beforeOverridingFinalJavaMethod.kt b/idea/testData/quickfix/override/overridingFinalJavaMethod.kt
similarity index 100%
rename from idea/testData/quickfix/override/beforeOverridingFinalJavaMethod.kt
rename to idea/testData/quickfix/override/overridingFinalJavaMethod.kt
diff --git a/idea/testData/quickfix/override/beforeOverridingFinalMethod.kt b/idea/testData/quickfix/override/overridingFinalMethod.kt
similarity index 100%
rename from idea/testData/quickfix/override/beforeOverridingFinalMethod.kt
rename to idea/testData/quickfix/override/overridingFinalMethod.kt
diff --git a/idea/testData/quickfix/override/afterOverridingFinalMethod.kt b/idea/testData/quickfix/override/overridingFinalMethod.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/afterOverridingFinalMethod.kt
rename to idea/testData/quickfix/override/overridingFinalMethod.kt.after
diff --git a/idea/testData/quickfix/override/beforeOverridingFinalMethodInLocal.kt b/idea/testData/quickfix/override/overridingFinalMethodInLocal.kt
similarity index 100%
rename from idea/testData/quickfix/override/beforeOverridingFinalMethodInLocal.kt
rename to idea/testData/quickfix/override/overridingFinalMethodInLocal.kt
diff --git a/idea/testData/quickfix/override/afterOverridingFinalMethodInLocal.kt b/idea/testData/quickfix/override/overridingFinalMethodInLocal.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/afterOverridingFinalMethodInLocal.kt
rename to idea/testData/quickfix/override/overridingFinalMethodInLocal.kt.after
diff --git a/idea/testData/quickfix/override/beforeOverridingFinalProperty.kt b/idea/testData/quickfix/override/overridingFinalProperty.kt
similarity index 100%
rename from idea/testData/quickfix/override/beforeOverridingFinalProperty.kt
rename to idea/testData/quickfix/override/overridingFinalProperty.kt
diff --git a/idea/testData/quickfix/override/afterOverridingFinalProperty.kt b/idea/testData/quickfix/override/overridingFinalProperty.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/afterOverridingFinalProperty.kt
rename to idea/testData/quickfix/override/overridingFinalProperty.kt.after
diff --git a/idea/testData/quickfix/override/beforeOverridingWritableAndNotWritableFinalMembers.kt b/idea/testData/quickfix/override/overridingWritableAndNotWritableFinalMembers.kt
similarity index 100%
rename from idea/testData/quickfix/override/beforeOverridingWritableAndNotWritableFinalMembers.kt
rename to idea/testData/quickfix/override/overridingWritableAndNotWritableFinalMembers.kt
diff --git a/idea/testData/quickfix/override/beforeParameterNameChangedAmbiguousRename.kt b/idea/testData/quickfix/override/parameterNameChangedAmbiguousRename.kt
similarity index 100%
rename from idea/testData/quickfix/override/beforeParameterNameChangedAmbiguousRename.kt
rename to idea/testData/quickfix/override/parameterNameChangedAmbiguousRename.kt
diff --git a/idea/testData/quickfix/override/beforeParameterNameChangedMultipleOverrideRenamePossible.kt b/idea/testData/quickfix/override/parameterNameChangedMultipleOverrideRenamePossible.kt
similarity index 100%
rename from idea/testData/quickfix/override/beforeParameterNameChangedMultipleOverrideRenamePossible.kt
rename to idea/testData/quickfix/override/parameterNameChangedMultipleOverrideRenamePossible.kt
diff --git a/idea/testData/quickfix/override/afterParameterNameChangedMultipleOverrideRenamePossible.kt b/idea/testData/quickfix/override/parameterNameChangedMultipleOverrideRenamePossible.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/afterParameterNameChangedMultipleOverrideRenamePossible.kt
rename to idea/testData/quickfix/override/parameterNameChangedMultipleOverrideRenamePossible.kt.after
diff --git a/idea/testData/quickfix/override/beforeParameterNameChangedRenamePossible.kt b/idea/testData/quickfix/override/parameterNameChangedRenamePossible.kt
similarity index 100%
rename from idea/testData/quickfix/override/beforeParameterNameChangedRenamePossible.kt
rename to idea/testData/quickfix/override/parameterNameChangedRenamePossible.kt
diff --git a/idea/testData/quickfix/override/afterParameterNameChangedRenamePossible.kt b/idea/testData/quickfix/override/parameterNameChangedRenamePossible.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/afterParameterNameChangedRenamePossible.kt
rename to idea/testData/quickfix/override/parameterNameChangedRenamePossible.kt.after
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeMultipleOverriddenPropertiesTypes.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeMultipleOverriddenPropertiesTypes.kt
similarity index 100%
rename from idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeMultipleOverriddenPropertiesTypes.kt
rename to idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeMultipleOverriddenPropertiesTypes.kt
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt
similarity index 100%
rename from idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt
rename to idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangePropertyTypeToMatchOverridenProperties.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangePropertyTypeToMatchOverridenProperties.kt
similarity index 100%
rename from idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangePropertyTypeToMatchOverridenProperties.kt
rename to idea/testData/quickfix/override/typeMismatchOnOverride/cantChangePropertyTypeToMatchOverridenProperties.kt
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeReturnTypeOfOverriddenFunction.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeReturnTypeOfOverriddenFunction.kt
similarity index 100%
rename from idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeReturnTypeOfOverriddenFunction.kt
rename to idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeReturnTypeOfOverriddenFunction.kt
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/beforeChangeOverriddenPropertyType1.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType1.kt
similarity index 100%
rename from idea/testData/quickfix/override/typeMismatchOnOverride/beforeChangeOverriddenPropertyType1.kt
rename to idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType1.kt
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/afterChangeOverriddenPropertyType1.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType1.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/typeMismatchOnOverride/afterChangeOverriddenPropertyType1.kt
rename to idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType1.kt.after
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/beforeChangeOverriddenPropertyType2.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType2.kt
similarity index 100%
rename from idea/testData/quickfix/override/typeMismatchOnOverride/beforeChangeOverriddenPropertyType2.kt
rename to idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType2.kt
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/afterChangeOverriddenPropertyType2.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType2.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/typeMismatchOnOverride/afterChangeOverriddenPropertyType2.kt
rename to idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType2.kt.after
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/beforeChangeOverridingPropertyTypeToFunctionType.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingPropertyTypeToFunctionType.kt
similarity index 100%
rename from idea/testData/quickfix/override/typeMismatchOnOverride/beforeChangeOverridingPropertyTypeToFunctionType.kt
rename to idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingPropertyTypeToFunctionType.kt
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/afterChangeOverridingPropertyTypeToFunctionType.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingPropertyTypeToFunctionType.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/typeMismatchOnOverride/afterChangeOverridingPropertyTypeToFunctionType.kt
rename to idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingPropertyTypeToFunctionType.kt.after
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/beforeChangeReturnTypeOfOverriddenFunction.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/changeReturnTypeOfOverriddenFunction.kt
similarity index 100%
rename from idea/testData/quickfix/override/typeMismatchOnOverride/beforeChangeReturnTypeOfOverriddenFunction.kt
rename to idea/testData/quickfix/override/typeMismatchOnOverride/changeReturnTypeOfOverriddenFunction.kt
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/afterChangeReturnTypeOfOverriddenFunction.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/changeReturnTypeOfOverriddenFunction.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/typeMismatchOnOverride/afterChangeReturnTypeOfOverriddenFunction.kt
rename to idea/testData/quickfix/override/typeMismatchOnOverride/changeReturnTypeOfOverriddenFunction.kt.after
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/beforeObjectInsideBody.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/objectInsideBody.kt
similarity index 100%
rename from idea/testData/quickfix/override/typeMismatchOnOverride/beforeObjectInsideBody.kt
rename to idea/testData/quickfix/override/typeMismatchOnOverride/objectInsideBody.kt
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/afterObjectInsideBody.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/objectInsideBody.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/typeMismatchOnOverride/afterObjectInsideBody.kt
rename to idea/testData/quickfix/override/typeMismatchOnOverride/objectInsideBody.kt.after
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/beforePropertyReturnTypeMismatchOnOverride.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/propertyReturnTypeMismatchOnOverride.kt
similarity index 100%
rename from idea/testData/quickfix/override/typeMismatchOnOverride/beforePropertyReturnTypeMismatchOnOverride.kt
rename to idea/testData/quickfix/override/typeMismatchOnOverride/propertyReturnTypeMismatchOnOverride.kt
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/afterPropertyReturnTypeMismatchOnOverride.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/propertyReturnTypeMismatchOnOverride.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/typeMismatchOnOverride/afterPropertyReturnTypeMismatchOnOverride.kt
rename to idea/testData/quickfix/override/typeMismatchOnOverride/propertyReturnTypeMismatchOnOverride.kt.after
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/beforePropertyTypeMismatchOnOverrideIntLong.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntLong.kt
similarity index 100%
rename from idea/testData/quickfix/override/typeMismatchOnOverride/beforePropertyTypeMismatchOnOverrideIntLong.kt
rename to idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntLong.kt
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/afterPropertyTypeMismatchOnOverrideIntLong.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntLong.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/typeMismatchOnOverride/afterPropertyTypeMismatchOnOverrideIntLong.kt
rename to idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntLong.kt.after
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/beforePropertyTypeMismatchOnOverrideIntUnit.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntUnit.kt
similarity index 100%
rename from idea/testData/quickfix/override/typeMismatchOnOverride/beforePropertyTypeMismatchOnOverrideIntUnit.kt
rename to idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntUnit.kt
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/afterPropertyTypeMismatchOnOverrideIntUnit.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntUnit.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/typeMismatchOnOverride/afterPropertyTypeMismatchOnOverrideIntUnit.kt
rename to idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntUnit.kt.after
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/beforeReturnTypeMismatchOnMultipleOverride.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.kt
similarity index 100%
rename from idea/testData/quickfix/override/typeMismatchOnOverride/beforeReturnTypeMismatchOnMultipleOverride.kt
rename to idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.kt
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/afterReturnTypeMismatchOnMultipleOverride.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/typeMismatchOnOverride/afterReturnTypeMismatchOnMultipleOverride.kt
rename to idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.kt.after
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/beforeReturnTypeMismatchOnMultipleOverrideAmbiguity.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverrideAmbiguity.kt
similarity index 100%
rename from idea/testData/quickfix/override/typeMismatchOnOverride/beforeReturnTypeMismatchOnMultipleOverrideAmbiguity.kt
rename to idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverrideAmbiguity.kt
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/beforeReturnTypeMismatchOnOverrideIntLong.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntLong.kt
similarity index 100%
rename from idea/testData/quickfix/override/typeMismatchOnOverride/beforeReturnTypeMismatchOnOverrideIntLong.kt
rename to idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntLong.kt
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/afterReturnTypeMismatchOnOverrideIntLong.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntLong.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/typeMismatchOnOverride/afterReturnTypeMismatchOnOverrideIntLong.kt
rename to idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntLong.kt.after
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/beforeReturnTypeMismatchOnOverrideIntUnit.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntUnit.kt
similarity index 100%
rename from idea/testData/quickfix/override/typeMismatchOnOverride/beforeReturnTypeMismatchOnOverrideIntUnit.kt
rename to idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntUnit.kt
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/afterReturnTypeMismatchOnOverrideIntUnit.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntUnit.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/typeMismatchOnOverride/afterReturnTypeMismatchOnOverrideIntUnit.kt
rename to idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntUnit.kt.after
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/beforeReturnTypeMismatchOnOverrideUnitInt.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideUnitInt.kt
similarity index 100%
rename from idea/testData/quickfix/override/typeMismatchOnOverride/beforeReturnTypeMismatchOnOverrideUnitInt.kt
rename to idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideUnitInt.kt
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/afterReturnTypeMismatchOnOverrideUnitInt.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideUnitInt.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/typeMismatchOnOverride/afterReturnTypeMismatchOnOverrideUnitInt.kt
rename to idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideUnitInt.kt.after
diff --git a/idea/testData/quickfix/override/beforeVirtualMethodHidden.kt b/idea/testData/quickfix/override/virtualMethodHidden.kt
similarity index 100%
rename from idea/testData/quickfix/override/beforeVirtualMethodHidden.kt
rename to idea/testData/quickfix/override/virtualMethodHidden.kt
diff --git a/idea/testData/quickfix/override/afterVirtualMethodHidden.kt b/idea/testData/quickfix/override/virtualMethodHidden.kt.after
similarity index 100%
rename from idea/testData/quickfix/override/afterVirtualMethodHidden.kt
rename to idea/testData/quickfix/override/virtualMethodHidden.kt.after
diff --git a/idea/testData/quickfix/platformClasses/beforeMapPlatformClassToKotlin1.kt b/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin1.kt
similarity index 100%
rename from idea/testData/quickfix/platformClasses/beforeMapPlatformClassToKotlin1.kt
rename to idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin1.kt
diff --git a/idea/testData/quickfix/platformClasses/afterMapPlatformClassToKotlin1.kt b/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin1.kt.after
similarity index 100%
rename from idea/testData/quickfix/platformClasses/afterMapPlatformClassToKotlin1.kt
rename to idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin1.kt.after
diff --git a/idea/testData/quickfix/platformClasses/beforeMapPlatformClassToKotlin2.kt b/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin2.kt
similarity index 100%
rename from idea/testData/quickfix/platformClasses/beforeMapPlatformClassToKotlin2.kt
rename to idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin2.kt
diff --git a/idea/testData/quickfix/platformClasses/afterMapPlatformClassToKotlin2.kt b/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin2.kt.after
similarity index 100%
rename from idea/testData/quickfix/platformClasses/afterMapPlatformClassToKotlin2.kt
rename to idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin2.kt.after
diff --git a/idea/testData/quickfix/platformClasses/beforeMapPlatformClassToKotlin3.kt b/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin3.kt
similarity index 100%
rename from idea/testData/quickfix/platformClasses/beforeMapPlatformClassToKotlin3.kt
rename to idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin3.kt
diff --git a/idea/testData/quickfix/platformClasses/afterMapPlatformClassToKotlin3.kt b/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin3.kt.after
similarity index 100%
rename from idea/testData/quickfix/platformClasses/afterMapPlatformClassToKotlin3.kt
rename to idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin3.kt.after
diff --git a/idea/testData/quickfix/platformClasses/beforeMapPlatformClassToKotlin4.kt b/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin4.kt
similarity index 100%
rename from idea/testData/quickfix/platformClasses/beforeMapPlatformClassToKotlin4.kt
rename to idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin4.kt
diff --git a/idea/testData/quickfix/platformClasses/afterMapPlatformClassToKotlin4.kt b/idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin4.kt.after
similarity index 100%
rename from idea/testData/quickfix/platformClasses/afterMapPlatformClassToKotlin4.kt
rename to idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin4.kt.after
diff --git a/idea/testData/quickfix/removeUnused/beforeUnusedClass.kt b/idea/testData/quickfix/removeUnused/unusedClass.kt
similarity index 100%
rename from idea/testData/quickfix/removeUnused/beforeUnusedClass.kt
rename to idea/testData/quickfix/removeUnused/unusedClass.kt
diff --git a/idea/testData/quickfix/removeUnused/afterUnusedClass.kt b/idea/testData/quickfix/removeUnused/unusedClass.kt.after
similarity index 100%
rename from idea/testData/quickfix/removeUnused/afterUnusedClass.kt
rename to idea/testData/quickfix/removeUnused/unusedClass.kt.after
diff --git a/idea/testData/quickfix/removeUnused/beforeUnusedFunction.kt b/idea/testData/quickfix/removeUnused/unusedFunction.kt
similarity index 100%
rename from idea/testData/quickfix/removeUnused/beforeUnusedFunction.kt
rename to idea/testData/quickfix/removeUnused/unusedFunction.kt
diff --git a/idea/testData/quickfix/removeUnused/afterUnusedFunction.kt b/idea/testData/quickfix/removeUnused/unusedFunction.kt.after
similarity index 100%
rename from idea/testData/quickfix/removeUnused/afterUnusedFunction.kt
rename to idea/testData/quickfix/removeUnused/unusedFunction.kt.after
diff --git a/idea/testData/quickfix/removeUnused/beforeUnusedProperty.kt b/idea/testData/quickfix/removeUnused/unusedProperty.kt
similarity index 100%
rename from idea/testData/quickfix/removeUnused/beforeUnusedProperty.kt
rename to idea/testData/quickfix/removeUnused/unusedProperty.kt
diff --git a/idea/testData/quickfix/removeUnused/afterUnusedProperty.kt b/idea/testData/quickfix/removeUnused/unusedProperty.kt.after
similarity index 100%
rename from idea/testData/quickfix/removeUnused/afterUnusedProperty.kt
rename to idea/testData/quickfix/removeUnused/unusedProperty.kt.after
diff --git a/idea/testData/quickfix/removeUnused/beforeUnusedPropertyAsConstructorParameter.kt b/idea/testData/quickfix/removeUnused/unusedPropertyAsConstructorParameter.kt
similarity index 100%
rename from idea/testData/quickfix/removeUnused/beforeUnusedPropertyAsConstructorParameter.kt
rename to idea/testData/quickfix/removeUnused/unusedPropertyAsConstructorParameter.kt
diff --git a/idea/testData/quickfix/removeUnused/afterUnusedPropertyAsConstructorParameter.kt b/idea/testData/quickfix/removeUnused/unusedPropertyAsConstructorParameter.kt.after
similarity index 100%
rename from idea/testData/quickfix/removeUnused/afterUnusedPropertyAsConstructorParameter.kt
rename to idea/testData/quickfix/removeUnused/unusedPropertyAsConstructorParameter.kt.after
diff --git a/idea/testData/quickfix/removeUnused/beforeUnusedTypeParameter.kt b/idea/testData/quickfix/removeUnused/unusedTypeParameter.kt
similarity index 100%
rename from idea/testData/quickfix/removeUnused/beforeUnusedTypeParameter.kt
rename to idea/testData/quickfix/removeUnused/unusedTypeParameter.kt
diff --git a/idea/testData/quickfix/removeUnused/afterUnusedTypeParameter.kt b/idea/testData/quickfix/removeUnused/unusedTypeParameter.kt.after
similarity index 100%
rename from idea/testData/quickfix/removeUnused/afterUnusedTypeParameter.kt
rename to idea/testData/quickfix/removeUnused/unusedTypeParameter.kt.after
diff --git a/idea/testData/quickfix/removeUnusedReceiver/beforeInFunction.kt b/idea/testData/quickfix/removeUnusedReceiver/inFunction.kt
similarity index 100%
rename from idea/testData/quickfix/removeUnusedReceiver/beforeInFunction.kt
rename to idea/testData/quickfix/removeUnusedReceiver/inFunction.kt
diff --git a/idea/testData/quickfix/removeUnusedReceiver/afterInFunction.kt b/idea/testData/quickfix/removeUnusedReceiver/inFunction.kt.after
similarity index 100%
rename from idea/testData/quickfix/removeUnusedReceiver/afterInFunction.kt
rename to idea/testData/quickfix/removeUnusedReceiver/inFunction.kt.after
diff --git a/idea/testData/quickfix/removeUnusedReceiver/beforeInProperty.kt b/idea/testData/quickfix/removeUnusedReceiver/inProperty.kt
similarity index 100%
rename from idea/testData/quickfix/removeUnusedReceiver/beforeInProperty.kt
rename to idea/testData/quickfix/removeUnusedReceiver/inProperty.kt
diff --git a/idea/testData/quickfix/removeUnusedReceiver/afterInProperty.kt b/idea/testData/quickfix/removeUnusedReceiver/inProperty.kt.after
similarity index 100%
rename from idea/testData/quickfix/removeUnusedReceiver/afterInProperty.kt
rename to idea/testData/quickfix/removeUnusedReceiver/inProperty.kt.after
diff --git a/idea/testData/quickfix/supercalls/beforeTypeArgumentsRedundantInSuperQualifier.kt b/idea/testData/quickfix/supercalls/typeArgumentsRedundantInSuperQualifier.kt
similarity index 100%
rename from idea/testData/quickfix/supercalls/beforeTypeArgumentsRedundantInSuperQualifier.kt
rename to idea/testData/quickfix/supercalls/typeArgumentsRedundantInSuperQualifier.kt
diff --git a/idea/testData/quickfix/supercalls/afterTypeArgumentsRedundantInSuperQualifier.kt b/idea/testData/quickfix/supercalls/typeArgumentsRedundantInSuperQualifier.kt.after
similarity index 100%
rename from idea/testData/quickfix/supercalls/afterTypeArgumentsRedundantInSuperQualifier.kt
rename to idea/testData/quickfix/supercalls/typeArgumentsRedundantInSuperQualifier.kt.after
diff --git a/idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitialized.kt b/idea/testData/quickfix/supertypeInitialization/supertypeNotInitialized.kt
similarity index 100%
rename from idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitialized.kt
rename to idea/testData/quickfix/supertypeInitialization/supertypeNotInitialized.kt
diff --git a/idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitializedDefaultParameters.kt b/idea/testData/quickfix/supertypeInitialization/supertypeNotInitializedDefaultParameters.kt
similarity index 100%
rename from idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitializedDefaultParameters.kt
rename to idea/testData/quickfix/supertypeInitialization/supertypeNotInitializedDefaultParameters.kt
diff --git a/idea/testData/quickfix/supertypeInitialization/afterSupertypeNotInitializedDefaultParameters.kt b/idea/testData/quickfix/supertypeInitialization/supertypeNotInitializedDefaultParameters.kt.after
similarity index 100%
rename from idea/testData/quickfix/supertypeInitialization/afterSupertypeNotInitializedDefaultParameters.kt
rename to idea/testData/quickfix/supertypeInitialization/supertypeNotInitializedDefaultParameters.kt.after
diff --git a/idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitializedEmptyConstructor.kt b/idea/testData/quickfix/supertypeInitialization/supertypeNotInitializedEmptyConstructor.kt
similarity index 100%
rename from idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitializedEmptyConstructor.kt
rename to idea/testData/quickfix/supertypeInitialization/supertypeNotInitializedEmptyConstructor.kt
diff --git a/idea/testData/quickfix/supertypeInitialization/afterSupertypeNotInitializedEmptyConstructor.kt b/idea/testData/quickfix/supertypeInitialization/supertypeNotInitializedEmptyConstructor.kt.after
similarity index 100%
rename from idea/testData/quickfix/supertypeInitialization/afterSupertypeNotInitializedEmptyConstructor.kt
rename to idea/testData/quickfix/supertypeInitialization/supertypeNotInitializedEmptyConstructor.kt.after
diff --git a/idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitializedForLocalClass.kt b/idea/testData/quickfix/supertypeInitialization/supertypeNotInitializedForLocalClass.kt
similarity index 100%
rename from idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitializedForLocalClass.kt
rename to idea/testData/quickfix/supertypeInitialization/supertypeNotInitializedForLocalClass.kt
diff --git a/idea/testData/quickfix/supertypeInitialization/afterSupertypeNotInitializedForLocalClass.kt b/idea/testData/quickfix/supertypeInitialization/supertypeNotInitializedForLocalClass.kt.after
similarity index 100%
rename from idea/testData/quickfix/supertypeInitialization/afterSupertypeNotInitializedForLocalClass.kt
rename to idea/testData/quickfix/supertypeInitialization/supertypeNotInitializedForLocalClass.kt.after
diff --git a/idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitializedForObjectExpression.kt b/idea/testData/quickfix/supertypeInitialization/supertypeNotInitializedForObjectExpression.kt
similarity index 100%
rename from idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitializedForObjectExpression.kt
rename to idea/testData/quickfix/supertypeInitialization/supertypeNotInitializedForObjectExpression.kt
diff --git a/idea/testData/quickfix/supertypeInitialization/afterSupertypeNotInitializedForObjectExpression.kt b/idea/testData/quickfix/supertypeInitialization/supertypeNotInitializedForObjectExpression.kt.after
similarity index 100%
rename from idea/testData/quickfix/supertypeInitialization/afterSupertypeNotInitializedForObjectExpression.kt
rename to idea/testData/quickfix/supertypeInitialization/supertypeNotInitializedForObjectExpression.kt.after
diff --git a/idea/testData/quickfix/suppress/annotationPosition/beforeParamWithModifier.kt b/idea/testData/quickfix/suppress/annotationPosition/paramWithModifier.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/annotationPosition/beforeParamWithModifier.kt
rename to idea/testData/quickfix/suppress/annotationPosition/paramWithModifier.kt
diff --git a/idea/testData/quickfix/suppress/annotationPosition/afterParamWithModifier.kt b/idea/testData/quickfix/suppress/annotationPosition/paramWithModifier.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/annotationPosition/afterParamWithModifier.kt
rename to idea/testData/quickfix/suppress/annotationPosition/paramWithModifier.kt.after
diff --git a/idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionModifierOnThePreviousLine.kt b/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionModifierOnThePreviousLine.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionModifierOnThePreviousLine.kt
rename to idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionModifierOnThePreviousLine.kt
diff --git a/idea/testData/quickfix/suppress/annotationPosition/afterTopLevelFunctionModifierOnThePreviousLine.kt b/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionModifierOnThePreviousLine.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/annotationPosition/afterTopLevelFunctionModifierOnThePreviousLine.kt
rename to idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionModifierOnThePreviousLine.kt.after
diff --git a/idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionModifierOnTheSameLine.kt b/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionModifierOnTheSameLine.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionModifierOnTheSameLine.kt
rename to idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionModifierOnTheSameLine.kt
diff --git a/idea/testData/quickfix/suppress/annotationPosition/afterTopLevelFunctionModifierOnTheSameLine.kt b/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionModifierOnTheSameLine.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/annotationPosition/afterTopLevelFunctionModifierOnTheSameLine.kt
rename to idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionModifierOnTheSameLine.kt.after
diff --git a/idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionNoModifiers.kt b/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionNoModifiers.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionNoModifiers.kt
rename to idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionNoModifiers.kt
diff --git a/idea/testData/quickfix/suppress/annotationPosition/afterTopLevelFunctionNoModifiers.kt b/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionNoModifiers.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/annotationPosition/afterTopLevelFunctionNoModifiers.kt
rename to idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionNoModifiers.kt.after
diff --git a/idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionSuppressAnotherPreviousLine.kt b/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressAnotherPreviousLine.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionSuppressAnotherPreviousLine.kt
rename to idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressAnotherPreviousLine.kt
diff --git a/idea/testData/quickfix/suppress/annotationPosition/afterTopLevelFunctionSuppressAnotherPreviousLine.kt b/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressAnotherPreviousLine.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/annotationPosition/afterTopLevelFunctionSuppressAnotherPreviousLine.kt
rename to idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressAnotherPreviousLine.kt.after
diff --git a/idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionSuppressEmptyArgsPreviousLine.kt b/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressEmptyArgsPreviousLine.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionSuppressEmptyArgsPreviousLine.kt
rename to idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressEmptyArgsPreviousLine.kt
diff --git a/idea/testData/quickfix/suppress/annotationPosition/afterTopLevelFunctionSuppressEmptyArgsPreviousLine.kt b/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressEmptyArgsPreviousLine.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/annotationPosition/afterTopLevelFunctionSuppressEmptyArgsPreviousLine.kt
rename to idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressEmptyArgsPreviousLine.kt.after
diff --git a/idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionSuppressNoArgsPreviousLine.kt b/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsPreviousLine.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionSuppressNoArgsPreviousLine.kt
rename to idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsPreviousLine.kt
diff --git a/idea/testData/quickfix/suppress/annotationPosition/afterTopLevelFunctionSuppressNoArgsPreviousLine.kt b/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsPreviousLine.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/annotationPosition/afterTopLevelFunctionSuppressNoArgsPreviousLine.kt
rename to idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsPreviousLine.kt.after
diff --git a/idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionSuppressNoArgsPreviousLineBare.kt b/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsPreviousLineBare.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionSuppressNoArgsPreviousLineBare.kt
rename to idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsPreviousLineBare.kt
diff --git a/idea/testData/quickfix/suppress/annotationPosition/afterTopLevelFunctionSuppressNoArgsPreviousLineBare.kt b/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsPreviousLineBare.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/annotationPosition/afterTopLevelFunctionSuppressNoArgsPreviousLineBare.kt
rename to idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsPreviousLineBare.kt.after
diff --git a/idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionSuppressNoArgsTheSameLine.kt b/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsTheSameLine.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionSuppressNoArgsTheSameLine.kt
rename to idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsTheSameLine.kt
diff --git a/idea/testData/quickfix/suppress/annotationPosition/afterTopLevelFunctionSuppressNoArgsTheSameLine.kt b/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsTheSameLine.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/annotationPosition/afterTopLevelFunctionSuppressNoArgsTheSameLine.kt
rename to idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsTheSameLine.kt.after
diff --git a/idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionSuppressNoArgsTheSameLineBare.kt b/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsTheSameLineBare.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionSuppressNoArgsTheSameLineBare.kt
rename to idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsTheSameLineBare.kt
diff --git a/idea/testData/quickfix/suppress/annotationPosition/afterTopLevelFunctionSuppressNoArgsTheSameLineBare.kt b/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsTheSameLineBare.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/annotationPosition/afterTopLevelFunctionSuppressNoArgsTheSameLineBare.kt
rename to idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsTheSameLineBare.kt.after
diff --git a/idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionUnrelatedAnnotation.kt b/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionUnrelatedAnnotation.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionUnrelatedAnnotation.kt
rename to idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionUnrelatedAnnotation.kt
diff --git a/idea/testData/quickfix/suppress/annotationPosition/afterTopLevelFunctionUnrelatedAnnotation.kt b/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionUnrelatedAnnotation.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/annotationPosition/afterTopLevelFunctionUnrelatedAnnotation.kt
rename to idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionUnrelatedAnnotation.kt.after
diff --git a/idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionUnrelatedAnnotationBare.kt b/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionUnrelatedAnnotationBare.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionUnrelatedAnnotationBare.kt
rename to idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionUnrelatedAnnotationBare.kt
diff --git a/idea/testData/quickfix/suppress/annotationPosition/afterTopLevelFunctionUnrelatedAnnotationBare.kt b/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionUnrelatedAnnotationBare.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/annotationPosition/afterTopLevelFunctionUnrelatedAnnotationBare.kt
rename to idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionUnrelatedAnnotationBare.kt.after
diff --git a/idea/testData/quickfix/suppress/availability/beforeLocalFunSuppressForLocal.kt b/idea/testData/quickfix/suppress/availability/localFunSuppressForLocal.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/availability/beforeLocalFunSuppressForLocal.kt
rename to idea/testData/quickfix/suppress/availability/localFunSuppressForLocal.kt
diff --git a/idea/testData/quickfix/suppress/availability/afterLocalFunSuppressForLocal.kt b/idea/testData/quickfix/suppress/availability/localFunSuppressForLocal.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/availability/afterLocalFunSuppressForLocal.kt
rename to idea/testData/quickfix/suppress/availability/localFunSuppressForLocal.kt.after
diff --git a/idea/testData/quickfix/suppress/availability/beforeLocalFunSuppressForOuter.kt b/idea/testData/quickfix/suppress/availability/localFunSuppressForOuter.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/availability/beforeLocalFunSuppressForOuter.kt
rename to idea/testData/quickfix/suppress/availability/localFunSuppressForOuter.kt
diff --git a/idea/testData/quickfix/suppress/availability/afterLocalFunSuppressForOuter.kt b/idea/testData/quickfix/suppress/availability/localFunSuppressForOuter.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/availability/afterLocalFunSuppressForOuter.kt
rename to idea/testData/quickfix/suppress/availability/localFunSuppressForOuter.kt.after
diff --git a/idea/testData/quickfix/suppress/availability/beforeLocalValSuppressForFun.kt b/idea/testData/quickfix/suppress/availability/localValSuppressForFun.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/availability/beforeLocalValSuppressForFun.kt
rename to idea/testData/quickfix/suppress/availability/localValSuppressForFun.kt
diff --git a/idea/testData/quickfix/suppress/availability/afterLocalValSuppressForFun.kt b/idea/testData/quickfix/suppress/availability/localValSuppressForFun.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/availability/afterLocalValSuppressForFun.kt
rename to idea/testData/quickfix/suppress/availability/localValSuppressForFun.kt.after
diff --git a/idea/testData/quickfix/suppress/availability/beforeLocalValSuppressForVal.kt b/idea/testData/quickfix/suppress/availability/localValSuppressForVal.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/availability/beforeLocalValSuppressForVal.kt
rename to idea/testData/quickfix/suppress/availability/localValSuppressForVal.kt
diff --git a/idea/testData/quickfix/suppress/availability/afterLocalValSuppressForVal.kt b/idea/testData/quickfix/suppress/availability/localValSuppressForVal.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/availability/afterLocalValSuppressForVal.kt
rename to idea/testData/quickfix/suppress/availability/localValSuppressForVal.kt.after
diff --git a/idea/testData/quickfix/suppress/availability/beforeMemberOfNestedSuppressForMember.kt b/idea/testData/quickfix/suppress/availability/memberOfNestedSuppressForMember.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/availability/beforeMemberOfNestedSuppressForMember.kt
rename to idea/testData/quickfix/suppress/availability/memberOfNestedSuppressForMember.kt
diff --git a/idea/testData/quickfix/suppress/availability/afterMemberOfNestedSuppressForMember.kt b/idea/testData/quickfix/suppress/availability/memberOfNestedSuppressForMember.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/availability/afterMemberOfNestedSuppressForMember.kt
rename to idea/testData/quickfix/suppress/availability/memberOfNestedSuppressForMember.kt.after
diff --git a/idea/testData/quickfix/suppress/availability/beforeMemberOfNestedSuppressForNested.kt b/idea/testData/quickfix/suppress/availability/memberOfNestedSuppressForNested.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/availability/beforeMemberOfNestedSuppressForNested.kt
rename to idea/testData/quickfix/suppress/availability/memberOfNestedSuppressForNested.kt
diff --git a/idea/testData/quickfix/suppress/availability/afterMemberOfNestedSuppressForNested.kt b/idea/testData/quickfix/suppress/availability/memberOfNestedSuppressForNested.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/availability/afterMemberOfNestedSuppressForNested.kt
rename to idea/testData/quickfix/suppress/availability/memberOfNestedSuppressForNested.kt.after
diff --git a/idea/testData/quickfix/suppress/availability/beforeMemberOfNestedSuppressForOuter.kt b/idea/testData/quickfix/suppress/availability/memberOfNestedSuppressForOuter.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/availability/beforeMemberOfNestedSuppressForOuter.kt
rename to idea/testData/quickfix/suppress/availability/memberOfNestedSuppressForOuter.kt
diff --git a/idea/testData/quickfix/suppress/availability/afterMemberOfNestedSuppressForOuter.kt b/idea/testData/quickfix/suppress/availability/memberOfNestedSuppressForOuter.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/availability/afterMemberOfNestedSuppressForOuter.kt
rename to idea/testData/quickfix/suppress/availability/memberOfNestedSuppressForOuter.kt.after
diff --git a/idea/testData/quickfix/suppress/availability/beforeMemberSuppressForClass.kt b/idea/testData/quickfix/suppress/availability/memberSuppressForClass.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/availability/beforeMemberSuppressForClass.kt
rename to idea/testData/quickfix/suppress/availability/memberSuppressForClass.kt
diff --git a/idea/testData/quickfix/suppress/availability/afterMemberSuppressForClass.kt b/idea/testData/quickfix/suppress/availability/memberSuppressForClass.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/availability/afterMemberSuppressForClass.kt
rename to idea/testData/quickfix/suppress/availability/memberSuppressForClass.kt.after
diff --git a/idea/testData/quickfix/suppress/availability/beforeMemberSuppressForMember.kt b/idea/testData/quickfix/suppress/availability/memberSuppressForMember.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/availability/beforeMemberSuppressForMember.kt
rename to idea/testData/quickfix/suppress/availability/memberSuppressForMember.kt
diff --git a/idea/testData/quickfix/suppress/availability/afterMemberSuppressForMember.kt b/idea/testData/quickfix/suppress/availability/memberSuppressForMember.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/availability/afterMemberSuppressForMember.kt
rename to idea/testData/quickfix/suppress/availability/memberSuppressForMember.kt.after
diff --git a/idea/testData/quickfix/suppress/availability/beforeTopLevelFunctionAlreadySuppressed.kt b/idea/testData/quickfix/suppress/availability/topLevelFunctionAlreadySuppressed.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/availability/beforeTopLevelFunctionAlreadySuppressed.kt
rename to idea/testData/quickfix/suppress/availability/topLevelFunctionAlreadySuppressed.kt
diff --git a/idea/testData/quickfix/suppress/declarationKinds/beforeClass.kt b/idea/testData/quickfix/suppress/declarationKinds/class.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/declarationKinds/beforeClass.kt
rename to idea/testData/quickfix/suppress/declarationKinds/class.kt
diff --git a/idea/testData/quickfix/suppress/declarationKinds/afterClass.kt b/idea/testData/quickfix/suppress/declarationKinds/class.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/declarationKinds/afterClass.kt
rename to idea/testData/quickfix/suppress/declarationKinds/class.kt.after
diff --git a/idea/testData/quickfix/suppress/declarationKinds/beforeClassObject.kt b/idea/testData/quickfix/suppress/declarationKinds/classObject.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/declarationKinds/beforeClassObject.kt
rename to idea/testData/quickfix/suppress/declarationKinds/classObject.kt
diff --git a/idea/testData/quickfix/suppress/declarationKinds/afterClassObject.kt b/idea/testData/quickfix/suppress/declarationKinds/classObject.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/declarationKinds/afterClassObject.kt
rename to idea/testData/quickfix/suppress/declarationKinds/classObject.kt.after
diff --git a/idea/testData/quickfix/suppress/declarationKinds/beforeEnumEntry.kt b/idea/testData/quickfix/suppress/declarationKinds/enumEntry.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/declarationKinds/beforeEnumEntry.kt
rename to idea/testData/quickfix/suppress/declarationKinds/enumEntry.kt
diff --git a/idea/testData/quickfix/suppress/declarationKinds/afterEnumEntry.kt b/idea/testData/quickfix/suppress/declarationKinds/enumEntry.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/declarationKinds/afterEnumEntry.kt
rename to idea/testData/quickfix/suppress/declarationKinds/enumEntry.kt.after
diff --git a/idea/testData/quickfix/suppress/declarationKinds/beforeFun.kt b/idea/testData/quickfix/suppress/declarationKinds/fun.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/declarationKinds/beforeFun.kt
rename to idea/testData/quickfix/suppress/declarationKinds/fun.kt
diff --git a/idea/testData/quickfix/suppress/declarationKinds/afterFun.kt b/idea/testData/quickfix/suppress/declarationKinds/fun.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/declarationKinds/afterFun.kt
rename to idea/testData/quickfix/suppress/declarationKinds/fun.kt.after
diff --git a/idea/testData/quickfix/suppress/declarationKinds/beforeMultiVal.kt b/idea/testData/quickfix/suppress/declarationKinds/multiVal.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/declarationKinds/beforeMultiVal.kt
rename to idea/testData/quickfix/suppress/declarationKinds/multiVal.kt
diff --git a/idea/testData/quickfix/suppress/declarationKinds/afterMultiVal.kt b/idea/testData/quickfix/suppress/declarationKinds/multiVal.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/declarationKinds/afterMultiVal.kt
rename to idea/testData/quickfix/suppress/declarationKinds/multiVal.kt.after
diff --git a/idea/testData/quickfix/suppress/declarationKinds/beforeMultiVar.kt b/idea/testData/quickfix/suppress/declarationKinds/multiVar.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/declarationKinds/beforeMultiVar.kt
rename to idea/testData/quickfix/suppress/declarationKinds/multiVar.kt
diff --git a/idea/testData/quickfix/suppress/declarationKinds/afterMultiVar.kt b/idea/testData/quickfix/suppress/declarationKinds/multiVar.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/declarationKinds/afterMultiVar.kt
rename to idea/testData/quickfix/suppress/declarationKinds/multiVar.kt.after
diff --git a/idea/testData/quickfix/suppress/declarationKinds/beforeObject.kt b/idea/testData/quickfix/suppress/declarationKinds/object.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/declarationKinds/beforeObject.kt
rename to idea/testData/quickfix/suppress/declarationKinds/object.kt
diff --git a/idea/testData/quickfix/suppress/declarationKinds/afterObject.kt b/idea/testData/quickfix/suppress/declarationKinds/object.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/declarationKinds/afterObject.kt
rename to idea/testData/quickfix/suppress/declarationKinds/object.kt.after
diff --git a/idea/testData/quickfix/suppress/declarationKinds/beforeParam.kt b/idea/testData/quickfix/suppress/declarationKinds/param.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/declarationKinds/beforeParam.kt
rename to idea/testData/quickfix/suppress/declarationKinds/param.kt
diff --git a/idea/testData/quickfix/suppress/declarationKinds/afterParam.kt b/idea/testData/quickfix/suppress/declarationKinds/param.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/declarationKinds/afterParam.kt
rename to idea/testData/quickfix/suppress/declarationKinds/param.kt.after
diff --git a/idea/testData/quickfix/suppress/declarationKinds/beforeTrait.kt b/idea/testData/quickfix/suppress/declarationKinds/trait.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/declarationKinds/beforeTrait.kt
rename to idea/testData/quickfix/suppress/declarationKinds/trait.kt
diff --git a/idea/testData/quickfix/suppress/declarationKinds/afterTrait.kt b/idea/testData/quickfix/suppress/declarationKinds/trait.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/declarationKinds/afterTrait.kt
rename to idea/testData/quickfix/suppress/declarationKinds/trait.kt.after
diff --git a/idea/testData/quickfix/suppress/declarationKinds/beforeVal.kt b/idea/testData/quickfix/suppress/declarationKinds/val.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/declarationKinds/beforeVal.kt
rename to idea/testData/quickfix/suppress/declarationKinds/val.kt
diff --git a/idea/testData/quickfix/suppress/declarationKinds/afterVal.kt b/idea/testData/quickfix/suppress/declarationKinds/val.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/declarationKinds/afterVal.kt
rename to idea/testData/quickfix/suppress/declarationKinds/val.kt.after
diff --git a/idea/testData/quickfix/suppress/declarationKinds/beforeVar.kt b/idea/testData/quickfix/suppress/declarationKinds/var.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/declarationKinds/beforeVar.kt
rename to idea/testData/quickfix/suppress/declarationKinds/var.kt
diff --git a/idea/testData/quickfix/suppress/declarationKinds/afterVar.kt b/idea/testData/quickfix/suppress/declarationKinds/var.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/declarationKinds/afterVar.kt
rename to idea/testData/quickfix/suppress/declarationKinds/var.kt.after
diff --git a/idea/testData/quickfix/suppress/errorRecovery/beforeNonStringInSuppress.kt b/idea/testData/quickfix/suppress/errorRecovery/nonStringInSuppress.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/errorRecovery/beforeNonStringInSuppress.kt
rename to idea/testData/quickfix/suppress/errorRecovery/nonStringInSuppress.kt
diff --git a/idea/testData/quickfix/suppress/errorRecovery/afterNonStringInSuppress.kt b/idea/testData/quickfix/suppress/errorRecovery/nonStringInSuppress.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/errorRecovery/afterNonStringInSuppress.kt
rename to idea/testData/quickfix/suppress/errorRecovery/nonStringInSuppress.kt.after
diff --git a/idea/testData/quickfix/suppress/errorRecovery/beforeUnresolvedAnnotation.kt b/idea/testData/quickfix/suppress/errorRecovery/unresolvedAnnotation.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/errorRecovery/beforeUnresolvedAnnotation.kt
rename to idea/testData/quickfix/suppress/errorRecovery/unresolvedAnnotation.kt
diff --git a/idea/testData/quickfix/suppress/errorRecovery/afterUnresolvedAnnotation.kt b/idea/testData/quickfix/suppress/errorRecovery/unresolvedAnnotation.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/errorRecovery/afterUnresolvedAnnotation.kt
rename to idea/testData/quickfix/suppress/errorRecovery/unresolvedAnnotation.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeAndAnd.kt b/idea/testData/quickfix/suppress/forStatement/andAnd.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeAndAnd.kt
rename to idea/testData/quickfix/suppress/forStatement/andAnd.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterAndAnd.kt b/idea/testData/quickfix/suppress/forStatement/andAnd.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterAndAnd.kt
rename to idea/testData/quickfix/suppress/forStatement/andAnd.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeAnnotatedExpr.kt b/idea/testData/quickfix/suppress/forStatement/annotatedExpr.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeAnnotatedExpr.kt
rename to idea/testData/quickfix/suppress/forStatement/annotatedExpr.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterAnnotatedExpr.kt b/idea/testData/quickfix/suppress/forStatement/annotatedExpr.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterAnnotatedExpr.kt
rename to idea/testData/quickfix/suppress/forStatement/annotatedExpr.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeAnnotatedExprWithSuppress.kt b/idea/testData/quickfix/suppress/forStatement/annotatedExprWithSuppress.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeAnnotatedExprWithSuppress.kt
rename to idea/testData/quickfix/suppress/forStatement/annotatedExprWithSuppress.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterAnnotatedExprWithSuppress.kt b/idea/testData/quickfix/suppress/forStatement/annotatedExprWithSuppress.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterAnnotatedExprWithSuppress.kt
rename to idea/testData/quickfix/suppress/forStatement/annotatedExprWithSuppress.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeArrayRead.kt b/idea/testData/quickfix/suppress/forStatement/arrayRead.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeArrayRead.kt
rename to idea/testData/quickfix/suppress/forStatement/arrayRead.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterArrayRead.kt b/idea/testData/quickfix/suppress/forStatement/arrayRead.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterArrayRead.kt
rename to idea/testData/quickfix/suppress/forStatement/arrayRead.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeAs.kt b/idea/testData/quickfix/suppress/forStatement/as.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeAs.kt
rename to idea/testData/quickfix/suppress/forStatement/as.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterAs.kt b/idea/testData/quickfix/suppress/forStatement/as.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterAs.kt
rename to idea/testData/quickfix/suppress/forStatement/as.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeAsSafe.kt b/idea/testData/quickfix/suppress/forStatement/asSafe.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeAsSafe.kt
rename to idea/testData/quickfix/suppress/forStatement/asSafe.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterAsSafe.kt b/idea/testData/quickfix/suppress/forStatement/asSafe.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterAsSafe.kt
rename to idea/testData/quickfix/suppress/forStatement/asSafe.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeAssign.kt b/idea/testData/quickfix/suppress/forStatement/assign.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeAssign.kt
rename to idea/testData/quickfix/suppress/forStatement/assign.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterAssign.kt b/idea/testData/quickfix/suppress/forStatement/assign.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterAssign.kt
rename to idea/testData/quickfix/suppress/forStatement/assign.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeCall.kt b/idea/testData/quickfix/suppress/forStatement/call.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeCall.kt
rename to idea/testData/quickfix/suppress/forStatement/call.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterCall.kt b/idea/testData/quickfix/suppress/forStatement/call.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterCall.kt
rename to idea/testData/quickfix/suppress/forStatement/call.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeColon.kt b/idea/testData/quickfix/suppress/forStatement/colon.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeColon.kt
rename to idea/testData/quickfix/suppress/forStatement/colon.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterColon.kt b/idea/testData/quickfix/suppress/forStatement/colon.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterColon.kt
rename to idea/testData/quickfix/suppress/forStatement/colon.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeDoWhile.kt b/idea/testData/quickfix/suppress/forStatement/doWhile.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeDoWhile.kt
rename to idea/testData/quickfix/suppress/forStatement/doWhile.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterDoWhile.kt b/idea/testData/quickfix/suppress/forStatement/doWhile.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterDoWhile.kt
rename to idea/testData/quickfix/suppress/forStatement/doWhile.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeDotQualified.kt b/idea/testData/quickfix/suppress/forStatement/dotQualified.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeDotQualified.kt
rename to idea/testData/quickfix/suppress/forStatement/dotQualified.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterDotQualified.kt b/idea/testData/quickfix/suppress/forStatement/dotQualified.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterDotQualified.kt
rename to idea/testData/quickfix/suppress/forStatement/dotQualified.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeElvis.kt b/idea/testData/quickfix/suppress/forStatement/elvis.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeElvis.kt
rename to idea/testData/quickfix/suppress/forStatement/elvis.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterElvis.kt b/idea/testData/quickfix/suppress/forStatement/elvis.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterElvis.kt
rename to idea/testData/quickfix/suppress/forStatement/elvis.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeEqEq.kt b/idea/testData/quickfix/suppress/forStatement/eqEq.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeEqEq.kt
rename to idea/testData/quickfix/suppress/forStatement/eqEq.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterEqEq.kt b/idea/testData/quickfix/suppress/forStatement/eqEq.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterEqEq.kt
rename to idea/testData/quickfix/suppress/forStatement/eqEq.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeFor.kt b/idea/testData/quickfix/suppress/forStatement/for.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeFor.kt
rename to idea/testData/quickfix/suppress/forStatement/for.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterFor.kt b/idea/testData/quickfix/suppress/forStatement/for.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterFor.kt
rename to idea/testData/quickfix/suppress/forStatement/for.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeIf.kt b/idea/testData/quickfix/suppress/forStatement/if.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeIf.kt
rename to idea/testData/quickfix/suppress/forStatement/if.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterIf.kt b/idea/testData/quickfix/suppress/forStatement/if.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterIf.kt
rename to idea/testData/quickfix/suppress/forStatement/if.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeIn.kt b/idea/testData/quickfix/suppress/forStatement/in.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeIn.kt
rename to idea/testData/quickfix/suppress/forStatement/in.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterIn.kt b/idea/testData/quickfix/suppress/forStatement/in.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterIn.kt
rename to idea/testData/quickfix/suppress/forStatement/in.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeInfix.kt b/idea/testData/quickfix/suppress/forStatement/infix.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeInfix.kt
rename to idea/testData/quickfix/suppress/forStatement/infix.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterInfix.kt b/idea/testData/quickfix/suppress/forStatement/infix.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterInfix.kt
rename to idea/testData/quickfix/suppress/forStatement/infix.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeIs.kt b/idea/testData/quickfix/suppress/forStatement/is.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeIs.kt
rename to idea/testData/quickfix/suppress/forStatement/is.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterIs.kt b/idea/testData/quickfix/suppress/forStatement/is.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterIs.kt
rename to idea/testData/quickfix/suppress/forStatement/is.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeLabeled.kt b/idea/testData/quickfix/suppress/forStatement/labeled.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeLabeled.kt
rename to idea/testData/quickfix/suppress/forStatement/labeled.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterLabeled.kt b/idea/testData/quickfix/suppress/forStatement/labeled.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterLabeled.kt
rename to idea/testData/quickfix/suppress/forStatement/labeled.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeLess.kt b/idea/testData/quickfix/suppress/forStatement/less.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeLess.kt
rename to idea/testData/quickfix/suppress/forStatement/less.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterLess.kt b/idea/testData/quickfix/suppress/forStatement/less.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterLess.kt
rename to idea/testData/quickfix/suppress/forStatement/less.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeMul.kt b/idea/testData/quickfix/suppress/forStatement/mul.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeMul.kt
rename to idea/testData/quickfix/suppress/forStatement/mul.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterMul.kt b/idea/testData/quickfix/suppress/forStatement/mul.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterMul.kt
rename to idea/testData/quickfix/suppress/forStatement/mul.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeOrOr.kt b/idea/testData/quickfix/suppress/forStatement/orOr.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeOrOr.kt
rename to idea/testData/quickfix/suppress/forStatement/orOr.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterOrOr.kt b/idea/testData/quickfix/suppress/forStatement/orOr.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterOrOr.kt
rename to idea/testData/quickfix/suppress/forStatement/orOr.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeParenthesized.kt b/idea/testData/quickfix/suppress/forStatement/parenthesized.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeParenthesized.kt
rename to idea/testData/quickfix/suppress/forStatement/parenthesized.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterParenthesized.kt b/idea/testData/quickfix/suppress/forStatement/parenthesized.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterParenthesized.kt
rename to idea/testData/quickfix/suppress/forStatement/parenthesized.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforePlus.kt b/idea/testData/quickfix/suppress/forStatement/plus.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforePlus.kt
rename to idea/testData/quickfix/suppress/forStatement/plus.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterPlus.kt b/idea/testData/quickfix/suppress/forStatement/plus.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterPlus.kt
rename to idea/testData/quickfix/suppress/forStatement/plus.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforePostfix.kt b/idea/testData/quickfix/suppress/forStatement/postfix.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforePostfix.kt
rename to idea/testData/quickfix/suppress/forStatement/postfix.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterPostfix.kt b/idea/testData/quickfix/suppress/forStatement/postfix.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterPostfix.kt
rename to idea/testData/quickfix/suppress/forStatement/postfix.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforePostfixPlusPlus.kt b/idea/testData/quickfix/suppress/forStatement/postfixPlusPlus.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforePostfixPlusPlus.kt
rename to idea/testData/quickfix/suppress/forStatement/postfixPlusPlus.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterPostfixPlusPlus.kt b/idea/testData/quickfix/suppress/forStatement/postfixPlusPlus.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterPostfixPlusPlus.kt
rename to idea/testData/quickfix/suppress/forStatement/postfixPlusPlus.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforePrefixPlusPlus.kt b/idea/testData/quickfix/suppress/forStatement/prefixPlusPlus.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforePrefixPlusPlus.kt
rename to idea/testData/quickfix/suppress/forStatement/prefixPlusPlus.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterPrefixPlusPlus.kt b/idea/testData/quickfix/suppress/forStatement/prefixPlusPlus.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterPrefixPlusPlus.kt
rename to idea/testData/quickfix/suppress/forStatement/prefixPlusPlus.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeRange.kt b/idea/testData/quickfix/suppress/forStatement/range.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeRange.kt
rename to idea/testData/quickfix/suppress/forStatement/range.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterRange.kt b/idea/testData/quickfix/suppress/forStatement/range.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterRange.kt
rename to idea/testData/quickfix/suppress/forStatement/range.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeReturn.kt b/idea/testData/quickfix/suppress/forStatement/return.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeReturn.kt
rename to idea/testData/quickfix/suppress/forStatement/return.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterReturn.kt b/idea/testData/quickfix/suppress/forStatement/return.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterReturn.kt
rename to idea/testData/quickfix/suppress/forStatement/return.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeSafeQualified.kt b/idea/testData/quickfix/suppress/forStatement/safeQualified.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeSafeQualified.kt
rename to idea/testData/quickfix/suppress/forStatement/safeQualified.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterSafeQualified.kt b/idea/testData/quickfix/suppress/forStatement/safeQualified.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterSafeQualified.kt
rename to idea/testData/quickfix/suppress/forStatement/safeQualified.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeSimpleName.kt b/idea/testData/quickfix/suppress/forStatement/simpleName.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeSimpleName.kt
rename to idea/testData/quickfix/suppress/forStatement/simpleName.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterSimpleName.kt b/idea/testData/quickfix/suppress/forStatement/simpleName.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterSimpleName.kt
rename to idea/testData/quickfix/suppress/forStatement/simpleName.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeStringTemplate.kt b/idea/testData/quickfix/suppress/forStatement/stringTemplate.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeStringTemplate.kt
rename to idea/testData/quickfix/suppress/forStatement/stringTemplate.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterStringTemplate.kt b/idea/testData/quickfix/suppress/forStatement/stringTemplate.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterStringTemplate.kt
rename to idea/testData/quickfix/suppress/forStatement/stringTemplate.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeThrow.kt b/idea/testData/quickfix/suppress/forStatement/throw.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeThrow.kt
rename to idea/testData/quickfix/suppress/forStatement/throw.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterThrow.kt b/idea/testData/quickfix/suppress/forStatement/throw.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterThrow.kt
rename to idea/testData/quickfix/suppress/forStatement/throw.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeTry.kt b/idea/testData/quickfix/suppress/forStatement/try.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeTry.kt
rename to idea/testData/quickfix/suppress/forStatement/try.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterTry.kt b/idea/testData/quickfix/suppress/forStatement/try.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterTry.kt
rename to idea/testData/quickfix/suppress/forStatement/try.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInAnnotationArgument.kt b/idea/testData/quickfix/suppress/forStatement/unavailable/inAnnotationArgument.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/unavailable/beforeInAnnotationArgument.kt
rename to idea/testData/quickfix/suppress/forStatement/unavailable/inAnnotationArgument.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInClassHeader.kt b/idea/testData/quickfix/suppress/forStatement/unavailable/inClassHeader.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/unavailable/beforeInClassHeader.kt
rename to idea/testData/quickfix/suppress/forStatement/unavailable/inClassHeader.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInDefaultArgument.kt b/idea/testData/quickfix/suppress/forStatement/unavailable/inDefaultArgument.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/unavailable/beforeInDefaultArgument.kt
rename to idea/testData/quickfix/suppress/forStatement/unavailable/inDefaultArgument.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInExpressionBody.kt b/idea/testData/quickfix/suppress/forStatement/unavailable/inExpressionBody.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/unavailable/beforeInExpressionBody.kt
rename to idea/testData/quickfix/suppress/forStatement/unavailable/inExpressionBody.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInLocalValInitializer.kt b/idea/testData/quickfix/suppress/forStatement/unavailable/inLocalValInitializer.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/unavailable/beforeInLocalValInitializer.kt
rename to idea/testData/quickfix/suppress/forStatement/unavailable/inLocalValInitializer.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInParameterType.kt b/idea/testData/quickfix/suppress/forStatement/unavailable/inParameterType.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/unavailable/beforeInParameterType.kt
rename to idea/testData/quickfix/suppress/forStatement/unavailable/inParameterType.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInParameterTypeInFunctionLiteral.kt b/idea/testData/quickfix/suppress/forStatement/unavailable/inParameterTypeInFunctionLiteral.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/unavailable/beforeInParameterTypeInFunctionLiteral.kt
rename to idea/testData/quickfix/suppress/forStatement/unavailable/inParameterTypeInFunctionLiteral.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInPropertyInitializer.kt b/idea/testData/quickfix/suppress/forStatement/unavailable/inPropertyInitializer.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/unavailable/beforeInPropertyInitializer.kt
rename to idea/testData/quickfix/suppress/forStatement/unavailable/inPropertyInitializer.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/unavailable/beforeObjectLiteral.kt b/idea/testData/quickfix/suppress/forStatement/unavailable/objectLiteral.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/unavailable/beforeObjectLiteral.kt
rename to idea/testData/quickfix/suppress/forStatement/unavailable/objectLiteral.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/unavailable/beforeObjectLiteralInsideExpression.kt b/idea/testData/quickfix/suppress/forStatement/unavailable/objectLiteralInsideExpression.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/unavailable/beforeObjectLiteralInsideExpression.kt
rename to idea/testData/quickfix/suppress/forStatement/unavailable/objectLiteralInsideExpression.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/unavailable/beforeSupretype.kt b/idea/testData/quickfix/suppress/forStatement/unavailable/supretype.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/unavailable/beforeSupretype.kt
rename to idea/testData/quickfix/suppress/forStatement/unavailable/supretype.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeWhenExpressionEntry.kt b/idea/testData/quickfix/suppress/forStatement/whenExpressionEntry.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeWhenExpressionEntry.kt
rename to idea/testData/quickfix/suppress/forStatement/whenExpressionEntry.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterWhenExpressionEntry.kt b/idea/testData/quickfix/suppress/forStatement/whenExpressionEntry.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterWhenExpressionEntry.kt
rename to idea/testData/quickfix/suppress/forStatement/whenExpressionEntry.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeWhenInEntry.kt b/idea/testData/quickfix/suppress/forStatement/whenInEntry.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeWhenInEntry.kt
rename to idea/testData/quickfix/suppress/forStatement/whenInEntry.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterWhenInEntry.kt b/idea/testData/quickfix/suppress/forStatement/whenInEntry.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterWhenInEntry.kt
rename to idea/testData/quickfix/suppress/forStatement/whenInEntry.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeWhenIsEntry.kt b/idea/testData/quickfix/suppress/forStatement/whenIsEntry.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeWhenIsEntry.kt
rename to idea/testData/quickfix/suppress/forStatement/whenIsEntry.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterWhenIsEntry.kt b/idea/testData/quickfix/suppress/forStatement/whenIsEntry.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterWhenIsEntry.kt
rename to idea/testData/quickfix/suppress/forStatement/whenIsEntry.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeWhenSubject.kt b/idea/testData/quickfix/suppress/forStatement/whenSubject.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeWhenSubject.kt
rename to idea/testData/quickfix/suppress/forStatement/whenSubject.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterWhenSubject.kt b/idea/testData/quickfix/suppress/forStatement/whenSubject.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterWhenSubject.kt
rename to idea/testData/quickfix/suppress/forStatement/whenSubject.kt.after
diff --git a/idea/testData/quickfix/suppress/forStatement/beforeWhile.kt b/idea/testData/quickfix/suppress/forStatement/while.kt
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/beforeWhile.kt
rename to idea/testData/quickfix/suppress/forStatement/while.kt
diff --git a/idea/testData/quickfix/suppress/forStatement/afterWhile.kt b/idea/testData/quickfix/suppress/forStatement/while.kt.after
similarity index 100%
rename from idea/testData/quickfix/suppress/forStatement/afterWhile.kt
rename to idea/testData/quickfix/suppress/forStatement/while.kt.after
diff --git a/idea/testData/quickfix/typeAddition/beforeAmbiguousFunctionReturnType.kt b/idea/testData/quickfix/typeAddition/ambiguousFunctionReturnType.kt
similarity index 100%
rename from idea/testData/quickfix/typeAddition/beforeAmbiguousFunctionReturnType.kt
rename to idea/testData/quickfix/typeAddition/ambiguousFunctionReturnType.kt
diff --git a/idea/testData/quickfix/typeAddition/afterAmbiguousFunctionReturnType.kt b/idea/testData/quickfix/typeAddition/ambiguousFunctionReturnType.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeAddition/afterAmbiguousFunctionReturnType.kt
rename to idea/testData/quickfix/typeAddition/ambiguousFunctionReturnType.kt.after
diff --git a/idea/testData/quickfix/typeAddition/beforeAmbiguousPropertyReturnType.kt b/idea/testData/quickfix/typeAddition/ambiguousPropertyReturnType.kt
similarity index 100%
rename from idea/testData/quickfix/typeAddition/beforeAmbiguousPropertyReturnType.kt
rename to idea/testData/quickfix/typeAddition/ambiguousPropertyReturnType.kt
diff --git a/idea/testData/quickfix/typeAddition/afterAmbiguousPropertyReturnType.kt b/idea/testData/quickfix/typeAddition/ambiguousPropertyReturnType.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeAddition/afterAmbiguousPropertyReturnType.kt
rename to idea/testData/quickfix/typeAddition/ambiguousPropertyReturnType.kt.after
diff --git a/idea/testData/quickfix/typeAddition/beforeChangeAccessorTypeToFunctionType.kt b/idea/testData/quickfix/typeAddition/changeAccessorTypeToFunctionType.kt
similarity index 100%
rename from idea/testData/quickfix/typeAddition/beforeChangeAccessorTypeToFunctionType.kt
rename to idea/testData/quickfix/typeAddition/changeAccessorTypeToFunctionType.kt
diff --git a/idea/testData/quickfix/typeAddition/afterChangeAccessorTypeToFunctionType.kt b/idea/testData/quickfix/typeAddition/changeAccessorTypeToFunctionType.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeAddition/afterChangeAccessorTypeToFunctionType.kt
rename to idea/testData/quickfix/typeAddition/changeAccessorTypeToFunctionType.kt.after
diff --git a/idea/testData/quickfix/typeAddition/beforeNoAddErrorType.kt b/idea/testData/quickfix/typeAddition/noAddErrorType.kt
similarity index 100%
rename from idea/testData/quickfix/typeAddition/beforeNoAddErrorType.kt
rename to idea/testData/quickfix/typeAddition/noAddErrorType.kt
diff --git a/idea/testData/quickfix/typeAddition/beforeProtectedFunWithoutReturnType.kt b/idea/testData/quickfix/typeAddition/protectedFunWithoutReturnType.kt
similarity index 100%
rename from idea/testData/quickfix/typeAddition/beforeProtectedFunWithoutReturnType.kt
rename to idea/testData/quickfix/typeAddition/protectedFunWithoutReturnType.kt
diff --git a/idea/testData/quickfix/typeAddition/afterProtectedFunWithoutReturnType.kt b/idea/testData/quickfix/typeAddition/protectedFunWithoutReturnType.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeAddition/afterProtectedFunWithoutReturnType.kt
rename to idea/testData/quickfix/typeAddition/protectedFunWithoutReturnType.kt.after
diff --git a/idea/testData/quickfix/typeAddition/beforePublicFunWithoutBody.kt b/idea/testData/quickfix/typeAddition/publicFunWithoutBody.kt
similarity index 100%
rename from idea/testData/quickfix/typeAddition/beforePublicFunWithoutBody.kt
rename to idea/testData/quickfix/typeAddition/publicFunWithoutBody.kt
diff --git a/idea/testData/quickfix/typeAddition/beforePublicFunWithoutReturnType.kt b/idea/testData/quickfix/typeAddition/publicFunWithoutReturnType.kt
similarity index 100%
rename from idea/testData/quickfix/typeAddition/beforePublicFunWithoutReturnType.kt
rename to idea/testData/quickfix/typeAddition/publicFunWithoutReturnType.kt
diff --git a/idea/testData/quickfix/typeAddition/afterPublicFunWithoutReturnType.kt b/idea/testData/quickfix/typeAddition/publicFunWithoutReturnType.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeAddition/afterPublicFunWithoutReturnType.kt
rename to idea/testData/quickfix/typeAddition/publicFunWithoutReturnType.kt.after
diff --git a/idea/testData/quickfix/typeAddition/beforePublicFunWithoutReturnTypeCaretOnParameter.kt b/idea/testData/quickfix/typeAddition/publicFunWithoutReturnTypeCaretOnParameter.kt
similarity index 100%
rename from idea/testData/quickfix/typeAddition/beforePublicFunWithoutReturnTypeCaretOnParameter.kt
rename to idea/testData/quickfix/typeAddition/publicFunWithoutReturnTypeCaretOnParameter.kt
diff --git a/idea/testData/quickfix/typeAddition/afterPublicFunWithoutReturnTypeCaretOnParameter.kt b/idea/testData/quickfix/typeAddition/publicFunWithoutReturnTypeCaretOnParameter.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeAddition/afterPublicFunWithoutReturnTypeCaretOnParameter.kt
rename to idea/testData/quickfix/typeAddition/publicFunWithoutReturnTypeCaretOnParameter.kt.after
diff --git a/idea/testData/quickfix/typeAddition/beforePublicValWithoutReturnType.kt b/idea/testData/quickfix/typeAddition/publicValWithoutReturnType.kt
similarity index 100%
rename from idea/testData/quickfix/typeAddition/beforePublicValWithoutReturnType.kt
rename to idea/testData/quickfix/typeAddition/publicValWithoutReturnType.kt
diff --git a/idea/testData/quickfix/typeAddition/afterPublicValWithoutReturnType.kt b/idea/testData/quickfix/typeAddition/publicValWithoutReturnType.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeAddition/afterPublicValWithoutReturnType.kt
rename to idea/testData/quickfix/typeAddition/publicValWithoutReturnType.kt.after
diff --git a/idea/testData/quickfix/typeAddition/beforePublicValWithoutReturnTypeCaretOnPublic.kt b/idea/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt
similarity index 100%
rename from idea/testData/quickfix/typeAddition/beforePublicValWithoutReturnTypeCaretOnPublic.kt
rename to idea/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt
diff --git a/idea/testData/quickfix/typeAddition/afterPublicValWithoutReturnTypeCaretOnPublic.kt b/idea/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeAddition/afterPublicValWithoutReturnTypeCaretOnPublic.kt
rename to idea/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt.after
diff --git a/idea/testData/quickfix/typeAddition/beforeWrongGetterParameterType.kt b/idea/testData/quickfix/typeAddition/wrongGetterParameterType.kt
similarity index 100%
rename from idea/testData/quickfix/typeAddition/beforeWrongGetterParameterType.kt
rename to idea/testData/quickfix/typeAddition/wrongGetterParameterType.kt
diff --git a/idea/testData/quickfix/typeAddition/afterWrongGetterParameterType.kt b/idea/testData/quickfix/typeAddition/wrongGetterParameterType.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeAddition/afterWrongGetterParameterType.kt
rename to idea/testData/quickfix/typeAddition/wrongGetterParameterType.kt.after
diff --git a/idea/testData/quickfix/typeAddition/beforeWrongGetterParameterTypeLongNameRuntime.kt b/idea/testData/quickfix/typeAddition/wrongGetterParameterTypeLongNameRuntime.kt
similarity index 100%
rename from idea/testData/quickfix/typeAddition/beforeWrongGetterParameterTypeLongNameRuntime.kt
rename to idea/testData/quickfix/typeAddition/wrongGetterParameterTypeLongNameRuntime.kt
diff --git a/idea/testData/quickfix/typeAddition/afterWrongGetterParameterTypeLongNameRuntime.kt b/idea/testData/quickfix/typeAddition/wrongGetterParameterTypeLongNameRuntime.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeAddition/afterWrongGetterParameterTypeLongNameRuntime.kt
rename to idea/testData/quickfix/typeAddition/wrongGetterParameterTypeLongNameRuntime.kt.after
diff --git a/idea/testData/quickfix/typeAddition/beforeWrongSetterParameterType.kt b/idea/testData/quickfix/typeAddition/wrongSetterParameterType.kt
similarity index 100%
rename from idea/testData/quickfix/typeAddition/beforeWrongSetterParameterType.kt
rename to idea/testData/quickfix/typeAddition/wrongSetterParameterType.kt
diff --git a/idea/testData/quickfix/typeAddition/afterWrongSetterParameterType.kt b/idea/testData/quickfix/typeAddition/wrongSetterParameterType.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeAddition/afterWrongSetterParameterType.kt
rename to idea/testData/quickfix/typeAddition/wrongSetterParameterType.kt.after
diff --git a/idea/testData/quickfix/typeImports/beforeHasThisImport.kt b/idea/testData/quickfix/typeImports/hasThisImport.kt
similarity index 100%
rename from idea/testData/quickfix/typeImports/beforeHasThisImport.kt
rename to idea/testData/quickfix/typeImports/hasThisImport.kt
diff --git a/idea/testData/quickfix/typeImports/afterHasThisImport.kt b/idea/testData/quickfix/typeImports/hasThisImport.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeImports/afterHasThisImport.kt
rename to idea/testData/quickfix/typeImports/hasThisImport.kt.after
diff --git a/idea/testData/quickfix/typeImports/beforeNoImportFromTheSameFile.kt b/idea/testData/quickfix/typeImports/noImportFromTheSameFile.kt
similarity index 100%
rename from idea/testData/quickfix/typeImports/beforeNoImportFromTheSameFile.kt
rename to idea/testData/quickfix/typeImports/noImportFromTheSameFile.kt
diff --git a/idea/testData/quickfix/typeImports/afterNoImportFromTheSameFile.kt b/idea/testData/quickfix/typeImports/noImportFromTheSameFile.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeImports/afterNoImportFromTheSameFile.kt
rename to idea/testData/quickfix/typeImports/noImportFromTheSameFile.kt.after
diff --git a/idea/testData/quickfix/typeImports/beforeNoImportJavaLang.kt b/idea/testData/quickfix/typeImports/noImportJavaLang.kt
similarity index 100%
rename from idea/testData/quickfix/typeImports/beforeNoImportJavaLang.kt
rename to idea/testData/quickfix/typeImports/noImportJavaLang.kt
diff --git a/idea/testData/quickfix/typeImports/afterNoImportJavaLang.kt b/idea/testData/quickfix/typeImports/noImportJavaLang.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeImports/afterNoImportJavaLang.kt
rename to idea/testData/quickfix/typeImports/noImportJavaLang.kt.after
diff --git a/idea/testData/quickfix/typeImports/beforeNoImportJetStandard.kt b/idea/testData/quickfix/typeImports/noImportJetStandard.kt
similarity index 100%
rename from idea/testData/quickfix/typeImports/beforeNoImportJetStandard.kt
rename to idea/testData/quickfix/typeImports/noImportJetStandard.kt
diff --git a/idea/testData/quickfix/typeImports/afterNoImportJetStandard.kt b/idea/testData/quickfix/typeImports/noImportJetStandard.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeImports/afterNoImportJetStandard.kt
rename to idea/testData/quickfix/typeImports/noImportJetStandard.kt.after
diff --git a/idea/testData/quickfix/typeImports/beforeToImport1.kt b/idea/testData/quickfix/typeImports/toImport1.kt
similarity index 100%
rename from idea/testData/quickfix/typeImports/beforeToImport1.kt
rename to idea/testData/quickfix/typeImports/toImport1.kt
diff --git a/idea/testData/quickfix/typeImports/afterToImport1.kt b/idea/testData/quickfix/typeImports/toImport1.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeImports/afterToImport1.kt
rename to idea/testData/quickfix/typeImports/toImport1.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/beforeAccessibleLocalClassInReturn.kt b/idea/testData/quickfix/typeMismatch/accessibleLocalClassInReturn.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/beforeAccessibleLocalClassInReturn.kt
rename to idea/testData/quickfix/typeMismatch/accessibleLocalClassInReturn.kt
diff --git a/idea/testData/quickfix/typeMismatch/afterAccessibleLocalClassInReturn.kt b/idea/testData/quickfix/typeMismatch/accessibleLocalClassInReturn.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/afterAccessibleLocalClassInReturn.kt
rename to idea/testData/quickfix/typeMismatch/accessibleLocalClassInReturn.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/beforeAnonymousObjectInCall.kt b/idea/testData/quickfix/typeMismatch/anonymousObjectInCall.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/beforeAnonymousObjectInCall.kt
rename to idea/testData/quickfix/typeMismatch/anonymousObjectInCall.kt
diff --git a/idea/testData/quickfix/typeMismatch/afterAnonymousObjectInCall.kt b/idea/testData/quickfix/typeMismatch/anonymousObjectInCall.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/afterAnonymousObjectInCall.kt
rename to idea/testData/quickfix/typeMismatch/anonymousObjectInCall.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/beforeAnonymousObjectInInfixCall.kt b/idea/testData/quickfix/typeMismatch/anonymousObjectInInfixCall.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/beforeAnonymousObjectInInfixCall.kt
rename to idea/testData/quickfix/typeMismatch/anonymousObjectInInfixCall.kt
diff --git a/idea/testData/quickfix/typeMismatch/afterAnonymousObjectInInfixCall.kt b/idea/testData/quickfix/typeMismatch/anonymousObjectInInfixCall.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/afterAnonymousObjectInInfixCall.kt
rename to idea/testData/quickfix/typeMismatch/anonymousObjectInInfixCall.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/beforeAnonymousObjectInInitializer.kt b/idea/testData/quickfix/typeMismatch/anonymousObjectInInitializer.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/beforeAnonymousObjectInInitializer.kt
rename to idea/testData/quickfix/typeMismatch/anonymousObjectInInitializer.kt
diff --git a/idea/testData/quickfix/typeMismatch/afterAnonymousObjectInInitializer.kt b/idea/testData/quickfix/typeMismatch/anonymousObjectInInitializer.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/afterAnonymousObjectInInitializer.kt
rename to idea/testData/quickfix/typeMismatch/anonymousObjectInInitializer.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/beforeAnonymousObjectInReturn.kt b/idea/testData/quickfix/typeMismatch/anonymousObjectInReturn.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/beforeAnonymousObjectInReturn.kt
rename to idea/testData/quickfix/typeMismatch/anonymousObjectInReturn.kt
diff --git a/idea/testData/quickfix/typeMismatch/afterAnonymousObjectInReturn.kt b/idea/testData/quickfix/typeMismatch/anonymousObjectInReturn.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/afterAnonymousObjectInReturn.kt
rename to idea/testData/quickfix/typeMismatch/anonymousObjectInReturn.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/beforeAnyInReturn.kt b/idea/testData/quickfix/typeMismatch/anyInReturn.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/beforeAnyInReturn.kt
rename to idea/testData/quickfix/typeMismatch/anyInReturn.kt
diff --git a/idea/testData/quickfix/typeMismatch/afterAnyInReturn.kt b/idea/testData/quickfix/typeMismatch/anyInReturn.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/afterAnyInReturn.kt
rename to idea/testData/quickfix/typeMismatch/anyInReturn.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/casts/beforeCastToFunctionType.kt b/idea/testData/quickfix/typeMismatch/casts/castToFunctionType.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/casts/beforeCastToFunctionType.kt
rename to idea/testData/quickfix/typeMismatch/casts/castToFunctionType.kt
diff --git a/idea/testData/quickfix/typeMismatch/casts/afterCastToFunctionType.kt b/idea/testData/quickfix/typeMismatch/casts/castToFunctionType.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/casts/afterCastToFunctionType.kt
rename to idea/testData/quickfix/typeMismatch/casts/castToFunctionType.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/casts/beforeSmartcastImpossible1.kt b/idea/testData/quickfix/typeMismatch/casts/smartcastImpossible1.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/casts/beforeSmartcastImpossible1.kt
rename to idea/testData/quickfix/typeMismatch/casts/smartcastImpossible1.kt
diff --git a/idea/testData/quickfix/typeMismatch/casts/afterSmartcastImpossible1.kt b/idea/testData/quickfix/typeMismatch/casts/smartcastImpossible1.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/casts/afterSmartcastImpossible1.kt
rename to idea/testData/quickfix/typeMismatch/casts/smartcastImpossible1.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/casts/beforeSmartcastImpossible2.kt b/idea/testData/quickfix/typeMismatch/casts/smartcastImpossible2.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/casts/beforeSmartcastImpossible2.kt
rename to idea/testData/quickfix/typeMismatch/casts/smartcastImpossible2.kt
diff --git a/idea/testData/quickfix/typeMismatch/casts/afterSmartcastImpossible2.kt b/idea/testData/quickfix/typeMismatch/casts/smartcastImpossible2.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/casts/afterSmartcastImpossible2.kt
rename to idea/testData/quickfix/typeMismatch/casts/smartcastImpossible2.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/casts/beforeSmartcastImpossible3.kt b/idea/testData/quickfix/typeMismatch/casts/smartcastImpossible3.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/casts/beforeSmartcastImpossible3.kt
rename to idea/testData/quickfix/typeMismatch/casts/smartcastImpossible3.kt
diff --git a/idea/testData/quickfix/typeMismatch/casts/afterSmartcastImpossible3.kt b/idea/testData/quickfix/typeMismatch/casts/smartcastImpossible3.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/casts/afterSmartcastImpossible3.kt
rename to idea/testData/quickfix/typeMismatch/casts/smartcastImpossible3.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatch1.kt b/idea/testData/quickfix/typeMismatch/casts/typeMismatch1.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatch1.kt
rename to idea/testData/quickfix/typeMismatch/casts/typeMismatch1.kt
diff --git a/idea/testData/quickfix/typeMismatch/casts/afterTypeMismatch1.kt b/idea/testData/quickfix/typeMismatch/casts/typeMismatch1.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/casts/afterTypeMismatch1.kt
rename to idea/testData/quickfix/typeMismatch/casts/typeMismatch1.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatch2.kt b/idea/testData/quickfix/typeMismatch/casts/typeMismatch2.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatch2.kt
rename to idea/testData/quickfix/typeMismatch/casts/typeMismatch2.kt
diff --git a/idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatch3.kt b/idea/testData/quickfix/typeMismatch/casts/typeMismatch3.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatch3.kt
rename to idea/testData/quickfix/typeMismatch/casts/typeMismatch3.kt
diff --git a/idea/testData/quickfix/typeMismatch/casts/afterTypeMismatch3.kt b/idea/testData/quickfix/typeMismatch/casts/typeMismatch3.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/casts/afterTypeMismatch3.kt
rename to idea/testData/quickfix/typeMismatch/casts/typeMismatch3.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatch4.kt b/idea/testData/quickfix/typeMismatch/casts/typeMismatch4.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatch4.kt
rename to idea/testData/quickfix/typeMismatch/casts/typeMismatch4.kt
diff --git a/idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatchLongNameRuntime.kt b/idea/testData/quickfix/typeMismatch/casts/typeMismatchLongNameRuntime.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatchLongNameRuntime.kt
rename to idea/testData/quickfix/typeMismatch/casts/typeMismatchLongNameRuntime.kt
diff --git a/idea/testData/quickfix/typeMismatch/casts/afterTypeMismatchLongNameRuntime.kt b/idea/testData/quickfix/typeMismatch/casts/typeMismatchLongNameRuntime.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/casts/afterTypeMismatchLongNameRuntime.kt
rename to idea/testData/quickfix/typeMismatch/casts/typeMismatchLongNameRuntime.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/beforeChangeFunctionLiteralParameterTypeToFunctionType.kt b/idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionType.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/beforeChangeFunctionLiteralParameterTypeToFunctionType.kt
rename to idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionType.kt
diff --git a/idea/testData/quickfix/typeMismatch/afterChangeFunctionLiteralParameterTypeToFunctionType.kt b/idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionType.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/afterChangeFunctionLiteralParameterTypeToFunctionType.kt
rename to idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionType.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/beforeChangeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt b/idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/beforeChangeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt
rename to idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt
diff --git a/idea/testData/quickfix/typeMismatch/afterChangeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt b/idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/afterChangeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt
rename to idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/beforeChangeFunctionReturnTypeToMatchExpectedTypeOfCall.kt b/idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCall.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/beforeChangeFunctionReturnTypeToMatchExpectedTypeOfCall.kt
rename to idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCall.kt
diff --git a/idea/testData/quickfix/typeMismatch/afterChangeFunctionReturnTypeToMatchExpectedTypeOfCall.kt b/idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCall.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/afterChangeFunctionReturnTypeToMatchExpectedTypeOfCall.kt
rename to idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCall.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/beforeChangeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt b/idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/beforeChangeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt
rename to idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt
diff --git a/idea/testData/quickfix/typeMismatch/afterChangeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt b/idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/afterChangeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt
rename to idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/beforeChangeReturnTypeToSpecificNullable.kt b/idea/testData/quickfix/typeMismatch/changeReturnTypeToSpecificNullable.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/beforeChangeReturnTypeToSpecificNullable.kt
rename to idea/testData/quickfix/typeMismatch/changeReturnTypeToSpecificNullable.kt
diff --git a/idea/testData/quickfix/typeMismatch/afterChangeReturnTypeToSpecificNullable.kt b/idea/testData/quickfix/typeMismatch/changeReturnTypeToSpecificNullable.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/afterChangeReturnTypeToSpecificNullable.kt
rename to idea/testData/quickfix/typeMismatch/changeReturnTypeToSpecificNullable.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/beforeChangeReturnTypeWhenFunctionNameIsMissing.kt b/idea/testData/quickfix/typeMismatch/changeReturnTypeWhenFunctionNameIsMissing.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/beforeChangeReturnTypeWhenFunctionNameIsMissing.kt
rename to idea/testData/quickfix/typeMismatch/changeReturnTypeWhenFunctionNameIsMissing.kt
diff --git a/idea/testData/quickfix/typeMismatch/afterChangeReturnTypeWhenFunctionNameIsMissing.kt b/idea/testData/quickfix/typeMismatch/changeReturnTypeWhenFunctionNameIsMissing.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/afterChangeReturnTypeWhenFunctionNameIsMissing.kt
rename to idea/testData/quickfix/typeMismatch/changeReturnTypeWhenFunctionNameIsMissing.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/beforeChangeReturnTypeWhenValueParameterListIsAbsent.kt b/idea/testData/quickfix/typeMismatch/changeReturnTypeWhenValueParameterListIsAbsent.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/beforeChangeReturnTypeWhenValueParameterListIsAbsent.kt
rename to idea/testData/quickfix/typeMismatch/changeReturnTypeWhenValueParameterListIsAbsent.kt
diff --git a/idea/testData/quickfix/typeMismatch/afterChangeReturnTypeWhenValueParameterListIsAbsent.kt b/idea/testData/quickfix/typeMismatch/changeReturnTypeWhenValueParameterListIsAbsent.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/afterChangeReturnTypeWhenValueParameterListIsAbsent.kt
rename to idea/testData/quickfix/typeMismatch/changeReturnTypeWhenValueParameterListIsAbsent.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/beforeCompareToTypeMismatch.kt b/idea/testData/quickfix/typeMismatch/compareToTypeMismatch.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/beforeCompareToTypeMismatch.kt
rename to idea/testData/quickfix/typeMismatch/compareToTypeMismatch.kt
diff --git a/idea/testData/quickfix/typeMismatch/afterCompareToTypeMismatch.kt b/idea/testData/quickfix/typeMismatch/compareToTypeMismatch.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/afterCompareToTypeMismatch.kt
rename to idea/testData/quickfix/typeMismatch/compareToTypeMismatch.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/beforeComponentFunctionReturnTypeMismatch1.kt b/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch1.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/beforeComponentFunctionReturnTypeMismatch1.kt
rename to idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch1.kt
diff --git a/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/afterComponentFunctionReturnTypeMismatch1.kt b/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch1.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/afterComponentFunctionReturnTypeMismatch1.kt
rename to idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch1.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/beforeComponentFunctionReturnTypeMismatch2.kt b/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch2.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/beforeComponentFunctionReturnTypeMismatch2.kt
rename to idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch2.kt
diff --git a/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/afterComponentFunctionReturnTypeMismatch2.kt b/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch2.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/afterComponentFunctionReturnTypeMismatch2.kt
rename to idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch2.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/beforeComponentFunctionReturnTypeMismatch3.kt b/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch3.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/beforeComponentFunctionReturnTypeMismatch3.kt
rename to idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch3.kt
diff --git a/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/afterComponentFunctionReturnTypeMismatch3.kt b/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch3.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/afterComponentFunctionReturnTypeMismatch3.kt
rename to idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch3.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/beforeComponentFunctionReturnTypeMismatch4.kt b/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch4.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/beforeComponentFunctionReturnTypeMismatch4.kt
rename to idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch4.kt
diff --git a/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/afterComponentFunctionReturnTypeMismatch4.kt b/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch4.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/afterComponentFunctionReturnTypeMismatch4.kt
rename to idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch4.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/beforeComponentFunctionReturnTypeMismatch5.kt b/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch5.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/beforeComponentFunctionReturnTypeMismatch5.kt
rename to idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch5.kt
diff --git a/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/afterComponentFunctionReturnTypeMismatch5.kt b/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch5.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/afterComponentFunctionReturnTypeMismatch5.kt
rename to idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch5.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/beforeConstantTypeMismatch.kt b/idea/testData/quickfix/typeMismatch/constantTypeMismatch.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/beforeConstantTypeMismatch.kt
rename to idea/testData/quickfix/typeMismatch/constantTypeMismatch.kt
diff --git a/idea/testData/quickfix/typeMismatch/afterConstantTypeMismatch.kt b/idea/testData/quickfix/typeMismatch/constantTypeMismatch.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/afterConstantTypeMismatch.kt
rename to idea/testData/quickfix/typeMismatch/constantTypeMismatch.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/beforeDontChangeOverriddenPropertyTypeToErrorType.kt b/idea/testData/quickfix/typeMismatch/dontChangeOverriddenPropertyTypeToErrorType.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/beforeDontChangeOverriddenPropertyTypeToErrorType.kt
rename to idea/testData/quickfix/typeMismatch/dontChangeOverriddenPropertyTypeToErrorType.kt
diff --git a/idea/testData/quickfix/typeMismatch/beforeExpectedParameterTypeMismatch.kt b/idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatch.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/beforeExpectedParameterTypeMismatch.kt
rename to idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatch.kt
diff --git a/idea/testData/quickfix/typeMismatch/afterExpectedParameterTypeMismatch.kt b/idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatch.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/afterExpectedParameterTypeMismatch.kt
rename to idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatch.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/beforeExpectedParameterTypeMismatchLongNameRuntime.kt b/idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatchLongNameRuntime.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/beforeExpectedParameterTypeMismatchLongNameRuntime.kt
rename to idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatchLongNameRuntime.kt
diff --git a/idea/testData/quickfix/typeMismatch/afterExpectedParameterTypeMismatchLongNameRuntime.kt b/idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatchLongNameRuntime.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/afterExpectedParameterTypeMismatchLongNameRuntime.kt
rename to idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatchLongNameRuntime.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/beforeExpectedReturnTypeMismatch.kt b/idea/testData/quickfix/typeMismatch/expectedReturnTypeMismatch.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/beforeExpectedReturnTypeMismatch.kt
rename to idea/testData/quickfix/typeMismatch/expectedReturnTypeMismatch.kt
diff --git a/idea/testData/quickfix/typeMismatch/afterExpectedReturnTypeMismatch.kt b/idea/testData/quickfix/typeMismatch/expectedReturnTypeMismatch.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/afterExpectedReturnTypeMismatch.kt
rename to idea/testData/quickfix/typeMismatch/expectedReturnTypeMismatch.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/fixOverloadedOperator/beforeChangeNotFunctionReturnType.kt b/idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changeNotFunctionReturnType.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/fixOverloadedOperator/beforeChangeNotFunctionReturnType.kt
rename to idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changeNotFunctionReturnType.kt
diff --git a/idea/testData/quickfix/typeMismatch/fixOverloadedOperator/afterChangeNotFunctionReturnType.kt b/idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changeNotFunctionReturnType.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/fixOverloadedOperator/afterChangeNotFunctionReturnType.kt
rename to idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changeNotFunctionReturnType.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/fixOverloadedOperator/beforeChangePlusFunctionReturnType.kt b/idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changePlusFunctionReturnType.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/fixOverloadedOperator/beforeChangePlusFunctionReturnType.kt
rename to idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changePlusFunctionReturnType.kt
diff --git a/idea/testData/quickfix/typeMismatch/fixOverloadedOperator/afterChangePlusFunctionReturnType.kt b/idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changePlusFunctionReturnType.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/fixOverloadedOperator/afterChangePlusFunctionReturnType.kt
rename to idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changePlusFunctionReturnType.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/fixOverloadedOperator/beforeChangeTimesFunctionParameterType.kt b/idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changeTimesFunctionParameterType.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/fixOverloadedOperator/beforeChangeTimesFunctionParameterType.kt
rename to idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changeTimesFunctionParameterType.kt
diff --git a/idea/testData/quickfix/typeMismatch/fixOverloadedOperator/afterChangeTimesFunctionParameterType.kt b/idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changeTimesFunctionParameterType.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/fixOverloadedOperator/afterChangeTimesFunctionParameterType.kt
rename to idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changeTimesFunctionParameterType.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/beforeHasNextFunctionReturnTypeMismatch.kt b/idea/testData/quickfix/typeMismatch/hasNextFunctionReturnTypeMismatch.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/beforeHasNextFunctionReturnTypeMismatch.kt
rename to idea/testData/quickfix/typeMismatch/hasNextFunctionReturnTypeMismatch.kt
diff --git a/idea/testData/quickfix/typeMismatch/afterHasNextFunctionReturnTypeMismatch.kt b/idea/testData/quickfix/typeMismatch/hasNextFunctionReturnTypeMismatch.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/afterHasNextFunctionReturnTypeMismatch.kt
rename to idea/testData/quickfix/typeMismatch/hasNextFunctionReturnTypeMismatch.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/beforeLocalClassInReturn1.kt b/idea/testData/quickfix/typeMismatch/localClassInReturn1.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/beforeLocalClassInReturn1.kt
rename to idea/testData/quickfix/typeMismatch/localClassInReturn1.kt
diff --git a/idea/testData/quickfix/typeMismatch/afterLocalClassInReturn1.kt b/idea/testData/quickfix/typeMismatch/localClassInReturn1.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/afterLocalClassInReturn1.kt
rename to idea/testData/quickfix/typeMismatch/localClassInReturn1.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/beforeLocalClassInReturn2.kt b/idea/testData/quickfix/typeMismatch/localClassInReturn2.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/beforeLocalClassInReturn2.kt
rename to idea/testData/quickfix/typeMismatch/localClassInReturn2.kt
diff --git a/idea/testData/quickfix/typeMismatch/afterLocalClassInReturn2.kt b/idea/testData/quickfix/typeMismatch/localClassInReturn2.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/afterLocalClassInReturn2.kt
rename to idea/testData/quickfix/typeMismatch/localClassInReturn2.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/beforeMakeReturnTypeNullable.kt b/idea/testData/quickfix/typeMismatch/makeReturnTypeNullable.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/beforeMakeReturnTypeNullable.kt
rename to idea/testData/quickfix/typeMismatch/makeReturnTypeNullable.kt
diff --git a/idea/testData/quickfix/typeMismatch/afterMakeReturnTypeNullable.kt b/idea/testData/quickfix/typeMismatch/makeReturnTypeNullable.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/afterMakeReturnTypeNullable.kt
rename to idea/testData/quickfix/typeMismatch/makeReturnTypeNullable.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/beforeNoReturnInFunctionWithBlockBody.kt b/idea/testData/quickfix/typeMismatch/noReturnInFunctionWithBlockBody.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/beforeNoReturnInFunctionWithBlockBody.kt
rename to idea/testData/quickfix/typeMismatch/noReturnInFunctionWithBlockBody.kt
diff --git a/idea/testData/quickfix/typeMismatch/afterNoReturnInFunctionWithBlockBody.kt b/idea/testData/quickfix/typeMismatch/noReturnInFunctionWithBlockBody.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/afterNoReturnInFunctionWithBlockBody.kt
rename to idea/testData/quickfix/typeMismatch/noReturnInFunctionWithBlockBody.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/beforeNullArgumentForNonNullParameter.kt b/idea/testData/quickfix/typeMismatch/nullArgumentForNonNullParameter.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/beforeNullArgumentForNonNullParameter.kt
rename to idea/testData/quickfix/typeMismatch/nullArgumentForNonNullParameter.kt
diff --git a/idea/testData/quickfix/typeMismatch/afterNullArgumentForNonNullParameter.kt b/idea/testData/quickfix/typeMismatch/nullArgumentForNonNullParameter.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/afterNullArgumentForNonNullParameter.kt
rename to idea/testData/quickfix/typeMismatch/nullArgumentForNonNullParameter.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType1.kt b/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeFunctionParameterType1.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType1.kt
rename to idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeFunctionParameterType1.kt
diff --git a/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/afterChangeFunctionParameterType1.kt b/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeFunctionParameterType1.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/parameterTypeMismatch/afterChangeFunctionParameterType1.kt
rename to idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeFunctionParameterType1.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType2.kt b/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeFunctionParameterType2.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType2.kt
rename to idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeFunctionParameterType2.kt
diff --git a/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/afterChangeFunctionParameterType2.kt b/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeFunctionParameterType2.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/parameterTypeMismatch/afterChangeFunctionParameterType2.kt
rename to idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeFunctionParameterType2.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType3.kt b/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeFunctionParameterType3.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType3.kt
rename to idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeFunctionParameterType3.kt
diff --git a/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/afterChangeFunctionParameterType3.kt b/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeFunctionParameterType3.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/parameterTypeMismatch/afterChangeFunctionParameterType3.kt
rename to idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeFunctionParameterType3.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType4.kt b/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeFunctionParameterType4.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType4.kt
rename to idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeFunctionParameterType4.kt
diff --git a/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType5.kt b/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeFunctionParameterType5.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType5.kt
rename to idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeFunctionParameterType5.kt
diff --git a/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeParameterTypeLongNameRuntime.kt b/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeParameterTypeLongNameRuntime.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeParameterTypeLongNameRuntime.kt
rename to idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeParameterTypeLongNameRuntime.kt
diff --git a/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/afterChangeParameterTypeLongNameRuntime.kt b/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeParameterTypeLongNameRuntime.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/parameterTypeMismatch/afterChangeParameterTypeLongNameRuntime.kt
rename to idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeParameterTypeLongNameRuntime.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangePrimaryConstructorParameterType.kt b/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changePrimaryConstructorParameterType.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangePrimaryConstructorParameterType.kt
rename to idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changePrimaryConstructorParameterType.kt
diff --git a/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/afterChangePrimaryConstructorParameterType.kt b/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changePrimaryConstructorParameterType.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/parameterTypeMismatch/afterChangePrimaryConstructorParameterType.kt
rename to idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changePrimaryConstructorParameterType.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeMultiFakeOverride.kt b/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/multiFakeOverride.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeMultiFakeOverride.kt
rename to idea/testData/quickfix/typeMismatch/parameterTypeMismatch/multiFakeOverride.kt
diff --git a/idea/testData/quickfix/typeMismatch/beforePropertyTypeMismatch.kt b/idea/testData/quickfix/typeMismatch/propertyTypeMismatch.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/beforePropertyTypeMismatch.kt
rename to idea/testData/quickfix/typeMismatch/propertyTypeMismatch.kt
diff --git a/idea/testData/quickfix/typeMismatch/afterPropertyTypeMismatch.kt b/idea/testData/quickfix/typeMismatch/propertyTypeMismatch.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/afterPropertyTypeMismatch.kt
rename to idea/testData/quickfix/typeMismatch/propertyTypeMismatch.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/beforePropertyTypeMismatchLongNameRuntime.kt b/idea/testData/quickfix/typeMismatch/propertyTypeMismatchLongNameRuntime.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/beforePropertyTypeMismatchLongNameRuntime.kt
rename to idea/testData/quickfix/typeMismatch/propertyTypeMismatchLongNameRuntime.kt
diff --git a/idea/testData/quickfix/typeMismatch/afterPropertyTypeMismatchLongNameRuntime.kt b/idea/testData/quickfix/typeMismatch/propertyTypeMismatchLongNameRuntime.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/afterPropertyTypeMismatchLongNameRuntime.kt
rename to idea/testData/quickfix/typeMismatch/propertyTypeMismatchLongNameRuntime.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/beforeResolvableTypeParams.kt b/idea/testData/quickfix/typeMismatch/resolvableTypeParams.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/beforeResolvableTypeParams.kt
rename to idea/testData/quickfix/typeMismatch/resolvableTypeParams.kt
diff --git a/idea/testData/quickfix/typeMismatch/afterResolvableTypeParams.kt b/idea/testData/quickfix/typeMismatch/resolvableTypeParams.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/afterResolvableTypeParams.kt
rename to idea/testData/quickfix/typeMismatch/resolvableTypeParams.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/beforeReturnTypeMismatch.kt b/idea/testData/quickfix/typeMismatch/returnTypeMismatch.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/beforeReturnTypeMismatch.kt
rename to idea/testData/quickfix/typeMismatch/returnTypeMismatch.kt
diff --git a/idea/testData/quickfix/typeMismatch/afterReturnTypeMismatch.kt b/idea/testData/quickfix/typeMismatch/returnTypeMismatch.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/afterReturnTypeMismatch.kt
rename to idea/testData/quickfix/typeMismatch/returnTypeMismatch.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/beforeTooManyArgumentsException.kt b/idea/testData/quickfix/typeMismatch/tooManyArgumentsException.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/beforeTooManyArgumentsException.kt
rename to idea/testData/quickfix/typeMismatch/tooManyArgumentsException.kt
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeAssignmentTypeMismatch.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/assignmentTypeMismatch.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeAssignmentTypeMismatch.kt
rename to idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/assignmentTypeMismatch.kt
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterAssignmentTypeMismatch.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/assignmentTypeMismatch.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterAssignmentTypeMismatch.kt
rename to idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/assignmentTypeMismatch.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeChangeFunctionLiteralTypeWithoutChangingFunctionParameterType.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionLiteralTypeWithoutChangingFunctionParameterType.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeChangeFunctionLiteralTypeWithoutChangingFunctionParameterType.kt
rename to idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionLiteralTypeWithoutChangingFunctionParameterType.kt
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterChangeFunctionLiteralTypeWithoutChangingFunctionParameterType.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionLiteralTypeWithoutChangingFunctionParameterType.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterChangeFunctionLiteralTypeWithoutChangingFunctionParameterType.kt
rename to idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionLiteralTypeWithoutChangingFunctionParameterType.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeChangeFunctionLiteralTypeWithoutChangingPropertyType.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionLiteralTypeWithoutChangingPropertyType.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeChangeFunctionLiteralTypeWithoutChangingPropertyType.kt
rename to idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionLiteralTypeWithoutChangingPropertyType.kt
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterChangeFunctionLiteralTypeWithoutChangingPropertyType.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionLiteralTypeWithoutChangingPropertyType.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterChangeFunctionLiteralTypeWithoutChangingPropertyType.kt
rename to idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionLiteralTypeWithoutChangingPropertyType.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeChangeFunctionReturnTypeToFunctionType.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToFunctionType.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeChangeFunctionReturnTypeToFunctionType.kt
rename to idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToFunctionType.kt
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterChangeFunctionReturnTypeToFunctionType.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToFunctionType.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterChangeFunctionReturnTypeToFunctionType.kt
rename to idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToFunctionType.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeChangeFunctionReturnTypeToMatchReturnTypeOfReturnedLiteral.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToMatchReturnTypeOfReturnedLiteral.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeChangeFunctionReturnTypeToMatchReturnTypeOfReturnedLiteral.kt
rename to idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToMatchReturnTypeOfReturnedLiteral.kt
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterChangeFunctionReturnTypeToMatchReturnTypeOfReturnedLiteral.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToMatchReturnTypeOfReturnedLiteral.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterChangeFunctionReturnTypeToMatchReturnTypeOfReturnedLiteral.kt
rename to idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToMatchReturnTypeOfReturnedLiteral.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeDontChangeFunctionReturnTypeToErrorType.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/dontChangeFunctionReturnTypeToErrorType.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeDontChangeFunctionReturnTypeToErrorType.kt
rename to idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/dontChangeFunctionReturnTypeToErrorType.kt
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeExpectedTypeMismatch.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/expectedTypeMismatch.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeExpectedTypeMismatch.kt
rename to idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/expectedTypeMismatch.kt
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterExpectedTypeMismatch.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/expectedTypeMismatch.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterExpectedTypeMismatch.kt
rename to idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/expectedTypeMismatch.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeMultiFakeOverride.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiFakeOverride.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeMultiFakeOverride.kt
rename to idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiFakeOverride.kt
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeMultiFakeOverrideForOperatorConvention.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiFakeOverrideForOperatorConvention.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeMultiFakeOverrideForOperatorConvention.kt
rename to idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiFakeOverrideForOperatorConvention.kt
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeNonLocalReturnRuntime.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/nonLocalReturnRuntime.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeNonLocalReturnRuntime.kt
rename to idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/nonLocalReturnRuntime.kt
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterNonLocalReturnRuntime.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/nonLocalReturnRuntime.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterNonLocalReturnRuntime.kt
rename to idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/nonLocalReturnRuntime.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeNonLocalReturnWithLabelRuntime.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/nonLocalReturnWithLabelRuntime.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeNonLocalReturnWithLabelRuntime.kt
rename to idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/nonLocalReturnWithLabelRuntime.kt
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterNonLocalReturnWithLabelRuntime.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/nonLocalReturnWithLabelRuntime.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterNonLocalReturnWithLabelRuntime.kt
rename to idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/nonLocalReturnWithLabelRuntime.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforePropertyGetterInitializerTypeMismatch.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterInitializerTypeMismatch.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforePropertyGetterInitializerTypeMismatch.kt
rename to idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterInitializerTypeMismatch.kt
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterPropertyGetterInitializerTypeMismatch.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterInitializerTypeMismatch.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterPropertyGetterInitializerTypeMismatch.kt
rename to idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterInitializerTypeMismatch.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeReturnedExpresionCantEvaluateToExpresionThatTypeMismatch.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/returnedExpresionCantEvaluateToExpresionThatTypeMismatch.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeReturnedExpresionCantEvaluateToExpresionThatTypeMismatch.kt
rename to idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/returnedExpresionCantEvaluateToExpresionThatTypeMismatch.kt
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeReturnedExpressionTypeMismatchFunctionParameterType.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/returnedExpressionTypeMismatchFunctionParameterType.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeReturnedExpressionTypeMismatchFunctionParameterType.kt
rename to idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/returnedExpressionTypeMismatchFunctionParameterType.kt
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterReturnedExpressionTypeMismatchFunctionParameterType.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/returnedExpressionTypeMismatchFunctionParameterType.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterReturnedExpressionTypeMismatchFunctionParameterType.kt
rename to idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/returnedExpressionTypeMismatchFunctionParameterType.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeTypeMismatchInIfStatementReturnedByFunction.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByFunction.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeTypeMismatchInIfStatementReturnedByFunction.kt
rename to idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByFunction.kt
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterTypeMismatchInIfStatementReturnedByFunction.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByFunction.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterTypeMismatchInIfStatementReturnedByFunction.kt
rename to idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByFunction.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeTypeMismatchInIfStatementReturnedByLiteral.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByLiteral.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeTypeMismatchInIfStatementReturnedByLiteral.kt
rename to idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByLiteral.kt
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterTypeMismatchInIfStatementReturnedByLiteral.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByLiteral.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterTypeMismatchInIfStatementReturnedByLiteral.kt
rename to idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByLiteral.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeTypeMismatchInInitializer.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInInitializer.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeTypeMismatchInInitializer.kt
rename to idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInInitializer.kt
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterTypeMismatchInInitializer.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInInitializer.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterTypeMismatchInInitializer.kt
rename to idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInInitializer.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeTypeMismatchInReturnStatement.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInReturnStatement.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeTypeMismatchInReturnStatement.kt
rename to idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInReturnStatement.kt
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterTypeMismatchInReturnStatement.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInReturnStatement.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/afterTypeMismatchInReturnStatement.kt
rename to idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInReturnStatement.kt.after
diff --git a/idea/testData/quickfix/typeMismatch/beforeUnresolvableTypeParams.kt b/idea/testData/quickfix/typeMismatch/unresolvableTypeParams.kt
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/beforeUnresolvableTypeParams.kt
rename to idea/testData/quickfix/typeMismatch/unresolvableTypeParams.kt
diff --git a/idea/testData/quickfix/typeMismatch/afterUnresolvableTypeParams.kt b/idea/testData/quickfix/typeMismatch/unresolvableTypeParams.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeMismatch/afterUnresolvableTypeParams.kt
rename to idea/testData/quickfix/typeMismatch/unresolvableTypeParams.kt.after
diff --git a/idea/testData/quickfix/typeProjection/beforeConflictingProjection.kt b/idea/testData/quickfix/typeProjection/conflictingProjection.kt
similarity index 100%
rename from idea/testData/quickfix/typeProjection/beforeConflictingProjection.kt
rename to idea/testData/quickfix/typeProjection/conflictingProjection.kt
diff --git a/idea/testData/quickfix/typeProjection/afterConflictingProjection.kt b/idea/testData/quickfix/typeProjection/conflictingProjection.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeProjection/afterConflictingProjection.kt
rename to idea/testData/quickfix/typeProjection/conflictingProjection.kt.after
diff --git a/idea/testData/quickfix/typeProjection/beforeProjectionInImmediateArgumentToSupertype.kt b/idea/testData/quickfix/typeProjection/projectionInImmediateArgumentToSupertype.kt
similarity index 100%
rename from idea/testData/quickfix/typeProjection/beforeProjectionInImmediateArgumentToSupertype.kt
rename to idea/testData/quickfix/typeProjection/projectionInImmediateArgumentToSupertype.kt
diff --git a/idea/testData/quickfix/typeProjection/afterProjectionInImmediateArgumentToSupertype.kt b/idea/testData/quickfix/typeProjection/projectionInImmediateArgumentToSupertype.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeProjection/afterProjectionInImmediateArgumentToSupertype.kt
rename to idea/testData/quickfix/typeProjection/projectionInImmediateArgumentToSupertype.kt.after
diff --git a/idea/testData/quickfix/typeProjection/beforeProjectionOnNonClassTypeArgument1.kt b/idea/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument1.kt
similarity index 100%
rename from idea/testData/quickfix/typeProjection/beforeProjectionOnNonClassTypeArgument1.kt
rename to idea/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument1.kt
diff --git a/idea/testData/quickfix/typeProjection/afterProjectionOnNonClassTypeArgument1.kt b/idea/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument1.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeProjection/afterProjectionOnNonClassTypeArgument1.kt
rename to idea/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument1.kt.after
diff --git a/idea/testData/quickfix/typeProjection/beforeProjectionOnNonClassTypeArgument2.kt b/idea/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument2.kt
similarity index 100%
rename from idea/testData/quickfix/typeProjection/beforeProjectionOnNonClassTypeArgument2.kt
rename to idea/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument2.kt
diff --git a/idea/testData/quickfix/typeProjection/afterProjectionOnNonClassTypeArgument2.kt b/idea/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument2.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeProjection/afterProjectionOnNonClassTypeArgument2.kt
rename to idea/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument2.kt.after
diff --git a/idea/testData/quickfix/typeProjection/beforeRemoveRedundantProjection1.kt b/idea/testData/quickfix/typeProjection/removeRedundantProjection1.kt
similarity index 100%
rename from idea/testData/quickfix/typeProjection/beforeRemoveRedundantProjection1.kt
rename to idea/testData/quickfix/typeProjection/removeRedundantProjection1.kt
diff --git a/idea/testData/quickfix/typeProjection/afterRemoveRedundantProjection1.kt b/idea/testData/quickfix/typeProjection/removeRedundantProjection1.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeProjection/afterRemoveRedundantProjection1.kt
rename to idea/testData/quickfix/typeProjection/removeRedundantProjection1.kt.after
diff --git a/idea/testData/quickfix/typeProjection/beforeRemoveRedundantProjection2.kt b/idea/testData/quickfix/typeProjection/removeRedundantProjection2.kt
similarity index 100%
rename from idea/testData/quickfix/typeProjection/beforeRemoveRedundantProjection2.kt
rename to idea/testData/quickfix/typeProjection/removeRedundantProjection2.kt
diff --git a/idea/testData/quickfix/typeProjection/afterRemoveRedundantProjection2.kt b/idea/testData/quickfix/typeProjection/removeRedundantProjection2.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeProjection/afterRemoveRedundantProjection2.kt
rename to idea/testData/quickfix/typeProjection/removeRedundantProjection2.kt.after
diff --git a/idea/testData/quickfix/typeProjection/beforeRemoveVariance.kt b/idea/testData/quickfix/typeProjection/removeVariance.kt
similarity index 100%
rename from idea/testData/quickfix/typeProjection/beforeRemoveVariance.kt
rename to idea/testData/quickfix/typeProjection/removeVariance.kt
diff --git a/idea/testData/quickfix/typeProjection/afterRemoveVariance.kt b/idea/testData/quickfix/typeProjection/removeVariance.kt.after
similarity index 100%
rename from idea/testData/quickfix/typeProjection/afterRemoveVariance.kt
rename to idea/testData/quickfix/typeProjection/removeVariance.kt.after
diff --git a/idea/testData/quickfix/variables/changeMutability/beforeValOverrideVar.kt b/idea/testData/quickfix/variables/changeMutability/valOverrideVar.kt
similarity index 100%
rename from idea/testData/quickfix/variables/changeMutability/beforeValOverrideVar.kt
rename to idea/testData/quickfix/variables/changeMutability/valOverrideVar.kt
diff --git a/idea/testData/quickfix/variables/changeMutability/afterValOverrideVar.kt b/idea/testData/quickfix/variables/changeMutability/valOverrideVar.kt.after
similarity index 100%
rename from idea/testData/quickfix/variables/changeMutability/afterValOverrideVar.kt
rename to idea/testData/quickfix/variables/changeMutability/valOverrideVar.kt.after
diff --git a/idea/testData/quickfix/variables/changeMutability/beforeValReassignmentLocal.kt b/idea/testData/quickfix/variables/changeMutability/valReassignmentLocal.kt
similarity index 100%
rename from idea/testData/quickfix/variables/changeMutability/beforeValReassignmentLocal.kt
rename to idea/testData/quickfix/variables/changeMutability/valReassignmentLocal.kt
diff --git a/idea/testData/quickfix/variables/changeMutability/afterValReassignmentLocal.kt b/idea/testData/quickfix/variables/changeMutability/valReassignmentLocal.kt.after
similarity index 100%
rename from idea/testData/quickfix/variables/changeMutability/afterValReassignmentLocal.kt
rename to idea/testData/quickfix/variables/changeMutability/valReassignmentLocal.kt.after
diff --git a/idea/testData/quickfix/variables/changeMutability/beforeValReassignmentOuterDecl.kt b/idea/testData/quickfix/variables/changeMutability/valReassignmentOuterDecl.kt
similarity index 100%
rename from idea/testData/quickfix/variables/changeMutability/beforeValReassignmentOuterDecl.kt
rename to idea/testData/quickfix/variables/changeMutability/valReassignmentOuterDecl.kt
diff --git a/idea/testData/quickfix/variables/changeMutability/afterValReassignmentOuterDecl.kt b/idea/testData/quickfix/variables/changeMutability/valReassignmentOuterDecl.kt.after
similarity index 100%
rename from idea/testData/quickfix/variables/changeMutability/afterValReassignmentOuterDecl.kt
rename to idea/testData/quickfix/variables/changeMutability/valReassignmentOuterDecl.kt.after
diff --git a/idea/testData/quickfix/variables/changeMutability/beforeValReassignmentProperty.kt b/idea/testData/quickfix/variables/changeMutability/valReassignmentProperty.kt
similarity index 100%
rename from idea/testData/quickfix/variables/changeMutability/beforeValReassignmentProperty.kt
rename to idea/testData/quickfix/variables/changeMutability/valReassignmentProperty.kt
diff --git a/idea/testData/quickfix/variables/changeMutability/afterValReassignmentProperty.kt b/idea/testData/quickfix/variables/changeMutability/valReassignmentProperty.kt.after
similarity index 100%
rename from idea/testData/quickfix/variables/changeMutability/afterValReassignmentProperty.kt
rename to idea/testData/quickfix/variables/changeMutability/valReassignmentProperty.kt.after
diff --git a/idea/testData/quickfix/variables/changeMutability/beforeValWithSetter.kt b/idea/testData/quickfix/variables/changeMutability/valWithSetter.kt
similarity index 100%
rename from idea/testData/quickfix/variables/changeMutability/beforeValWithSetter.kt
rename to idea/testData/quickfix/variables/changeMutability/valWithSetter.kt
diff --git a/idea/testData/quickfix/variables/changeMutability/afterValWithSetter.kt b/idea/testData/quickfix/variables/changeMutability/valWithSetter.kt.after
similarity index 100%
rename from idea/testData/quickfix/variables/changeMutability/afterValWithSetter.kt
rename to idea/testData/quickfix/variables/changeMutability/valWithSetter.kt.after
diff --git a/idea/testData/quickfix/variables/changeToBackingField/beforeBFRequired.kt b/idea/testData/quickfix/variables/changeToBackingField/bFRequired.kt
similarity index 100%
rename from idea/testData/quickfix/variables/changeToBackingField/beforeBFRequired.kt
rename to idea/testData/quickfix/variables/changeToBackingField/bFRequired.kt
diff --git a/idea/testData/quickfix/variables/changeToBackingField/afterBFRequired.kt b/idea/testData/quickfix/variables/changeToBackingField/bFRequired.kt.after
similarity index 100%
rename from idea/testData/quickfix/variables/changeToBackingField/afterBFRequired.kt
rename to idea/testData/quickfix/variables/changeToBackingField/bFRequired.kt.after
diff --git a/idea/testData/quickfix/variables/changeToBackingField/beforeKt510.kt b/idea/testData/quickfix/variables/changeToBackingField/kt510.kt
similarity index 100%
rename from idea/testData/quickfix/variables/changeToBackingField/beforeKt510.kt
rename to idea/testData/quickfix/variables/changeToBackingField/kt510.kt
diff --git a/idea/testData/quickfix/variables/changeToBackingField/afterKt510.kt b/idea/testData/quickfix/variables/changeToBackingField/kt510.kt.after
similarity index 100%
rename from idea/testData/quickfix/variables/changeToBackingField/afterKt510.kt
rename to idea/testData/quickfix/variables/changeToBackingField/kt510.kt.after
diff --git a/idea/testData/quickfix/variables/changeToFunctionInvocation/beforeFunInvWithoutParentheses.kt b/idea/testData/quickfix/variables/changeToFunctionInvocation/funInvWithoutParentheses.kt
similarity index 100%
rename from idea/testData/quickfix/variables/changeToFunctionInvocation/beforeFunInvWithoutParentheses.kt
rename to idea/testData/quickfix/variables/changeToFunctionInvocation/funInvWithoutParentheses.kt
diff --git a/idea/testData/quickfix/variables/changeToFunctionInvocation/afterFunInvWithoutParentheses.kt b/idea/testData/quickfix/variables/changeToFunctionInvocation/funInvWithoutParentheses.kt.after
similarity index 100%
rename from idea/testData/quickfix/variables/changeToFunctionInvocation/afterFunInvWithoutParentheses.kt
rename to idea/testData/quickfix/variables/changeToFunctionInvocation/funInvWithoutParentheses.kt.after
diff --git a/idea/testData/quickfix/variables/changeToPropertyName/beforeAbstractProperty.kt b/idea/testData/quickfix/variables/changeToPropertyName/abstractProperty.kt
similarity index 100%
rename from idea/testData/quickfix/variables/changeToPropertyName/beforeAbstractProperty.kt
rename to idea/testData/quickfix/variables/changeToPropertyName/abstractProperty.kt
diff --git a/idea/testData/quickfix/variables/changeToPropertyName/afterAbstractProperty.kt b/idea/testData/quickfix/variables/changeToPropertyName/abstractProperty.kt.after
similarity index 100%
rename from idea/testData/quickfix/variables/changeToPropertyName/afterAbstractProperty.kt
rename to idea/testData/quickfix/variables/changeToPropertyName/abstractProperty.kt.after
diff --git a/idea/testData/quickfix/variables/changeToPropertyName/beforeAbstractPropertyThis.kt b/idea/testData/quickfix/variables/changeToPropertyName/abstractPropertyThis.kt
similarity index 100%
rename from idea/testData/quickfix/variables/changeToPropertyName/beforeAbstractPropertyThis.kt
rename to idea/testData/quickfix/variables/changeToPropertyName/abstractPropertyThis.kt
diff --git a/idea/testData/quickfix/variables/changeToPropertyName/afterAbstractPropertyThis.kt b/idea/testData/quickfix/variables/changeToPropertyName/abstractPropertyThis.kt.after
similarity index 100%
rename from idea/testData/quickfix/variables/changeToPropertyName/afterAbstractPropertyThis.kt
rename to idea/testData/quickfix/variables/changeToPropertyName/abstractPropertyThis.kt.after
diff --git a/idea/testData/quickfix/variables/changeToPropertyName/beforeCustomAccessors.kt b/idea/testData/quickfix/variables/changeToPropertyName/customAccessors.kt
similarity index 100%
rename from idea/testData/quickfix/variables/changeToPropertyName/beforeCustomAccessors.kt
rename to idea/testData/quickfix/variables/changeToPropertyName/customAccessors.kt
diff --git a/idea/testData/quickfix/variables/changeToPropertyName/afterCustomAccessors.kt b/idea/testData/quickfix/variables/changeToPropertyName/customAccessors.kt.after
similarity index 100%
rename from idea/testData/quickfix/variables/changeToPropertyName/afterCustomAccessors.kt
rename to idea/testData/quickfix/variables/changeToPropertyName/customAccessors.kt.after
diff --git a/idea/testData/quickfix/variables/changeToPropertyName/beforeInaccessibleBackingField.kt b/idea/testData/quickfix/variables/changeToPropertyName/inaccessibleBackingField.kt
similarity index 100%
rename from idea/testData/quickfix/variables/changeToPropertyName/beforeInaccessibleBackingField.kt
rename to idea/testData/quickfix/variables/changeToPropertyName/inaccessibleBackingField.kt
diff --git a/idea/testData/quickfix/variables/changeToPropertyName/afterInaccessibleBackingField.kt b/idea/testData/quickfix/variables/changeToPropertyName/inaccessibleBackingField.kt.after
similarity index 100%
rename from idea/testData/quickfix/variables/changeToPropertyName/afterInaccessibleBackingField.kt
rename to idea/testData/quickfix/variables/changeToPropertyName/inaccessibleBackingField.kt.after
diff --git a/idea/testData/quickfix/variables/changeToPropertyName/beforeInaccessibleBackingFieldQualified.kt b/idea/testData/quickfix/variables/changeToPropertyName/inaccessibleBackingFieldQualified.kt
similarity index 100%
rename from idea/testData/quickfix/variables/changeToPropertyName/beforeInaccessibleBackingFieldQualified.kt
rename to idea/testData/quickfix/variables/changeToPropertyName/inaccessibleBackingFieldQualified.kt
diff --git a/idea/testData/quickfix/variables/changeToPropertyName/afterInaccessibleBackingFieldQualified.kt b/idea/testData/quickfix/variables/changeToPropertyName/inaccessibleBackingFieldQualified.kt.after
similarity index 100%
rename from idea/testData/quickfix/variables/changeToPropertyName/afterInaccessibleBackingFieldQualified.kt
rename to idea/testData/quickfix/variables/changeToPropertyName/inaccessibleBackingFieldQualified.kt.after
diff --git a/idea/testData/quickfix/variables/removeValVarFromParameter/beforeCatchParameter.kt b/idea/testData/quickfix/variables/removeValVarFromParameter/catchParameter.kt
similarity index 100%
rename from idea/testData/quickfix/variables/removeValVarFromParameter/beforeCatchParameter.kt
rename to idea/testData/quickfix/variables/removeValVarFromParameter/catchParameter.kt
diff --git a/idea/testData/quickfix/variables/removeValVarFromParameter/afterCatchParameter.kt b/idea/testData/quickfix/variables/removeValVarFromParameter/catchParameter.kt.after
similarity index 100%
rename from idea/testData/quickfix/variables/removeValVarFromParameter/afterCatchParameter.kt
rename to idea/testData/quickfix/variables/removeValVarFromParameter/catchParameter.kt.after
diff --git a/idea/testData/quickfix/variables/removeValVarFromParameter/beforeConstructorParameter.kt b/idea/testData/quickfix/variables/removeValVarFromParameter/constructorParameter.kt
similarity index 100%
rename from idea/testData/quickfix/variables/removeValVarFromParameter/beforeConstructorParameter.kt
rename to idea/testData/quickfix/variables/removeValVarFromParameter/constructorParameter.kt
diff --git a/idea/testData/quickfix/variables/removeValVarFromParameter/beforeFunParameter.kt b/idea/testData/quickfix/variables/removeValVarFromParameter/funParameter.kt
similarity index 100%
rename from idea/testData/quickfix/variables/removeValVarFromParameter/beforeFunParameter.kt
rename to idea/testData/quickfix/variables/removeValVarFromParameter/funParameter.kt
diff --git a/idea/testData/quickfix/variables/removeValVarFromParameter/afterFunParameter.kt b/idea/testData/quickfix/variables/removeValVarFromParameter/funParameter.kt.after
similarity index 100%
rename from idea/testData/quickfix/variables/removeValVarFromParameter/afterFunParameter.kt
rename to idea/testData/quickfix/variables/removeValVarFromParameter/funParameter.kt.after
diff --git a/idea/testData/quickfix/variables/removeValVarFromParameter/beforeLoopParameter.kt b/idea/testData/quickfix/variables/removeValVarFromParameter/loopParameter.kt
similarity index 100%
rename from idea/testData/quickfix/variables/removeValVarFromParameter/beforeLoopParameter.kt
rename to idea/testData/quickfix/variables/removeValVarFromParameter/loopParameter.kt
diff --git a/idea/testData/quickfix/variables/removeValVarFromParameter/afterLoopParameter.kt b/idea/testData/quickfix/variables/removeValVarFromParameter/loopParameter.kt.after
similarity index 100%
rename from idea/testData/quickfix/variables/removeValVarFromParameter/afterLoopParameter.kt
rename to idea/testData/quickfix/variables/removeValVarFromParameter/loopParameter.kt.after
diff --git a/idea/testData/quickfix/variables/removeValVarFromParameter/beforeParameterWithComment.kt b/idea/testData/quickfix/variables/removeValVarFromParameter/parameterWithComment.kt
similarity index 100%
rename from idea/testData/quickfix/variables/removeValVarFromParameter/beforeParameterWithComment.kt
rename to idea/testData/quickfix/variables/removeValVarFromParameter/parameterWithComment.kt
diff --git a/idea/testData/quickfix/variables/removeValVarFromParameter/afterParameterWithComment.kt b/idea/testData/quickfix/variables/removeValVarFromParameter/parameterWithComment.kt.after
similarity index 100%
rename from idea/testData/quickfix/variables/removeValVarFromParameter/afterParameterWithComment.kt
rename to idea/testData/quickfix/variables/removeValVarFromParameter/parameterWithComment.kt.after
diff --git a/idea/testData/quickfix/variables/removeValVarFromParameter/beforeSecondaryConstructorParameter.kt b/idea/testData/quickfix/variables/removeValVarFromParameter/secondaryConstructorParameter.kt
similarity index 100%
rename from idea/testData/quickfix/variables/removeValVarFromParameter/beforeSecondaryConstructorParameter.kt
rename to idea/testData/quickfix/variables/removeValVarFromParameter/secondaryConstructorParameter.kt
diff --git a/idea/testData/quickfix/variables/removeValVarFromParameter/afterSecondaryConstructorParameter.kt b/idea/testData/quickfix/variables/removeValVarFromParameter/secondaryConstructorParameter.kt.after
similarity index 100%
rename from idea/testData/quickfix/variables/removeValVarFromParameter/afterSecondaryConstructorParameter.kt
rename to idea/testData/quickfix/variables/removeValVarFromParameter/secondaryConstructorParameter.kt.after
diff --git a/idea/testData/quickfix/variables/beforeUnusedVariableWithInitializer.kt b/idea/testData/quickfix/variables/unusedVariableWithInitializer.kt
similarity index 100%
rename from idea/testData/quickfix/variables/beforeUnusedVariableWithInitializer.kt
rename to idea/testData/quickfix/variables/unusedVariableWithInitializer.kt
diff --git a/idea/testData/quickfix/variables/afterUnusedVariableWithInitializer.kt b/idea/testData/quickfix/variables/unusedVariableWithInitializer.kt.after
similarity index 100%
rename from idea/testData/quickfix/variables/afterUnusedVariableWithInitializer.kt
rename to idea/testData/quickfix/variables/unusedVariableWithInitializer.kt.after
diff --git a/idea/testData/quickfix/variables/beforeUnusedVariableWithoutInitializer.kt b/idea/testData/quickfix/variables/unusedVariableWithoutInitializer.kt
similarity index 100%
rename from idea/testData/quickfix/variables/beforeUnusedVariableWithoutInitializer.kt
rename to idea/testData/quickfix/variables/unusedVariableWithoutInitializer.kt
diff --git a/idea/testData/quickfix/variables/afterUnusedVariableWithoutInitializer.kt b/idea/testData/quickfix/variables/unusedVariableWithoutInitializer.kt.after
similarity index 100%
rename from idea/testData/quickfix/variables/afterUnusedVariableWithoutInitializer.kt
rename to idea/testData/quickfix/variables/unusedVariableWithoutInitializer.kt.after
diff --git a/idea/testData/quickfix/when/beforeElseNotLastInWhen.kt b/idea/testData/quickfix/when/elseNotLastInWhen.kt
similarity index 100%
rename from idea/testData/quickfix/when/beforeElseNotLastInWhen.kt
rename to idea/testData/quickfix/when/elseNotLastInWhen.kt
diff --git a/idea/testData/quickfix/when/afterElseNotLastInWhen.kt b/idea/testData/quickfix/when/elseNotLastInWhen.kt.after
similarity index 100%
rename from idea/testData/quickfix/when/afterElseNotLastInWhen.kt
rename to idea/testData/quickfix/when/elseNotLastInWhen.kt.after
diff --git a/idea/testData/quickfix/when/beforeNoElseInWhenWithBranches.kt b/idea/testData/quickfix/when/noElseInWhenWithBranches.kt
similarity index 100%
rename from idea/testData/quickfix/when/beforeNoElseInWhenWithBranches.kt
rename to idea/testData/quickfix/when/noElseInWhenWithBranches.kt
diff --git a/idea/testData/quickfix/when/afterNoElseInWhenWithBranches.kt b/idea/testData/quickfix/when/noElseInWhenWithBranches.kt.after
similarity index 100%
rename from idea/testData/quickfix/when/afterNoElseInWhenWithBranches.kt
rename to idea/testData/quickfix/when/noElseInWhenWithBranches.kt.after
diff --git a/idea/testData/quickfix/when/beforeNoElseInWhenWithoutBranches.kt b/idea/testData/quickfix/when/noElseInWhenWithoutBranches.kt
similarity index 100%
rename from idea/testData/quickfix/when/beforeNoElseInWhenWithoutBranches.kt
rename to idea/testData/quickfix/when/noElseInWhenWithoutBranches.kt
diff --git a/idea/testData/quickfix/when/afterNoElseInWhenWithoutBranches.kt b/idea/testData/quickfix/when/noElseInWhenWithoutBranches.kt.after
similarity index 100%
rename from idea/testData/quickfix/when/afterNoElseInWhenWithoutBranches.kt
rename to idea/testData/quickfix/when/noElseInWhenWithoutBranches.kt.after
diff --git a/idea/testData/quickfix/when/beforeTwoElseBranchesInWhen.kt b/idea/testData/quickfix/when/twoElseBranchesInWhen.kt
similarity index 100%
rename from idea/testData/quickfix/when/beforeTwoElseBranchesInWhen.kt
rename to idea/testData/quickfix/when/twoElseBranchesInWhen.kt
diff --git a/idea/testData/quickfix/when/afterTwoElseBranchesInWhen.kt b/idea/testData/quickfix/when/twoElseBranchesInWhen.kt.after
similarity index 100%
rename from idea/testData/quickfix/when/afterTwoElseBranchesInWhen.kt
rename to idea/testData/quickfix/when/twoElseBranchesInWhen.kt.after
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java
index 64c819ee475..3240330cd53 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java
@@ -17,25 +17,31 @@
 package org.jetbrains.kotlin.idea.quickfix;
 
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;
+import com.intellij.codeInsight.daemon.quickFix.QuickFixTestCase;
 import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.codeInspection.SuppressIntentionAction;
 import com.intellij.codeInspection.SuppressableProblemGroup;
 import com.intellij.ide.startup.impl.StartupManagerImpl;
 import com.intellij.lang.annotation.ProblemGroup;
+import com.intellij.openapi.command.CommandProcessor;
 import com.intellij.openapi.projectRoots.JavaSdk;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.startup.StartupManager;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.io.FileUtil;
+import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.openapi.vfs.CharsetToolkit;
 import com.intellij.psi.PsiElement;
+import com.intellij.rt.execution.junit.FileComparisonFailure;
+import kotlin.KotlinPackage;
 import org.apache.commons.lang.SystemUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.idea.test.DirectiveBasedActionUtils;
 import org.jetbrains.kotlin.idea.KotlinLightQuickFixTestCase;
+import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil;
+import org.jetbrains.kotlin.idea.test.DirectiveBasedActionUtils;
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase;
 import org.jetbrains.kotlin.psi.JetFile;
-import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil;
 import org.jetbrains.kotlin.test.InTextDirectivesUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.Assert;
@@ -46,6 +52,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import static com.intellij.util.ObjectUtils.notNull;
+
 public abstract class AbstractQuickFixTest extends KotlinLightQuickFixTestCase {
     @Override
     protected void setUp() throws Exception {
@@ -81,6 +89,69 @@ public abstract class AbstractQuickFixTest extends KotlinLightQuickFixTestCase {
         }
     }
 
+    //region Severe hack - lot of code copied from LightQuickFixTestCase to workaround stupid format of test data with before/after prefixes
+    @Override
+    protected void doSingleTest(String fileSuffix) {
+        doTestFor(fileSuffix, createWrapper());
+    }
+
+    private static QuickFixTestCase myWrapper;
+
+    private static void doTestFor(final String testName, final QuickFixTestCase quickFixTestCase) {
+        final String relativePath = notNull(quickFixTestCase.getBasePath(), "") + "/" + KotlinPackage.decapitalize(testName);
+        final String testFullPath = quickFixTestCase.getTestDataPath().replace(File.separatorChar, '/') + relativePath;
+        final File testFile = new File(testFullPath);
+        CommandProcessor.getInstance().executeCommand(quickFixTestCase.getProject(), new Runnable() {
+            @SuppressWarnings({"AssignmentToStaticFieldFromInstanceMethod", "CallToPrintStackTrace"})
+            @Override
+            public void run() {
+                try {
+                    String contents = StringUtil.convertLineSeparators(FileUtil.loadFile(testFile, CharsetToolkit.UTF8_CHARSET));
+                    quickFixTestCase.configureFromFileText(testFile.getName(), contents);
+                    quickFixTestCase.bringRealEditorBack();
+                    final Pair<String, Boolean> pair = quickFixTestCase.parseActionHintImpl(quickFixTestCase.getFile(), contents);
+                    final String text = pair.getFirst();
+                    final boolean actionShouldBeAvailable = pair.getSecond().booleanValue();
+
+                    quickFixTestCase.beforeActionStarted(testName, contents);
+
+                    try {
+                        myWrapper = quickFixTestCase;
+                        quickFixTestCase.doAction(text, actionShouldBeAvailable, testFullPath, testName);
+                    }
+                    finally {
+                        myWrapper = null;
+                        quickFixTestCase.afterActionCompleted(testName, contents);
+                    }
+                }
+                catch (FileComparisonFailure e) {
+                    throw e;
+                }
+                catch (Throwable e) {
+                    e.printStackTrace();
+                    fail(testName);
+                }
+            }
+        }, "", "");
+    }
+
+    @Override
+    protected void doAction(final String text, final boolean actionShouldBeAvailable, final String testFullPath, final String testName)
+            throws Exception {
+        doAction(text, actionShouldBeAvailable, testFullPath, testName, myWrapper);
+    }
+
+    @Override
+    protected void checkResultByFile(@Nullable String message, @NotNull String filePath, boolean ignoreTrailingSpaces) {
+        File file = new File(filePath);
+        String afterFileName = file.getName();
+        assert afterFileName.startsWith(AFTER_PREFIX);
+        String newAfterFileName = KotlinPackage.decapitalize(afterFileName.substring(AFTER_PREFIX.length())) + ".after";
+
+        super.checkResultByFile(message, new File(file.getParent(), newAfterFileName).getPath(), ignoreTrailingSpaces);
+    }
+    //endregion
+
     private static void configureRuntimeIfNeeded(@NotNull String beforeFileName) {
         if (beforeFileName.endsWith("JsRuntime.kt")) {
             ConfigLibraryUtil.configureKotlinJsRuntimeAndSdk(getModule(), getFullJavaJDK());
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
index ed25a63074f..40d90a8ffb3 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
@@ -32,12 +32,12 @@ import java.util.regex.Pattern;
 @RunWith(JUnit3RunnerWithInners.class)
 public class QuickFixTestGenerated extends AbstractQuickFixTest {
     public void testAllFilesPresentInQuickfix() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix"), Pattern.compile("^(\\w+)\\.kt$"), true);
     }
 
-    @TestMetadata("beforeAnonymousObject.kt")
+    @TestMetadata("anonymousObject.kt")
     public void testAnonymousObject() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/beforeAnonymousObject.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/anonymousObject.kt");
         doTest(fileName);
     }
 
@@ -45,133 +45,133 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Abstract extends AbstractQuickFixTest {
-        @TestMetadata("beforeAbstractFunctionInNonAbstractClass.kt")
+        @TestMetadata("abstractFunctionInNonAbstractClass.kt")
         public void testAbstractFunctionInNonAbstractClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeAbstractFunctionInNonAbstractClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractFunctionInNonAbstractClass.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeAbstractFunctionWithBody.kt")
+        @TestMetadata("abstractFunctionWithBody.kt")
         public void testAbstractFunctionWithBody() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeAbstractFunctionWithBody.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractFunctionWithBody.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeAbstractFunctionWithBody2.kt")
+        @TestMetadata("abstractFunctionWithBody2.kt")
         public void testAbstractFunctionWithBody2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeAbstractFunctionWithBody2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractFunctionWithBody2.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeAbstractFunctionWithBody3.kt")
+        @TestMetadata("abstractFunctionWithBody3.kt")
         public void testAbstractFunctionWithBody3() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeAbstractFunctionWithBody3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractFunctionWithBody3.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeAbstractPropertyInNonAbstractClass1.kt")
+        @TestMetadata("abstractPropertyInNonAbstractClass1.kt")
         public void testAbstractPropertyInNonAbstractClass1() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeAbstractPropertyInNonAbstractClass1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass1.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeAbstractPropertyInNonAbstractClass2.kt")
+        @TestMetadata("abstractPropertyInNonAbstractClass2.kt")
         public void testAbstractPropertyInNonAbstractClass2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeAbstractPropertyInNonAbstractClass2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass2.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeAbstractPropertyInNonAbstractClass3.kt")
+        @TestMetadata("abstractPropertyInNonAbstractClass3.kt")
         public void testAbstractPropertyInNonAbstractClass3() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeAbstractPropertyInNonAbstractClass3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass3.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeAbstractPropertyInPrimaryConstructorParameters.kt")
+        @TestMetadata("abstractPropertyInPrimaryConstructorParameters.kt")
         public void testAbstractPropertyInPrimaryConstructorParameters() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeAbstractPropertyInPrimaryConstructorParameters.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractPropertyInPrimaryConstructorParameters.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeAbstractPropertyNotInClass.kt")
+        @TestMetadata("abstractPropertyNotInClass.kt")
         public void testAbstractPropertyNotInClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeAbstractPropertyNotInClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractPropertyNotInClass.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeAbstractPropertyWIthInitializer2.kt")
+        @TestMetadata("abstractPropertyWIthInitializer2.kt")
         public void testAbstractPropertyWIthInitializer2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeAbstractPropertyWIthInitializer2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractPropertyWIthInitializer2.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeAbstractPropertyWIthInitializer3.kt")
+        @TestMetadata("abstractPropertyWIthInitializer3.kt")
         public void testAbstractPropertyWIthInitializer3() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeAbstractPropertyWIthInitializer3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractPropertyWIthInitializer3.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeAbstractPropertyWithGetter1.kt")
+        @TestMetadata("abstractPropertyWithGetter1.kt")
         public void testAbstractPropertyWithGetter1() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeAbstractPropertyWithGetter1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractPropertyWithGetter1.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeAbstractPropertyWithGetter2.kt")
+        @TestMetadata("abstractPropertyWithGetter2.kt")
         public void testAbstractPropertyWithGetter2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeAbstractPropertyWithGetter2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractPropertyWithGetter2.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeAbstractPropertyWithInitializer1.kt")
+        @TestMetadata("abstractPropertyWithInitializer1.kt")
         public void testAbstractPropertyWithInitializer1() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeAbstractPropertyWithInitializer1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractPropertyWithInitializer1.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeAbstractPropertyWithSetter.kt")
+        @TestMetadata("abstractPropertyWithSetter.kt")
         public void testAbstractPropertyWithSetter() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeAbstractPropertyWithSetter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractPropertyWithSetter.kt");
             doTest(fileName);
         }
 
         public void testAllFilesPresentInAbstract() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/abstract"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/abstract"), Pattern.compile("^(\\w+)\\.kt$"), true);
         }
 
-        @TestMetadata("beforeMustBeInitializedOrBeAbstract.kt")
+        @TestMetadata("mustBeInitializedOrBeAbstract.kt")
         public void testMustBeInitializedOrBeAbstract() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeMustBeInitializedOrBeAbstract.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstract.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeNonAbstractFunctionWithNoBody.kt")
+        @TestMetadata("nonAbstractFunctionWithNoBody.kt")
         public void testNonAbstractFunctionWithNoBody() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeNonAbstractFunctionWithNoBody.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/nonAbstractFunctionWithNoBody.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeNonMemberAbstractFunction.kt")
+        @TestMetadata("nonMemberAbstractFunction.kt")
         public void testNonMemberAbstractFunction() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeNonMemberAbstractFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/nonMemberAbstractFunction.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeNonMemberFunctionNoBody.kt")
+        @TestMetadata("nonMemberFunctionNoBody.kt")
         public void testNonMemberFunctionNoBody() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeNonMemberFunctionNoBody.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/nonMemberFunctionNoBody.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeRedundantAbstract.kt")
+        @TestMetadata("redundantAbstract.kt")
         public void testRedundantAbstract() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeRedundantAbstract.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/redundantAbstract.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeReplaceOpen.kt")
+        @TestMetadata("replaceOpen.kt")
         public void testReplaceOpen() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeReplaceOpen.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/replaceOpen.kt");
             doTest(fileName);
         }
     }
@@ -181,42 +181,42 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class AddStarProjections extends AbstractQuickFixTest {
         public void testAllFilesPresentInAddStarProjections() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections"), Pattern.compile("^(\\w+)\\.kt$"), true);
         }
 
-        @TestMetadata("beforeQualifiedArrayList.kt")
+        @TestMetadata("qualifiedArrayList.kt")
         public void testQualifiedArrayList() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/beforeQualifiedArrayList.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/qualifiedArrayList.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeQualifiedList.kt")
+        @TestMetadata("qualifiedList.kt")
         public void testQualifiedList() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/beforeQualifiedList.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/qualifiedList.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeQualifiedMap.kt")
+        @TestMetadata("qualifiedMap.kt")
         public void testQualifiedMap() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/beforeQualifiedMap.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/qualifiedMap.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeUnqualifiedList.kt")
+        @TestMetadata("unqualifiedList.kt")
         public void testUnqualifiedList() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/beforeUnqualifiedList.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/unqualifiedList.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeUnqualifiedMap.kt")
+        @TestMetadata("unqualifiedMap.kt")
         public void testUnqualifiedMap() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/beforeUnqualifiedMap.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/unqualifiedMap.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeUnqualifiedMapOneArg.kt")
+        @TestMetadata("unqualifiedMapOneArg.kt")
         public void testUnqualifiedMapOneArg() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/beforeUnqualifiedMapOneArg.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/unqualifiedMapOneArg.kt");
             doTest(fileName);
         }
 
@@ -225,18 +225,18 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class Cast extends AbstractQuickFixTest {
             public void testAllFilesPresentInCast() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections/cast"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections/cast"), Pattern.compile("^(\\w+)\\.kt$"), true);
             }
 
-            @TestMetadata("beforeChangeToStarProjection.kt")
+            @TestMetadata("changeToStarProjection.kt")
             public void testChangeToStarProjection() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/cast/beforeChangeToStarProjection.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/cast/changeToStarProjection.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeChangeToStarProjectionNullable.kt")
+            @TestMetadata("changeToStarProjectionNullable.kt")
             public void testChangeToStarProjectionNullable() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/cast/beforeChangeToStarProjectionNullable.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/cast/changeToStarProjectionNullable.kt");
                 doTest(fileName);
             }
         }
@@ -246,24 +246,24 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class CheckType extends AbstractQuickFixTest {
             public void testAllFilesPresentInCheckType() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections/checkType"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections/checkType"), Pattern.compile("^(\\w+)\\.kt$"), true);
             }
 
-            @TestMetadata("beforeChangeToStarProjectionMultipleParameters.kt")
+            @TestMetadata("changeToStarProjectionMultipleParameters.kt")
             public void testChangeToStarProjectionMultipleParameters() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/checkType/beforeChangeToStarProjectionMultipleParameters.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/checkType/changeToStarProjectionMultipleParameters.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeChangeToStarProjectionNullable.kt")
+            @TestMetadata("changeToStarProjectionNullable.kt")
             public void testChangeToStarProjectionNullable() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/checkType/beforeChangeToStarProjectionNullable.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/checkType/changeToStarProjectionNullable.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeChangeToStarProjectionSingleParameter.kt")
+            @TestMetadata("changeToStarProjectionSingleParameter.kt")
             public void testChangeToStarProjectionSingleParameter() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/checkType/beforeChangeToStarProjectionSingleParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/checkType/changeToStarProjectionSingleParameter.kt");
                 doTest(fileName);
             }
         }
@@ -273,30 +273,30 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class JavaClass extends AbstractQuickFixTest {
             public void testAllFilesPresentInJavaClass() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections/javaClass"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections/javaClass"), Pattern.compile("^(\\w+)\\.kt$"), true);
             }
 
-            @TestMetadata("beforeFooOfC2.kt")
+            @TestMetadata("fooOfC2.kt")
             public void testFooOfC2() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/javaClass/beforeFooOfC2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/javaClass/fooOfC2.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeJavaClassOfC1Runtime.kt")
+            @TestMetadata("javaClassOfC1Runtime.kt")
             public void testJavaClassOfC1Runtime() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/javaClass/beforeJavaClassOfC1Runtime.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/javaClass/javaClassOfC1Runtime.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeJavaClassOfC2Runtime.kt")
+            @TestMetadata("javaClassOfC2Runtime.kt")
             public void testJavaClassOfC2Runtime() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/javaClass/beforeJavaClassOfC2Runtime.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/javaClass/javaClassOfC2Runtime.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeJavaClassOfCRuntime.kt")
+            @TestMetadata("javaClassOfCRuntime.kt")
             public void testJavaClassOfCRuntime() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/javaClass/beforeJavaClassOfCRuntime.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/javaClass/javaClassOfCRuntime.kt");
                 doTest(fileName);
             }
         }
@@ -306,42 +306,42 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class When extends AbstractQuickFixTest {
             public void testAllFilesPresentInWhen() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections/when"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections/when"), Pattern.compile("^(\\w+)\\.kt$"), true);
             }
 
-            @TestMetadata("beforeQualifiedArrayList.kt")
+            @TestMetadata("qualifiedArrayList.kt")
             public void testQualifiedArrayList() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/when/beforeQualifiedArrayList.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/when/qualifiedArrayList.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeQualifiedList.kt")
+            @TestMetadata("qualifiedList.kt")
             public void testQualifiedList() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/when/beforeQualifiedList.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/when/qualifiedList.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeQualifiedMap.kt")
+            @TestMetadata("qualifiedMap.kt")
             public void testQualifiedMap() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/when/beforeQualifiedMap.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/when/qualifiedMap.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeUnqualifiedList.kt")
+            @TestMetadata("unqualifiedList.kt")
             public void testUnqualifiedList() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/when/beforeUnqualifiedList.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/when/unqualifiedList.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeUnqualifiedMap.kt")
+            @TestMetadata("unqualifiedMap.kt")
             public void testUnqualifiedMap() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/when/beforeUnqualifiedMap.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/when/unqualifiedMap.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeUnqualifiedMapOneArg.kt")
+            @TestMetadata("unqualifiedMapOneArg.kt")
             public void testUnqualifiedMapOneArg() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/when/beforeUnqualifiedMapOneArg.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/when/unqualifiedMapOneArg.kt");
                 doTest(fileName);
             }
         }
@@ -352,96 +352,96 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class AutoImports extends AbstractQuickFixTest {
         public void testAllFilesPresentInAutoImports() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/autoImports"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/autoImports"), Pattern.compile("^(\\w+)\\.kt$"), true);
         }
 
-        @TestMetadata("beforeCheckNoStackOverflowInImportInnerClassInCurrentFile.kt")
+        @TestMetadata("checkNoStackOverflowInImportInnerClassInCurrentFile.kt")
         public void testCheckNoStackOverflowInImportInnerClassInCurrentFile() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/beforeCheckNoStackOverflowInImportInnerClassInCurrentFile.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/checkNoStackOverflowInImportInnerClassInCurrentFile.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeLibraryClassJsRuntime.kt")
+        @TestMetadata("libraryClassJsRuntime.kt")
         public void testLibraryClassJsRuntime() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/beforeLibraryClassJsRuntime.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/libraryClassJsRuntime.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeLibraryPropertyJsRuntime.kt")
+        @TestMetadata("libraryPropertyJsRuntime.kt")
         public void testLibraryPropertyJsRuntime() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/beforeLibraryPropertyJsRuntime.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/libraryPropertyJsRuntime.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeLibraryPropertyRuntime.kt")
+        @TestMetadata("libraryPropertyRuntime.kt")
         public void testLibraryPropertyRuntime() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/beforeLibraryPropertyRuntime.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/libraryPropertyRuntime.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeLibraryTopLevelFunctionImportJsRuntime.kt")
+        @TestMetadata("libraryTopLevelFunctionImportJsRuntime.kt")
         public void testLibraryTopLevelFunctionImportJsRuntime() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/beforeLibraryTopLevelFunctionImportJsRuntime.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/libraryTopLevelFunctionImportJsRuntime.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeLibraryTopLevelFunctionImportRuntime.kt")
+        @TestMetadata("libraryTopLevelFunctionImportRuntime.kt")
         public void testLibraryTopLevelFunctionImportRuntime() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/beforeLibraryTopLevelFunctionImportRuntime.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/libraryTopLevelFunctionImportRuntime.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeNamelessClass.kt")
+        @TestMetadata("namelessClass.kt")
         public void testNamelessClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/beforeNamelessClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/namelessClass.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeNamelessFunction.kt")
+        @TestMetadata("namelessFunction.kt")
         public void testNamelessFunction() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/beforeNamelessFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/namelessFunction.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeNamelessObject.kt")
+        @TestMetadata("namelessObject.kt")
         public void testNamelessObject() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/beforeNamelessObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/namelessObject.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeNamelessParameter.kt")
+        @TestMetadata("namelessParameter.kt")
         public void testNamelessParameter() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/beforeNamelessParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/namelessParameter.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeNamelessProperty.kt")
+        @TestMetadata("namelessProperty.kt")
         public void testNamelessProperty() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/beforeNamelessProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/namelessProperty.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeNoImportForAlreadyImported.kt")
+        @TestMetadata("noImportForAlreadyImported.kt")
         public void testNoImportForAlreadyImported() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/beforeNoImportForAlreadyImported.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/noImportForAlreadyImported.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeNoImportForIndex.kt")
+        @TestMetadata("noImportForIndex.kt")
         public void testNoImportForIndex() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/beforeNoImportForIndex.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/noImportForIndex.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeSAMConstructorFromLambda.kt")
+        @TestMetadata("sAMConstructorFromLambda.kt")
         public void testSAMConstructorFromLambda() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/beforeSAMConstructorFromLambda.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/sAMConstructorFromLambda.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeUnresolvedReferenceInCall.kt")
+        @TestMetadata("unresolvedReferenceInCall.kt")
         public void testUnresolvedReferenceInCall() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/beforeUnresolvedReferenceInCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/unresolvedReferenceInCall.kt");
             doTest(fileName);
         }
     }
@@ -450,157 +450,157 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ChangeSignature extends AbstractQuickFixTest {
-        @TestMetadata("beforeAddConstructorParameter.kt")
+        @TestMetadata("addConstructorParameter.kt")
         public void testAddConstructorParameter() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeAddConstructorParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/addConstructorParameter.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeAddFunctionParameter.kt")
+        @TestMetadata("addFunctionParameter.kt")
         public void testAddFunctionParameter() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeAddFunctionParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/addFunctionParameter.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeAddFunctionParameterAndChangeTypes.kt")
+        @TestMetadata("addFunctionParameterAndChangeTypes.kt")
         public void testAddFunctionParameterAndChangeTypes() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeAddFunctionParameterAndChangeTypes.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/addFunctionParameterAndChangeTypes.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeAddFunctionParameterLongNameRuntime.kt")
+        @TestMetadata("addFunctionParameterLongNameRuntime.kt")
         public void testAddFunctionParameterLongNameRuntime() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeAddFunctionParameterLongNameRuntime.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/addFunctionParameterLongNameRuntime.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeAddParameterNotAvailableForBuiltins.kt")
+        @TestMetadata("addParameterNotAvailableForBuiltins.kt")
         public void testAddParameterNotAvailableForBuiltins() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeAddParameterNotAvailableForBuiltins.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/addParameterNotAvailableForBuiltins.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeAddParameterNotAvailableForLibrary.kt")
+        @TestMetadata("addParameterNotAvailableForLibrary.kt")
         public void testAddParameterNotAvailableForLibrary() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeAddParameterNotAvailableForLibrary.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/addParameterNotAvailableForLibrary.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeAddParameterToFakeOverride.kt")
+        @TestMetadata("addParameterToFakeOverride.kt")
         public void testAddParameterToFakeOverride() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeAddParameterToFakeOverride.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/addParameterToFakeOverride.kt");
             doTest(fileName);
         }
 
         public void testAllFilesPresentInChangeSignature() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/changeSignature"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/changeSignature"), Pattern.compile("^(\\w+)\\.kt$"), true);
         }
 
-        @TestMetadata("beforeChangeFunctionLiteralParameters1.kt")
+        @TestMetadata("changeFunctionLiteralParameters1.kt")
         public void testChangeFunctionLiteralParameters1() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeChangeFunctionLiteralParameters1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/changeFunctionLiteralParameters1.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeChangeFunctionLiteralParameters2.kt")
+        @TestMetadata("changeFunctionLiteralParameters2.kt")
         public void testChangeFunctionLiteralParameters2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeChangeFunctionLiteralParameters2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/changeFunctionLiteralParameters2.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeComplexHierarchy.kt")
+        @TestMetadata("complexHierarchy.kt")
         public void testComplexHierarchy() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeComplexHierarchy.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/complexHierarchy.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeComplexHierarchyHead.kt")
+        @TestMetadata("complexHierarchyHead.kt")
         public void testComplexHierarchyHead() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeComplexHierarchyHead.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/complexHierarchyHead.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeComplexHierarchyTail.kt")
+        @TestMetadata("complexHierarchyTail.kt")
         public void testComplexHierarchyTail() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeComplexHierarchyTail.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/complexHierarchyTail.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeFixExtensionLambdaSignature.kt")
+        @TestMetadata("fixExtensionLambdaSignature.kt")
         public void testFixExtensionLambdaSignature() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeFixExtensionLambdaSignature.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/fixExtensionLambdaSignature.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeLinearHierarchy.kt")
+        @TestMetadata("linearHierarchy.kt")
         public void testLinearHierarchy() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeLinearHierarchy.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/linearHierarchy.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeNotAvailableForSynthesized.kt")
+        @TestMetadata("notAvailableForSynthesized.kt")
         public void testNotAvailableForSynthesized() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeNotAvailableForSynthesized.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/notAvailableForSynthesized.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeNotEditable.kt")
+        @TestMetadata("notEditable.kt")
         public void testNotEditable() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeNotEditable.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/notEditable.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeRemoveConstructorParameter.kt")
+        @TestMetadata("removeConstructorParameter.kt")
         public void testRemoveConstructorParameter() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeRemoveConstructorParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeConstructorParameter.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeRemoveFunctionFirstParameter.kt")
+        @TestMetadata("removeFunctionFirstParameter.kt")
         public void testRemoveFunctionFirstParameter() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeRemoveFunctionFirstParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeFunctionFirstParameter.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeRemoveFunctionSecondParameter1.kt")
+        @TestMetadata("removeFunctionSecondParameter1.kt")
         public void testRemoveFunctionSecondParameter1() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeRemoveFunctionSecondParameter1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeFunctionSecondParameter1.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeRemoveFunctionSecondParameter2.kt")
+        @TestMetadata("removeFunctionSecondParameter2.kt")
         public void testRemoveFunctionSecondParameter2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeRemoveFunctionSecondParameter2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeFunctionSecondParameter2.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeRemoveNamedParameter.kt")
+        @TestMetadata("removeNamedParameter.kt")
         public void testRemoveNamedParameter() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeRemoveNamedParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeNamedParameter.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeRemoveParameterFromFakeOverride.kt")
+        @TestMetadata("removeParameterFromFakeOverride.kt")
         public void testRemoveParameterFromFakeOverride() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeRemoveParameterFromFakeOverride.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeParameterFromFakeOverride.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeRemoveParameterNotAvailableForBuiltins.kt")
+        @TestMetadata("removeParameterNotAvailableForBuiltins.kt")
         public void testRemoveParameterNotAvailableForBuiltins() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeRemoveParameterNotAvailableForBuiltins.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeParameterNotAvailableForBuiltins.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeRemoveUnusedExtensionParameter.kt")
+        @TestMetadata("removeUnusedExtensionParameter.kt")
         public void testRemoveUnusedExtensionParameter() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeRemoveUnusedExtensionParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeUnusedExtensionParameter.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeRemoveUnusedParameter.kt")
+        @TestMetadata("removeUnusedParameter.kt")
         public void testRemoveUnusedParameter() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeRemoveUnusedParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeUnusedParameter.kt");
             doTest(fileName);
         }
     }
@@ -610,54 +610,54 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class CheckArguments extends AbstractQuickFixTest {
         public void testAllFilesPresentInCheckArguments() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/checkArguments"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/checkArguments"), Pattern.compile("^(\\w+)\\.kt$"), true);
         }
 
-        @TestMetadata("beforeInvokeOnString.kt")
+        @TestMetadata("invokeOnString.kt")
         public void testInvokeOnString() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/beforeInvokeOnString.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/invokeOnString.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeMixedNamedAndPositionalArguments.kt")
+        @TestMetadata("mixedNamedAndPositionalArguments.kt")
         public void testMixedNamedAndPositionalArguments() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArguments.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArguments.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeMixedNamedAndPositionalArgumentsConstructor.kt")
+        @TestMetadata("mixedNamedAndPositionalArgumentsConstructor.kt")
         public void testMixedNamedAndPositionalArgumentsConstructor() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArgumentsConstructor.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsConstructor.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeMixedNamedAndPositionalArgumentsMultiple.kt")
+        @TestMetadata("mixedNamedAndPositionalArgumentsMultiple.kt")
         public void testMixedNamedAndPositionalArgumentsMultiple() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArgumentsMultiple.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsMultiple.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeMixedNamedAndPositionalArgumentsSubtype.kt")
+        @TestMetadata("mixedNamedAndPositionalArgumentsSubtype.kt")
         public void testMixedNamedAndPositionalArgumentsSubtype() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArgumentsSubtype.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsSubtype.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeMixedNamedAndPositionalArgumentsUsedNamed.kt")
+        @TestMetadata("mixedNamedAndPositionalArgumentsUsedNamed.kt")
         public void testMixedNamedAndPositionalArgumentsUsedNamed() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArgumentsUsedNamed.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsUsedNamed.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeMixedNamedAndPositionalArgumentsUsedPositional.kt")
+        @TestMetadata("mixedNamedAndPositionalArgumentsUsedPositional.kt")
         public void testMixedNamedAndPositionalArgumentsUsedPositional() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArgumentsUsedPositional.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsUsedPositional.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeNonVarargSpread.kt")
+        @TestMetadata("nonVarargSpread.kt")
         public void testNonVarargSpread() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/beforeNonVarargSpread.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/nonVarargSpread.kt");
             doTest(fileName);
         }
     }
@@ -667,12 +667,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ConflictingImports extends AbstractQuickFixTest {
         public void testAllFilesPresentInConflictingImports() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/conflictingImports"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/conflictingImports"), Pattern.compile("^(\\w+)\\.kt$"), true);
         }
 
-        @TestMetadata("beforeRemoveConflictingImport.kt")
+        @TestMetadata("removeConflictingImport.kt")
         public void testRemoveConflictingImport() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/conflictingImports/beforeRemoveConflictingImport.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/conflictingImports/removeConflictingImport.kt");
             doTest(fileName);
         }
     }
@@ -682,7 +682,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class CreateFromUsage extends AbstractQuickFixTest {
         public void testAllFilesPresentInCreateFromUsage() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage"), Pattern.compile("^(\\w+)\\.kt$"), true);
         }
 
         @TestMetadata("idea/testData/quickfix/createFromUsage/createClass")
@@ -690,7 +690,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class CreateClass extends AbstractQuickFixTest {
             public void testAllFilesPresentInCreateClass() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass"), Pattern.compile("^(\\w+)\\.kt$"), true);
             }
 
             @TestMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry")
@@ -698,54 +698,54 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             @RunWith(JUnit3RunnerWithInners.class)
             public static class AnnotationEntry extends AbstractQuickFixTest {
                 public void testAllFilesPresentInAnnotationEntry() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/annotationEntry"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/annotationEntry"), Pattern.compile("^(\\w+)\\.kt$"), true);
                 }
 
-                @TestMetadata("beforeAnnotationNoBrackets.kt")
+                @TestMetadata("annotationNoBrackets.kt")
                 public void testAnnotationNoBrackets() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/beforeAnnotationNoBrackets.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationNoBrackets.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeAnnotationNoParamList.kt")
+                @TestMetadata("annotationNoParamList.kt")
                 public void testAnnotationNoParamList() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/beforeAnnotationNoParamList.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationNoParamList.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeAnnotationNoParams.kt")
+                @TestMetadata("annotationNoParams.kt")
                 public void testAnnotationNoParams() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/beforeAnnotationNoParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationNoParams.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeAnnotationWithParams.kt")
+                @TestMetadata("annotationWithParams.kt")
                 public void testAnnotationWithParams() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/beforeAnnotationWithParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationWithParams.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeAnnotationWithTypeParams.kt")
+                @TestMetadata("annotationWithTypeParams.kt")
                 public void testAnnotationWithTypeParams() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/beforeAnnotationWithTypeParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationWithTypeParams.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeNotAnnotation.kt")
+                @TestMetadata("notAnnotation.kt")
                 public void testNotAnnotation() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/beforeNotAnnotation.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/notAnnotation.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeSingleArgAnnotation.kt")
+                @TestMetadata("singleArgAnnotation.kt")
                 public void testSingleArgAnnotation() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/beforeSingleArgAnnotation.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/singleArgAnnotation.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeSingleNamedArgAnnotation.kt")
+                @TestMetadata("singleNamedArgAnnotation.kt")
                 public void testSingleNamedArgAnnotation() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/beforeSingleNamedArgAnnotation.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/singleNamedArgAnnotation.kt");
                     doTest(fileName);
                 }
             }
@@ -755,186 +755,186 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             @RunWith(JUnit3RunnerWithInners.class)
             public static class CallExpression extends AbstractQuickFixTest {
                 public void testAllFilesPresentInCallExpression() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/callExpression"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/callExpression"), Pattern.compile("^(\\w+)\\.kt$"), true);
                 }
 
-                @TestMetadata("beforeCallInAnnotationEntry.kt")
+                @TestMetadata("callInAnnotationEntry.kt")
                 public void testCallInAnnotationEntry() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallInAnnotationEntry.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callInAnnotationEntry.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCallInLambda.kt")
+                @TestMetadata("callInLambda.kt")
                 public void testCallInLambda() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallInLambda.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callInLambda.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCallInLocalFunNoReceiver.kt")
+                @TestMetadata("callInLocalFunNoReceiver.kt")
                 public void testCallInLocalFunNoReceiver() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallInLocalFunNoReceiver.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callInLocalFunNoReceiver.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCallInMemberFunNoReceiver.kt")
+                @TestMetadata("callInMemberFunNoReceiver.kt")
                 public void testCallInMemberFunNoReceiver() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallInMemberFunNoReceiver.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberFunNoReceiver.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCallInMemberValDelegateRuntime.kt")
+                @TestMetadata("callInMemberValDelegateRuntime.kt")
                 public void testCallInMemberValDelegateRuntime() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallInMemberValDelegateRuntime.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberValDelegateRuntime.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCallInMemberVarDelegateRuntime.kt")
+                @TestMetadata("callInMemberVarDelegateRuntime.kt")
                 public void testCallInMemberVarDelegateRuntime() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallInMemberVarDelegateRuntime.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberVarDelegateRuntime.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCallNoReceiver.kt")
+                @TestMetadata("callNoReceiver.kt")
                 public void testCallNoReceiver() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallNoReceiver.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callNoReceiver.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCallWithClassQualifier.kt")
+                @TestMetadata("callWithClassQualifier.kt")
                 public void testCallWithClassQualifier() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithClassQualifier.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithClassQualifier.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCallWithExplicitParamNames.kt")
+                @TestMetadata("callWithExplicitParamNames.kt")
                 public void testCallWithExplicitParamNames() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithExplicitParamNames.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithExplicitParamNames.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCallWithExtraArgs.kt")
+                @TestMetadata("callWithExtraArgs.kt")
                 public void testCallWithExtraArgs() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithExtraArgs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithExtraArgs.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCallWithFinalSupertype.kt")
+                @TestMetadata("callWithFinalSupertype.kt")
                 public void testCallWithFinalSupertype() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithFinalSupertype.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithFinalSupertype.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCallWithGenericReceiver.kt")
+                @TestMetadata("callWithGenericReceiver.kt")
                 public void testCallWithGenericReceiver() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithGenericReceiver.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericReceiver.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCallWithLambdaArg.kt")
+                @TestMetadata("callWithLambdaArg.kt")
                 public void testCallWithLambdaArg() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithLambdaArg.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithLambdaArg.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCallWithLambdaArgOnly.kt")
+                @TestMetadata("callWithLambdaArgOnly.kt")
                 public void testCallWithLambdaArgOnly() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithLambdaArgOnly.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithLambdaArgOnly.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCallWithLibClassQualifier.kt")
+                @TestMetadata("callWithLibClassQualifier.kt")
                 public void testCallWithLibClassQualifier() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithLibClassQualifier.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithLibClassQualifier.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCallWithMissingArgs.kt")
+                @TestMetadata("callWithMissingArgs.kt")
                 public void testCallWithMissingArgs() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithMissingArgs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithMissingArgs.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCallWithObjectQualifier.kt")
+                @TestMetadata("callWithObjectQualifier.kt")
                 public void testCallWithObjectQualifier() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithObjectQualifier.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithObjectQualifier.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCallWithPackageName.kt")
+                @TestMetadata("callWithPackageName.kt")
                 public void testCallWithPackageName() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithPackageName.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithPackageName.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCallWithReceiver.kt")
+                @TestMetadata("callWithReceiver.kt")
                 public void testCallWithReceiver() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithReceiver.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithReceiver.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCallWithSuperclassNoConstructorParams.kt")
+                @TestMetadata("callWithSuperclassNoConstructorParams.kt")
                 public void testCallWithSuperclassNoConstructorParams() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithSuperclassNoConstructorParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassNoConstructorParams.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCallWithSuperclassWithConstructorParams.kt")
+                @TestMetadata("callWithSuperclassWithConstructorParams.kt")
                 public void testCallWithSuperclassWithConstructorParams() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithSuperclassWithConstructorParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassWithConstructorParams.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCallWithSupertrait.kt")
+                @TestMetadata("callWithSupertrait.kt")
                 public void testCallWithSupertrait() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithSupertrait.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSupertrait.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCallWithThisReceiverInClass.kt")
+                @TestMetadata("callWithThisReceiverInClass.kt")
                 public void testCallWithThisReceiverInClass() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithThisReceiverInClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithThisReceiverInClass.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCallWithThisReceiverInExtension.kt")
+                @TestMetadata("callWithThisReceiverInExtension.kt")
                 public void testCallWithThisReceiverInExtension() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithThisReceiverInExtension.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithThisReceiverInExtension.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCallWithThisReceiverInNestedClass1.kt")
+                @TestMetadata("callWithThisReceiverInNestedClass1.kt")
                 public void testCallWithThisReceiverInNestedClass1() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithThisReceiverInNestedClass1.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithThisReceiverInNestedClass1.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCallWithThisReceiverInNestedClass2.kt")
+                @TestMetadata("callWithThisReceiverInNestedClass2.kt")
                 public void testCallWithThisReceiverInNestedClass2() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithThisReceiverInNestedClass2.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithThisReceiverInNestedClass2.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCallWithTypeArgsInAnnotationEntry.kt")
+                @TestMetadata("callWithTypeArgsInAnnotationEntry.kt")
                 public void testCallWithTypeArgsInAnnotationEntry() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithTypeArgsInAnnotationEntry.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithTypeArgsInAnnotationEntry.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeSingleArgCallInAnnotationEntry.kt")
+                @TestMetadata("singleArgCallInAnnotationEntry.kt")
                 public void testSingleArgCallInAnnotationEntry() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeSingleArgCallInAnnotationEntry.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/singleArgCallInAnnotationEntry.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeSingleNamedArgCallInAnnotationEntry.kt")
+                @TestMetadata("singleNamedArgCallInAnnotationEntry.kt")
                 public void testSingleNamedArgCallInAnnotationEntry() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeSingleNamedArgCallInAnnotationEntry.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/singleNamedArgCallInAnnotationEntry.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeUnusedCallResult.kt")
+                @TestMetadata("unusedCallResult.kt")
                 public void testUnusedCallResult() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeUnusedCallResult.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/unusedCallResult.kt");
                     doTest(fileName);
                 }
 
@@ -943,78 +943,78 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
                 @RunWith(JUnit3RunnerWithInners.class)
                 public static class TypeArguments extends AbstractQuickFixTest {
                     public void testAllFilesPresentInTypeArguments() throws Exception {
-                        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments"), Pattern.compile("^(\\w+)\\.kt$"), true);
                     }
 
-                    @TestMetadata("beforeCallWithStarProjection.kt")
+                    @TestMetadata("callWithStarProjection.kt")
                     public void testCallWithStarProjection() throws Exception {
-                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeCallWithStarProjection.kt");
+                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/callWithStarProjection.kt");
                         doTest(fileName);
                     }
 
-                    @TestMetadata("beforeClassMember.kt")
+                    @TestMetadata("classMember.kt")
                     public void testClassMember() throws Exception {
-                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeClassMember.kt");
+                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMember.kt");
                         doTest(fileName);
                     }
 
-                    @TestMetadata("beforeClassMemberInner.kt")
+                    @TestMetadata("classMemberInner.kt")
                     public void testClassMemberInner() throws Exception {
-                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeClassMemberInner.kt");
+                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMemberInner.kt");
                         doTest(fileName);
                     }
 
-                    @TestMetadata("beforeClassMemberInnerPartialSubstitution.kt")
+                    @TestMetadata("classMemberInnerPartialSubstitution.kt")
                     public void testClassMemberInnerPartialSubstitution() throws Exception {
-                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeClassMemberInnerPartialSubstitution.kt");
+                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMemberInnerPartialSubstitution.kt");
                         doTest(fileName);
                     }
 
-                    @TestMetadata("beforeClassMemberInnerWithReceiverArg.kt")
+                    @TestMetadata("classMemberInnerWithReceiverArg.kt")
                     public void testClassMemberInnerWithReceiverArg() throws Exception {
-                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeClassMemberInnerWithReceiverArg.kt");
+                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMemberInnerWithReceiverArg.kt");
                         doTest(fileName);
                     }
 
-                    @TestMetadata("beforeClassMemberPartialSubstitution.kt")
+                    @TestMetadata("classMemberPartialSubstitution.kt")
                     public void testClassMemberPartialSubstitution() throws Exception {
-                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeClassMemberPartialSubstitution.kt");
+                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMemberPartialSubstitution.kt");
                         doTest(fileName);
                     }
 
-                    @TestMetadata("beforeExtension.kt")
+                    @TestMetadata("extension.kt")
                     public void testExtension() throws Exception {
-                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeExtension.kt");
+                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/extension.kt");
                         doTest(fileName);
                     }
 
-                    @TestMetadata("beforeNoReceiver.kt")
+                    @TestMetadata("noReceiver.kt")
                     public void testNoReceiver() throws Exception {
-                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeNoReceiver.kt");
+                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/noReceiver.kt");
                         doTest(fileName);
                     }
 
-                    @TestMetadata("beforeNoReceiverExtraArgs.kt")
+                    @TestMetadata("noReceiverExtraArgs.kt")
                     public void testNoReceiverExtraArgs() throws Exception {
-                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeNoReceiverExtraArgs.kt");
+                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/noReceiverExtraArgs.kt");
                         doTest(fileName);
                     }
 
-                    @TestMetadata("beforeNoReceiverLongName.kt")
+                    @TestMetadata("noReceiverLongName.kt")
                     public void testNoReceiverLongName() throws Exception {
-                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeNoReceiverLongName.kt");
+                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/noReceiverLongName.kt");
                         doTest(fileName);
                     }
 
-                    @TestMetadata("beforeNoReceiverPartialSubstitution.kt")
+                    @TestMetadata("noReceiverPartialSubstitution.kt")
                     public void testNoReceiverPartialSubstitution() throws Exception {
-                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeNoReceiverPartialSubstitution.kt");
+                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/noReceiverPartialSubstitution.kt");
                         doTest(fileName);
                     }
 
-                    @TestMetadata("beforeWithExpectedTypeNoReceiver.kt")
+                    @TestMetadata("withExpectedTypeNoReceiver.kt")
                     public void testWithExpectedTypeNoReceiver() throws Exception {
-                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeWithExpectedTypeNoReceiver.kt");
+                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/withExpectedTypeNoReceiver.kt");
                         doTest(fileName);
                     }
                 }
@@ -1025,48 +1025,48 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             @RunWith(JUnit3RunnerWithInners.class)
             public static class DelegationSpecifier extends AbstractQuickFixTest {
                 public void testAllFilesPresentInDelegationSpecifier() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier"), Pattern.compile("^(\\w+)\\.kt$"), true);
                 }
 
-                @TestMetadata("beforeClassDelegatorToSuperclass.kt")
+                @TestMetadata("classDelegatorToSuperclass.kt")
                 public void testClassDelegatorToSuperclass() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/beforeClassDelegatorToSuperclass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/classDelegatorToSuperclass.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeDelegatorToSupercallNoReceiver.kt")
+                @TestMetadata("delegatorToSupercallNoReceiver.kt")
                 public void testDelegatorToSupercallNoReceiver() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/beforeDelegatorToSupercallNoReceiver.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallNoReceiver.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeDelegatorToSupercallWithClassQualifier.kt")
+                @TestMetadata("delegatorToSupercallWithClassQualifier.kt")
                 public void testDelegatorToSupercallWithClassQualifier() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/beforeDelegatorToSupercallWithClassQualifier.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithClassQualifier.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeDelegatorToSupercallWithPackageQualifier.kt")
+                @TestMetadata("delegatorToSupercallWithPackageQualifier.kt")
                 public void testDelegatorToSupercallWithPackageQualifier() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/beforeDelegatorToSupercallWithPackageQualifier.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithPackageQualifier.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeDelegatorToSupercallWithParamNames.kt")
+                @TestMetadata("delegatorToSupercallWithParamNames.kt")
                 public void testDelegatorToSupercallWithParamNames() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/beforeDelegatorToSupercallWithParamNames.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithParamNames.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeDelegatorToSupercallWithTypeParams.kt")
+                @TestMetadata("delegatorToSupercallWithTypeParams.kt")
                 public void testDelegatorToSupercallWithTypeParams() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/beforeDelegatorToSupercallWithTypeParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithTypeParams.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeTraitDelegatorToSuperclass.kt")
+                @TestMetadata("traitDelegatorToSuperclass.kt")
                 public void testTraitDelegatorToSuperclass() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/beforeTraitDelegatorToSuperclass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToSuperclass.kt");
                     doTest(fileName);
                 }
             }
@@ -1076,84 +1076,84 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             @RunWith(JUnit3RunnerWithInners.class)
             public static class ImportDirective extends AbstractQuickFixTest {
                 public void testAllFilesPresentInImportDirective() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/importDirective"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/importDirective"), Pattern.compile("^(\\w+)\\.kt$"), true);
                 }
 
-                @TestMetadata("beforeAnnotationInPackage.kt")
+                @TestMetadata("annotationInPackage.kt")
                 public void testAnnotationInPackage() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeAnnotationInPackage.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/annotationInPackage.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeAnnotationWithQualifier.kt")
+                @TestMetadata("annotationWithQualifier.kt")
                 public void testAnnotationWithQualifier() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeAnnotationWithQualifier.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/annotationWithQualifier.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeClassInPackage.kt")
+                @TestMetadata("classInPackage.kt")
                 public void testClassInPackage() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeClassInPackage.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/classInPackage.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeClassWithQualifier.kt")
+                @TestMetadata("classWithQualifier.kt")
                 public void testClassWithQualifier() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeClassWithQualifier.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/classWithQualifier.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeEnumEntryInEnum.kt")
+                @TestMetadata("enumEntryInEnum.kt")
                 public void testEnumEntryInEnum() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeEnumEntryInEnum.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/enumEntryInEnum.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeEnumEntryInPackage.kt")
+                @TestMetadata("enumEntryInPackage.kt")
                 public void testEnumEntryInPackage() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeEnumEntryInPackage.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/enumEntryInPackage.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeEnumEntryWithQualifier.kt")
+                @TestMetadata("enumEntryWithQualifier.kt")
                 public void testEnumEntryWithQualifier() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeEnumEntryWithQualifier.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/enumEntryWithQualifier.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeEnumInPackage.kt")
+                @TestMetadata("enumInPackage.kt")
                 public void testEnumInPackage() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeEnumInPackage.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/enumInPackage.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeEnumWithQualifier.kt")
+                @TestMetadata("enumWithQualifier.kt")
                 public void testEnumWithQualifier() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeEnumWithQualifier.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/enumWithQualifier.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeObjectInPackage.kt")
+                @TestMetadata("objectInPackage.kt")
                 public void testObjectInPackage() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeObjectInPackage.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/objectInPackage.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeObjectWithQualifier.kt")
+                @TestMetadata("objectWithQualifier.kt")
                 public void testObjectWithQualifier() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeObjectWithQualifier.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/objectWithQualifier.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeTraitInPackage.kt")
+                @TestMetadata("traitInPackage.kt")
                 public void testTraitInPackage() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeTraitInPackage.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/traitInPackage.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeTraitWithQualifier.kt")
+                @TestMetadata("traitWithQualifier.kt")
                 public void testTraitWithQualifier() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/beforeTraitWithQualifier.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/traitWithQualifier.kt");
                     doTest(fileName);
                 }
             }
@@ -1163,174 +1163,174 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             @RunWith(JUnit3RunnerWithInners.class)
             public static class ReferenceExpression extends AbstractQuickFixTest {
                 public void testAllFilesPresentInReferenceExpression() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/referenceExpression"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/referenceExpression"), Pattern.compile("^(\\w+)\\.kt$"), true);
                 }
 
-                @TestMetadata("beforeAnnotationNoReceiver.kt")
+                @TestMetadata("annotationNoReceiver.kt")
                 public void testAnnotationNoReceiver() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeAnnotationNoReceiver.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/annotationNoReceiver.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeClassByNestedQualifier.kt")
+                @TestMetadata("classByNestedQualifier.kt")
                 public void testClassByNestedQualifier() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeClassByNestedQualifier.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classByNestedQualifier.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeClassByQualifier.kt")
+                @TestMetadata("classByQualifier.kt")
                 public void testClassByQualifier() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeClassByQualifier.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classByQualifier.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeClassInPackage.kt")
+                @TestMetadata("classInPackage.kt")
                 public void testClassInPackage() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeClassInPackage.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classInPackage.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeClassNoReceiver.kt")
+                @TestMetadata("classNoReceiver.kt")
                 public void testClassNoReceiver() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeClassNoReceiver.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classNoReceiver.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeClassWithQualifier.kt")
+                @TestMetadata("classWithQualifier.kt")
                 public void testClassWithQualifier() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeClassWithQualifier.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classWithQualifier.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeClassWithReceiver.kt")
+                @TestMetadata("classWithReceiver.kt")
                 public void testClassWithReceiver() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeClassWithReceiver.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classWithReceiver.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeEnumByQualifier.kt")
+                @TestMetadata("enumByQualifier.kt")
                 public void testEnumByQualifier() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeEnumByQualifier.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumByQualifier.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeEnumEntryNoReceiver.kt")
+                @TestMetadata("enumEntryNoReceiver.kt")
                 public void testEnumEntryNoReceiver() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeEnumEntryNoReceiver.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryNoReceiver.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeEnumEntryWithEnumQualifier.kt")
+                @TestMetadata("enumEntryWithEnumQualifier.kt")
                 public void testEnumEntryWithEnumQualifier() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeEnumEntryWithEnumQualifier.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithEnumQualifier.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeEnumEntryWithEnumQualifierAndParams.kt")
+                @TestMetadata("enumEntryWithEnumQualifierAndParams.kt")
                 public void testEnumEntryWithEnumQualifierAndParams() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeEnumEntryWithEnumQualifierAndParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithEnumQualifierAndParams.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeEnumEntryWithEnumSuperclass.kt")
+                @TestMetadata("enumEntryWithEnumSuperclass.kt")
                 public void testEnumEntryWithEnumSuperclass() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeEnumEntryWithEnumSuperclass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithEnumSuperclass.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeEnumEntryWithQualifier.kt")
+                @TestMetadata("enumEntryWithQualifier.kt")
                 public void testEnumEntryWithQualifier() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeEnumEntryWithQualifier.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithQualifier.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeEnumEntryWithReceiver.kt")
+                @TestMetadata("enumEntryWithReceiver.kt")
                 public void testEnumEntryWithReceiver() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeEnumEntryWithReceiver.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithReceiver.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeEnumEntryWithSuperclass.kt")
+                @TestMetadata("enumEntryWithSuperclass.kt")
                 public void testEnumEntryWithSuperclass() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeEnumEntryWithSuperclass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithSuperclass.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeEnumNoReceiver.kt")
+                @TestMetadata("enumNoReceiver.kt")
                 public void testEnumNoReceiver() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeEnumNoReceiver.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumNoReceiver.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeObjectByQualifier.kt")
+                @TestMetadata("objectByQualifier.kt")
                 public void testObjectByQualifier() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeObjectByQualifier.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectByQualifier.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeObjectInPackage.kt")
+                @TestMetadata("objectInPackage.kt")
                 public void testObjectInPackage() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeObjectInPackage.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectInPackage.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeObjectNoReceiver.kt")
+                @TestMetadata("objectNoReceiver.kt")
                 public void testObjectNoReceiver() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeObjectNoReceiver.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectNoReceiver.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeObjectWithQualifier.kt")
+                @TestMetadata("objectWithQualifier.kt")
                 public void testObjectWithQualifier() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeObjectWithQualifier.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithQualifier.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeObjectWithReceiver.kt")
+                @TestMetadata("objectWithReceiver.kt")
                 public void testObjectWithReceiver() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeObjectWithReceiver.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithReceiver.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeObjectWithSuperclass.kt")
+                @TestMetadata("objectWithSuperclass.kt")
                 public void testObjectWithSuperclass() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeObjectWithSuperclass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithSuperclass.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeObjectWithSupertrait.kt")
+                @TestMetadata("objectWithSupertrait.kt")
                 public void testObjectWithSupertrait() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeObjectWithSupertrait.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithSupertrait.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeTraitByQualifier.kt")
+                @TestMetadata("traitByQualifier.kt")
                 public void testTraitByQualifier() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeTraitByQualifier.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/traitByQualifier.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeTraitNoReceiver.kt")
+                @TestMetadata("traitNoReceiver.kt")
                 public void testTraitNoReceiver() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeTraitNoReceiver.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/traitNoReceiver.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeUnusedReference.kt")
+                @TestMetadata("unusedReference.kt")
                 public void testUnusedReference() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeUnusedReference.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/unusedReference.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeValDelegateExpressionRuntime.kt")
+                @TestMetadata("valDelegateExpressionRuntime.kt")
                 public void testValDelegateExpressionRuntime() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeValDelegateExpressionRuntime.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/valDelegateExpressionRuntime.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeVarDelegateExpressionRuntime.kt")
+                @TestMetadata("varDelegateExpressionRuntime.kt")
                 public void testVarDelegateExpressionRuntime() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/beforeVarDelegateExpressionRuntime.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/varDelegateExpressionRuntime.kt");
                     doTest(fileName);
                 }
             }
@@ -1340,114 +1340,114 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             @RunWith(JUnit3RunnerWithInners.class)
             public static class TypeReference extends AbstractQuickFixTest {
                 public void testAllFilesPresentInTypeReference() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/typeReference"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/typeReference"), Pattern.compile("^(\\w+)\\.kt$"), true);
                 }
 
-                @TestMetadata("beforeAnnotationNotQualifierNoTypeArgs.kt")
+                @TestMetadata("annotationNotQualifierNoTypeArgs.kt")
                 public void testAnnotationNotQualifierNoTypeArgs() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeAnnotationNotQualifierNoTypeArgs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/annotationNotQualifierNoTypeArgs.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeAnnotationNotQualifierWithTypeArgs.kt")
+                @TestMetadata("annotationNotQualifierWithTypeArgs.kt")
                 public void testAnnotationNotQualifierWithTypeArgs() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeAnnotationNotQualifierWithTypeArgs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/annotationNotQualifierWithTypeArgs.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeAnnotationQualifierNoTypeArgs.kt")
+                @TestMetadata("annotationQualifierNoTypeArgs.kt")
                 public void testAnnotationQualifierNoTypeArgs() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeAnnotationQualifierNoTypeArgs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/annotationQualifierNoTypeArgs.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeClassCurrentPackageReceiver.kt")
+                @TestMetadata("classCurrentPackageReceiver.kt")
                 public void testClassCurrentPackageReceiver() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeClassCurrentPackageReceiver.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/classCurrentPackageReceiver.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeClassLibTypeReceiver.kt")
+                @TestMetadata("classLibTypeReceiver.kt")
                 public void testClassLibTypeReceiver() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeClassLibTypeReceiver.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/classLibTypeReceiver.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeClassNotQualifierNoTypeArgs.kt")
+                @TestMetadata("classNotQualifierNoTypeArgs.kt")
                 public void testClassNotQualifierNoTypeArgs() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeClassNotQualifierNoTypeArgs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/classNotQualifierNoTypeArgs.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeClassNotQualifierWithStarProjection.kt")
+                @TestMetadata("classNotQualifierWithStarProjection.kt")
                 public void testClassNotQualifierWithStarProjection() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeClassNotQualifierWithStarProjection.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/classNotQualifierWithStarProjection.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeClassNotQualifierWithTypeArgs.kt")
+                @TestMetadata("classNotQualifierWithTypeArgs.kt")
                 public void testClassNotQualifierWithTypeArgs() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeClassNotQualifierWithTypeArgs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/classNotQualifierWithTypeArgs.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeClassQualifierNoTypeArgs.kt")
+                @TestMetadata("classQualifierNoTypeArgs.kt")
                 public void testClassQualifierNoTypeArgs() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeClassQualifierNoTypeArgs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/classQualifierNoTypeArgs.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeClassUserTypeReceiver.kt")
+                @TestMetadata("classUserTypeReceiver.kt")
                 public void testClassUserTypeReceiver() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeClassUserTypeReceiver.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/classUserTypeReceiver.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeClassUserTypeReceiverNoBody.kt")
+                @TestMetadata("classUserTypeReceiverNoBody.kt")
                 public void testClassUserTypeReceiverNoBody() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeClassUserTypeReceiverNoBody.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/classUserTypeReceiverNoBody.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeEnumEntryNotQualifierNoTypeArgs.kt")
+                @TestMetadata("enumEntryNotQualifierNoTypeArgs.kt")
                 public void testEnumEntryNotQualifierNoTypeArgs() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeEnumEntryNotQualifierNoTypeArgs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/enumEntryNotQualifierNoTypeArgs.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeEnumNotQualifierNoTypeArgs.kt")
+                @TestMetadata("enumNotQualifierNoTypeArgs.kt")
                 public void testEnumNotQualifierNoTypeArgs() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeEnumNotQualifierNoTypeArgs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/enumNotQualifierNoTypeArgs.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeEnumNotQualifierWithTypeArgs.kt")
+                @TestMetadata("enumNotQualifierWithTypeArgs.kt")
                 public void testEnumNotQualifierWithTypeArgs() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeEnumNotQualifierWithTypeArgs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/enumNotQualifierWithTypeArgs.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeObjectNotQualifierNoTypeArgs.kt")
+                @TestMetadata("objectNotQualifierNoTypeArgs.kt")
                 public void testObjectNotQualifierNoTypeArgs() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeObjectNotQualifierNoTypeArgs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/objectNotQualifierNoTypeArgs.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeObjectNotQualifierWithTypeArgs.kt")
+                @TestMetadata("objectNotQualifierWithTypeArgs.kt")
                 public void testObjectNotQualifierWithTypeArgs() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeObjectNotQualifierWithTypeArgs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/objectNotQualifierWithTypeArgs.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeObjectQualifierNoTypeArgs.kt")
+                @TestMetadata("objectQualifierNoTypeArgs.kt")
                 public void testObjectQualifierNoTypeArgs() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeObjectQualifierNoTypeArgs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/objectQualifierNoTypeArgs.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeTraitNotQualifierNoTypeArgs.kt")
+                @TestMetadata("traitNotQualifierNoTypeArgs.kt")
                 public void testTraitNotQualifierNoTypeArgs() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/beforeTraitNotQualifierNoTypeArgs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/traitNotQualifierNoTypeArgs.kt");
                     doTest(fileName);
                 }
             }
@@ -1458,7 +1458,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class CreateFunction extends AbstractQuickFixTest {
             public void testAllFilesPresentInCreateFunction() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction"), Pattern.compile("^(\\w+)\\.kt$"), true);
             }
 
             @TestMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations")
@@ -1466,90 +1466,90 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             @RunWith(JUnit3RunnerWithInners.class)
             public static class BinaryOperations extends AbstractQuickFixTest {
                 public void testAllFilesPresentInBinaryOperations() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations"), Pattern.compile("^(\\w+)\\.kt$"), true);
                 }
 
-                @TestMetadata("beforeCustomOperationOnUserType.kt")
+                @TestMetadata("customOperationOnUserType.kt")
                 public void testCustomOperationOnUserType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforeCustomOperationOnUserType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeGreaterOrEqualOnUserType.kt")
+                @TestMetadata("greaterOrEqualOnUserType.kt")
                 public void testGreaterOrEqualOnUserType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforeGreaterOrEqualOnUserType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInOnUserType.kt")
+                @TestMetadata("inOnUserType.kt")
                 public void testInOnUserType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforeInOnUserType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeLessOnUserType.kt")
+                @TestMetadata("lessOnUserType.kt")
                 public void testLessOnUserType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforeLessOnUserType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeNotInOnUserType.kt")
+                @TestMetadata("notInOnUserType.kt")
                 public void testNotInOnUserType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforeNotInOnUserType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforePlusAssignOnUserType.kt")
+                @TestMetadata("plusAssignOnUserType.kt")
                 public void testPlusAssignOnUserType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforePlusAssignOnUserType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforePlusExtraArgs.kt")
+                @TestMetadata("plusExtraArgs.kt")
                 public void testPlusExtraArgs() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforePlusExtraArgs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforePlusForAssignmentOnUserType.kt")
+                @TestMetadata("plusForAssignmentOnUserType.kt")
                 public void testPlusForAssignmentOnUserType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforePlusForAssignmentOnUserType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforePlusMissingArgs.kt")
+                @TestMetadata("plusMissingArgs.kt")
                 public void testPlusMissingArgs() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforePlusMissingArgs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforePlusOnLibType.kt")
+                @TestMetadata("plusOnLibType.kt")
                 public void testPlusOnLibType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforePlusOnLibType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnLibType.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforePlusOnUserType.kt")
+                @TestMetadata("plusOnUserType.kt")
                 public void testPlusOnUserType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforePlusOnUserType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforePlusOnUserTypeWithTypeParams.kt")
+                @TestMetadata("plusOnUserTypeWithTypeParams.kt")
                 public void testPlusOnUserTypeWithTypeParams() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforePlusOnUserTypeWithTypeParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeWhenInOnUserType.kt")
+                @TestMetadata("whenInOnUserType.kt")
                 public void testWhenInOnUserType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforeWhenInOnUserType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeWhenNotInOnUserType.kt")
+                @TestMetadata("whenNotInOnUserType.kt")
                 public void testWhenNotInOnUserType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/beforeWhenNotInOnUserType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt");
                     doTest(fileName);
                 }
             }
@@ -1559,288 +1559,288 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             @RunWith(JUnit3RunnerWithInners.class)
             public static class Call extends AbstractQuickFixTest {
                 public void testAllFilesPresentInCall() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/call"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/call"), Pattern.compile("^(\\w+)\\.kt$"), true);
                 }
 
-                @TestMetadata("beforeCallInAnnotationEntry.kt")
+                @TestMetadata("callInAnnotationEntry.kt")
                 public void testCallInAnnotationEntry() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeCallInAnnotationEntry.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/callInAnnotationEntry.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCallInStringTemplateRuntime.kt")
+                @TestMetadata("callInStringTemplateRuntime.kt")
                 public void testCallInStringTemplateRuntime() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeCallInStringTemplateRuntime.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/callInStringTemplateRuntime.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCallWithLambdaArg.kt")
+                @TestMetadata("callWithLambdaArg.kt")
                 public void testCallWithLambdaArg() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeCallWithLambdaArg.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCallWithLambdaArgOnly.kt")
+                @TestMetadata("callWithLambdaArgOnly.kt")
                 public void testCallWithLambdaArgOnly() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeCallWithLambdaArgOnly.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeDoNotStripPrefix.kt")
+                @TestMetadata("doNotStripPrefix.kt")
                 public void testDoNotStripPrefix() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeDoNotStripPrefix.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeExtensionFunOnTrait.kt")
+                @TestMetadata("extensionFunOnTrait.kt")
                 public void testExtensionFunOnTrait() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeExtensionFunOnTrait.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTrait.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeExtensionRefInImport.kt")
+                @TestMetadata("extensionRefInImport.kt")
                 public void testExtensionRefInImport() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeExtensionRefInImport.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/extensionRefInImport.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeFunExtraArgs.kt")
+                @TestMetadata("funExtraArgs.kt")
                 public void testFunExtraArgs() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunExtraArgs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeFunMissingArgs.kt")
+                @TestMetadata("funMissingArgs.kt")
                 public void testFunMissingArgs() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunMissingArgs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeFunOnClassNoClassObject.kt")
+                @TestMetadata("funOnClassNoClassObject.kt")
                 public void testFunOnClassNoClassObject() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunOnClassNoClassObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassNoClassObject.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeFunOnClassObject.kt")
+                @TestMetadata("funOnClassObject.kt")
                 public void testFunOnClassObject() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunOnClassObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeFunOnLibObject.kt")
+                @TestMetadata("funOnLibObject.kt")
                 public void testFunOnLibObject() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunOnLibObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibObject.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeFunOnLibType.kt")
+                @TestMetadata("funOnLibType.kt")
                 public void testFunOnLibType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunOnLibType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibType.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeFunOnTrait.kt")
+                @TestMetadata("funOnTrait.kt")
                 public void testFunOnTrait() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunOnTrait.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeFunOnUserObject.kt")
+                @TestMetadata("funOnUserObject.kt")
                 public void testFunOnUserObject() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunOnUserObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeFunOnUserType.kt")
+                @TestMetadata("funOnUserType.kt")
                 public void testFunOnUserType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunOnUserType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeFunOnUserTypeWithDeclarations.kt")
+                @TestMetadata("funOnUserTypeWithDeclarations.kt")
                 public void testFunOnUserTypeWithDeclarations() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunOnUserTypeWithDeclarations.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeFunOnUserTypeWithTypeParams.kt")
+                @TestMetadata("funOnUserTypeWithTypeParams.kt")
                 public void testFunOnUserTypeWithTypeParams() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunOnUserTypeWithTypeParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeFunPlacement.kt")
+                @TestMetadata("funPlacement.kt")
                 public void testFunPlacement() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunPlacement.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funPlacement.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeFunWithExplicitParamNamesOnUserType.kt")
+                @TestMetadata("funWithExplicitParamNamesOnUserType.kt")
                 public void testFunWithExplicitParamNamesOnUserType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunWithExplicitParamNamesOnUserType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeFunWithNullableParamType.kt")
+                @TestMetadata("funWithNullableParamType.kt")
                 public void testFunWithNullableParamType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunWithNullableParamType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeFunWithNullableType.kt")
+                @TestMetadata("funWithNullableType.kt")
                 public void testFunWithNullableType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunWithNullableType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeFunWithNullableTypeParameter.kt")
+                @TestMetadata("funWithNullableTypeParameter.kt")
                 public void testFunWithNullableTypeParameter() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunWithNullableTypeParameter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeFunWithPackageName.kt")
+                @TestMetadata("funWithPackageName.kt")
                 public void testFunWithPackageName() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunWithPackageName.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funWithPackageName.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInLambda.kt")
+                @TestMetadata("inLambda.kt")
                 public void testInLambda() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeInLambda.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/inLambda.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInconsistentTypes.kt")
+                @TestMetadata("inconsistentTypes.kt")
                 public void testInconsistentTypes() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeInconsistentTypes.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeLocalFunNoReceiver.kt")
+                @TestMetadata("localFunNoReceiver.kt")
                 public void testLocalFunNoReceiver() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeLocalFunNoReceiver.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/localFunNoReceiver.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeMemberFunNoReceiver.kt")
+                @TestMetadata("memberFunNoReceiver.kt")
                 public void testMemberFunNoReceiver() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeMemberFunNoReceiver.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/memberFunNoReceiver.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeMemberValDelegateRuntime.kt")
+                @TestMetadata("memberValDelegateRuntime.kt")
                 public void testMemberValDelegateRuntime() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeMemberValDelegateRuntime.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/memberValDelegateRuntime.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeMemberVarDelegateRuntime.kt")
+                @TestMetadata("memberVarDelegateRuntime.kt")
                 public void testMemberVarDelegateRuntime() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeMemberVarDelegateRuntime.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/memberVarDelegateRuntime.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeObjectMemberFunNoReceiver.kt")
+                @TestMetadata("objectMemberFunNoReceiver.kt")
                 public void testObjectMemberFunNoReceiver() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeObjectMemberFunNoReceiver.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/objectMemberFunNoReceiver.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforePrivateForMembers.kt")
+                @TestMetadata("privateForMembers.kt")
                 public void testPrivateForMembers() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforePrivateForMembers.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/privateForMembers.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforePropertyOnUserType.kt")
+                @TestMetadata("propertyOnUserType.kt")
                 public void testPropertyOnUserType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforePropertyOnUserType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/propertyOnUserType.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeQualifiedCallInStringTemplateRuntime.kt")
+                @TestMetadata("qualifiedCallInStringTemplateRuntime.kt")
                 public void testQualifiedCallInStringTemplateRuntime() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeQualifiedCallInStringTemplateRuntime.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeRefInImport.kt")
+                @TestMetadata("refInImport.kt")
                 public void testRefInImport() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeRefInImport.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/refInImport.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeSmartCastWithIs.kt")
+                @TestMetadata("smartCastWithIs.kt")
                 public void testSmartCastWithIs() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeSmartCastWithIs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/smartCastWithIs.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeSmartCastWithNullCheck.kt")
+                @TestMetadata("smartCastWithNullCheck.kt")
                 public void testSmartCastWithNullCheck() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeSmartCastWithNullCheck.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/smartCastWithNullCheck.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeStripPrefix.kt")
+                @TestMetadata("stripPrefix.kt")
                 public void testStripPrefix() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeStripPrefix.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeThisInClass.kt")
+                @TestMetadata("thisInClass.kt")
                 public void testThisInClass() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeThisInClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeThisInExtension.kt")
+                @TestMetadata("thisInExtension.kt")
                 public void testThisInExtension() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeThisInExtension.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeThisInNestedClass1.kt")
+                @TestMetadata("thisInNestedClass1.kt")
                 public void testThisInNestedClass1() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeThisInNestedClass1.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeThisInNestedClass2.kt")
+                @TestMetadata("thisInNestedClass2.kt")
                 public void testThisInNestedClass2() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeThisInNestedClass2.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeTopLevelFunNoReceiver.kt")
+                @TestMetadata("topLevelFunNoReceiver.kt")
                 public void testTopLevelFunNoReceiver() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeTopLevelFunNoReceiver.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/topLevelFunNoReceiver.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeTopLevelFunPlacement.kt")
+                @TestMetadata("topLevelFunPlacement.kt")
                 public void testTopLevelFunPlacement() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeTopLevelFunPlacement.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/topLevelFunPlacement.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeUnitFun.kt")
+                @TestMetadata("unitFun.kt")
                 public void testUnitFun() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeUnitFun.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/unitFun.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeUnknownType.kt")
+                @TestMetadata("unknownType.kt")
                 public void testUnknownType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeUnknownType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeUnresolvedSupertype.kt")
+                @TestMetadata("unresolvedSupertype.kt")
                 public void testUnresolvedSupertype() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/beforeUnresolvedSupertype.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt");
                     doTest(fileName);
                 }
 
@@ -1849,72 +1849,72 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
                 @RunWith(JUnit3RunnerWithInners.class)
                 public static class TypeArguments extends AbstractQuickFixTest {
                     public void testAllFilesPresentInTypeArguments() throws Exception {
-                        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments"), Pattern.compile("^(\\w+)\\.kt$"), true);
                     }
 
-                    @TestMetadata("beforeCallWithStarProjection.kt")
+                    @TestMetadata("callWithStarProjection.kt")
                     public void testCallWithStarProjection() throws Exception {
-                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeCallWithStarProjection.kt");
+                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/callWithStarProjection.kt");
                         doTest(fileName);
                     }
 
-                    @TestMetadata("beforeClassMember.kt")
+                    @TestMetadata("classMember.kt")
                     public void testClassMember() throws Exception {
-                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeClassMember.kt");
+                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt");
                         doTest(fileName);
                     }
 
-                    @TestMetadata("beforeClassMemberPartialSubstitution.kt")
+                    @TestMetadata("classMemberPartialSubstitution.kt")
                     public void testClassMemberPartialSubstitution() throws Exception {
-                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeClassMemberPartialSubstitution.kt");
+                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt");
                         doTest(fileName);
                     }
 
-                    @TestMetadata("beforeClassMemberWithReceiverArg.kt")
+                    @TestMetadata("classMemberWithReceiverArg.kt")
                     public void testClassMemberWithReceiverArg() throws Exception {
-                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeClassMemberWithReceiverArg.kt");
+                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt");
                         doTest(fileName);
                     }
 
-                    @TestMetadata("beforeExtension.kt")
+                    @TestMetadata("extension.kt")
                     public void testExtension() throws Exception {
-                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeExtension.kt");
+                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extension.kt");
                         doTest(fileName);
                     }
 
-                    @TestMetadata("beforeExtensionPartialSubstitution.kt")
+                    @TestMetadata("extensionPartialSubstitution.kt")
                     public void testExtensionPartialSubstitution() throws Exception {
-                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeExtensionPartialSubstitution.kt");
+                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionPartialSubstitution.kt");
                         doTest(fileName);
                     }
 
-                    @TestMetadata("beforeExtensionWithReceiverArg.kt")
+                    @TestMetadata("extensionWithReceiverArg.kt")
                     public void testExtensionWithReceiverArg() throws Exception {
-                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeExtensionWithReceiverArg.kt");
+                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithReceiverArg.kt");
                         doTest(fileName);
                     }
 
-                    @TestMetadata("beforeNoReceiver.kt")
+                    @TestMetadata("noReceiver.kt")
                     public void testNoReceiver() throws Exception {
-                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeNoReceiver.kt");
+                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiver.kt");
                         doTest(fileName);
                     }
 
-                    @TestMetadata("beforeNoReceiverExtraArgs.kt")
+                    @TestMetadata("noReceiverExtraArgs.kt")
                     public void testNoReceiverExtraArgs() throws Exception {
-                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeNoReceiverExtraArgs.kt");
+                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverExtraArgs.kt");
                         doTest(fileName);
                     }
 
-                    @TestMetadata("beforeNoReceiverLongName.kt")
+                    @TestMetadata("noReceiverLongName.kt")
                     public void testNoReceiverLongName() throws Exception {
-                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeNoReceiverLongName.kt");
+                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverLongName.kt");
                         doTest(fileName);
                     }
 
-                    @TestMetadata("beforeNoReceiverPartialSubstitution.kt")
+                    @TestMetadata("noReceiverPartialSubstitution.kt")
                     public void testNoReceiverPartialSubstitution() throws Exception {
-                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeNoReceiverPartialSubstitution.kt");
+                        String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverPartialSubstitution.kt");
                         doTest(fileName);
                     }
                 }
@@ -1925,24 +1925,24 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             @RunWith(JUnit3RunnerWithInners.class)
             public static class Component extends AbstractQuickFixTest {
                 public void testAllFilesPresentInComponent() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/component"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/component"), Pattern.compile("^(\\w+)\\.kt$"), true);
                 }
 
-                @TestMetadata("beforeCreateComponentFromUsage1.kt")
+                @TestMetadata("createComponentFromUsage1.kt")
                 public void testCreateComponentFromUsage1() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/component/beforeCreateComponentFromUsage1.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCreateComponentFromUsage2.kt")
+                @TestMetadata("createComponentFromUsage2.kt")
                 public void testCreateComponentFromUsage2() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/component/beforeCreateComponentFromUsage2.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCreateComponentFromUsage3.kt")
+                @TestMetadata("createComponentFromUsage3.kt")
                 public void testCreateComponentFromUsage3() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/component/beforeCreateComponentFromUsage3.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage3.kt");
                     doTest(fileName);
                 }
             }
@@ -1952,30 +1952,30 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             @RunWith(JUnit3RunnerWithInners.class)
             public static class DelegateAccessors extends AbstractQuickFixTest {
                 public void testAllFilesPresentInDelegateAccessors() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors"), Pattern.compile("^(\\w+)\\.kt$"), true);
                 }
 
-                @TestMetadata("beforeVal.kt")
+                @TestMetadata("val.kt")
                 public void testVal() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/beforeVal.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeVar.kt")
+                @TestMetadata("var.kt")
                 public void testVar() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/beforeVar.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeVarMissingGet.kt")
+                @TestMetadata("varMissingGet.kt")
                 public void testVarMissingGet() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/beforeVarMissingGet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeVarMissingSet.kt")
+                @TestMetadata("varMissingSet.kt")
                 public void testVarMissingSet() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/beforeVarMissingSet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt");
                     doTest(fileName);
                 }
             }
@@ -1985,78 +1985,78 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             @RunWith(JUnit3RunnerWithInners.class)
             public static class Get extends AbstractQuickFixTest {
                 public void testAllFilesPresentInGet() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/get"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/get"), Pattern.compile("^(\\w+)\\.kt$"), true);
                 }
 
-                @TestMetadata("beforeCreateGetFromUsage1.kt")
+                @TestMetadata("createGetFromUsage1.kt")
                 public void testCreateGetFromUsage1() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage1.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCreateGetFromUsage10.kt")
+                @TestMetadata("createGetFromUsage10.kt")
                 public void testCreateGetFromUsage10() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage10.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCreateGetFromUsage11.kt")
+                @TestMetadata("createGetFromUsage11.kt")
                 public void testCreateGetFromUsage11() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage11.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCreateGetFromUsage12.kt")
+                @TestMetadata("createGetFromUsage12.kt")
                 public void testCreateGetFromUsage12() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage12.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCreateGetFromUsage13.kt")
+                @TestMetadata("createGetFromUsage13.kt")
                 public void testCreateGetFromUsage13() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage13.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCreateGetFromUsage2.kt")
+                @TestMetadata("createGetFromUsage2.kt")
                 public void testCreateGetFromUsage2() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage2.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage2.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCreateGetFromUsage3.kt")
+                @TestMetadata("createGetFromUsage3.kt")
                 public void testCreateGetFromUsage3() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage3.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCreateGetFromUsage4.kt")
+                @TestMetadata("createGetFromUsage4.kt")
                 public void testCreateGetFromUsage4() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage4.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCreateGetFromUsage5.kt")
+                @TestMetadata("createGetFromUsage5.kt")
                 public void testCreateGetFromUsage5() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage5.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCreateGetFromUsage7.kt")
+                @TestMetadata("createGetFromUsage7.kt")
                 public void testCreateGetFromUsage7() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage7.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCreateGetFromUsage8.kt")
+                @TestMetadata("createGetFromUsage8.kt")
                 public void testCreateGetFromUsage8() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage8.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCreateGetFromUsage9.kt")
+                @TestMetadata("createGetFromUsage9.kt")
                 public void testCreateGetFromUsage9() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage9.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt");
                     doTest(fileName);
                 }
             }
@@ -2066,18 +2066,18 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             @RunWith(JUnit3RunnerWithInners.class)
             public static class HasNext extends AbstractQuickFixTest {
                 public void testAllFilesPresentInHasNext() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/hasNext"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/hasNext"), Pattern.compile("^(\\w+)\\.kt$"), true);
                 }
 
-                @TestMetadata("beforeCreateHasNextFromUsage1.kt")
+                @TestMetadata("createHasNextFromUsage1.kt")
                 public void testCreateHasNextFromUsage1() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/hasNext/beforeCreateHasNextFromUsage1.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCreateHasNextFromUsage2.kt")
+                @TestMetadata("createHasNextFromUsage2.kt")
                 public void testCreateHasNextFromUsage2() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/hasNext/beforeCreateHasNextFromUsage2.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt");
                     doTest(fileName);
                 }
             }
@@ -2087,30 +2087,30 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             @RunWith(JUnit3RunnerWithInners.class)
             public static class Invoke extends AbstractQuickFixTest {
                 public void testAllFilesPresentInInvoke() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/invoke"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/invoke"), Pattern.compile("^(\\w+)\\.kt$"), true);
                 }
 
-                @TestMetadata("beforeInvokeOnLibType.kt")
+                @TestMetadata("invokeOnLibType.kt")
                 public void testInvokeOnLibType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/invoke/beforeInvokeOnLibType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnLibType.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInvokeOnUserType.kt")
+                @TestMetadata("invokeOnUserType.kt")
                 public void testInvokeOnUserType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/invoke/beforeInvokeOnUserType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInvokeOnUserTypeWithTypeParams.kt")
+                @TestMetadata("invokeOnUserTypeWithTypeParams.kt")
                 public void testInvokeOnUserTypeWithTypeParams() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/invoke/beforeInvokeOnUserTypeWithTypeParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInvokeWithExplicitParamNamesOnUserType.kt")
+                @TestMetadata("invokeWithExplicitParamNamesOnUserType.kt")
                 public void testInvokeWithExplicitParamNamesOnUserType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/invoke/beforeInvokeWithExplicitParamNamesOnUserType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt");
                     doTest(fileName);
                 }
             }
@@ -2120,24 +2120,24 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             @RunWith(JUnit3RunnerWithInners.class)
             public static class Iterator extends AbstractQuickFixTest {
                 public void testAllFilesPresentInIterator() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/iterator"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/iterator"), Pattern.compile("^(\\w+)\\.kt$"), true);
                 }
 
-                @TestMetadata("beforeCreateIteratorFromUsage1.kt")
+                @TestMetadata("createIteratorFromUsage1.kt")
                 public void testCreateIteratorFromUsage1() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/iterator/beforeCreateIteratorFromUsage1.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCreateIteratorFromUsage2.kt")
+                @TestMetadata("createIteratorFromUsage2.kt")
                 public void testCreateIteratorFromUsage2() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/iterator/beforeCreateIteratorFromUsage2.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCreateIteratorFromUsage3.kt")
+                @TestMetadata("createIteratorFromUsage3.kt")
                 public void testCreateIteratorFromUsage3() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/iterator/beforeCreateIteratorFromUsage3.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt");
                     doTest(fileName);
                 }
             }
@@ -2147,18 +2147,18 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             @RunWith(JUnit3RunnerWithInners.class)
             public static class Next extends AbstractQuickFixTest {
                 public void testAllFilesPresentInNext() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/next"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/next"), Pattern.compile("^(\\w+)\\.kt$"), true);
                 }
 
-                @TestMetadata("beforeCreateNextFromUsage1.kt")
+                @TestMetadata("createNextFromUsage1.kt")
                 public void testCreateNextFromUsage1() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/next/beforeCreateNextFromUsage1.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCreateNextFromUsage2.kt")
+                @TestMetadata("createNextFromUsage2.kt")
                 public void testCreateNextFromUsage2() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/next/beforeCreateNextFromUsage2.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt");
                     doTest(fileName);
                 }
             }
@@ -2168,24 +2168,24 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             @RunWith(JUnit3RunnerWithInners.class)
             public static class Set extends AbstractQuickFixTest {
                 public void testAllFilesPresentInSet() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/set"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/set"), Pattern.compile("^(\\w+)\\.kt$"), true);
                 }
 
-                @TestMetadata("beforeCreateSetFromUsage1.kt")
+                @TestMetadata("createSetFromUsage1.kt")
                 public void testCreateSetFromUsage1() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/set/beforeCreateSetFromUsage1.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeCreateSetFromUsage2.kt")
+                @TestMetadata("createSetFromUsage2.kt")
                 public void testCreateSetFromUsage2() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/set/beforeCreateSetFromUsage2.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeSetterForIncrement.kt")
+                @TestMetadata("setterForIncrement.kt")
                 public void testSetterForIncrement() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/set/beforeSetterForIncrement.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt");
                     doTest(fileName);
                 }
             }
@@ -2195,36 +2195,36 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             @RunWith(JUnit3RunnerWithInners.class)
             public static class UnaryOperations extends AbstractQuickFixTest {
                 public void testAllFilesPresentInUnaryOperations() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/unaryOperations"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/unaryOperations"), Pattern.compile("^(\\w+)\\.kt$"), true);
                 }
 
-                @TestMetadata("beforeIncOnUserType.kt")
+                @TestMetadata("incOnUserType.kt")
                 public void testIncOnUserType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/beforeIncOnUserType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeMinusMissingArgs.kt")
+                @TestMetadata("minusMissingArgs.kt")
                 public void testMinusMissingArgs() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/beforeMinusMissingArgs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeMinusOnLibType.kt")
+                @TestMetadata("minusOnLibType.kt")
                 public void testMinusOnLibType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/beforeMinusOnLibType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnLibType.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeMinusOnUserType.kt")
+                @TestMetadata("minusOnUserType.kt")
                 public void testMinusOnUserType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/beforeMinusOnUserType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeMinusOnUserTypeWithTypeParams.kt")
+                @TestMetadata("minusOnUserTypeWithTypeParams.kt")
                 public void testMinusOnUserTypeWithTypeParams() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/beforeMinusOnUserTypeWithTypeParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt");
                     doTest(fileName);
                 }
             }
@@ -2235,66 +2235,66 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class CreateSecondaryConstructor extends AbstractQuickFixTest {
             public void testAllFilesPresentInCreateSecondaryConstructor() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createSecondaryConstructor"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createSecondaryConstructor"), Pattern.compile("^(\\w+)\\.kt$"), true);
             }
 
-            @TestMetadata("beforeCallWithExpectedType.kt")
+            @TestMetadata("callWithExpectedType.kt")
             public void testCallWithExpectedType() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/beforeCallWithExpectedType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/callWithExpectedType.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeCallWithTypeArguments.kt")
+            @TestMetadata("callWithTypeArguments.kt")
             public void testCallWithTypeArguments() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/beforeCallWithTypeArguments.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/callWithTypeArguments.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeClassWithBody.kt")
+            @TestMetadata("classWithBody.kt")
             public void testClassWithBody() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/beforeClassWithBody.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/classWithBody.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeClassWithoutBody.kt")
+            @TestMetadata("classWithoutBody.kt")
             public void testClassWithoutBody() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/beforeClassWithoutBody.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/classWithoutBody.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeDelegatorToSuperCall.kt")
+            @TestMetadata("delegatorToSuperCall.kt")
             public void testDelegatorToSuperCall() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/beforeDelegatorToSuperCall.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/delegatorToSuperCall.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeDelegatorToSuperCallNoClass.kt")
+            @TestMetadata("delegatorToSuperCallNoClass.kt")
             public void testDelegatorToSuperCallNoClass() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/beforeDelegatorToSuperCallNoClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/delegatorToSuperCallNoClass.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeSuperCall.kt")
+            @TestMetadata("superCall.kt")
             public void testSuperCall() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/beforeSuperCall.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/superCall.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeSuperCallNoClass.kt")
+            @TestMetadata("superCallNoClass.kt")
             public void testSuperCallNoClass() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/beforeSuperCallNoClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/superCallNoClass.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeThisCall.kt")
+            @TestMetadata("thisCall.kt")
             public void testThisCall() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/beforeThisCall.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/thisCall.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeWrongExpectedType.kt")
+            @TestMetadata("wrongExpectedType.kt")
             public void testWrongExpectedType() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/beforeWrongExpectedType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/wrongExpectedType.kt");
                 doTest(fileName);
             }
         }
@@ -2304,7 +2304,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class CreateVariable extends AbstractQuickFixTest {
             public void testAllFilesPresentInCreateVariable() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createVariable"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createVariable"), Pattern.compile("^(\\w+)\\.kt$"), true);
             }
 
             @TestMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable")
@@ -2312,108 +2312,108 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             @RunWith(JUnit3RunnerWithInners.class)
             public static class LocalVariable extends AbstractQuickFixTest {
                 public void testAllFilesPresentInLocalVariable() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createVariable/localVariable"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createVariable/localVariable"), Pattern.compile("^(\\w+)\\.kt$"), true);
                 }
 
-                @TestMetadata("beforeAssignedInFun.kt")
+                @TestMetadata("assignedInFun.kt")
                 public void testAssignedInFun() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeAssignedInFun.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/assignedInFun.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInAccessor.kt")
+                @TestMetadata("inAccessor.kt")
                 public void testInAccessor() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeInAccessor.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/inAccessor.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInAccessorWithExpressionBody.kt")
+                @TestMetadata("inAccessorWithExpressionBody.kt")
                 public void testInAccessorWithExpressionBody() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeInAccessorWithExpressionBody.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/inAccessorWithExpressionBody.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInClass.kt")
+                @TestMetadata("inClass.kt")
                 public void testInClass() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeInClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/inClass.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInFun.kt")
+                @TestMetadata("inFun.kt")
                 public void testInFun() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeInFun.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/inFun.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInFunWithExpressionBody.kt")
+                @TestMetadata("inFunWithExpressionBody.kt")
                 public void testInFunWithExpressionBody() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeInFunWithExpressionBody.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/inFunWithExpressionBody.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInLambdaNoParams.kt")
+                @TestMetadata("inLambdaNoParams.kt")
                 public void testInLambdaNoParams() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeInLambdaNoParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/inLambdaNoParams.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInLambdaWithParams.kt")
+                @TestMetadata("inLambdaWithParams.kt")
                 public void testInLambdaWithParams() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeInLambdaWithParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/inLambdaWithParams.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInMultiLineLambdaNoParams.kt")
+                @TestMetadata("inMultiLineLambdaNoParams.kt")
                 public void testInMultiLineLambdaNoParams() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeInMultiLineLambdaNoParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/inMultiLineLambdaNoParams.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInMultiLineLambdaWithParams.kt")
+                @TestMetadata("inMultiLineLambdaWithParams.kt")
                 public void testInMultiLineLambdaWithParams() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeInMultiLineLambdaWithParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/inMultiLineLambdaWithParams.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInWhen.kt")
+                @TestMetadata("inWhen.kt")
                 public void testInWhen() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeInWhen.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/inWhen.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeLocalWithPackageName.kt")
+                @TestMetadata("localWithPackageName.kt")
                 public void testLocalWithPackageName() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeLocalWithPackageName.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/localWithPackageName.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeNullableType.kt")
+                @TestMetadata("nullableType.kt")
                 public void testNullableType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeNullableType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/nullableType.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeOnTopLevel.kt")
+                @TestMetadata("onTopLevel.kt")
                 public void testOnTopLevel() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeOnTopLevel.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/onTopLevel.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforePositionNextToUsage.kt")
+                @TestMetadata("positionNextToUsage.kt")
                 public void testPositionNextToUsage() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforePositionNextToUsage.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/positionNextToUsage.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeQualifiedInFun.kt")
+                @TestMetadata("qualifiedInFun.kt")
                 public void testQualifiedInFun() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeQualifiedInFun.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/qualifiedInFun.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeUnitTypedInFun.kt")
+                @TestMetadata("unitTypedInFun.kt")
                 public void testUnitTypedInFun() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeUnitTypedInFun.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/unitTypedInFun.kt");
                     doTest(fileName);
                 }
             }
@@ -2423,258 +2423,258 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             @RunWith(JUnit3RunnerWithInners.class)
             public static class Parameter extends AbstractQuickFixTest {
                 public void testAllFilesPresentInParameter() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createVariable/parameter"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createVariable/parameter"), Pattern.compile("^(\\w+)\\.kt$"), true);
                 }
 
-                @TestMetadata("beforeAssignedInFun.kt")
+                @TestMetadata("assignedInFun.kt")
                 public void testAssignedInFun() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeAssignedInFun.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/assignedInFun.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeAssignedInFunInClass.kt")
+                @TestMetadata("assignedInFunInClass.kt")
                 public void testAssignedInFunInClass() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeAssignedInFunInClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/assignedInFunInClass.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInAccessorInClass.kt")
+                @TestMetadata("inAccessorInClass.kt")
                 public void testInAccessorInClass() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInAccessorInClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInClass.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInAccessorInClassObject.kt")
+                @TestMetadata("inAccessorInClassObject.kt")
                 public void testInAccessorInClassObject() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInAccessorInClassObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInClassObject.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInAccessorInGenClass.kt")
+                @TestMetadata("inAccessorInGenClass.kt")
                 public void testInAccessorInGenClass() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInAccessorInGenClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInGenClass.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInAccessorInObject.kt")
+                @TestMetadata("inAccessorInObject.kt")
                 public void testInAccessorInObject() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInAccessorInObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInObject.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInAccessorInTrait.kt")
+                @TestMetadata("inAccessorInTrait.kt")
                 public void testInAccessorInTrait() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInAccessorInTrait.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInTrait.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInAccessorNoClass.kt")
+                @TestMetadata("inAccessorNoClass.kt")
                 public void testInAccessorNoClass() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInAccessorNoClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorNoClass.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInAccessorWithExpressionBodyInClass.kt")
+                @TestMetadata("inAccessorWithExpressionBodyInClass.kt")
                 public void testInAccessorWithExpressionBodyInClass() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInAccessorWithExpressionBodyInClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorWithExpressionBodyInClass.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInClassInitializer.kt")
+                @TestMetadata("inClassInitializer.kt")
                 public void testInClassInitializer() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInClassInitializer.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inClassInitializer.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInClassObjectInitializer.kt")
+                @TestMetadata("inClassObjectInitializer.kt")
                 public void testInClassObjectInitializer() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInClassObjectInitializer.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inClassObjectInitializer.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInFun.kt")
+                @TestMetadata("inFun.kt")
                 public void testInFun() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInFun.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inFun.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInFunInClass.kt")
+                @TestMetadata("inFunInClass.kt")
                 public void testInFunInClass() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInFunInClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inFunInClass.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInFunInGenClass.kt")
+                @TestMetadata("inFunInGenClass.kt")
                 public void testInFunInGenClass() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInFunInGenClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inFunInGenClass.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInGenAccessorInClass.kt")
+                @TestMetadata("inGenAccessorInClass.kt")
                 public void testInGenAccessorInClass() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInGenAccessorInClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenAccessorInClass.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInGenAccessorInGenClass.kt")
+                @TestMetadata("inGenAccessorInGenClass.kt")
                 public void testInGenAccessorInGenClass() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInGenAccessorInGenClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenAccessorInGenClass.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInGenFunInClass.kt")
+                @TestMetadata("inGenFunInClass.kt")
                 public void testInGenFunInClass() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInGenFunInClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInClass.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInGenFunInGenClass.kt")
+                @TestMetadata("inGenFunInGenClass.kt")
                 public void testInGenFunInGenClass() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInGenFunInGenClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInGenClass.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInGenPropertyInitializerInClass.kt")
+                @TestMetadata("inGenPropertyInitializerInClass.kt")
                 public void testInGenPropertyInitializerInClass() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInGenPropertyInitializerInClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenPropertyInitializerInClass.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInGenPropertyInitializerInGenClass.kt")
+                @TestMetadata("inGenPropertyInitializerInGenClass.kt")
                 public void testInGenPropertyInitializerInGenClass() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInGenPropertyInitializerInGenClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenPropertyInitializerInGenClass.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInLambdaNoParams.kt")
+                @TestMetadata("inLambdaNoParams.kt")
                 public void testInLambdaNoParams() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInLambdaNoParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inLambdaNoParams.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInLambdaWithIt.kt")
+                @TestMetadata("inLambdaWithIt.kt")
                 public void testInLambdaWithIt() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInLambdaWithIt.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inLambdaWithIt.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInLambdaWithParams.kt")
+                @TestMetadata("inLambdaWithParams.kt")
                 public void testInLambdaWithParams() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInLambdaWithParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inLambdaWithParams.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInLambdaWithTypedParams.kt")
+                @TestMetadata("inLambdaWithTypedParams.kt")
                 public void testInLambdaWithTypedParams() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInLambdaWithTypedParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inLambdaWithTypedParams.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInMultiLineLambdaNoParams.kt")
+                @TestMetadata("inMultiLineLambdaNoParams.kt")
                 public void testInMultiLineLambdaNoParams() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInMultiLineLambdaNoParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inMultiLineLambdaNoParams.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInPropertyInitializerInClass.kt")
+                @TestMetadata("inPropertyInitializerInClass.kt")
                 public void testInPropertyInitializerInClass() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInPropertyInitializerInClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInClass.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInPropertyInitializerInClassObject.kt")
+                @TestMetadata("inPropertyInitializerInClassObject.kt")
                 public void testInPropertyInitializerInClassObject() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInPropertyInitializerInClassObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInClassObject.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInPropertyInitializerInEnumClass.kt")
+                @TestMetadata("inPropertyInitializerInEnumClass.kt")
                 public void testInPropertyInitializerInEnumClass() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInPropertyInitializerInEnumClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInEnumClass.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInPropertyInitializerInEnumEntry.kt")
+                @TestMetadata("inPropertyInitializerInEnumEntry.kt")
                 public void testInPropertyInitializerInEnumEntry() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInPropertyInitializerInEnumEntry.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInEnumEntry.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInPropertyInitializerInGenClass.kt")
+                @TestMetadata("inPropertyInitializerInGenClass.kt")
                 public void testInPropertyInitializerInGenClass() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInPropertyInitializerInGenClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInGenClass.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInPropertyInitializerInNestedClass.kt")
+                @TestMetadata("inPropertyInitializerInNestedClass.kt")
                 public void testInPropertyInitializerInNestedClass() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInPropertyInitializerInNestedClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInNestedClass.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInPropertyInitializerInObject.kt")
+                @TestMetadata("inPropertyInitializerInObject.kt")
                 public void testInPropertyInitializerInObject() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInPropertyInitializerInObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInObject.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInPropertyInitializerNoClass.kt")
+                @TestMetadata("inPropertyInitializerNoClass.kt")
                 public void testInPropertyInitializerNoClass() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInPropertyInitializerNoClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerNoClass.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeNamedArgInConstructorCall.kt")
+                @TestMetadata("namedArgInConstructorCall.kt")
                 public void testNamedArgInConstructorCall() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeNamedArgInConstructorCall.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/namedArgInConstructorCall.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeNamedArgInFunctionCall.kt")
+                @TestMetadata("namedArgInFunctionCall.kt")
                 public void testNamedArgInFunctionCall() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeNamedArgInFunctionCall.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/namedArgInFunctionCall.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeNullableType.kt")
+                @TestMetadata("nullableType.kt")
                 public void testNullableType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeNullableType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/nullableType.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeParameterFromClassDelegationSpecifier.kt")
+                @TestMetadata("parameterFromClassDelegationSpecifier.kt")
                 public void testParameterFromClassDelegationSpecifier() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeParameterFromClassDelegationSpecifier.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/parameterFromClassDelegationSpecifier.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeParameterFromEnumEntryDelegationSpecifier.kt")
+                @TestMetadata("parameterFromEnumEntryDelegationSpecifier.kt")
                 public void testParameterFromEnumEntryDelegationSpecifier() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeParameterFromEnumEntryDelegationSpecifier.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/parameterFromEnumEntryDelegationSpecifier.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeParameterFromObjectDelegationSpecifier.kt")
+                @TestMetadata("parameterFromObjectDelegationSpecifier.kt")
                 public void testParameterFromObjectDelegationSpecifier() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeParameterFromObjectDelegationSpecifier.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/parameterFromObjectDelegationSpecifier.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeQualifiedInFun.kt")
+                @TestMetadata("qualifiedInFun.kt")
                 public void testQualifiedInFun() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeQualifiedInFun.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/qualifiedInFun.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeWithPackageName.kt")
+                @TestMetadata("withPackageName.kt")
                 public void testWithPackageName() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeWithPackageName.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/withPackageName.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeWrongReceiver.kt")
+                @TestMetadata("wrongReceiver.kt")
                 public void testWrongReceiver() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeWrongReceiver.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/wrongReceiver.kt");
                     doTest(fileName);
                 }
             }
@@ -2684,174 +2684,174 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             @RunWith(JUnit3RunnerWithInners.class)
             public static class Property extends AbstractQuickFixTest {
                 public void testAllFilesPresentInProperty() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createVariable/property"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createVariable/property"), Pattern.compile("^(\\w+)\\.kt$"), true);
                 }
 
-                @TestMetadata("beforeCallOnUserType.kt")
+                @TestMetadata("callOnUserType.kt")
                 public void testCallOnUserType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/beforeCallOnUserType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/callOnUserType.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeExtensionRefInImport.kt")
+                @TestMetadata("extensionRefInImport.kt")
                 public void testExtensionRefInImport() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/beforeExtensionRefInImport.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/extensionRefInImport.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInconsistentTypes.kt")
+                @TestMetadata("inconsistentTypes.kt")
                 public void testInconsistentTypes() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/beforeInconsistentTypes.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeLocalValNoReceiver.kt")
+                @TestMetadata("localValNoReceiver.kt")
                 public void testLocalValNoReceiver() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/beforeLocalValNoReceiver.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/localValNoReceiver.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeMemberValDelegateRuntime.kt")
+                @TestMetadata("memberValDelegateRuntime.kt")
                 public void testMemberValDelegateRuntime() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/beforeMemberValDelegateRuntime.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/memberValDelegateRuntime.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeMemberValNoReceiver.kt")
+                @TestMetadata("memberValNoReceiver.kt")
                 public void testMemberValNoReceiver() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/beforeMemberValNoReceiver.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/memberValNoReceiver.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeMemberVarDelegateRuntime.kt")
+                @TestMetadata("memberVarDelegateRuntime.kt")
                 public void testMemberVarDelegateRuntime() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/beforeMemberVarDelegateRuntime.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/memberVarDelegateRuntime.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeObjectMemberValNoReceiver.kt")
+                @TestMetadata("objectMemberValNoReceiver.kt")
                 public void testObjectMemberValNoReceiver() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/beforeObjectMemberValNoReceiver.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/objectMemberValNoReceiver.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforePrivateForMembers.kt")
+                @TestMetadata("privateForMembers.kt")
                 public void testPrivateForMembers() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/beforePrivateForMembers.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/privateForMembers.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeQualifiedRefInStringTemplateRuntime.kt")
+                @TestMetadata("qualifiedRefInStringTemplateRuntime.kt")
                 public void testQualifiedRefInStringTemplateRuntime() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/beforeQualifiedRefInStringTemplateRuntime.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/qualifiedRefInStringTemplateRuntime.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeRefInImport.kt")
+                @TestMetadata("refInImport.kt")
                 public void testRefInImport() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/beforeRefInImport.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/refInImport.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeRefInStringTemplateRuntime.kt")
+                @TestMetadata("refInStringTemplateRuntime.kt")
                 public void testRefInStringTemplateRuntime() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/beforeRefInStringTemplateRuntime.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/refInStringTemplateRuntime.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeThisInClass.kt")
+                @TestMetadata("thisInClass.kt")
                 public void testThisInClass() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/beforeThisInClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/thisInClass.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeThisInExtension.kt")
+                @TestMetadata("thisInExtension.kt")
                 public void testThisInExtension() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/beforeThisInExtension.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/thisInExtension.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeThisInNestedClass1.kt")
+                @TestMetadata("thisInNestedClass1.kt")
                 public void testThisInNestedClass1() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/beforeThisInNestedClass1.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass1.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeThisInNestedClass2.kt")
+                @TestMetadata("thisInNestedClass2.kt")
                 public void testThisInNestedClass2() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/beforeThisInNestedClass2.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass2.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeTopLevelValNoReceiver.kt")
+                @TestMetadata("topLevelValNoReceiver.kt")
                 public void testTopLevelValNoReceiver() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/beforeTopLevelValNoReceiver.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/topLevelValNoReceiver.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeTopLevelValWithPackageName.kt")
+                @TestMetadata("topLevelValWithPackageName.kt")
                 public void testTopLevelValWithPackageName() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/beforeTopLevelValWithPackageName.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/topLevelValWithPackageName.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeValOnClassNoClassObject.kt")
+                @TestMetadata("valOnClassNoClassObject.kt")
                 public void testValOnClassNoClassObject() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/beforeValOnClassNoClassObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/valOnClassNoClassObject.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeValOnClassObject.kt")
+                @TestMetadata("valOnClassObject.kt")
                 public void testValOnClassObject() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/beforeValOnClassObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/valOnClassObject.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeValOnLibObject.kt")
+                @TestMetadata("valOnLibObject.kt")
                 public void testValOnLibObject() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/beforeValOnLibObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibObject.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeValOnLibType.kt")
+                @TestMetadata("valOnLibType.kt")
                 public void testValOnLibType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/beforeValOnLibType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibType.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeValOnUserObject.kt")
+                @TestMetadata("valOnUserObject.kt")
                 public void testValOnUserObject() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/beforeValOnUserObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserObject.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeValOnUserType.kt")
+                @TestMetadata("valOnUserType.kt")
                 public void testValOnUserType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/beforeValOnUserType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserType.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeValOnUserTypeWithTypeParams.kt")
+                @TestMetadata("valOnUserTypeWithTypeParams.kt")
                 public void testValOnUserTypeWithTypeParams() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/beforeValOnUserTypeWithTypeParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeValWithNullableType.kt")
+                @TestMetadata("valWithNullableType.kt")
                 public void testValWithNullableType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/beforeValWithNullableType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/valWithNullableType.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeVarOnLibType.kt")
+                @TestMetadata("varOnLibType.kt")
                 public void testVarOnLibType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/beforeVarOnLibType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/varOnLibType.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeVarOnUserType.kt")
+                @TestMetadata("varOnUserType.kt")
                 public void testVarOnUserType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/beforeVarOnUserType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/varOnUserType.kt");
                     doTest(fileName);
                 }
             }
@@ -2863,84 +2863,84 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Expressions extends AbstractQuickFixTest {
         public void testAllFilesPresentInExpressions() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/expressions"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/expressions"), Pattern.compile("^(\\w+)\\.kt$"), true);
         }
 
-        @TestMetadata("beforeRemoveStaticTypeAssertion.kt")
+        @TestMetadata("removeStaticTypeAssertion.kt")
         public void testRemoveStaticTypeAssertion() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/beforeRemoveStaticTypeAssertion.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/removeStaticTypeAssertion.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeRemoveUselessCast.kt")
+        @TestMetadata("removeUselessCast.kt")
         public void testRemoveUselessCast() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/beforeRemoveUselessCast.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/removeUselessCast.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeRemoveUselessCastInParens.kt")
+        @TestMetadata("removeUselessCastInParens.kt")
         public void testRemoveUselessCastInParens() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/beforeRemoveUselessCastInParens.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/removeUselessCastInParens.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeRemoveUselessCastUnderSmartCast.kt")
+        @TestMetadata("removeUselessCastUnderSmartCast.kt")
         public void testRemoveUselessCastUnderSmartCast() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/beforeRemoveUselessCastUnderSmartCast.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/removeUselessCastUnderSmartCast.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeUnnecessaryNonNullAssertion1.kt")
+        @TestMetadata("unnecessaryNonNullAssertion1.kt")
         public void testUnnecessaryNonNullAssertion1() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/beforeUnnecessaryNonNullAssertion1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/unnecessaryNonNullAssertion1.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeUnnecessaryNonNullAssertion2.kt")
+        @TestMetadata("unnecessaryNonNullAssertion2.kt")
         public void testUnnecessaryNonNullAssertion2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/beforeUnnecessaryNonNullAssertion2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/unnecessaryNonNullAssertion2.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeUnnecessaryNonNullAssertion3.kt")
+        @TestMetadata("unnecessaryNonNullAssertion3.kt")
         public void testUnnecessaryNonNullAssertion3() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/beforeUnnecessaryNonNullAssertion3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/unnecessaryNonNullAssertion3.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeUnnecessarySafeCall1.kt")
+        @TestMetadata("unnecessarySafeCall1.kt")
         public void testUnnecessarySafeCall1() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/beforeUnnecessarySafeCall1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/unnecessarySafeCall1.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeUnsafeCall1.kt")
+        @TestMetadata("unsafeCall1.kt")
         public void testUnsafeCall1() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/beforeUnsafeCall1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/unsafeCall1.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeUnsafeCall2.kt")
+        @TestMetadata("unsafeCall2.kt")
         public void testUnsafeCall2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/beforeUnsafeCall2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/unsafeCall2.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeUnsafeCall3.kt")
+        @TestMetadata("unsafeCall3.kt")
         public void testUnsafeCall3() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/beforeUnsafeCall3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/unsafeCall3.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeUselessCastStaticAssertIsFine.kt")
+        @TestMetadata("uselessCastStaticAssertIsFine.kt")
         public void testUselessCastStaticAssertIsFine() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/beforeUselessCastStaticAssertIsFine.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/uselessCastStaticAssertIsFine.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeUselessElvis.kt")
+        @TestMetadata("uselessElvis.kt")
         public void testUselessElvis() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/beforeUselessElvis.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/uselessElvis.kt");
             doTest(fileName);
         }
     }
@@ -2950,54 +2950,54 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class InsertDelegationCall extends AbstractQuickFixTest {
         public void testAllFilesPresentInInsertDelegationCall() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/insertDelegationCall"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/insertDelegationCall"), Pattern.compile("^(\\w+)\\.kt$"), true);
         }
 
-        @TestMetadata("beforeNonApplicableInsertSuper.kt")
+        @TestMetadata("nonApplicableInsertSuper.kt")
         public void testNonApplicableInsertSuper() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/insertDelegationCall/beforeNonApplicableInsertSuper.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/insertDelegationCall/nonApplicableInsertSuper.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeNonApplicableInsertThis.kt")
+        @TestMetadata("nonApplicableInsertThis.kt")
         public void testNonApplicableInsertThis() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/insertDelegationCall/beforeNonApplicableInsertThis.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/insertDelegationCall/nonApplicableInsertThis.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeNonApplicableOnEmpty.kt")
+        @TestMetadata("nonApplicableOnEmpty.kt")
         public void testNonApplicableOnEmpty() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/insertDelegationCall/beforeNonApplicableOnEmpty.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/insertDelegationCall/nonApplicableOnEmpty.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeNonApplicableWithOneConstructor.kt")
+        @TestMetadata("nonApplicableWithOneConstructor.kt")
         public void testNonApplicableWithOneConstructor() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/insertDelegationCall/beforeNonApplicableWithOneConstructor.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/insertDelegationCall/nonApplicableWithOneConstructor.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforePrimaryRequiredNoSuper.kt")
+        @TestMetadata("primaryRequiredNoSuper.kt")
         public void testPrimaryRequiredNoSuper() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/insertDelegationCall/beforePrimaryRequiredNoSuper.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/insertDelegationCall/primaryRequiredNoSuper.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforePrimaryRequiredParameterless.kt")
+        @TestMetadata("primaryRequiredParameterless.kt")
         public void testPrimaryRequiredParameterless() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/insertDelegationCall/beforePrimaryRequiredParameterless.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/insertDelegationCall/primaryRequiredParameterless.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforePrimaryRequiredWithBody.kt")
+        @TestMetadata("primaryRequiredWithBody.kt")
         public void testPrimaryRequiredWithBody() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/insertDelegationCall/beforePrimaryRequiredWithBody.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/insertDelegationCall/primaryRequiredWithBody.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforePrimaryRequiredWithParameter.kt")
+        @TestMetadata("primaryRequiredWithParameter.kt")
         public void testPrimaryRequiredWithParameter() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/insertDelegationCall/beforePrimaryRequiredWithParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/insertDelegationCall/primaryRequiredWithParameter.kt");
             doTest(fileName);
         }
     }
@@ -3006,14 +3006,14 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Migration extends AbstractQuickFixTest {
-        @TestMetadata("beforeAddOverrideToEqualsHashCodeToString.kt")
+        @TestMetadata("addOverrideToEqualsHashCodeToString.kt")
         public void testAddOverrideToEqualsHashCodeToString() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/beforeAddOverrideToEqualsHashCodeToString.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/addOverrideToEqualsHashCodeToString.kt");
             doTest(fileName);
         }
 
         public void testAllFilesPresentInMigration() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration"), Pattern.compile("^(\\w+)\\.kt$"), true);
         }
 
         @TestMetadata("idea/testData/quickfix/migration/bracketsAnnotations")
@@ -3021,12 +3021,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class BracketsAnnotations extends AbstractQuickFixTest {
             public void testAllFilesPresentInBracketsAnnotations() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration/bracketsAnnotations"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration/bracketsAnnotations"), Pattern.compile("^(\\w+)\\.kt$"), true);
             }
 
-            @TestMetadata("beforeBasic.kt")
+            @TestMetadata("basic.kt")
             public void testBasic() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/bracketsAnnotations/beforeBasic.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/bracketsAnnotations/basic.kt");
                 doTest(fileName);
             }
         }
@@ -3036,54 +3036,54 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class LambdaSyntax extends AbstractQuickFixTest {
             public void testAllFilesPresentInLambdaSyntax() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration/lambdaSyntax"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration/lambdaSyntax"), Pattern.compile("^(\\w+)\\.kt$"), true);
             }
 
-            @TestMetadata("beforeLabelInLiteralArgument.kt")
+            @TestMetadata("labelInLiteralArgument.kt")
             public void testLabelInLiteralArgument() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/lambdaSyntax/beforeLabelInLiteralArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/lambdaSyntax/labelInLiteralArgument.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeLabelInLiteralArgumentImplicitReceiverType.kt")
+            @TestMetadata("labelInLiteralArgumentImplicitReceiverType.kt")
             public void testLabelInLiteralArgumentImplicitReceiverType() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/lambdaSyntax/beforeLabelInLiteralArgumentImplicitReceiverType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/lambdaSyntax/labelInLiteralArgumentImplicitReceiverType.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeLabelInLiteralArgumentImplicitReturnType.kt")
+            @TestMetadata("labelInLiteralArgumentImplicitReturnType.kt")
             public void testLabelInLiteralArgumentImplicitReturnType() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/lambdaSyntax/beforeLabelInLiteralArgumentImplicitReturnType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/lambdaSyntax/labelInLiteralArgumentImplicitReturnType.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeLabelInLiteralArgumentOneStatement.kt")
+            @TestMetadata("labelInLiteralArgumentOneStatement.kt")
             public void testLabelInLiteralArgumentOneStatement() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/lambdaSyntax/beforeLabelInLiteralArgumentOneStatement.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/lambdaSyntax/labelInLiteralArgumentOneStatement.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeLambdaInFunctionArgument.kt")
+            @TestMetadata("lambdaInFunctionArgument.kt")
             public void testLambdaInFunctionArgument() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/lambdaSyntax/beforeLambdaInFunctionArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/lambdaSyntax/lambdaInFunctionArgument.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeLambdaInsideLambda.kt")
+            @TestMetadata("lambdaInsideLambda.kt")
             public void testLambdaInsideLambda() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/lambdaSyntax/beforeLambdaInsideLambda.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/lambdaSyntax/lambdaInsideLambda.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeParanthesizedParameters.kt")
+            @TestMetadata("paranthesizedParameters.kt")
             public void testParanthesizedParameters() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/lambdaSyntax/beforeParanthesizedParameters.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/lambdaSyntax/paranthesizedParameters.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeReceiverAndReturnInExpression.kt")
+            @TestMetadata("receiverAndReturnInExpression.kt")
             public void testReceiverAndReturnInExpression() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/lambdaSyntax/beforeReceiverAndReturnInExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/lambdaSyntax/receiverAndReturnInExpression.kt");
                 doTest(fileName);
             }
         }
@@ -3093,36 +3093,36 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ReplaceJavaClassAsAnnotationParameter extends AbstractQuickFixTest {
             public void testAllFilesPresentInReplaceJavaClassAsAnnotationParameter() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter"), Pattern.compile("^(\\w+)\\.kt$"), true);
             }
 
-            @TestMetadata("beforeArrayRuntime.kt")
+            @TestMetadata("arrayRuntime.kt")
             public void testArrayRuntime() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/beforeArrayRuntime.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/arrayRuntime.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeBasicRuntime.kt")
+            @TestMetadata("basicRuntime.kt")
             public void testBasicRuntime() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/beforeBasicRuntime.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/basicRuntime.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeDefaultRuntime.kt")
+            @TestMetadata("defaultRuntime.kt")
             public void testDefaultRuntime() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/beforeDefaultRuntime.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/defaultRuntime.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeUsageWithErrorRuntime.kt")
+            @TestMetadata("usageWithErrorRuntime.kt")
             public void testUsageWithErrorRuntime() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/beforeUsageWithErrorRuntime.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/usageWithErrorRuntime.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeVarargRuntime.kt")
+            @TestMetadata("varargRuntime.kt")
             public void testVarargRuntime() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/beforeVarargRuntime.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/replaceJavaClassAsAnnotationParameter/varargRuntime.kt");
                 doTest(fileName);
             }
         }
@@ -3133,175 +3133,175 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Modifiers extends AbstractQuickFixTest {
-        @TestMetadata("beforeAbstractModifierInEnum.kt")
+        @TestMetadata("abstractModifierInEnum.kt")
         public void testAbstractModifierInEnum() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeAbstractModifierInEnum.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/abstractModifierInEnum.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeAddInnerModifier.kt")
+        @TestMetadata("addInnerModifier.kt")
         public void testAddInnerModifier() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeAddInnerModifier.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addInnerModifier.kt");
             doTest(fileName);
         }
 
         public void testAllFilesPresentInModifiers() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers"), Pattern.compile("^(\\w+)\\.kt$"), true);
         }
 
-        @TestMetadata("beforeCannotMakeClassAnnotation.kt")
+        @TestMetadata("cannotMakeClassAnnotation.kt")
         public void testCannotMakeClassAnnotation() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeCannotMakeClassAnnotation.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/cannotMakeClassAnnotation.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeFinalTrait.kt")
+        @TestMetadata("finalTrait.kt")
         public void testFinalTrait() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeFinalTrait.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/finalTrait.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeIllegalEnumAnnotation1.kt")
+        @TestMetadata("illegalEnumAnnotation1.kt")
         public void testIllegalEnumAnnotation1() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeIllegalEnumAnnotation1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/illegalEnumAnnotation1.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeIllegalEnumAnnotation2.kt")
+        @TestMetadata("illegalEnumAnnotation2.kt")
         public void testIllegalEnumAnnotation2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeIllegalEnumAnnotation2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/illegalEnumAnnotation2.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeNestedClassNotAllowed.kt")
+        @TestMetadata("nestedClassNotAllowed.kt")
         public void testNestedClassNotAllowed() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeNestedClassNotAllowed.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/nestedClassNotAllowed.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeNotAnAnnotationClass.kt")
+        @TestMetadata("notAnAnnotationClass.kt")
         public void testNotAnAnnotationClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeNotAnAnnotationClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/notAnAnnotationClass.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeOpenMemberInFinalClass1.kt")
+        @TestMetadata("openMemberInFinalClass1.kt")
         public void testOpenMemberInFinalClass1() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeOpenMemberInFinalClass1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/openMemberInFinalClass1.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeOpenMemberInFinalClass2.kt")
+        @TestMetadata("openMemberInFinalClass2.kt")
         public void testOpenMemberInFinalClass2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeOpenMemberInFinalClass2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/openMemberInFinalClass2.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeOpenMemberInFinalClass3.kt")
+        @TestMetadata("openMemberInFinalClass3.kt")
         public void testOpenMemberInFinalClass3() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeOpenMemberInFinalClass3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/openMemberInFinalClass3.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeOpenMemberInFinalClass4.kt")
+        @TestMetadata("openMemberInFinalClass4.kt")
         public void testOpenMemberInFinalClass4() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeOpenMemberInFinalClass4.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/openMemberInFinalClass4.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeOpenModifierInEnum.kt")
+        @TestMetadata("openModifierInEnum.kt")
         public void testOpenModifierInEnum() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeOpenModifierInEnum.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/openModifierInEnum.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforePackageMemberCannotBeProtected.kt")
+        @TestMetadata("packageMemberCannotBeProtected.kt")
         public void testPackageMemberCannotBeProtected() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforePackageMemberCannotBeProtected.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/packageMemberCannotBeProtected.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeRemoveAbstractModifier.kt")
+        @TestMetadata("removeAbstractModifier.kt")
         public void testRemoveAbstractModifier() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeRemoveAbstractModifier.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeAbstractModifier.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeRemoveIncompatibleModifier.kt")
+        @TestMetadata("removeIncompatibleModifier.kt")
         public void testRemoveIncompatibleModifier() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeRemoveIncompatibleModifier.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeIncompatibleModifier.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeRemoveInnerForClassInTrait.kt")
+        @TestMetadata("removeInnerForClassInTrait.kt")
         public void testRemoveInnerForClassInTrait() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeRemoveInnerForClassInTrait.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeInnerForClassInTrait.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeRemoveProtectedModifier.kt")
+        @TestMetadata("removeProtectedModifier.kt")
         public void testRemoveProtectedModifier() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeRemoveProtectedModifier.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeProtectedModifier.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeRemoveRedundantModifier1.kt")
+        @TestMetadata("removeRedundantModifier1.kt")
         public void testRemoveRedundantModifier1() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeRemoveRedundantModifier1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeRedundantModifier1.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeRemoveRedundantModifier2.kt")
+        @TestMetadata("removeRedundantModifier2.kt")
         public void testRemoveRedundantModifier2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeRemoveRedundantModifier2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeRedundantModifier2.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeRemoveRedundantModifier3.kt")
+        @TestMetadata("removeRedundantModifier3.kt")
         public void testRemoveRedundantModifier3() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeRemoveRedundantModifier3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeRedundantModifier3.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeRemoveSupertype1.kt")
+        @TestMetadata("removeSupertype1.kt")
         public void testRemoveSupertype1() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeRemoveSupertype1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeSupertype1.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeRemoveSupertype2.kt")
+        @TestMetadata("removeSupertype2.kt")
         public void testRemoveSupertype2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeRemoveSupertype2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeSupertype2.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeRemoveSupertype3.kt")
+        @TestMetadata("removeSupertype3.kt")
         public void testRemoveSupertype3() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeRemoveSupertype3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeSupertype3.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeRemoveSupertype4.kt")
+        @TestMetadata("removeSupertype4.kt")
         public void testRemoveSupertype4() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeRemoveSupertype4.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeSupertype4.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeVisibilityModifer1.kt")
+        @TestMetadata("visibilityModifer1.kt")
         public void testVisibilityModifer1() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeVisibilityModifer1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/visibilityModifer1.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeVisibilityModifer2.kt")
+        @TestMetadata("visibilityModifer2.kt")
         public void testVisibilityModifer2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeVisibilityModifer2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/visibilityModifer2.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeVisibilityModiferParameter.kt")
+        @TestMetadata("visibilityModiferParameter.kt")
         public void testVisibilityModiferParameter() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeVisibilityModiferParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/visibilityModiferParameter.kt");
             doTest(fileName);
         }
 
@@ -3310,72 +3310,72 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class AddOpenToClassDeclaration extends AbstractQuickFixTest {
             public void testAllFilesPresentInAddOpenToClassDeclaration() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers/addOpenToClassDeclaration"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers/addOpenToClassDeclaration"), Pattern.compile("^(\\w+)\\.kt$"), true);
             }
 
-            @TestMetadata("beforeEnumSupertype.kt")
+            @TestMetadata("enumSupertype.kt")
             public void testEnumSupertype() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeEnumSupertype.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/enumSupertype.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeEnumUpperBound.kt")
+            @TestMetadata("enumUpperBound.kt")
             public void testEnumUpperBound() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeEnumUpperBound.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/enumUpperBound.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeExplicitlyFinalSupertype.kt")
+            @TestMetadata("explicitlyFinalSupertype.kt")
             public void testExplicitlyFinalSupertype() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeExplicitlyFinalSupertype.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/explicitlyFinalSupertype.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeExplicitlyFinalUpperBound.kt")
+            @TestMetadata("explicitlyFinalUpperBound.kt")
             public void testExplicitlyFinalUpperBound() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeExplicitlyFinalUpperBound.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/explicitlyFinalUpperBound.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeFinalLibrarySupertype.kt")
+            @TestMetadata("finalLibrarySupertype.kt")
             public void testFinalLibrarySupertype() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalLibrarySupertype.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalLibrarySupertype.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeFinalLibraryUpperBound.kt")
+            @TestMetadata("finalLibraryUpperBound.kt")
             public void testFinalLibraryUpperBound() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalLibraryUpperBound.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalLibraryUpperBound.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeFinalSupertype.kt")
+            @TestMetadata("finalSupertype.kt")
             public void testFinalSupertype() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalSupertype.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalSupertype.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeFinalUpperBound.kt")
+            @TestMetadata("finalUpperBound.kt")
             public void testFinalUpperBound() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalUpperBound.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalUpperBound.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeImplementTraitFinalSupertype.kt")
+            @TestMetadata("implementTraitFinalSupertype.kt")
             public void testImplementTraitFinalSupertype() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeImplementTraitFinalSupertype.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/implementTraitFinalSupertype.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeSecondaryCtrDelegationInHeader.kt")
+            @TestMetadata("secondaryCtrDelegationInHeader.kt")
             public void testSecondaryCtrDelegationInHeader() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeSecondaryCtrDelegationInHeader.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/secondaryCtrDelegationInHeader.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeSecondaryCtrDelegationInSecondary.kt")
+            @TestMetadata("secondaryCtrDelegationInSecondary.kt")
             public void testSecondaryCtrDelegationInSecondary() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeSecondaryCtrDelegationInSecondary.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/secondaryCtrDelegationInSecondary.kt");
                 doTest(fileName);
             }
 
@@ -3384,7 +3384,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             @RunWith(JUnit3RunnerWithInners.class)
             public static class FinalJavaClass extends AbstractQuickFixTest {
                 public void testAllFilesPresentInFinalJavaClass() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass"), Pattern.compile("^(\\w+)\\.kt$"), true);
                 }
 
                 @TestMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/javaCode")
@@ -3392,7 +3392,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
                 @RunWith(JUnit3RunnerWithInners.class)
                 public static class JavaCode extends AbstractQuickFixTest {
                     public void testAllFilesPresentInJavaCode() throws Exception {
-                        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/javaCode"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/javaCode"), Pattern.compile("^(\\w+)\\.kt$"), true);
                     }
 
                 }
@@ -3405,30 +3405,30 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Nullables extends AbstractQuickFixTest {
         public void testAllFilesPresentInNullables() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/nullables"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/nullables"), Pattern.compile("^(\\w+)\\.kt$"), true);
         }
 
-        @TestMetadata("beforeRemoveRedundantNullable.kt")
+        @TestMetadata("removeRedundantNullable.kt")
         public void testRemoveRedundantNullable() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/nullables/beforeRemoveRedundantNullable.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/nullables/removeRedundantNullable.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeRemoveSupertypeNullable1.kt")
+        @TestMetadata("removeSupertypeNullable1.kt")
         public void testRemoveSupertypeNullable1() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/nullables/beforeRemoveSupertypeNullable1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/nullables/removeSupertypeNullable1.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeRemoveSupertypeNullable2.kt")
+        @TestMetadata("removeSupertypeNullable2.kt")
         public void testRemoveSupertypeNullable2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/nullables/beforeRemoveSupertypeNullable2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/nullables/removeSupertypeNullable2.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeRemoveUselessNullable.kt")
+        @TestMetadata("removeUselessNullable.kt")
         public void testRemoveUselessNullable() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/nullables/beforeRemoveUselessNullable.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/nullables/removeUselessNullable.kt");
             doTest(fileName);
         }
 
@@ -3437,12 +3437,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class UnsafeInfixCall extends AbstractQuickFixTest {
             public void testAllFilesPresentInUnsafeInfixCall() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/nullables/unsafeInfixCall"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/nullables/unsafeInfixCall"), Pattern.compile("^(\\w+)\\.kt$"), true);
             }
 
-            @TestMetadata("beforeUnsafeInfixCall.kt")
+            @TestMetadata("unsafeInfixCall.kt")
             public void testUnsafeInfixCall() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/nullables/unsafeInfixCall/beforeUnsafeInfixCall.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/nullables/unsafeInfixCall/unsafeInfixCall.kt");
                 doTest(fileName);
             }
         }
@@ -3453,84 +3453,84 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Override extends AbstractQuickFixTest {
         public void testAllFilesPresentInOverride() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/override"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/override"), Pattern.compile("^(\\w+)\\.kt$"), true);
         }
 
-        @TestMetadata("beforeChangeToInvocation.kt")
+        @TestMetadata("changeToInvocation.kt")
         public void testChangeToInvocation() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/beforeChangeToInvocation.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/changeToInvocation.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeOverriddingMultipleFinalMethods.kt")
+        @TestMetadata("overriddingMultipleFinalMethods.kt")
         public void testOverriddingMultipleFinalMethods() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/beforeOverriddingMultipleFinalMethods.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/overriddingMultipleFinalMethods.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeOverridingDelegatedMethod.kt")
+        @TestMetadata("overridingDelegatedMethod.kt")
         public void testOverridingDelegatedMethod() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/beforeOverridingDelegatedMethod.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/overridingDelegatedMethod.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeOverridingFakeOverride.kt")
+        @TestMetadata("overridingFakeOverride.kt")
         public void testOverridingFakeOverride() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/beforeOverridingFakeOverride.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/overridingFakeOverride.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeOverridingFinalJavaMethod.kt")
+        @TestMetadata("overridingFinalJavaMethod.kt")
         public void testOverridingFinalJavaMethod() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/beforeOverridingFinalJavaMethod.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/overridingFinalJavaMethod.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeOverridingFinalMethod.kt")
+        @TestMetadata("overridingFinalMethod.kt")
         public void testOverridingFinalMethod() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/beforeOverridingFinalMethod.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/overridingFinalMethod.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeOverridingFinalMethodInLocal.kt")
+        @TestMetadata("overridingFinalMethodInLocal.kt")
         public void testOverridingFinalMethodInLocal() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/beforeOverridingFinalMethodInLocal.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/overridingFinalMethodInLocal.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeOverridingFinalProperty.kt")
+        @TestMetadata("overridingFinalProperty.kt")
         public void testOverridingFinalProperty() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/beforeOverridingFinalProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/overridingFinalProperty.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeOverridingWritableAndNotWritableFinalMembers.kt")
+        @TestMetadata("overridingWritableAndNotWritableFinalMembers.kt")
         public void testOverridingWritableAndNotWritableFinalMembers() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/beforeOverridingWritableAndNotWritableFinalMembers.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/overridingWritableAndNotWritableFinalMembers.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeParameterNameChangedAmbiguousRename.kt")
+        @TestMetadata("parameterNameChangedAmbiguousRename.kt")
         public void testParameterNameChangedAmbiguousRename() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/beforeParameterNameChangedAmbiguousRename.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/parameterNameChangedAmbiguousRename.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeParameterNameChangedMultipleOverrideRenamePossible.kt")
+        @TestMetadata("parameterNameChangedMultipleOverrideRenamePossible.kt")
         public void testParameterNameChangedMultipleOverrideRenamePossible() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/beforeParameterNameChangedMultipleOverrideRenamePossible.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/parameterNameChangedMultipleOverrideRenamePossible.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeParameterNameChangedRenamePossible.kt")
+        @TestMetadata("parameterNameChangedRenamePossible.kt")
         public void testParameterNameChangedRenamePossible() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/beforeParameterNameChangedRenamePossible.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/parameterNameChangedRenamePossible.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeVirtualMethodHidden.kt")
+        @TestMetadata("virtualMethodHidden.kt")
         public void testVirtualMethodHidden() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/beforeVirtualMethodHidden.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/virtualMethodHidden.kt");
             doTest(fileName);
         }
 
@@ -3538,187 +3538,187 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class NothingToOverride extends AbstractQuickFixTest {
-            @TestMetadata("beforeAddFunction.kt")
+            @TestMetadata("addFunction.kt")
             public void testAddFunction() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeAddFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addFunction.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeAddFunctionAbstractClass.kt")
+            @TestMetadata("addFunctionAbstractClass.kt")
             public void testAddFunctionAbstractClass() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionAbstractClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addFunctionAbstractClass.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeAddFunctionInLocalDeclaration.kt")
+            @TestMetadata("addFunctionInLocalDeclaration.kt")
             public void testAddFunctionInLocalDeclaration() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionInLocalDeclaration.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addFunctionInLocalDeclaration.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeAddFunctionNoBody.kt")
+            @TestMetadata("addFunctionNoBody.kt")
             public void testAddFunctionNoBody() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionNoBody.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addFunctionNoBody.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeAddFunctionNonUnitReturnType.kt")
+            @TestMetadata("addFunctionNonUnitReturnType.kt")
             public void testAddFunctionNonUnitReturnType() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionNonUnitReturnType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addFunctionNonUnitReturnType.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeAddFunctionTrait.kt")
+            @TestMetadata("addFunctionTrait.kt")
             public void testAddFunctionTrait() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionTrait.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addFunctionTrait.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeAddFunctionTwoSuperclasses.kt")
+            @TestMetadata("addFunctionTwoSuperclasses.kt")
             public void testAddFunctionTwoSuperclasses() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionTwoSuperclasses.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addFunctionTwoSuperclasses.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeAddFunctionTwoTraits.kt")
+            @TestMetadata("addFunctionTwoTraits.kt")
             public void testAddFunctionTwoTraits() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionTwoTraits.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addFunctionTwoTraits.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeAddParameter.kt")
+            @TestMetadata("addParameter.kt")
             public void testAddParameter() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeAddParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addParameter.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeAddParameterGenericClass.kt")
+            @TestMetadata("addParameterGenericClass.kt")
             public void testAddParameterGenericClass() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeAddParameterGenericClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addParameterGenericClass.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeAddParameterMultiple.kt")
+            @TestMetadata("addParameterMultiple.kt")
             public void testAddParameterMultiple() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeAddParameterMultiple.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addParameterMultiple.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeAddParameterPreserveVisibility.kt")
+            @TestMetadata("addParameterPreserveVisibility.kt")
             public void testAddParameterPreserveVisibility() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeAddParameterPreserveVisibility.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addParameterPreserveVisibility.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeAddParameterTwoSupertraits.kt")
+            @TestMetadata("addParameterTwoSupertraits.kt")
             public void testAddParameterTwoSupertraits() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeAddParameterTwoSupertraits.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addParameterTwoSupertraits.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeAddParameterTwoSupertypes.kt")
+            @TestMetadata("addParameterTwoSupertypes.kt")
             public void testAddParameterTwoSupertypes() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeAddParameterTwoSupertypes.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addParameterTwoSupertypes.kt");
                 doTest(fileName);
             }
 
             public void testAllFilesPresentInNothingToOverride() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/override/nothingToOverride"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/override/nothingToOverride"), Pattern.compile("^(\\w+)\\.kt$"), true);
             }
 
-            @TestMetadata("beforeChangeParameterType.kt")
+            @TestMetadata("changeParameterType.kt")
             public void testChangeParameterType() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/changeParameterType.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeChangeParameterTypeAbstractSuperclass.kt")
+            @TestMetadata("changeParameterTypeAbstractSuperclass.kt")
             public void testChangeParameterTypeAbstractSuperclass() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeAbstractSuperclass.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/changeParameterTypeAbstractSuperclass.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeChangeParameterTypeInTrait.kt")
+            @TestMetadata("changeParameterTypeInTrait.kt")
             public void testChangeParameterTypeInTrait() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeInTrait.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/changeParameterTypeInTrait.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeChangeParameterTypeMatchNames.kt")
+            @TestMetadata("changeParameterTypeMatchNames.kt")
             public void testChangeParameterTypeMatchNames() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeMatchNames.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/changeParameterTypeMatchNames.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeChangeParameterTypeModifyOrder.kt")
+            @TestMetadata("changeParameterTypeModifyOrder.kt")
             public void testChangeParameterTypeModifyOrder() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeModifyOrder.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/changeParameterTypeModifyOrder.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeChangeParameterTypeOpenOverride.kt")
+            @TestMetadata("changeParameterTypeOpenOverride.kt")
             public void testChangeParameterTypeOpenOverride() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeOpenOverride.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/changeParameterTypeOpenOverride.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeChangeParameterTypeSingleExpressionFunction.kt")
+            @TestMetadata("changeParameterTypeSingleExpressionFunction.kt")
             public void testChangeParameterTypeSingleExpressionFunction() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeSingleExpressionFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/changeParameterTypeSingleExpressionFunction.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeChangeParameterTypeSuperTrait.kt")
+            @TestMetadata("changeParameterTypeSuperTrait.kt")
             public void testChangeParameterTypeSuperTrait() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeSuperTrait.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/changeParameterTypeSuperTrait.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeChangeReturnType.kt")
+            @TestMetadata("changeReturnType.kt")
             public void testChangeReturnType() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeChangeReturnType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/changeReturnType.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeDoNotLooseAnnotations.kt")
+            @TestMetadata("doNotLooseAnnotations.kt")
             public void testDoNotLooseAnnotations() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeDoNotLooseAnnotations.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/doNotLooseAnnotations.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeNoOpenSuperFunction.kt")
+            @TestMetadata("noOpenSuperFunction.kt")
             public void testNoOpenSuperFunction() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeNoOpenSuperFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/noOpenSuperFunction.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeOverrideJavaMethod.kt")
+            @TestMetadata("overrideJavaMethod.kt")
             public void testOverrideJavaMethod() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeOverrideJavaMethod.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/overrideJavaMethod.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeRemoveOverride.kt")
+            @TestMetadata("removeOverride.kt")
             public void testRemoveOverride() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeRemoveOverride.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/removeOverride.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeRemoveParameter.kt")
+            @TestMetadata("removeParameter.kt")
             public void testRemoveParameter() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeRemoveParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/removeParameter.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeRemoveParameterTwoTraits.kt")
+            @TestMetadata("removeParameterTwoTraits.kt")
             public void testRemoveParameterTwoTraits() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeRemoveParameterTwoTraits.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/removeParameterTwoTraits.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeSwapParametersGenericClass.kt")
+            @TestMetadata("swapParametersGenericClass.kt")
             public void testSwapParametersGenericClass() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeSwapParametersGenericClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/swapParametersGenericClass.kt");
                 doTest(fileName);
             }
         }
@@ -3728,108 +3728,108 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class TypeMismatchOnOverride extends AbstractQuickFixTest {
             public void testAllFilesPresentInTypeMismatchOnOverride() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/override/typeMismatchOnOverride"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/override/typeMismatchOnOverride"), Pattern.compile("^(\\w+)\\.kt$"), true);
             }
 
-            @TestMetadata("beforeCantChangeMultipleOverriddenPropertiesTypes.kt")
+            @TestMetadata("cantChangeMultipleOverriddenPropertiesTypes.kt")
             public void testCantChangeMultipleOverriddenPropertiesTypes() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeMultipleOverriddenPropertiesTypes.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeMultipleOverriddenPropertiesTypes.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeCantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt")
+            @TestMetadata("cantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt")
             public void testCantChangeOverriddenPropertyTypeToMatchOverridingProperty() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeCantChangePropertyTypeToMatchOverridenProperties.kt")
+            @TestMetadata("cantChangePropertyTypeToMatchOverridenProperties.kt")
             public void testCantChangePropertyTypeToMatchOverridenProperties() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangePropertyTypeToMatchOverridenProperties.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/cantChangePropertyTypeToMatchOverridenProperties.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeCantChangeReturnTypeOfOverriddenFunction.kt")
+            @TestMetadata("cantChangeReturnTypeOfOverriddenFunction.kt")
             public void testCantChangeReturnTypeOfOverriddenFunction() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeReturnTypeOfOverriddenFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeReturnTypeOfOverriddenFunction.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeChangeOverriddenPropertyType1.kt")
+            @TestMetadata("changeOverriddenPropertyType1.kt")
             public void testChangeOverriddenPropertyType1() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforeChangeOverriddenPropertyType1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType1.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeChangeOverriddenPropertyType2.kt")
+            @TestMetadata("changeOverriddenPropertyType2.kt")
             public void testChangeOverriddenPropertyType2() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforeChangeOverriddenPropertyType2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType2.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeChangeOverridingPropertyTypeToFunctionType.kt")
+            @TestMetadata("changeOverridingPropertyTypeToFunctionType.kt")
             public void testChangeOverridingPropertyTypeToFunctionType() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforeChangeOverridingPropertyTypeToFunctionType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingPropertyTypeToFunctionType.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeChangeReturnTypeOfOverriddenFunction.kt")
+            @TestMetadata("changeReturnTypeOfOverriddenFunction.kt")
             public void testChangeReturnTypeOfOverriddenFunction() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforeChangeReturnTypeOfOverriddenFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/changeReturnTypeOfOverriddenFunction.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeObjectInsideBody.kt")
+            @TestMetadata("objectInsideBody.kt")
             public void testObjectInsideBody() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforeObjectInsideBody.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/objectInsideBody.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforePropertyReturnTypeMismatchOnOverride.kt")
+            @TestMetadata("propertyReturnTypeMismatchOnOverride.kt")
             public void testPropertyReturnTypeMismatchOnOverride() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforePropertyReturnTypeMismatchOnOverride.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/propertyReturnTypeMismatchOnOverride.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforePropertyTypeMismatchOnOverrideIntLong.kt")
+            @TestMetadata("propertyTypeMismatchOnOverrideIntLong.kt")
             public void testPropertyTypeMismatchOnOverrideIntLong() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforePropertyTypeMismatchOnOverrideIntLong.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntLong.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforePropertyTypeMismatchOnOverrideIntUnit.kt")
+            @TestMetadata("propertyTypeMismatchOnOverrideIntUnit.kt")
             public void testPropertyTypeMismatchOnOverrideIntUnit() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforePropertyTypeMismatchOnOverrideIntUnit.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntUnit.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeReturnTypeMismatchOnMultipleOverride.kt")
+            @TestMetadata("returnTypeMismatchOnMultipleOverride.kt")
             public void testReturnTypeMismatchOnMultipleOverride() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforeReturnTypeMismatchOnMultipleOverride.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeReturnTypeMismatchOnMultipleOverrideAmbiguity.kt")
+            @TestMetadata("returnTypeMismatchOnMultipleOverrideAmbiguity.kt")
             public void testReturnTypeMismatchOnMultipleOverrideAmbiguity() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforeReturnTypeMismatchOnMultipleOverrideAmbiguity.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverrideAmbiguity.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeReturnTypeMismatchOnOverrideIntLong.kt")
+            @TestMetadata("returnTypeMismatchOnOverrideIntLong.kt")
             public void testReturnTypeMismatchOnOverrideIntLong() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforeReturnTypeMismatchOnOverrideIntLong.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntLong.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeReturnTypeMismatchOnOverrideIntUnit.kt")
+            @TestMetadata("returnTypeMismatchOnOverrideIntUnit.kt")
             public void testReturnTypeMismatchOnOverrideIntUnit() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforeReturnTypeMismatchOnOverrideIntUnit.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntUnit.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeReturnTypeMismatchOnOverrideUnitInt.kt")
+            @TestMetadata("returnTypeMismatchOnOverrideUnitInt.kt")
             public void testReturnTypeMismatchOnOverrideUnitInt() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforeReturnTypeMismatchOnOverrideUnitInt.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideUnitInt.kt");
                 doTest(fileName);
             }
         }
@@ -3840,30 +3840,30 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class PlatformClasses extends AbstractQuickFixTest {
         public void testAllFilesPresentInPlatformClasses() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/platformClasses"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/platformClasses"), Pattern.compile("^(\\w+)\\.kt$"), true);
         }
 
-        @TestMetadata("beforeMapPlatformClassToKotlin1.kt")
+        @TestMetadata("mapPlatformClassToKotlin1.kt")
         public void testMapPlatformClassToKotlin1() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/platformClasses/beforeMapPlatformClassToKotlin1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin1.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeMapPlatformClassToKotlin2.kt")
+        @TestMetadata("mapPlatformClassToKotlin2.kt")
         public void testMapPlatformClassToKotlin2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/platformClasses/beforeMapPlatformClassToKotlin2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin2.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeMapPlatformClassToKotlin3.kt")
+        @TestMetadata("mapPlatformClassToKotlin3.kt")
         public void testMapPlatformClassToKotlin3() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/platformClasses/beforeMapPlatformClassToKotlin3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin3.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeMapPlatformClassToKotlin4.kt")
+        @TestMetadata("mapPlatformClassToKotlin4.kt")
         public void testMapPlatformClassToKotlin4() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/platformClasses/beforeMapPlatformClassToKotlin4.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin4.kt");
             doTest(fileName);
         }
     }
@@ -3873,36 +3873,36 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class RemoveUnused extends AbstractQuickFixTest {
         public void testAllFilesPresentInRemoveUnused() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/removeUnused"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/removeUnused"), Pattern.compile("^(\\w+)\\.kt$"), true);
         }
 
-        @TestMetadata("beforeUnusedClass.kt")
+        @TestMetadata("unusedClass.kt")
         public void testUnusedClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/removeUnused/beforeUnusedClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/removeUnused/unusedClass.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeUnusedFunction.kt")
+        @TestMetadata("unusedFunction.kt")
         public void testUnusedFunction() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/removeUnused/beforeUnusedFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/removeUnused/unusedFunction.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeUnusedProperty.kt")
+        @TestMetadata("unusedProperty.kt")
         public void testUnusedProperty() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/removeUnused/beforeUnusedProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/removeUnused/unusedProperty.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeUnusedPropertyAsConstructorParameter.kt")
+        @TestMetadata("unusedPropertyAsConstructorParameter.kt")
         public void testUnusedPropertyAsConstructorParameter() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/removeUnused/beforeUnusedPropertyAsConstructorParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/removeUnused/unusedPropertyAsConstructorParameter.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeUnusedTypeParameter.kt")
+        @TestMetadata("unusedTypeParameter.kt")
         public void testUnusedTypeParameter() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/removeUnused/beforeUnusedTypeParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/removeUnused/unusedTypeParameter.kt");
             doTest(fileName);
         }
     }
@@ -3912,18 +3912,18 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class RemoveUnusedReceiver extends AbstractQuickFixTest {
         public void testAllFilesPresentInRemoveUnusedReceiver() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/removeUnusedReceiver"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/removeUnusedReceiver"), Pattern.compile("^(\\w+)\\.kt$"), true);
         }
 
-        @TestMetadata("beforeInFunction.kt")
+        @TestMetadata("inFunction.kt")
         public void testInFunction() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/removeUnusedReceiver/beforeInFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/removeUnusedReceiver/inFunction.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeInProperty.kt")
+        @TestMetadata("inProperty.kt")
         public void testInProperty() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/removeUnusedReceiver/beforeInProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/removeUnusedReceiver/inProperty.kt");
             doTest(fileName);
         }
     }
@@ -3933,12 +3933,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Supercalls extends AbstractQuickFixTest {
         public void testAllFilesPresentInSupercalls() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/supercalls"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/supercalls"), Pattern.compile("^(\\w+)\\.kt$"), true);
         }
 
-        @TestMetadata("beforeTypeArgumentsRedundantInSuperQualifier.kt")
+        @TestMetadata("typeArgumentsRedundantInSuperQualifier.kt")
         public void testTypeArgumentsRedundantInSuperQualifier() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supercalls/beforeTypeArgumentsRedundantInSuperQualifier.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supercalls/typeArgumentsRedundantInSuperQualifier.kt");
             doTest(fileName);
         }
     }
@@ -3948,36 +3948,36 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class SupertypeInitialization extends AbstractQuickFixTest {
         public void testAllFilesPresentInSupertypeInitialization() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/supertypeInitialization"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/supertypeInitialization"), Pattern.compile("^(\\w+)\\.kt$"), true);
         }
 
-        @TestMetadata("beforeSupertypeNotInitialized.kt")
+        @TestMetadata("supertypeNotInitialized.kt")
         public void testSupertypeNotInitialized() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitialized.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/supertypeNotInitialized.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeSupertypeNotInitializedDefaultParameters.kt")
+        @TestMetadata("supertypeNotInitializedDefaultParameters.kt")
         public void testSupertypeNotInitializedDefaultParameters() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitializedDefaultParameters.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/supertypeNotInitializedDefaultParameters.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeSupertypeNotInitializedEmptyConstructor.kt")
+        @TestMetadata("supertypeNotInitializedEmptyConstructor.kt")
         public void testSupertypeNotInitializedEmptyConstructor() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitializedEmptyConstructor.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/supertypeNotInitializedEmptyConstructor.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeSupertypeNotInitializedForLocalClass.kt")
+        @TestMetadata("supertypeNotInitializedForLocalClass.kt")
         public void testSupertypeNotInitializedForLocalClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitializedForLocalClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/supertypeNotInitializedForLocalClass.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeSupertypeNotInitializedForObjectExpression.kt")
+        @TestMetadata("supertypeNotInitializedForObjectExpression.kt")
         public void testSupertypeNotInitializedForObjectExpression() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitializedForObjectExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/supertypeNotInitializedForObjectExpression.kt");
             doTest(fileName);
         }
     }
@@ -3987,7 +3987,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Suppress extends AbstractQuickFixTest {
         public void testAllFilesPresentInSuppress() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress"), Pattern.compile("^(\\w+)\\.kt$"), true);
         }
 
         @TestMetadata("idea/testData/quickfix/suppress/annotationPosition")
@@ -3995,78 +3995,78 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class AnnotationPosition extends AbstractQuickFixTest {
             public void testAllFilesPresentInAnnotationPosition() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/annotationPosition"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/annotationPosition"), Pattern.compile("^(\\w+)\\.kt$"), true);
             }
 
-            @TestMetadata("beforeParamWithModifier.kt")
+            @TestMetadata("paramWithModifier.kt")
             public void testParamWithModifier() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/beforeParamWithModifier.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/paramWithModifier.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeTopLevelFunctionModifierOnThePreviousLine.kt")
+            @TestMetadata("topLevelFunctionModifierOnThePreviousLine.kt")
             public void testTopLevelFunctionModifierOnThePreviousLine() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionModifierOnThePreviousLine.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionModifierOnThePreviousLine.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeTopLevelFunctionModifierOnTheSameLine.kt")
+            @TestMetadata("topLevelFunctionModifierOnTheSameLine.kt")
             public void testTopLevelFunctionModifierOnTheSameLine() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionModifierOnTheSameLine.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionModifierOnTheSameLine.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeTopLevelFunctionNoModifiers.kt")
+            @TestMetadata("topLevelFunctionNoModifiers.kt")
             public void testTopLevelFunctionNoModifiers() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionNoModifiers.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionNoModifiers.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeTopLevelFunctionSuppressAnotherPreviousLine.kt")
+            @TestMetadata("topLevelFunctionSuppressAnotherPreviousLine.kt")
             public void testTopLevelFunctionSuppressAnotherPreviousLine() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionSuppressAnotherPreviousLine.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressAnotherPreviousLine.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeTopLevelFunctionSuppressEmptyArgsPreviousLine.kt")
+            @TestMetadata("topLevelFunctionSuppressEmptyArgsPreviousLine.kt")
             public void testTopLevelFunctionSuppressEmptyArgsPreviousLine() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionSuppressEmptyArgsPreviousLine.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressEmptyArgsPreviousLine.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeTopLevelFunctionSuppressNoArgsPreviousLine.kt")
+            @TestMetadata("topLevelFunctionSuppressNoArgsPreviousLine.kt")
             public void testTopLevelFunctionSuppressNoArgsPreviousLine() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionSuppressNoArgsPreviousLine.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsPreviousLine.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeTopLevelFunctionSuppressNoArgsPreviousLineBare.kt")
+            @TestMetadata("topLevelFunctionSuppressNoArgsPreviousLineBare.kt")
             public void testTopLevelFunctionSuppressNoArgsPreviousLineBare() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionSuppressNoArgsPreviousLineBare.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsPreviousLineBare.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeTopLevelFunctionSuppressNoArgsTheSameLine.kt")
+            @TestMetadata("topLevelFunctionSuppressNoArgsTheSameLine.kt")
             public void testTopLevelFunctionSuppressNoArgsTheSameLine() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionSuppressNoArgsTheSameLine.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsTheSameLine.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeTopLevelFunctionSuppressNoArgsTheSameLineBare.kt")
+            @TestMetadata("topLevelFunctionSuppressNoArgsTheSameLineBare.kt")
             public void testTopLevelFunctionSuppressNoArgsTheSameLineBare() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionSuppressNoArgsTheSameLineBare.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsTheSameLineBare.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeTopLevelFunctionUnrelatedAnnotation.kt")
+            @TestMetadata("topLevelFunctionUnrelatedAnnotation.kt")
             public void testTopLevelFunctionUnrelatedAnnotation() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionUnrelatedAnnotation.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionUnrelatedAnnotation.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeTopLevelFunctionUnrelatedAnnotationBare.kt")
+            @TestMetadata("topLevelFunctionUnrelatedAnnotationBare.kt")
             public void testTopLevelFunctionUnrelatedAnnotationBare() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionUnrelatedAnnotationBare.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionUnrelatedAnnotationBare.kt");
                 doTest(fileName);
             }
         }
@@ -4076,66 +4076,66 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class Availability extends AbstractQuickFixTest {
             public void testAllFilesPresentInAvailability() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/availability"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/availability"), Pattern.compile("^(\\w+)\\.kt$"), true);
             }
 
-            @TestMetadata("beforeLocalFunSuppressForLocal.kt")
+            @TestMetadata("localFunSuppressForLocal.kt")
             public void testLocalFunSuppressForLocal() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/beforeLocalFunSuppressForLocal.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/localFunSuppressForLocal.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeLocalFunSuppressForOuter.kt")
+            @TestMetadata("localFunSuppressForOuter.kt")
             public void testLocalFunSuppressForOuter() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/beforeLocalFunSuppressForOuter.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/localFunSuppressForOuter.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeLocalValSuppressForFun.kt")
+            @TestMetadata("localValSuppressForFun.kt")
             public void testLocalValSuppressForFun() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/beforeLocalValSuppressForFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/localValSuppressForFun.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeLocalValSuppressForVal.kt")
+            @TestMetadata("localValSuppressForVal.kt")
             public void testLocalValSuppressForVal() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/beforeLocalValSuppressForVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/localValSuppressForVal.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeMemberOfNestedSuppressForMember.kt")
+            @TestMetadata("memberOfNestedSuppressForMember.kt")
             public void testMemberOfNestedSuppressForMember() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/beforeMemberOfNestedSuppressForMember.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/memberOfNestedSuppressForMember.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeMemberOfNestedSuppressForNested.kt")
+            @TestMetadata("memberOfNestedSuppressForNested.kt")
             public void testMemberOfNestedSuppressForNested() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/beforeMemberOfNestedSuppressForNested.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/memberOfNestedSuppressForNested.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeMemberOfNestedSuppressForOuter.kt")
+            @TestMetadata("memberOfNestedSuppressForOuter.kt")
             public void testMemberOfNestedSuppressForOuter() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/beforeMemberOfNestedSuppressForOuter.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/memberOfNestedSuppressForOuter.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeMemberSuppressForClass.kt")
+            @TestMetadata("memberSuppressForClass.kt")
             public void testMemberSuppressForClass() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/beforeMemberSuppressForClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/memberSuppressForClass.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeMemberSuppressForMember.kt")
+            @TestMetadata("memberSuppressForMember.kt")
             public void testMemberSuppressForMember() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/beforeMemberSuppressForMember.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/memberSuppressForMember.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeTopLevelFunctionAlreadySuppressed.kt")
+            @TestMetadata("topLevelFunctionAlreadySuppressed.kt")
             public void testTopLevelFunctionAlreadySuppressed() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/beforeTopLevelFunctionAlreadySuppressed.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/topLevelFunctionAlreadySuppressed.kt");
                 doTest(fileName);
             }
         }
@@ -4145,72 +4145,72 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class DeclarationKinds extends AbstractQuickFixTest {
             public void testAllFilesPresentInDeclarationKinds() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/declarationKinds"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/declarationKinds"), Pattern.compile("^(\\w+)\\.kt$"), true);
             }
 
-            @TestMetadata("beforeClass.kt")
+            @TestMetadata("class.kt")
             public void testClass() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/beforeClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/class.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeClassObject.kt")
+            @TestMetadata("classObject.kt")
             public void testClassObject() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/beforeClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/classObject.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeEnumEntry.kt")
+            @TestMetadata("enumEntry.kt")
             public void testEnumEntry() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/beforeEnumEntry.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/enumEntry.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeFun.kt")
+            @TestMetadata("fun.kt")
             public void testFun() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/beforeFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/fun.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeMultiVal.kt")
+            @TestMetadata("multiVal.kt")
             public void testMultiVal() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/beforeMultiVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/multiVal.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeMultiVar.kt")
+            @TestMetadata("multiVar.kt")
             public void testMultiVar() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/beforeMultiVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/multiVar.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeObject.kt")
+            @TestMetadata("object.kt")
             public void testObject() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/beforeObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/object.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeParam.kt")
+            @TestMetadata("param.kt")
             public void testParam() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/beforeParam.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/param.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeTrait.kt")
+            @TestMetadata("trait.kt")
             public void testTrait() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/beforeTrait.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/trait.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeVal.kt")
+            @TestMetadata("val.kt")
             public void testVal() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/beforeVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/val.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeVar.kt")
+            @TestMetadata("var.kt")
             public void testVar() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/beforeVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/var.kt");
                 doTest(fileName);
             }
         }
@@ -4220,18 +4220,18 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ErrorRecovery extends AbstractQuickFixTest {
             public void testAllFilesPresentInErrorRecovery() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/errorRecovery"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/errorRecovery"), Pattern.compile("^(\\w+)\\.kt$"), true);
             }
 
-            @TestMetadata("beforeNonStringInSuppress.kt")
+            @TestMetadata("nonStringInSuppress.kt")
             public void testNonStringInSuppress() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/errorRecovery/beforeNonStringInSuppress.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/errorRecovery/nonStringInSuppress.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeUnresolvedAnnotation.kt")
+            @TestMetadata("unresolvedAnnotation.kt")
             public void testUnresolvedAnnotation() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/errorRecovery/beforeUnresolvedAnnotation.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/errorRecovery/unresolvedAnnotation.kt");
                 doTest(fileName);
             }
         }
@@ -4241,240 +4241,240 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ForStatement extends AbstractQuickFixTest {
             public void testAllFilesPresentInForStatement() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/forStatement"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/forStatement"), Pattern.compile("^(\\w+)\\.kt$"), true);
             }
 
-            @TestMetadata("beforeAndAnd.kt")
+            @TestMetadata("andAnd.kt")
             public void testAndAnd() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeAndAnd.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/andAnd.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeAnnotatedExpr.kt")
+            @TestMetadata("annotatedExpr.kt")
             public void testAnnotatedExpr() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeAnnotatedExpr.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/annotatedExpr.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeAnnotatedExprWithSuppress.kt")
+            @TestMetadata("annotatedExprWithSuppress.kt")
             public void testAnnotatedExprWithSuppress() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeAnnotatedExprWithSuppress.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/annotatedExprWithSuppress.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeArrayRead.kt")
+            @TestMetadata("arrayRead.kt")
             public void testArrayRead() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeArrayRead.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/arrayRead.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeAs.kt")
+            @TestMetadata("as.kt")
             public void testAs() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeAs.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/as.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeAsSafe.kt")
+            @TestMetadata("asSafe.kt")
             public void testAsSafe() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeAsSafe.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/asSafe.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeAssign.kt")
+            @TestMetadata("assign.kt")
             public void testAssign() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeAssign.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/assign.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeCall.kt")
+            @TestMetadata("call.kt")
             public void testCall() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeCall.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/call.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeColon.kt")
+            @TestMetadata("colon.kt")
             public void testColon() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeColon.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/colon.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeDoWhile.kt")
+            @TestMetadata("doWhile.kt")
             public void testDoWhile() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeDoWhile.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/doWhile.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeDotQualified.kt")
+            @TestMetadata("dotQualified.kt")
             public void testDotQualified() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeDotQualified.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/dotQualified.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeElvis.kt")
+            @TestMetadata("elvis.kt")
             public void testElvis() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeElvis.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/elvis.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeEqEq.kt")
+            @TestMetadata("eqEq.kt")
             public void testEqEq() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeEqEq.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/eqEq.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeFor.kt")
+            @TestMetadata("for.kt")
             public void testFor() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeFor.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/for.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeIf.kt")
+            @TestMetadata("if.kt")
             public void testIf() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeIf.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/if.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeIn.kt")
+            @TestMetadata("in.kt")
             public void testIn() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeIn.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/in.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeInfix.kt")
+            @TestMetadata("infix.kt")
             public void testInfix() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeInfix.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/infix.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeIs.kt")
+            @TestMetadata("is.kt")
             public void testIs() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeIs.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/is.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeLabeled.kt")
+            @TestMetadata("labeled.kt")
             public void testLabeled() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeLabeled.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/labeled.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeLess.kt")
+            @TestMetadata("less.kt")
             public void testLess() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeLess.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/less.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeMul.kt")
+            @TestMetadata("mul.kt")
             public void testMul() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeMul.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/mul.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeOrOr.kt")
+            @TestMetadata("orOr.kt")
             public void testOrOr() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeOrOr.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/orOr.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeParenthesized.kt")
+            @TestMetadata("parenthesized.kt")
             public void testParenthesized() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeParenthesized.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/parenthesized.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforePlus.kt")
+            @TestMetadata("plus.kt")
             public void testPlus() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforePlus.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/plus.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforePostfix.kt")
+            @TestMetadata("postfix.kt")
             public void testPostfix() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforePostfix.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/postfix.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforePostfixPlusPlus.kt")
+            @TestMetadata("postfixPlusPlus.kt")
             public void testPostfixPlusPlus() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforePostfixPlusPlus.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/postfixPlusPlus.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforePrefixPlusPlus.kt")
+            @TestMetadata("prefixPlusPlus.kt")
             public void testPrefixPlusPlus() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforePrefixPlusPlus.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/prefixPlusPlus.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeRange.kt")
+            @TestMetadata("range.kt")
             public void testRange() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeRange.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/range.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeReturn.kt")
+            @TestMetadata("return.kt")
             public void testReturn() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeReturn.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/return.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeSafeQualified.kt")
+            @TestMetadata("safeQualified.kt")
             public void testSafeQualified() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeSafeQualified.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/safeQualified.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeSimpleName.kt")
+            @TestMetadata("simpleName.kt")
             public void testSimpleName() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeSimpleName.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/simpleName.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeStringTemplate.kt")
+            @TestMetadata("stringTemplate.kt")
             public void testStringTemplate() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeStringTemplate.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/stringTemplate.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeThrow.kt")
+            @TestMetadata("throw.kt")
             public void testThrow() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeThrow.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/throw.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeTry.kt")
+            @TestMetadata("try.kt")
             public void testTry() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeTry.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/try.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeWhenExpressionEntry.kt")
+            @TestMetadata("whenExpressionEntry.kt")
             public void testWhenExpressionEntry() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeWhenExpressionEntry.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/whenExpressionEntry.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeWhenInEntry.kt")
+            @TestMetadata("whenInEntry.kt")
             public void testWhenInEntry() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeWhenInEntry.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/whenInEntry.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeWhenIsEntry.kt")
+            @TestMetadata("whenIsEntry.kt")
             public void testWhenIsEntry() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeWhenIsEntry.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/whenIsEntry.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeWhenSubject.kt")
+            @TestMetadata("whenSubject.kt")
             public void testWhenSubject() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeWhenSubject.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/whenSubject.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeWhile.kt")
+            @TestMetadata("while.kt")
             public void testWhile() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeWhile.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/while.kt");
                 doTest(fileName);
             }
 
@@ -4483,72 +4483,72 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             @RunWith(JUnit3RunnerWithInners.class)
             public static class Unavailable extends AbstractQuickFixTest {
                 public void testAllFilesPresentInUnavailable() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/forStatement/unavailable"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/forStatement/unavailable"), Pattern.compile("^(\\w+)\\.kt$"), true);
                 }
 
-                @TestMetadata("beforeInAnnotationArgument.kt")
+                @TestMetadata("inAnnotationArgument.kt")
                 public void testInAnnotationArgument() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/beforeInAnnotationArgument.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/inAnnotationArgument.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInClassHeader.kt")
+                @TestMetadata("inClassHeader.kt")
                 public void testInClassHeader() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/beforeInClassHeader.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/inClassHeader.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInDefaultArgument.kt")
+                @TestMetadata("inDefaultArgument.kt")
                 public void testInDefaultArgument() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/beforeInDefaultArgument.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/inDefaultArgument.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInExpressionBody.kt")
+                @TestMetadata("inExpressionBody.kt")
                 public void testInExpressionBody() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/beforeInExpressionBody.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/inExpressionBody.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInLocalValInitializer.kt")
+                @TestMetadata("inLocalValInitializer.kt")
                 public void testInLocalValInitializer() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/beforeInLocalValInitializer.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/inLocalValInitializer.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInParameterType.kt")
+                @TestMetadata("inParameterType.kt")
                 public void testInParameterType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/beforeInParameterType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/inParameterType.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInParameterTypeInFunctionLiteral.kt")
+                @TestMetadata("inParameterTypeInFunctionLiteral.kt")
                 public void testInParameterTypeInFunctionLiteral() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/beforeInParameterTypeInFunctionLiteral.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/inParameterTypeInFunctionLiteral.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeInPropertyInitializer.kt")
+                @TestMetadata("inPropertyInitializer.kt")
                 public void testInPropertyInitializer() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/beforeInPropertyInitializer.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/inPropertyInitializer.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeObjectLiteral.kt")
+                @TestMetadata("objectLiteral.kt")
                 public void testObjectLiteral() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/beforeObjectLiteral.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/objectLiteral.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeObjectLiteralInsideExpression.kt")
+                @TestMetadata("objectLiteralInsideExpression.kt")
                 public void testObjectLiteralInsideExpression() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/beforeObjectLiteralInsideExpression.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/objectLiteralInsideExpression.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("beforeSupretype.kt")
+                @TestMetadata("supretype.kt")
                 public void testSupretype() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/beforeSupretype.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/supretype.kt");
                     doTest(fileName);
                 }
             }
@@ -4560,84 +4560,84 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TypeAddition extends AbstractQuickFixTest {
         public void testAllFilesPresentInTypeAddition() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeAddition"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeAddition"), Pattern.compile("^(\\w+)\\.kt$"), true);
         }
 
-        @TestMetadata("beforeAmbiguousFunctionReturnType.kt")
+        @TestMetadata("ambiguousFunctionReturnType.kt")
         public void testAmbiguousFunctionReturnType() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/beforeAmbiguousFunctionReturnType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/ambiguousFunctionReturnType.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeAmbiguousPropertyReturnType.kt")
+        @TestMetadata("ambiguousPropertyReturnType.kt")
         public void testAmbiguousPropertyReturnType() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/beforeAmbiguousPropertyReturnType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/ambiguousPropertyReturnType.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeChangeAccessorTypeToFunctionType.kt")
+        @TestMetadata("changeAccessorTypeToFunctionType.kt")
         public void testChangeAccessorTypeToFunctionType() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/beforeChangeAccessorTypeToFunctionType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/changeAccessorTypeToFunctionType.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeNoAddErrorType.kt")
+        @TestMetadata("noAddErrorType.kt")
         public void testNoAddErrorType() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/beforeNoAddErrorType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/noAddErrorType.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeProtectedFunWithoutReturnType.kt")
+        @TestMetadata("protectedFunWithoutReturnType.kt")
         public void testProtectedFunWithoutReturnType() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/beforeProtectedFunWithoutReturnType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/protectedFunWithoutReturnType.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforePublicFunWithoutBody.kt")
+        @TestMetadata("publicFunWithoutBody.kt")
         public void testPublicFunWithoutBody() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/beforePublicFunWithoutBody.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/publicFunWithoutBody.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforePublicFunWithoutReturnType.kt")
+        @TestMetadata("publicFunWithoutReturnType.kt")
         public void testPublicFunWithoutReturnType() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/beforePublicFunWithoutReturnType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/publicFunWithoutReturnType.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforePublicFunWithoutReturnTypeCaretOnParameter.kt")
+        @TestMetadata("publicFunWithoutReturnTypeCaretOnParameter.kt")
         public void testPublicFunWithoutReturnTypeCaretOnParameter() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/beforePublicFunWithoutReturnTypeCaretOnParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/publicFunWithoutReturnTypeCaretOnParameter.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforePublicValWithoutReturnType.kt")
+        @TestMetadata("publicValWithoutReturnType.kt")
         public void testPublicValWithoutReturnType() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/beforePublicValWithoutReturnType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/publicValWithoutReturnType.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforePublicValWithoutReturnTypeCaretOnPublic.kt")
+        @TestMetadata("publicValWithoutReturnTypeCaretOnPublic.kt")
         public void testPublicValWithoutReturnTypeCaretOnPublic() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/beforePublicValWithoutReturnTypeCaretOnPublic.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeWrongGetterParameterType.kt")
+        @TestMetadata("wrongGetterParameterType.kt")
         public void testWrongGetterParameterType() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/beforeWrongGetterParameterType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/wrongGetterParameterType.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeWrongGetterParameterTypeLongNameRuntime.kt")
+        @TestMetadata("wrongGetterParameterTypeLongNameRuntime.kt")
         public void testWrongGetterParameterTypeLongNameRuntime() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/beforeWrongGetterParameterTypeLongNameRuntime.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/wrongGetterParameterTypeLongNameRuntime.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeWrongSetterParameterType.kt")
+        @TestMetadata("wrongSetterParameterType.kt")
         public void testWrongSetterParameterType() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/beforeWrongSetterParameterType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/wrongSetterParameterType.kt");
             doTest(fileName);
         }
     }
@@ -4647,36 +4647,36 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TypeImports extends AbstractQuickFixTest {
         public void testAllFilesPresentInTypeImports() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeImports"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeImports"), Pattern.compile("^(\\w+)\\.kt$"), true);
         }
 
-        @TestMetadata("beforeHasThisImport.kt")
+        @TestMetadata("hasThisImport.kt")
         public void testHasThisImport() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeImports/beforeHasThisImport.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeImports/hasThisImport.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeNoImportFromTheSameFile.kt")
+        @TestMetadata("noImportFromTheSameFile.kt")
         public void testNoImportFromTheSameFile() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeImports/beforeNoImportFromTheSameFile.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeImports/noImportFromTheSameFile.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeNoImportJavaLang.kt")
+        @TestMetadata("noImportJavaLang.kt")
         public void testNoImportJavaLang() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeImports/beforeNoImportJavaLang.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeImports/noImportJavaLang.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeNoImportJetStandard.kt")
+        @TestMetadata("noImportJetStandard.kt")
         public void testNoImportJetStandard() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeImports/beforeNoImportJetStandard.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeImports/noImportJetStandard.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeToImport1.kt")
+        @TestMetadata("toImport1.kt")
         public void testToImport1() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeImports/beforeToImport1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeImports/toImport1.kt");
             doTest(fileName);
         }
     }
@@ -4685,193 +4685,193 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TypeMismatch extends AbstractQuickFixTest {
-        @TestMetadata("beforeAccessibleLocalClassInReturn.kt")
+        @TestMetadata("accessibleLocalClassInReturn.kt")
         public void testAccessibleLocalClassInReturn() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeAccessibleLocalClassInReturn.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/accessibleLocalClassInReturn.kt");
             doTest(fileName);
         }
 
         public void testAllFilesPresentInTypeMismatch() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch"), Pattern.compile("^(\\w+)\\.kt$"), true);
         }
 
-        @TestMetadata("beforeAnonymousObjectInCall.kt")
+        @TestMetadata("anonymousObjectInCall.kt")
         public void testAnonymousObjectInCall() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeAnonymousObjectInCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/anonymousObjectInCall.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeAnonymousObjectInInfixCall.kt")
+        @TestMetadata("anonymousObjectInInfixCall.kt")
         public void testAnonymousObjectInInfixCall() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeAnonymousObjectInInfixCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/anonymousObjectInInfixCall.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeAnonymousObjectInInitializer.kt")
+        @TestMetadata("anonymousObjectInInitializer.kt")
         public void testAnonymousObjectInInitializer() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeAnonymousObjectInInitializer.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/anonymousObjectInInitializer.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeAnonymousObjectInReturn.kt")
+        @TestMetadata("anonymousObjectInReturn.kt")
         public void testAnonymousObjectInReturn() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeAnonymousObjectInReturn.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/anonymousObjectInReturn.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeAnyInReturn.kt")
+        @TestMetadata("anyInReturn.kt")
         public void testAnyInReturn() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeAnyInReturn.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/anyInReturn.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeChangeFunctionLiteralParameterTypeToFunctionType.kt")
+        @TestMetadata("changeFunctionLiteralParameterTypeToFunctionType.kt")
         public void testChangeFunctionLiteralParameterTypeToFunctionType() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeChangeFunctionLiteralParameterTypeToFunctionType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionType.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeChangeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt")
+        @TestMetadata("changeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt")
         public void testChangeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeChangeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeChangeFunctionReturnTypeToMatchExpectedTypeOfCall.kt")
+        @TestMetadata("changeFunctionReturnTypeToMatchExpectedTypeOfCall.kt")
         public void testChangeFunctionReturnTypeToMatchExpectedTypeOfCall() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeChangeFunctionReturnTypeToMatchExpectedTypeOfCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCall.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeChangeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt")
+        @TestMetadata("changeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt")
         public void testChangeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeChangeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeChangeReturnTypeToSpecificNullable.kt")
+        @TestMetadata("changeReturnTypeToSpecificNullable.kt")
         public void testChangeReturnTypeToSpecificNullable() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeChangeReturnTypeToSpecificNullable.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/changeReturnTypeToSpecificNullable.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeChangeReturnTypeWhenFunctionNameIsMissing.kt")
+        @TestMetadata("changeReturnTypeWhenFunctionNameIsMissing.kt")
         public void testChangeReturnTypeWhenFunctionNameIsMissing() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeChangeReturnTypeWhenFunctionNameIsMissing.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/changeReturnTypeWhenFunctionNameIsMissing.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeChangeReturnTypeWhenValueParameterListIsAbsent.kt")
+        @TestMetadata("changeReturnTypeWhenValueParameterListIsAbsent.kt")
         public void testChangeReturnTypeWhenValueParameterListIsAbsent() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeChangeReturnTypeWhenValueParameterListIsAbsent.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/changeReturnTypeWhenValueParameterListIsAbsent.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeCompareToTypeMismatch.kt")
+        @TestMetadata("compareToTypeMismatch.kt")
         public void testCompareToTypeMismatch() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeCompareToTypeMismatch.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/compareToTypeMismatch.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeConstantTypeMismatch.kt")
+        @TestMetadata("constantTypeMismatch.kt")
         public void testConstantTypeMismatch() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeConstantTypeMismatch.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/constantTypeMismatch.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeDontChangeOverriddenPropertyTypeToErrorType.kt")
+        @TestMetadata("dontChangeOverriddenPropertyTypeToErrorType.kt")
         public void testDontChangeOverriddenPropertyTypeToErrorType() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeDontChangeOverriddenPropertyTypeToErrorType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/dontChangeOverriddenPropertyTypeToErrorType.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeExpectedParameterTypeMismatch.kt")
+        @TestMetadata("expectedParameterTypeMismatch.kt")
         public void testExpectedParameterTypeMismatch() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeExpectedParameterTypeMismatch.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatch.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeExpectedParameterTypeMismatchLongNameRuntime.kt")
+        @TestMetadata("expectedParameterTypeMismatchLongNameRuntime.kt")
         public void testExpectedParameterTypeMismatchLongNameRuntime() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeExpectedParameterTypeMismatchLongNameRuntime.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatchLongNameRuntime.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeExpectedReturnTypeMismatch.kt")
+        @TestMetadata("expectedReturnTypeMismatch.kt")
         public void testExpectedReturnTypeMismatch() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeExpectedReturnTypeMismatch.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/expectedReturnTypeMismatch.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeHasNextFunctionReturnTypeMismatch.kt")
+        @TestMetadata("hasNextFunctionReturnTypeMismatch.kt")
         public void testHasNextFunctionReturnTypeMismatch() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeHasNextFunctionReturnTypeMismatch.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/hasNextFunctionReturnTypeMismatch.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeLocalClassInReturn1.kt")
+        @TestMetadata("localClassInReturn1.kt")
         public void testLocalClassInReturn1() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeLocalClassInReturn1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/localClassInReturn1.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeLocalClassInReturn2.kt")
+        @TestMetadata("localClassInReturn2.kt")
         public void testLocalClassInReturn2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeLocalClassInReturn2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/localClassInReturn2.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeMakeReturnTypeNullable.kt")
+        @TestMetadata("makeReturnTypeNullable.kt")
         public void testMakeReturnTypeNullable() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeMakeReturnTypeNullable.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/makeReturnTypeNullable.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeNoReturnInFunctionWithBlockBody.kt")
+        @TestMetadata("noReturnInFunctionWithBlockBody.kt")
         public void testNoReturnInFunctionWithBlockBody() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeNoReturnInFunctionWithBlockBody.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/noReturnInFunctionWithBlockBody.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeNullArgumentForNonNullParameter.kt")
+        @TestMetadata("nullArgumentForNonNullParameter.kt")
         public void testNullArgumentForNonNullParameter() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeNullArgumentForNonNullParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/nullArgumentForNonNullParameter.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforePropertyTypeMismatch.kt")
+        @TestMetadata("propertyTypeMismatch.kt")
         public void testPropertyTypeMismatch() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforePropertyTypeMismatch.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/propertyTypeMismatch.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforePropertyTypeMismatchLongNameRuntime.kt")
+        @TestMetadata("propertyTypeMismatchLongNameRuntime.kt")
         public void testPropertyTypeMismatchLongNameRuntime() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforePropertyTypeMismatchLongNameRuntime.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/propertyTypeMismatchLongNameRuntime.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeResolvableTypeParams.kt")
+        @TestMetadata("resolvableTypeParams.kt")
         public void testResolvableTypeParams() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeResolvableTypeParams.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/resolvableTypeParams.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeReturnTypeMismatch.kt")
+        @TestMetadata("returnTypeMismatch.kt")
         public void testReturnTypeMismatch() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeReturnTypeMismatch.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/returnTypeMismatch.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeTooManyArgumentsException.kt")
+        @TestMetadata("tooManyArgumentsException.kt")
         public void testTooManyArgumentsException() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeTooManyArgumentsException.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/tooManyArgumentsException.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeUnresolvableTypeParams.kt")
+        @TestMetadata("unresolvableTypeParams.kt")
         public void testUnresolvableTypeParams() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeUnresolvableTypeParams.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/unresolvableTypeParams.kt");
             doTest(fileName);
         }
 
@@ -4880,60 +4880,60 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class Casts extends AbstractQuickFixTest {
             public void testAllFilesPresentInCasts() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/casts"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/casts"), Pattern.compile("^(\\w+)\\.kt$"), true);
             }
 
-            @TestMetadata("beforeCastToFunctionType.kt")
+            @TestMetadata("castToFunctionType.kt")
             public void testCastToFunctionType() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/beforeCastToFunctionType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/castToFunctionType.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeSmartcastImpossible1.kt")
+            @TestMetadata("smartcastImpossible1.kt")
             public void testSmartcastImpossible1() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/beforeSmartcastImpossible1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/smartcastImpossible1.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeSmartcastImpossible2.kt")
+            @TestMetadata("smartcastImpossible2.kt")
             public void testSmartcastImpossible2() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/beforeSmartcastImpossible2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/smartcastImpossible2.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeSmartcastImpossible3.kt")
+            @TestMetadata("smartcastImpossible3.kt")
             public void testSmartcastImpossible3() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/beforeSmartcastImpossible3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/smartcastImpossible3.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeTypeMismatch1.kt")
+            @TestMetadata("typeMismatch1.kt")
             public void testTypeMismatch1() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatch1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/typeMismatch1.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeTypeMismatch2.kt")
+            @TestMetadata("typeMismatch2.kt")
             public void testTypeMismatch2() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatch2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/typeMismatch2.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeTypeMismatch3.kt")
+            @TestMetadata("typeMismatch3.kt")
             public void testTypeMismatch3() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatch3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/typeMismatch3.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeTypeMismatch4.kt")
+            @TestMetadata("typeMismatch4.kt")
             public void testTypeMismatch4() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatch4.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/typeMismatch4.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeTypeMismatchLongNameRuntime.kt")
+            @TestMetadata("typeMismatchLongNameRuntime.kt")
             public void testTypeMismatchLongNameRuntime() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatchLongNameRuntime.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/typeMismatchLongNameRuntime.kt");
                 doTest(fileName);
             }
         }
@@ -4943,36 +4943,36 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ComponentFunctionReturnTypeMismatch extends AbstractQuickFixTest {
             public void testAllFilesPresentInComponentFunctionReturnTypeMismatch() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch"), Pattern.compile("^(\\w+)\\.kt$"), true);
             }
 
-            @TestMetadata("beforeComponentFunctionReturnTypeMismatch1.kt")
+            @TestMetadata("componentFunctionReturnTypeMismatch1.kt")
             public void testComponentFunctionReturnTypeMismatch1() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/beforeComponentFunctionReturnTypeMismatch1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch1.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeComponentFunctionReturnTypeMismatch2.kt")
+            @TestMetadata("componentFunctionReturnTypeMismatch2.kt")
             public void testComponentFunctionReturnTypeMismatch2() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/beforeComponentFunctionReturnTypeMismatch2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch2.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeComponentFunctionReturnTypeMismatch3.kt")
+            @TestMetadata("componentFunctionReturnTypeMismatch3.kt")
             public void testComponentFunctionReturnTypeMismatch3() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/beforeComponentFunctionReturnTypeMismatch3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch3.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeComponentFunctionReturnTypeMismatch4.kt")
+            @TestMetadata("componentFunctionReturnTypeMismatch4.kt")
             public void testComponentFunctionReturnTypeMismatch4() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/beforeComponentFunctionReturnTypeMismatch4.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch4.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeComponentFunctionReturnTypeMismatch5.kt")
+            @TestMetadata("componentFunctionReturnTypeMismatch5.kt")
             public void testComponentFunctionReturnTypeMismatch5() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/beforeComponentFunctionReturnTypeMismatch5.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch5.kt");
                 doTest(fileName);
             }
         }
@@ -4982,24 +4982,24 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class FixOverloadedOperator extends AbstractQuickFixTest {
             public void testAllFilesPresentInFixOverloadedOperator() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/fixOverloadedOperator"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/fixOverloadedOperator"), Pattern.compile("^(\\w+)\\.kt$"), true);
             }
 
-            @TestMetadata("beforeChangeNotFunctionReturnType.kt")
+            @TestMetadata("changeNotFunctionReturnType.kt")
             public void testChangeNotFunctionReturnType() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/fixOverloadedOperator/beforeChangeNotFunctionReturnType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changeNotFunctionReturnType.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeChangePlusFunctionReturnType.kt")
+            @TestMetadata("changePlusFunctionReturnType.kt")
             public void testChangePlusFunctionReturnType() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/fixOverloadedOperator/beforeChangePlusFunctionReturnType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changePlusFunctionReturnType.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeChangeTimesFunctionParameterType.kt")
+            @TestMetadata("changeTimesFunctionParameterType.kt")
             public void testChangeTimesFunctionParameterType() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/fixOverloadedOperator/beforeChangeTimesFunctionParameterType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changeTimesFunctionParameterType.kt");
                 doTest(fileName);
             }
         }
@@ -5009,54 +5009,54 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ParameterTypeMismatch extends AbstractQuickFixTest {
             public void testAllFilesPresentInParameterTypeMismatch() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/parameterTypeMismatch"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/parameterTypeMismatch"), Pattern.compile("^(\\w+)\\.kt$"), true);
             }
 
-            @TestMetadata("beforeChangeFunctionParameterType1.kt")
+            @TestMetadata("changeFunctionParameterType1.kt")
             public void testChangeFunctionParameterType1() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeFunctionParameterType1.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeChangeFunctionParameterType2.kt")
+            @TestMetadata("changeFunctionParameterType2.kt")
             public void testChangeFunctionParameterType2() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeFunctionParameterType2.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeChangeFunctionParameterType3.kt")
+            @TestMetadata("changeFunctionParameterType3.kt")
             public void testChangeFunctionParameterType3() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeFunctionParameterType3.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeChangeFunctionParameterType4.kt")
+            @TestMetadata("changeFunctionParameterType4.kt")
             public void testChangeFunctionParameterType4() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType4.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeFunctionParameterType4.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeChangeFunctionParameterType5.kt")
+            @TestMetadata("changeFunctionParameterType5.kt")
             public void testChangeFunctionParameterType5() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType5.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeFunctionParameterType5.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeChangeParameterTypeLongNameRuntime.kt")
+            @TestMetadata("changeParameterTypeLongNameRuntime.kt")
             public void testChangeParameterTypeLongNameRuntime() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeParameterTypeLongNameRuntime.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeParameterTypeLongNameRuntime.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeChangePrimaryConstructorParameterType.kt")
+            @TestMetadata("changePrimaryConstructorParameterType.kt")
             public void testChangePrimaryConstructorParameterType() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangePrimaryConstructorParameterType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changePrimaryConstructorParameterType.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeMultiFakeOverride.kt")
+            @TestMetadata("multiFakeOverride.kt")
             public void testMultiFakeOverride() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeMultiFakeOverride.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/multiFakeOverride.kt");
                 doTest(fileName);
             }
         }
@@ -5066,114 +5066,114 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class TypeMismatchOnReturnedExpression extends AbstractQuickFixTest {
             public void testAllFilesPresentInTypeMismatchOnReturnedExpression() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression"), Pattern.compile("^(\\w+)\\.kt$"), true);
             }
 
-            @TestMetadata("beforeAssignmentTypeMismatch.kt")
+            @TestMetadata("assignmentTypeMismatch.kt")
             public void testAssignmentTypeMismatch() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeAssignmentTypeMismatch.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/assignmentTypeMismatch.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeChangeFunctionLiteralTypeWithoutChangingFunctionParameterType.kt")
+            @TestMetadata("changeFunctionLiteralTypeWithoutChangingFunctionParameterType.kt")
             public void testChangeFunctionLiteralTypeWithoutChangingFunctionParameterType() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeChangeFunctionLiteralTypeWithoutChangingFunctionParameterType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionLiteralTypeWithoutChangingFunctionParameterType.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeChangeFunctionLiteralTypeWithoutChangingPropertyType.kt")
+            @TestMetadata("changeFunctionLiteralTypeWithoutChangingPropertyType.kt")
             public void testChangeFunctionLiteralTypeWithoutChangingPropertyType() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeChangeFunctionLiteralTypeWithoutChangingPropertyType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionLiteralTypeWithoutChangingPropertyType.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeChangeFunctionReturnTypeToFunctionType.kt")
+            @TestMetadata("changeFunctionReturnTypeToFunctionType.kt")
             public void testChangeFunctionReturnTypeToFunctionType() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeChangeFunctionReturnTypeToFunctionType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToFunctionType.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeChangeFunctionReturnTypeToMatchReturnTypeOfReturnedLiteral.kt")
+            @TestMetadata("changeFunctionReturnTypeToMatchReturnTypeOfReturnedLiteral.kt")
             public void testChangeFunctionReturnTypeToMatchReturnTypeOfReturnedLiteral() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeChangeFunctionReturnTypeToMatchReturnTypeOfReturnedLiteral.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToMatchReturnTypeOfReturnedLiteral.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeDontChangeFunctionReturnTypeToErrorType.kt")
+            @TestMetadata("dontChangeFunctionReturnTypeToErrorType.kt")
             public void testDontChangeFunctionReturnTypeToErrorType() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeDontChangeFunctionReturnTypeToErrorType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/dontChangeFunctionReturnTypeToErrorType.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeExpectedTypeMismatch.kt")
+            @TestMetadata("expectedTypeMismatch.kt")
             public void testExpectedTypeMismatch() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeExpectedTypeMismatch.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/expectedTypeMismatch.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeMultiFakeOverride.kt")
+            @TestMetadata("multiFakeOverride.kt")
             public void testMultiFakeOverride() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeMultiFakeOverride.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiFakeOverride.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeMultiFakeOverrideForOperatorConvention.kt")
+            @TestMetadata("multiFakeOverrideForOperatorConvention.kt")
             public void testMultiFakeOverrideForOperatorConvention() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeMultiFakeOverrideForOperatorConvention.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiFakeOverrideForOperatorConvention.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeNonLocalReturnRuntime.kt")
+            @TestMetadata("nonLocalReturnRuntime.kt")
             public void testNonLocalReturnRuntime() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeNonLocalReturnRuntime.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/nonLocalReturnRuntime.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeNonLocalReturnWithLabelRuntime.kt")
+            @TestMetadata("nonLocalReturnWithLabelRuntime.kt")
             public void testNonLocalReturnWithLabelRuntime() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeNonLocalReturnWithLabelRuntime.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/nonLocalReturnWithLabelRuntime.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforePropertyGetterInitializerTypeMismatch.kt")
+            @TestMetadata("propertyGetterInitializerTypeMismatch.kt")
             public void testPropertyGetterInitializerTypeMismatch() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforePropertyGetterInitializerTypeMismatch.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterInitializerTypeMismatch.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeReturnedExpresionCantEvaluateToExpresionThatTypeMismatch.kt")
+            @TestMetadata("returnedExpresionCantEvaluateToExpresionThatTypeMismatch.kt")
             public void testReturnedExpresionCantEvaluateToExpresionThatTypeMismatch() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeReturnedExpresionCantEvaluateToExpresionThatTypeMismatch.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/returnedExpresionCantEvaluateToExpresionThatTypeMismatch.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeReturnedExpressionTypeMismatchFunctionParameterType.kt")
+            @TestMetadata("returnedExpressionTypeMismatchFunctionParameterType.kt")
             public void testReturnedExpressionTypeMismatchFunctionParameterType() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeReturnedExpressionTypeMismatchFunctionParameterType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/returnedExpressionTypeMismatchFunctionParameterType.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeTypeMismatchInIfStatementReturnedByFunction.kt")
+            @TestMetadata("typeMismatchInIfStatementReturnedByFunction.kt")
             public void testTypeMismatchInIfStatementReturnedByFunction() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeTypeMismatchInIfStatementReturnedByFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByFunction.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeTypeMismatchInIfStatementReturnedByLiteral.kt")
+            @TestMetadata("typeMismatchInIfStatementReturnedByLiteral.kt")
             public void testTypeMismatchInIfStatementReturnedByLiteral() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeTypeMismatchInIfStatementReturnedByLiteral.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByLiteral.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeTypeMismatchInInitializer.kt")
+            @TestMetadata("typeMismatchInInitializer.kt")
             public void testTypeMismatchInInitializer() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeTypeMismatchInInitializer.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInInitializer.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeTypeMismatchInReturnStatement.kt")
+            @TestMetadata("typeMismatchInReturnStatement.kt")
             public void testTypeMismatchInReturnStatement() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeTypeMismatchInReturnStatement.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInReturnStatement.kt");
                 doTest(fileName);
             }
         }
@@ -5184,48 +5184,48 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TypeProjection extends AbstractQuickFixTest {
         public void testAllFilesPresentInTypeProjection() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeProjection"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeProjection"), Pattern.compile("^(\\w+)\\.kt$"), true);
         }
 
-        @TestMetadata("beforeConflictingProjection.kt")
+        @TestMetadata("conflictingProjection.kt")
         public void testConflictingProjection() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/beforeConflictingProjection.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/conflictingProjection.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeProjectionInImmediateArgumentToSupertype.kt")
+        @TestMetadata("projectionInImmediateArgumentToSupertype.kt")
         public void testProjectionInImmediateArgumentToSupertype() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/beforeProjectionInImmediateArgumentToSupertype.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/projectionInImmediateArgumentToSupertype.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeProjectionOnNonClassTypeArgument1.kt")
+        @TestMetadata("projectionOnNonClassTypeArgument1.kt")
         public void testProjectionOnNonClassTypeArgument1() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/beforeProjectionOnNonClassTypeArgument1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument1.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeProjectionOnNonClassTypeArgument2.kt")
+        @TestMetadata("projectionOnNonClassTypeArgument2.kt")
         public void testProjectionOnNonClassTypeArgument2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/beforeProjectionOnNonClassTypeArgument2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument2.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeRemoveRedundantProjection1.kt")
+        @TestMetadata("removeRedundantProjection1.kt")
         public void testRemoveRedundantProjection1() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/beforeRemoveRedundantProjection1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/removeRedundantProjection1.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeRemoveRedundantProjection2.kt")
+        @TestMetadata("removeRedundantProjection2.kt")
         public void testRemoveRedundantProjection2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/beforeRemoveRedundantProjection2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/removeRedundantProjection2.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeRemoveVariance.kt")
+        @TestMetadata("removeVariance.kt")
         public void testRemoveVariance() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/beforeRemoveVariance.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/removeVariance.kt");
             doTest(fileName);
         }
     }
@@ -5235,18 +5235,18 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Variables extends AbstractQuickFixTest {
         public void testAllFilesPresentInVariables() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables"), Pattern.compile("^(\\w+)\\.kt$"), true);
         }
 
-        @TestMetadata("beforeUnusedVariableWithInitializer.kt")
+        @TestMetadata("unusedVariableWithInitializer.kt")
         public void testUnusedVariableWithInitializer() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/beforeUnusedVariableWithInitializer.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/unusedVariableWithInitializer.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeUnusedVariableWithoutInitializer.kt")
+        @TestMetadata("unusedVariableWithoutInitializer.kt")
         public void testUnusedVariableWithoutInitializer() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/beforeUnusedVariableWithoutInitializer.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/unusedVariableWithoutInitializer.kt");
             doTest(fileName);
         }
 
@@ -5255,36 +5255,36 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ChangeMutability extends AbstractQuickFixTest {
             public void testAllFilesPresentInChangeMutability() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables/changeMutability"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables/changeMutability"), Pattern.compile("^(\\w+)\\.kt$"), true);
             }
 
-            @TestMetadata("beforeValOverrideVar.kt")
+            @TestMetadata("valOverrideVar.kt")
             public void testValOverrideVar() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeMutability/beforeValOverrideVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeMutability/valOverrideVar.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeValReassignmentLocal.kt")
+            @TestMetadata("valReassignmentLocal.kt")
             public void testValReassignmentLocal() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeMutability/beforeValReassignmentLocal.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeMutability/valReassignmentLocal.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeValReassignmentOuterDecl.kt")
+            @TestMetadata("valReassignmentOuterDecl.kt")
             public void testValReassignmentOuterDecl() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeMutability/beforeValReassignmentOuterDecl.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeMutability/valReassignmentOuterDecl.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeValReassignmentProperty.kt")
+            @TestMetadata("valReassignmentProperty.kt")
             public void testValReassignmentProperty() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeMutability/beforeValReassignmentProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeMutability/valReassignmentProperty.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeValWithSetter.kt")
+            @TestMetadata("valWithSetter.kt")
             public void testValWithSetter() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeMutability/beforeValWithSetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeMutability/valWithSetter.kt");
                 doTest(fileName);
             }
         }
@@ -5294,18 +5294,18 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ChangeToBackingField extends AbstractQuickFixTest {
             public void testAllFilesPresentInChangeToBackingField() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables/changeToBackingField"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables/changeToBackingField"), Pattern.compile("^(\\w+)\\.kt$"), true);
             }
 
-            @TestMetadata("beforeBFRequired.kt")
+            @TestMetadata("bFRequired.kt")
             public void testBFRequired() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeToBackingField/beforeBFRequired.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeToBackingField/bFRequired.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeKt510.kt")
+            @TestMetadata("kt510.kt")
             public void testKt510() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeToBackingField/beforeKt510.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeToBackingField/kt510.kt");
                 doTest(fileName);
             }
         }
@@ -5315,12 +5315,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ChangeToFunctionInvocation extends AbstractQuickFixTest {
             public void testAllFilesPresentInChangeToFunctionInvocation() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables/changeToFunctionInvocation"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables/changeToFunctionInvocation"), Pattern.compile("^(\\w+)\\.kt$"), true);
             }
 
-            @TestMetadata("beforeFunInvWithoutParentheses.kt")
+            @TestMetadata("funInvWithoutParentheses.kt")
             public void testFunInvWithoutParentheses() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeToFunctionInvocation/beforeFunInvWithoutParentheses.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeToFunctionInvocation/funInvWithoutParentheses.kt");
                 doTest(fileName);
             }
         }
@@ -5329,37 +5329,37 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ChangeToPropertyName extends AbstractQuickFixTest {
-            @TestMetadata("beforeAbstractProperty.kt")
+            @TestMetadata("abstractProperty.kt")
             public void testAbstractProperty() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeToPropertyName/beforeAbstractProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeToPropertyName/abstractProperty.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeAbstractPropertyThis.kt")
+            @TestMetadata("abstractPropertyThis.kt")
             public void testAbstractPropertyThis() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeToPropertyName/beforeAbstractPropertyThis.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeToPropertyName/abstractPropertyThis.kt");
                 doTest(fileName);
             }
 
             public void testAllFilesPresentInChangeToPropertyName() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables/changeToPropertyName"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables/changeToPropertyName"), Pattern.compile("^(\\w+)\\.kt$"), true);
             }
 
-            @TestMetadata("beforeCustomAccessors.kt")
+            @TestMetadata("customAccessors.kt")
             public void testCustomAccessors() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeToPropertyName/beforeCustomAccessors.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeToPropertyName/customAccessors.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeInaccessibleBackingField.kt")
+            @TestMetadata("inaccessibleBackingField.kt")
             public void testInaccessibleBackingField() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeToPropertyName/beforeInaccessibleBackingField.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeToPropertyName/inaccessibleBackingField.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeInaccessibleBackingFieldQualified.kt")
+            @TestMetadata("inaccessibleBackingFieldQualified.kt")
             public void testInaccessibleBackingFieldQualified() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeToPropertyName/beforeInaccessibleBackingFieldQualified.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeToPropertyName/inaccessibleBackingFieldQualified.kt");
                 doTest(fileName);
             }
         }
@@ -5369,42 +5369,42 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class RemoveValVarFromParameter extends AbstractQuickFixTest {
             public void testAllFilesPresentInRemoveValVarFromParameter() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables/removeValVarFromParameter"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables/removeValVarFromParameter"), Pattern.compile("^(\\w+)\\.kt$"), true);
             }
 
-            @TestMetadata("beforeCatchParameter.kt")
+            @TestMetadata("catchParameter.kt")
             public void testCatchParameter() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/removeValVarFromParameter/beforeCatchParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/removeValVarFromParameter/catchParameter.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeConstructorParameter.kt")
+            @TestMetadata("constructorParameter.kt")
             public void testConstructorParameter() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/removeValVarFromParameter/beforeConstructorParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/removeValVarFromParameter/constructorParameter.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeFunParameter.kt")
+            @TestMetadata("funParameter.kt")
             public void testFunParameter() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/removeValVarFromParameter/beforeFunParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/removeValVarFromParameter/funParameter.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeLoopParameter.kt")
+            @TestMetadata("loopParameter.kt")
             public void testLoopParameter() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/removeValVarFromParameter/beforeLoopParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/removeValVarFromParameter/loopParameter.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeParameterWithComment.kt")
+            @TestMetadata("parameterWithComment.kt")
             public void testParameterWithComment() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/removeValVarFromParameter/beforeParameterWithComment.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/removeValVarFromParameter/parameterWithComment.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("beforeSecondaryConstructorParameter.kt")
+            @TestMetadata("secondaryConstructorParameter.kt")
             public void testSecondaryConstructorParameter() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/removeValVarFromParameter/beforeSecondaryConstructorParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/removeValVarFromParameter/secondaryConstructorParameter.kt");
                 doTest(fileName);
             }
         }
@@ -5415,30 +5415,30 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class When extends AbstractQuickFixTest {
         public void testAllFilesPresentInWhen() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/when"), Pattern.compile("^before(\\w+)\\.kt$"), true);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/when"), Pattern.compile("^(\\w+)\\.kt$"), true);
         }
 
-        @TestMetadata("beforeElseNotLastInWhen.kt")
+        @TestMetadata("elseNotLastInWhen.kt")
         public void testElseNotLastInWhen() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/when/beforeElseNotLastInWhen.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/when/elseNotLastInWhen.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeNoElseInWhenWithBranches.kt")
+        @TestMetadata("noElseInWhenWithBranches.kt")
         public void testNoElseInWhenWithBranches() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/when/beforeNoElseInWhenWithBranches.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/when/noElseInWhenWithBranches.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeNoElseInWhenWithoutBranches.kt")
+        @TestMetadata("noElseInWhenWithoutBranches.kt")
         public void testNoElseInWhenWithoutBranches() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/when/beforeNoElseInWhenWithoutBranches.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/when/noElseInWhenWithoutBranches.kt");
             doTest(fileName);
         }
 
-        @TestMetadata("beforeTwoElseBranchesInWhen.kt")
+        @TestMetadata("twoElseBranchesInWhen.kt")
         public void testTwoElseBranchesInWhen() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/when/beforeTwoElseBranchesInWhen.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/when/twoElseBranchesInWhen.kt");
             doTest(fileName);
         }
     }