diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index 21d92effb46..03c9b298e76 100644
--- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -752,8 +752,8 @@ fun main(args: Array<String>) {
     }
 
     testGroup("plugins/android-idea-plugin/tests", "plugins/android-idea-plugin/testData") {
-        testClass(javaClass<AbstractCrossParserTest>()) {
-            model("android/crossParser", recursive = false, extension = null)
+        testClass(javaClass<AbstractParserResultEqualityTest>()) {
+            model("android/parserResultEquality", recursive = false, extension = null)
         }
 
         testClass(javaClass<AbstractAndroidCompletionTest>()) {
diff --git a/plugins/android-idea-plugin/testData/android/completion/multiFile/multiFile.kt b/plugins/android-idea-plugin/testData/android/completion/multiFile/multiFile.kt
index 1a81c61f283..54bbc38d123 100644
--- a/plugins/android-idea-plugin/testData/android/completion/multiFile/multiFile.kt
+++ b/plugins/android-idea-plugin/testData/android/completion/multiFile/multiFile.kt
@@ -4,7 +4,7 @@ import android.app.Activity
 
 
 class MyActivity: Activity() {
-    val button = this.log<caret>
+    val button = log<caret>
 }
 
 // EXIST: login, loginButton
diff --git a/plugins/android-idea-plugin/testData/android/crossParser/AndroidManifest.xml b/plugins/android-idea-plugin/testData/android/parserResultEquality/AndroidManifest.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/crossParser/AndroidManifest.xml
rename to plugins/android-idea-plugin/testData/android/parserResultEquality/AndroidManifest.xml
diff --git a/plugins/android-idea-plugin/testData/android/crossParser/fqNameInAttr/res/layout/layout.xml b/plugins/android-idea-plugin/testData/android/parserResultEquality/fqNameInAttr/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/crossParser/fqNameInAttr/res/layout/layout.xml
rename to plugins/android-idea-plugin/testData/android/parserResultEquality/fqNameInAttr/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/crossParser/fqNameInTag/res/layout/layout.xml b/plugins/android-idea-plugin/testData/android/parserResultEquality/fqNameInTag/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/crossParser/fqNameInTag/res/layout/layout.xml
rename to plugins/android-idea-plugin/testData/android/parserResultEquality/fqNameInTag/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/crossParser/multiFile/res/layout/layout.xml b/plugins/android-idea-plugin/testData/android/parserResultEquality/multiFile/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/crossParser/multiFile/res/layout/layout.xml
rename to plugins/android-idea-plugin/testData/android/parserResultEquality/multiFile/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/crossParser/multiFile/res/layout/layout1.xml b/plugins/android-idea-plugin/testData/android/parserResultEquality/multiFile/res/layout/layout1.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/crossParser/multiFile/res/layout/layout1.xml
rename to plugins/android-idea-plugin/testData/android/parserResultEquality/multiFile/res/layout/layout1.xml
diff --git a/plugins/android-idea-plugin/testData/android/crossParser/noIds/res/layout/layout.xml b/plugins/android-idea-plugin/testData/android/parserResultEquality/noIds/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/crossParser/noIds/res/layout/layout.xml
rename to plugins/android-idea-plugin/testData/android/parserResultEquality/noIds/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/testData/android/crossParser/nolayout/res/nofiles.txt b/plugins/android-idea-plugin/testData/android/parserResultEquality/nolayout/res/nofiles.txt
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/crossParser/nolayout/res/nofiles.txt
rename to plugins/android-idea-plugin/testData/android/parserResultEquality/nolayout/res/nofiles.txt
diff --git a/plugins/android-idea-plugin/testData/android/crossParser/singleFile/res/layout/layout.xml b/plugins/android-idea-plugin/testData/android/parserResultEquality/singleFile/res/layout/layout.xml
similarity index 100%
rename from plugins/android-idea-plugin/testData/android/crossParser/singleFile/res/layout/layout.xml
rename to plugins/android-idea-plugin/testData/android/parserResultEquality/singleFile/res/layout/layout.xml
diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractCrossParserTest.kt b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractParserResultEqualityTest.kt
similarity index 94%
rename from plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractCrossParserTest.kt
rename to plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractParserResultEqualityTest.kt
index ff14d1cddb7..147e8cce87c 100644
--- a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractCrossParserTest.kt
+++ b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractParserResultEqualityTest.kt
@@ -29,7 +29,7 @@ import org.jetbrains.jet.plugin.PluginTestCaseBase
 import org.jetbrains.kotlin.android.AndroidConfigurationKeys
 import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles
 
-public abstract class AbstractCrossParserTest : KotlinAndroidTestCase() {
+public abstract class AbstractParserResultEqualityTest : KotlinAndroidTestCase() {
     public fun doTest(path: String) {
         val project = myFixture!!.getProject()
         project.putUserData(TestConst.TESTDATA_PATH, path)
@@ -51,6 +51,6 @@ public abstract class AbstractCrossParserTest : KotlinAndroidTestCase() {
     }
 
     override fun getTestDataPath(): String? {
-        return KotlinAndroidTestCaseBase.getPluginTestDataPathBase() + "/crossParser/" + getTestName(true) + "/"
+        return KotlinAndroidTestCaseBase.getPluginTestDataPathBase() + "/parserResultEquality/" + getTestName(true) + "/"
     }
 }
\ No newline at end of file
diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/CrossParserTestGenerated.java b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/ParserResultEqualityTestGenerated.java
similarity index 73%
rename from plugins/android-idea-plugin/tests/org/jetbrains/jet/android/CrossParserTestGenerated.java
rename to plugins/android-idea-plugin/tests/org/jetbrains/jet/android/ParserResultEqualityTestGenerated.java
index 57dec5d1317..61c2de43d12 100644
--- a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/CrossParserTestGenerated.java
+++ b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/ParserResultEqualityTestGenerated.java
@@ -28,47 +28,47 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("plugins/android-idea-plugin/testData/android/crossParser")
+@TestMetadata("plugins/android-idea-plugin/testData/android/parserResultEquality")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
-public class CrossParserTestGenerated extends AbstractCrossParserTest {
-    public void testAllFilesPresentInCrossParser() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-idea-plugin/testData/android/crossParser"), Pattern.compile("^([^\\.]+)$"), false);
+public class ParserResultEqualityTestGenerated extends AbstractParserResultEqualityTest {
+    public void testAllFilesPresentInParserResultEquality() throws Exception {
+        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-idea-plugin/testData/android/parserResultEquality"), Pattern.compile("^([^\\.]+)$"), false);
     }
 
     @TestMetadata("fqNameInAttr")
     public void testFqNameInAttr() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/crossParser/fqNameInAttr/");
+        String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/parserResultEquality/fqNameInAttr/");
         doTest(fileName);
     }
 
     @TestMetadata("fqNameInTag")
     public void testFqNameInTag() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/crossParser/fqNameInTag/");
+        String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/parserResultEquality/fqNameInTag/");
         doTest(fileName);
     }
 
     @TestMetadata("multiFile")
     public void testMultiFile() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/crossParser/multiFile/");
+        String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/parserResultEquality/multiFile/");
         doTest(fileName);
     }
 
     @TestMetadata("noIds")
     public void testNoIds() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/crossParser/noIds/");
+        String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/parserResultEquality/noIds/");
         doTest(fileName);
     }
 
     @TestMetadata("nolayout")
     public void testNolayout() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/crossParser/nolayout/");
+        String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/parserResultEquality/nolayout/");
         doTest(fileName);
     }
 
     @TestMetadata("singleFile")
     public void testSingleFile() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/crossParser/singleFile/");
+        String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/parserResultEquality/singleFile/");
         doTest(fileName);
     }
 }