diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin-core/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt
index 48b75c443da..ef1634908b4 100644
--- a/libraries/tools/kotlin-gradle-plugin-core/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-core/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt
@@ -17,7 +17,7 @@ import org.jetbrains.kotlin.gradle.BaseGradleIT.Project
 class BasicKotlinGradleIT : BaseGradleIT() {
 
     Test fun testSimpleCompile() {
-        val project = Project("alfa")
+        val project = Project("simpleProject")
 
         project.build("compileDeployKotlin", "build", "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT") {
             assertSuccessful()
@@ -32,7 +32,7 @@ class BasicKotlinGradleIT : BaseGradleIT() {
     }
 
     Test fun testKotlinCustomDirectory() {
-        Project("beta").build("build", "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT") {
+        Project("customSrcDir").build("build", "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT") {
             assertSuccessful()
         }
     }
@@ -44,7 +44,7 @@ class BasicKotlinGradleIT : BaseGradleIT() {
     }
 
     Test fun testSimpleKDoc() {
-        Project("delta").build("kdoc", "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT") {
+        Project("kdocProject").build("kdoc", "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT") {
             assertSuccessful()
             assertReportExists("build/docs/kdoc/demo/MyClass.html")
             assertContains(":kdoc", "Generating kdoc to")
@@ -52,7 +52,7 @@ class BasicKotlinGradleIT : BaseGradleIT() {
     }
 
     Ignore fun testKotlinExtraJavaSrc() {
-        Project("gamma").build("build", "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT") {
+        Project("additionalJavaSrc").build("build", "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT") {
             assertSuccessful()
         }
     }
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/gamma/build.gradle b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/additionalJavaSrc/build.gradle
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/gamma/build.gradle
rename to libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/additionalJavaSrc/build.gradle
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/externalAnnotations/com/google/common/base/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/additionalJavaSrc/externalAnnotations/com/google/common/base/annotations.xml
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/externalAnnotations/com/google/common/base/annotations.xml
rename to libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/additionalJavaSrc/externalAnnotations/com/google/common/base/annotations.xml
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/src/main/java/demo/Greeter.java b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/additionalJavaSrc/generated/demo/Greeter.java
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/src/main/java/demo/Greeter.java
rename to libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/additionalJavaSrc/generated/demo/Greeter.java
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/gamma/src/main/java/demo/HelloWorld.java b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/additionalJavaSrc/src/main/java/demo/HelloWorld.java
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/gamma/src/main/java/demo/HelloWorld.java
rename to libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/additionalJavaSrc/src/main/java/demo/HelloWorld.java
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/src/main/kotlin/helloWorld.kt b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/additionalJavaSrc/src/main/kotlin/helloWorld.kt
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/src/main/kotlin/helloWorld.kt
rename to libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/additionalJavaSrc/src/main/kotlin/helloWorld.kt
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/beta/build.gradle b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/customSrcDir/build.gradle
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/beta/build.gradle
rename to libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/customSrcDir/build.gradle
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/beta/externalAnnotations/com/google/common/base/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/customSrcDir/externalAnnotations/com/google/common/base/annotations.xml
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/beta/externalAnnotations/com/google/common/base/annotations.xml
rename to libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/customSrcDir/externalAnnotations/com/google/common/base/annotations.xml
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/beta/src/helloWorld.kt b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/customSrcDir/src/helloWorld.kt
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/beta/src/helloWorld.kt
rename to libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/customSrcDir/src/helloWorld.kt
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/delta/build.gradle b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/kdocProject/build.gradle
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/delta/build.gradle
rename to libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/kdocProject/build.gradle
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/delta/externalAnnotations/com/google/common/base/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/kdocProject/externalAnnotations/com/google/common/base/annotations.xml
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/delta/externalAnnotations/com/google/common/base/annotations.xml
rename to libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/kdocProject/externalAnnotations/com/google/common/base/annotations.xml
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/delta/src/main/kotlin/helloWorld.kt b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/kdocProject/src/main/kotlin/helloWorld.kt
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/delta/src/main/kotlin/helloWorld.kt
rename to libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/kdocProject/src/main/kotlin/helloWorld.kt
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/build.gradle b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/build.gradle
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/build.gradle
rename to libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/build.gradle
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/gamma/externalAnnotations/com/google/common/base/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/externalAnnotations/com/google/common/base/annotations.xml
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/gamma/externalAnnotations/com/google/common/base/annotations.xml
rename to libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/externalAnnotations/com/google/common/base/annotations.xml
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/src/deploy/kotlin/kotlinSrc.kt b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/src/deploy/kotlin/kotlinSrc.kt
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/src/deploy/kotlin/kotlinSrc.kt
rename to libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/src/deploy/kotlin/kotlinSrc.kt
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/gamma/generated/demo/Greeter.java b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/src/main/java/demo/Greeter.java
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/gamma/generated/demo/Greeter.java
rename to libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/src/main/java/demo/Greeter.java
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/src/main/java/demo/HelloWorld.java b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/src/main/java/demo/HelloWorld.java
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/src/main/java/demo/HelloWorld.java
rename to libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/src/main/java/demo/HelloWorld.java
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/gamma/src/main/kotlin/helloWorld.kt b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/src/main/kotlin/helloWorld.kt
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/gamma/src/main/kotlin/helloWorld.kt
rename to libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/src/main/kotlin/helloWorld.kt
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/src/test/kotlin/tests.kt b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/src/test/kotlin/tests.kt
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/src/test/kotlin/tests.kt
rename to libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/src/test/kotlin/tests.kt