diff --git a/libraries/tools/gradle-tools/build.gradle b/libraries/tools/gradle-tools/build.gradle
index 5fe8f08969a..6e8d2d23728 100644
--- a/libraries/tools/gradle-tools/build.gradle
+++ b/libraries/tools/gradle-tools/build.gradle
@@ -29,6 +29,14 @@ subprojects {
     task javadocJar(type: Jar) {
         classifier = 'javadoc'
     }
+    
+    afterEvaluate {
+        jar {
+            manifestAttributes(manifest, project)
+        }
+
+        compileKotlin.kotlinOptions.freeCompilerArgs += ["-module-name", "${project.name}"]
+    }
 }
 
 task clean {
diff --git a/libraries/tools/kotlin-gradle-plugin/pom.xml b/libraries/tools/kotlin-gradle-plugin/pom.xml
index b51c8286008..b91126cdb1e 100644
--- a/libraries/tools/kotlin-gradle-plugin/pom.xml
+++ b/libraries/tools/kotlin-gradle-plugin/pom.xml
@@ -149,7 +149,7 @@
                         <configuration>
                             <sources>
                                 <fileset>
-                                    <directory>${project.basedir}/src/main/kotlin</directory>
+                                    <directory>${project.basedir}/src/main/groovy</directory>
                                     <includes>
                                         <include>**/*.groovy</include>
                                     </includes>