diff --git a/libs/grok-common/build.gradle b/libs/grok/build.gradle
similarity index 89%
rename from libs/grok-common/build.gradle
rename to libs/grok/build.gradle
index c9fd11202de..c91312cf9e8 100644
--- a/libs/grok-common/build.gradle
+++ b/libs/grok/build.gradle
@@ -21,14 +21,16 @@ import org.elasticsearch.gradle.precommit.PrecommitTasks
 
 apply plugin: 'elasticsearch.build'
 
+archivesBaseName = 'elasticsearch-grok'
+
 dependencies {
     compile 'org.jruby.joni:joni:2.1.6'
     // joni dependencies:
     compile 'org.jruby.jcodings:jcodings:1.0.12'
 
-    if (isEclipse == false || project.path == ":libs:grok-common-tests") {
+    if (isEclipse == false || project.path == ":libs:grok-tests") {
         testCompile("org.elasticsearch.test:framework:${version}") {
-            exclude group: 'org.elasticsearch', module: 'grok-common'
+            exclude group: 'org.elasticsearch', module: 'grok'
         }
     }
 }
@@ -40,7 +42,7 @@ forbiddenApisMain {
 if (isEclipse) {
     // in eclipse the project is under a fake root, we need to change around the source sets
     sourceSets {
-        if (project.path == ":libs:grok-common") {
+        if (project.path == ":libs:grok") {
             main.java.srcDirs = ['java']
             main.resources.srcDirs = ['resources']
         } else {
diff --git a/libs/grok-common/licenses/jcodings-1.0.12.jar.sha1 b/libs/grok/licenses/jcodings-1.0.12.jar.sha1
similarity index 100%
rename from libs/grok-common/licenses/jcodings-1.0.12.jar.sha1
rename to libs/grok/licenses/jcodings-1.0.12.jar.sha1
diff --git a/libs/grok-common/licenses/jcodings-LICENSE.txt b/libs/grok/licenses/jcodings-LICENSE.txt
similarity index 100%
rename from libs/grok-common/licenses/jcodings-LICENSE.txt
rename to libs/grok/licenses/jcodings-LICENSE.txt
diff --git a/libs/grok-common/licenses/jcodings-NOTICE.txt b/libs/grok/licenses/jcodings-NOTICE.txt
similarity index 100%
rename from libs/grok-common/licenses/jcodings-NOTICE.txt
rename to libs/grok/licenses/jcodings-NOTICE.txt
diff --git a/libs/grok-common/licenses/joni-2.1.6.jar.sha1 b/libs/grok/licenses/joni-2.1.6.jar.sha1
similarity index 100%
rename from libs/grok-common/licenses/joni-2.1.6.jar.sha1
rename to libs/grok/licenses/joni-2.1.6.jar.sha1
diff --git a/libs/grok-common/licenses/joni-LICENSE.txt b/libs/grok/licenses/joni-LICENSE.txt
similarity index 100%
rename from libs/grok-common/licenses/joni-LICENSE.txt
rename to libs/grok/licenses/joni-LICENSE.txt
diff --git a/libs/grok-common/licenses/joni-NOTICE.txt b/libs/grok/licenses/joni-NOTICE.txt
similarity index 100%
rename from libs/grok-common/licenses/joni-NOTICE.txt
rename to libs/grok/licenses/joni-NOTICE.txt
diff --git a/libs/grok-common/src/main/java/org/elasticsearch/grok/Grok.java b/libs/grok/src/main/java/org/elasticsearch/grok/Grok.java
similarity index 100%
rename from libs/grok-common/src/main/java/org/elasticsearch/grok/Grok.java
rename to libs/grok/src/main/java/org/elasticsearch/grok/Grok.java
diff --git a/libs/grok-common/src/main/java/org/elasticsearch/grok/GrokMatchGroup.java b/libs/grok/src/main/java/org/elasticsearch/grok/GrokMatchGroup.java
similarity index 100%
rename from libs/grok-common/src/main/java/org/elasticsearch/grok/GrokMatchGroup.java
rename to libs/grok/src/main/java/org/elasticsearch/grok/GrokMatchGroup.java
diff --git a/libs/grok-common/src/main/resources/patterns/aws b/libs/grok/src/main/resources/patterns/aws
similarity index 100%
rename from libs/grok-common/src/main/resources/patterns/aws
rename to libs/grok/src/main/resources/patterns/aws
diff --git a/libs/grok-common/src/main/resources/patterns/bacula b/libs/grok/src/main/resources/patterns/bacula
similarity index 100%
rename from libs/grok-common/src/main/resources/patterns/bacula
rename to libs/grok/src/main/resources/patterns/bacula
diff --git a/libs/grok-common/src/main/resources/patterns/bro b/libs/grok/src/main/resources/patterns/bro
similarity index 100%
rename from libs/grok-common/src/main/resources/patterns/bro
rename to libs/grok/src/main/resources/patterns/bro
diff --git a/libs/grok-common/src/main/resources/patterns/exim b/libs/grok/src/main/resources/patterns/exim
similarity index 100%
rename from libs/grok-common/src/main/resources/patterns/exim
rename to libs/grok/src/main/resources/patterns/exim
diff --git a/libs/grok-common/src/main/resources/patterns/firewalls b/libs/grok/src/main/resources/patterns/firewalls
similarity index 100%
rename from libs/grok-common/src/main/resources/patterns/firewalls
rename to libs/grok/src/main/resources/patterns/firewalls
diff --git a/libs/grok-common/src/main/resources/patterns/grok-patterns b/libs/grok/src/main/resources/patterns/grok-patterns
similarity index 100%
rename from libs/grok-common/src/main/resources/patterns/grok-patterns
rename to libs/grok/src/main/resources/patterns/grok-patterns
diff --git a/libs/grok-common/src/main/resources/patterns/haproxy b/libs/grok/src/main/resources/patterns/haproxy
similarity index 100%
rename from libs/grok-common/src/main/resources/patterns/haproxy
rename to libs/grok/src/main/resources/patterns/haproxy
diff --git a/libs/grok-common/src/main/resources/patterns/java b/libs/grok/src/main/resources/patterns/java
similarity index 100%
rename from libs/grok-common/src/main/resources/patterns/java
rename to libs/grok/src/main/resources/patterns/java
diff --git a/libs/grok-common/src/main/resources/patterns/junos b/libs/grok/src/main/resources/patterns/junos
similarity index 100%
rename from libs/grok-common/src/main/resources/patterns/junos
rename to libs/grok/src/main/resources/patterns/junos
diff --git a/libs/grok-common/src/main/resources/patterns/linux-syslog b/libs/grok/src/main/resources/patterns/linux-syslog
similarity index 100%
rename from libs/grok-common/src/main/resources/patterns/linux-syslog
rename to libs/grok/src/main/resources/patterns/linux-syslog
diff --git a/libs/grok-common/src/main/resources/patterns/mcollective-patterns b/libs/grok/src/main/resources/patterns/mcollective-patterns
similarity index 100%
rename from libs/grok-common/src/main/resources/patterns/mcollective-patterns
rename to libs/grok/src/main/resources/patterns/mcollective-patterns
diff --git a/libs/grok-common/src/main/resources/patterns/mongodb b/libs/grok/src/main/resources/patterns/mongodb
similarity index 100%
rename from libs/grok-common/src/main/resources/patterns/mongodb
rename to libs/grok/src/main/resources/patterns/mongodb
diff --git a/libs/grok-common/src/main/resources/patterns/nagios b/libs/grok/src/main/resources/patterns/nagios
similarity index 100%
rename from libs/grok-common/src/main/resources/patterns/nagios
rename to libs/grok/src/main/resources/patterns/nagios
diff --git a/libs/grok-common/src/main/resources/patterns/postgresql b/libs/grok/src/main/resources/patterns/postgresql
similarity index 100%
rename from libs/grok-common/src/main/resources/patterns/postgresql
rename to libs/grok/src/main/resources/patterns/postgresql
diff --git a/libs/grok-common/src/main/resources/patterns/rails b/libs/grok/src/main/resources/patterns/rails
similarity index 100%
rename from libs/grok-common/src/main/resources/patterns/rails
rename to libs/grok/src/main/resources/patterns/rails
diff --git a/libs/grok-common/src/main/resources/patterns/redis b/libs/grok/src/main/resources/patterns/redis
similarity index 100%
rename from libs/grok-common/src/main/resources/patterns/redis
rename to libs/grok/src/main/resources/patterns/redis
diff --git a/libs/grok-common/src/main/resources/patterns/ruby b/libs/grok/src/main/resources/patterns/ruby
similarity index 100%
rename from libs/grok-common/src/main/resources/patterns/ruby
rename to libs/grok/src/main/resources/patterns/ruby
diff --git a/libs/grok-common/src/test/java/org/elasticsearch/grok/GrokTests.java b/libs/grok/src/test/java/org/elasticsearch/grok/GrokTests.java
similarity index 100%
rename from libs/grok-common/src/test/java/org/elasticsearch/grok/GrokTests.java
rename to libs/grok/src/test/java/org/elasticsearch/grok/GrokTests.java
diff --git a/modules/ingest-common/build.gradle b/modules/ingest-common/build.gradle
index 703f0e035de..424c1197da3 100644
--- a/modules/ingest-common/build.gradle
+++ b/modules/ingest-common/build.gradle
@@ -23,7 +23,7 @@ esplugin {
 }
 
 dependencies {
-    compile project(':libs:grok-common')
+    compile project(':libs:grok')
 }
 
 compileJava.options.compilerArgs << "-Xlint:-unchecked,-rawtypes"