diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/javaFacade/KotlinJavaFacadeTest.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/javaFacade/KotlinJavaFacadeTest.java
index 4d052d23fc71..72cf4c68ca40 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/javaFacade/KotlinJavaFacadeTest.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/javaFacade/KotlinJavaFacadeTest.java
@@ -16,7 +16,6 @@ import org.jetbrains.kotlin.asJava.classes.KtUltraLightClass;
 import org.jetbrains.kotlin.asJava.elements.KtLightMethod;
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase;
 import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor;
-import org.jetbrains.kotlin.idea.test.PluginTestCaseBase;
 import org.jetbrains.kotlin.name.SpecialNames;
 import org.jetbrains.kotlin.psi.*;
 import org.junit.internal.runners.JUnit38ClassRunner;
@@ -300,10 +299,4 @@ public class KotlinJavaFacadeTest extends KotlinLightCodeInsightFixtureTestCase
             lightClass.getClsDelegate();
         }
     }
-
-    @NotNull
-    @Override
-    protected String fileName() {
-        return getTestName(true) + ".kt";
-    }
 }
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/classObject.kt b/plugins/kotlin/idea/tests/testData/javaFacade/ClassObject.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/classObject.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/ClassObject.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/classWithObjectLiteralInClassObjectField.kt b/plugins/kotlin/idea/tests/testData/javaFacade/ClassWithObjectLiteralInClassObjectField.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/classWithObjectLiteralInClassObjectField.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/ClassWithObjectLiteralInClassObjectField.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/classWithObjectLiteralInConstructorProperty.kt b/plugins/kotlin/idea/tests/testData/javaFacade/ClassWithObjectLiteralInConstructorProperty.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/classWithObjectLiteralInConstructorProperty.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/ClassWithObjectLiteralInConstructorProperty.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/classWithObjectLiteralInField.kt b/plugins/kotlin/idea/tests/testData/javaFacade/ClassWithObjectLiteralInField.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/classWithObjectLiteralInField.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/ClassWithObjectLiteralInField.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/classWithObjectLiteralInFun.kt b/plugins/kotlin/idea/tests/testData/javaFacade/ClassWithObjectLiteralInFun.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/classWithObjectLiteralInFun.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/ClassWithObjectLiteralInFun.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/doNotWrapFunFromLocalClass.kt b/plugins/kotlin/idea/tests/testData/javaFacade/DoNotWrapFunFromLocalClass.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/doNotWrapFunFromLocalClass.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/DoNotWrapFunFromLocalClass.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/doNotWrapFunInAnonymousObject.kt b/plugins/kotlin/idea/tests/testData/javaFacade/DoNotWrapFunInAnonymousObject.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/doNotWrapFunInAnonymousObject.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/DoNotWrapFunInAnonymousObject.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/ea37034.kt b/plugins/kotlin/idea/tests/testData/javaFacade/Ea37034.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/ea37034.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/Ea37034.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/ea46019.kt b/plugins/kotlin/idea/tests/testData/javaFacade/Ea46019.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/ea46019.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/Ea46019.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/ea68569.kt b/plugins/kotlin/idea/tests/testData/javaFacade/Ea68569.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/ea68569.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/Ea68569.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/innerClass.kt b/plugins/kotlin/idea/tests/testData/javaFacade/InnerClass.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/innerClass.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/InnerClass.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/kt2764.kt b/plugins/kotlin/idea/tests/testData/javaFacade/Kt2764.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/kt2764.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/Kt2764.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/lightClassIsNotCreatedForBuiltins.kt b/plugins/kotlin/idea/tests/testData/javaFacade/LightClassIsNotCreatedForBuiltins.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/lightClassIsNotCreatedForBuiltins.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/LightClassIsNotCreatedForBuiltins.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/localClassSubclass.kt b/plugins/kotlin/idea/tests/testData/javaFacade/LocalClassSubclass.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/localClassSubclass.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/LocalClassSubclass.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/objectSubclassing.kt b/plugins/kotlin/idea/tests/testData/javaFacade/ObjectSubclassing.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/objectSubclassing.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/ObjectSubclassing.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/wrapConstructorField.kt b/plugins/kotlin/idea/tests/testData/javaFacade/WrapConstructorField.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/wrapConstructorField.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/WrapConstructorField.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/wrapConstructorParameter.kt b/plugins/kotlin/idea/tests/testData/javaFacade/WrapConstructorParameter.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/wrapConstructorParameter.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/WrapConstructorParameter.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/wrapFunInClassObject.kt b/plugins/kotlin/idea/tests/testData/javaFacade/WrapFunInClassObject.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/wrapFunInClassObject.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/WrapFunInClassObject.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/wrapFunInClassWithoutBody.kt b/plugins/kotlin/idea/tests/testData/javaFacade/WrapFunInClassWithoutBody.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/wrapFunInClassWithoutBody.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/WrapFunInClassWithoutBody.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/wrapFunInObject.kt b/plugins/kotlin/idea/tests/testData/javaFacade/WrapFunInObject.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/wrapFunInObject.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/WrapFunInObject.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/wrapFunInObjectInObject.kt b/plugins/kotlin/idea/tests/testData/javaFacade/WrapFunInObjectInObject.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/wrapFunInObjectInObject.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/WrapFunInObjectInObject.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/wrapFunWithDefaultParam.kt b/plugins/kotlin/idea/tests/testData/javaFacade/WrapFunWithDefaultParam.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/wrapFunWithDefaultParam.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/WrapFunWithDefaultParam.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/wrapFunWithImplInTrait.kt b/plugins/kotlin/idea/tests/testData/javaFacade/WrapFunWithImplInTrait.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/wrapFunWithImplInTrait.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/WrapFunWithImplInTrait.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/wrapFunWithoutImplInTrait.kt b/plugins/kotlin/idea/tests/testData/javaFacade/WrapFunWithoutImplInTrait.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/wrapFunWithoutImplInTrait.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/WrapFunWithoutImplInTrait.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/wrapFunctionParameter.kt b/plugins/kotlin/idea/tests/testData/javaFacade/WrapFunctionParameter.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/wrapFunctionParameter.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/WrapFunctionParameter.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/wrapTopLevelFun.kt b/plugins/kotlin/idea/tests/testData/javaFacade/WrapTopLevelFun.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/wrapTopLevelFun.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/WrapTopLevelFun.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/wrapTopLevelFunWithDefaultParams.kt b/plugins/kotlin/idea/tests/testData/javaFacade/WrapTopLevelFunWithDefaultParams.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/wrapTopLevelFunWithDefaultParams.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/WrapTopLevelFunWithDefaultParams.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/wrapValTopLevelProperty.kt b/plugins/kotlin/idea/tests/testData/javaFacade/WrapValTopLevelProperty.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/wrapValTopLevelProperty.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/WrapValTopLevelProperty.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/wrapVarPropertyInClass.kt b/plugins/kotlin/idea/tests/testData/javaFacade/WrapVarPropertyInClass.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/wrapVarPropertyInClass.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/WrapVarPropertyInClass.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/wrapVarPropertyInLocalClass.kt b/plugins/kotlin/idea/tests/testData/javaFacade/WrapVarPropertyInLocalClass.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/wrapVarPropertyInLocalClass.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/WrapVarPropertyInLocalClass.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/wrapVarPropertyWithAccessorsInTrait.kt b/plugins/kotlin/idea/tests/testData/javaFacade/WrapVarPropertyWithAccessorsInTrait.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/wrapVarPropertyWithAccessorsInTrait.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/WrapVarPropertyWithAccessorsInTrait.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/wrapVarTopLevelAccessor.kt b/plugins/kotlin/idea/tests/testData/javaFacade/WrapVarTopLevelAccessor.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/wrapVarTopLevelAccessor.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/WrapVarTopLevelAccessor.kt
diff --git a/plugins/kotlin/idea/tests/testData/javaFacade/wrapVarTopLevelProperty.kt b/plugins/kotlin/idea/tests/testData/javaFacade/WrapVarTopLevelProperty.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/javaFacade/wrapVarTopLevelProperty.kt
rename to plugins/kotlin/idea/tests/testData/javaFacade/WrapVarTopLevelProperty.kt