diff --git a/java/java-tests/testData/refactoring/inplaceIntroduceField/NearAnotherDeclaration.java b/java/java-tests/testData/refactoring/inplaceIntroduceField/extractNearAnotherDeclaration.java
similarity index 100%
rename from java/java-tests/testData/refactoring/inplaceIntroduceField/NearAnotherDeclaration.java
rename to java/java-tests/testData/refactoring/inplaceIntroduceField/extractNearAnotherDeclaration.java
diff --git a/java/java-tests/testData/refactoring/inplaceIntroduceField/NearAnotherDeclaration_after.java b/java/java-tests/testData/refactoring/inplaceIntroduceField/extractNearAnotherDeclaration_after.java
similarity index 100%
rename from java/java-tests/testData/refactoring/inplaceIntroduceField/NearAnotherDeclaration_after.java
rename to java/java-tests/testData/refactoring/inplaceIntroduceField/extractNearAnotherDeclaration_after.java
diff --git a/java/java-tests/testData/refactoring/inplaceIntroduceParameter/NoConflictingVariable.java b/java/java-tests/testData/refactoring/inplaceIntroduceParameter/noConflictingVariableDueToReparse.java
similarity index 100%
rename from java/java-tests/testData/refactoring/inplaceIntroduceParameter/NoConflictingVariable.java
rename to java/java-tests/testData/refactoring/inplaceIntroduceParameter/noConflictingVariableDueToReparse.java
diff --git a/java/java-tests/testData/refactoring/inplaceIntroduceParameter/NoConflictingVariable_after.java b/java/java-tests/testData/refactoring/inplaceIntroduceParameter/noConflictingVariableDueToReparse_after.java
similarity index 100%
rename from java/java-tests/testData/refactoring/inplaceIntroduceParameter/NoConflictingVariable_after.java
rename to java/java-tests/testData/refactoring/inplaceIntroduceParameter/noConflictingVariableDueToReparse_after.java
diff --git a/java/java-tests/testSrc/com/intellij/refactoring/InplaceIntroduceFieldTest.java b/java/java-tests/testSrc/com/intellij/refactoring/InplaceIntroduceFieldTest.java
index 74d9a97e5d85..6dac27f07eb8 100644
--- a/java/java-tests/testSrc/com/intellij/refactoring/InplaceIntroduceFieldTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/InplaceIntroduceFieldTest.java
@@ -124,7 +124,7 @@ public class InplaceIntroduceFieldTest extends AbstractJavaInplaceIntroduceTest
     doTestEscape();
   }
 
-  public void testNearAnotherDeclaration() throws Exception {
+  public void testExtractNearAnotherDeclaration() throws Exception {
     doTest(new Pass<AbstractInplaceIntroducer>() {
       @Override
       public void pass(AbstractInplaceIntroducer introducer) {}
diff --git a/java/java-tests/testSrc/com/intellij/refactoring/InplaceIntroduceParameterTest.java b/java/java-tests/testSrc/com/intellij/refactoring/InplaceIntroduceParameterTest.java
index 411516fc4e18..60febdf8401e 100644
--- a/java/java-tests/testSrc/com/intellij/refactoring/InplaceIntroduceParameterTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/InplaceIntroduceParameterTest.java
@@ -125,7 +125,7 @@ public class InplaceIntroduceParameterTest extends AbstractJavaInplaceIntroduceT
     });
   }
 
-  public void testNoConflictingVariable() throws Exception {
+  public void testNoConflictingVariableDueToReparse() throws Exception {
     doTest(new Pass<AbstractInplaceIntroducer>() {
       @Override
       public void pass(AbstractInplaceIntroducer inplaceIntroducePopup) {