diff --git a/.gitignore b/.gitignore
index 577e302..34ce5a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,5 @@
 /.gradle
-/build
 /core/build
-/etch/build
+/idriveconnectkit-etch/build
 *.iml
-/libs/apache-etch-java-runtime-1.4.0.jar
-/etch/libs/apache-etch-java-runtime-1.4.0.jar
\ No newline at end of file
+/etch-runtime/libs/apache-etch-java-runtime-1.4.0.jar
\ No newline at end of file
diff --git a/etch-runtime/build.gradle b/etch-runtime/build.gradle
index bac1701..5eca4f2 100644
--- a/etch-runtime/build.gradle
+++ b/etch-runtime/build.gradle
@@ -60,7 +60,7 @@ publishing {
         maven(MavenPublication) {
             // package names for Maven/Jitpack
             groupId 'org.apache.etch'
-            artifactId 'etch'
+            artifactId 'etch-runtime'
             version '1.4.0'
 
             from components.java
diff --git a/etch/BMWRemoting.etch b/idriveconnectkit-etch/BMWRemoting.etch
similarity index 100%
rename from etch/BMWRemoting.etch
rename to idriveconnectkit-etch/BMWRemoting.etch
diff --git a/etch/build.gradle b/idriveconnectkit-etch/build.gradle
similarity index 94%
rename from etch/build.gradle
rename to idriveconnectkit-etch/build.gradle
index 8977720..db60754 100644
--- a/etch/build.gradle
+++ b/idriveconnectkit-etch/build.gradle
@@ -9,7 +9,7 @@ apply plugin: 'maven-publish'
 
 
 dependencies {
-    api project(path: ':etch')
+    api project(path: ':etch-runtime')
 }
 
 sourceSets {
@@ -52,9 +52,9 @@ tasks.register('compileEtch', JavaExec) {
             "${buildDir}/etch/apache-etch-1.4.0/lib/apache-etch-java-compiler-1.4.0.jar",
             "${buildDir}/etch/apache-etch-1.4.0/lib/velocity-1.7-dep.jar"
     )
-    workingDir "${rootDir}/etch"
+    workingDir "${rootDir}/idriveconnectkit-etch"
     args('--binding', 'java', '--output-dir', "${buildDir}/generated", 'BMWRemoting.etch')
-    inputs.file("${rootDir}/etch/BMWRemoting.etch")
+    inputs.file("${rootDir}/idriveconnectkit-etch/BMWRemoting.etch")
     outputs.dir "${buildDir}/generated"
 }
 
diff --git a/settings.gradle b/settings.gradle
index a155591..39ecd37 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,4 @@
-include ':core', ':etch', ':etch-runtime'
+include ':core', ':idriveconnectkit-etch', ':etch-runtime'
 project(':core').name = "idriveconnectkit"
-project(':etch').name = "idriveconnectkit-etch"
-project(':etch-runtime').name = "etch"
\ No newline at end of file
+project(':idriveconnectkit-etch').name = "idriveconnectkit-etch"
+project(':etch-runtime').name = "etch-runtime"
\ No newline at end of file