diff --git a/annotation/pom.xml b/annotation/pom.xml
index f71ba00..d78b98f 100644
--- a/annotation/pom.xml
+++ b/annotation/pom.xml
@@ -4,8 +4,8 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>fragargs-parent</artifactId>
-    <groupId>com.hannesdorfmann.fragargs</groupId>
-    <version>0.0.4</version>
+    <groupId>com.hannesdorfmann.fragmentargs</groupId>
+    <version>0.0.8</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/annotation/src/main/java/com/hannesdorfmann/fragargs/annotation/Arg.java b/annotation/src/main/java/com/hannesdorfmann/fragmentargs/annotation/Arg.java
similarity index 93%
rename from annotation/src/main/java/com/hannesdorfmann/fragargs/annotation/Arg.java
rename to annotation/src/main/java/com/hannesdorfmann/fragmentargs/annotation/Arg.java
index faa4674..b98f67d 100644
--- a/annotation/src/main/java/com/hannesdorfmann/fragargs/annotation/Arg.java
+++ b/annotation/src/main/java/com/hannesdorfmann/fragmentargs/annotation/Arg.java
@@ -1,4 +1,4 @@
-package com.hannesdorfmann.fragargs.annotation;
+package com.hannesdorfmann.fragmentargs.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/pom.xml b/pom.xml
index 2652c46..cc52964 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,10 +10,10 @@
         <version>7</version>
     </parent>
 
-    <groupId>com.hannesdorfmann.fragargs</groupId>
+    <groupId>com.hannesdorfmann.fragmentargs</groupId>
     <artifactId>fragargs-parent</artifactId>
     <packaging>pom</packaging>
-    <version>0.0.4</version>
+    <version>0.0.8</version>
     <modules>
         <module>annotation</module>
         <module>processor</module>
diff --git a/processor/pom.xml b/processor/pom.xml
index ca5d9d0..31f8d4a 100644
--- a/processor/pom.xml
+++ b/processor/pom.xml
@@ -4,8 +4,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>fragargs-parent</artifactId>
-        <groupId>com.hannesdorfmann.fragargs</groupId>
-        <version>0.0.4</version>
+        <groupId>com.hannesdorfmann.fragmentargs</groupId>
+        <version>0.0.8</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -69,7 +69,7 @@
                         </goals>
                         <configuration>
                             <annotationProcessors>
-                                <annotationProcessor>com.hannesdorfmann.fragargs.processor.ArgProcessor
+                                <annotationProcessor>com.hannesdorfmann.fragmentargs.processor.ArgProcessor
                                 </annotationProcessor>
                             </annotationProcessors>
                         </configuration>
diff --git a/processor/src/main/java/com/hannesdorfmann/fragargs/processor/AnnotatedField.java b/processor/src/main/java/com/hannesdorfmann/fragmentargs/processor/AnnotatedField.java
similarity index 97%
rename from processor/src/main/java/com/hannesdorfmann/fragargs/processor/AnnotatedField.java
rename to processor/src/main/java/com/hannesdorfmann/fragmentargs/processor/AnnotatedField.java
index 27cd440..01ed213 100644
--- a/processor/src/main/java/com/hannesdorfmann/fragargs/processor/AnnotatedField.java
+++ b/processor/src/main/java/com/hannesdorfmann/fragmentargs/processor/AnnotatedField.java
@@ -1,4 +1,4 @@
-package com.hannesdorfmann.fragargs.processor;
+package com.hannesdorfmann.fragmentargs.processor;
 
 import javax.lang.model.element.Element;
 
diff --git a/processor/src/main/java/com/hannesdorfmann/fragargs/processor/ArgProcessor.java b/processor/src/main/java/com/hannesdorfmann/fragmentargs/processor/ArgProcessor.java
similarity index 98%
rename from processor/src/main/java/com/hannesdorfmann/fragargs/processor/ArgProcessor.java
rename to processor/src/main/java/com/hannesdorfmann/fragmentargs/processor/ArgProcessor.java
index c3b010d..c0cf7b6 100644
--- a/processor/src/main/java/com/hannesdorfmann/fragargs/processor/ArgProcessor.java
+++ b/processor/src/main/java/com/hannesdorfmann/fragmentargs/processor/ArgProcessor.java
@@ -1,6 +1,6 @@
-package com.hannesdorfmann.fragargs.processor;
+package com.hannesdorfmann.fragmentargs.processor;
 
-import com.hannesdorfmann.fragargs.annotation.Arg;
+import com.hannesdorfmann.fragmentargs.annotation.Arg;
 import com.squareup.javawriter.JavaWriter;
 import java.io.IOException;
 import java.io.Serializable;
@@ -36,7 +36,7 @@
  *
  * @author Hannes Dorfmann
  */
-@SupportedAnnotationTypes("com.hannesdorfmann.fragargs.annotation.Arg")
+@SupportedAnnotationTypes("com.hannesdorfmann.fragmentargs.annotation.Arg")
 public class ArgProcessor extends AbstractProcessor {
 
   private static final Map<String, String> ARGUMENT_TYPES = new HashMap<String, String>(20);
diff --git a/processor/src/main/java/com/hannesdorfmann/fragargs/processor/ArgumentAnnotatedField.java b/processor/src/main/java/com/hannesdorfmann/fragmentargs/processor/ArgumentAnnotatedField.java
similarity index 85%
rename from processor/src/main/java/com/hannesdorfmann/fragargs/processor/ArgumentAnnotatedField.java
rename to processor/src/main/java/com/hannesdorfmann/fragmentargs/processor/ArgumentAnnotatedField.java
index d194373..881aaf9 100644
--- a/processor/src/main/java/com/hannesdorfmann/fragargs/processor/ArgumentAnnotatedField.java
+++ b/processor/src/main/java/com/hannesdorfmann/fragmentargs/processor/ArgumentAnnotatedField.java
@@ -1,6 +1,6 @@
-package com.hannesdorfmann.fragargs.processor;
+package com.hannesdorfmann.fragmentargs.processor;
 
-import com.hannesdorfmann.fragargs.annotation.Arg;
+import com.hannesdorfmann.fragmentargs.annotation.Arg;
 import javax.lang.model.element.Element;
 
 public class ArgumentAnnotatedField extends AnnotatedField {
diff --git a/processor/src/main/java/com/hannesdorfmann/fragargs/processor/ProcessorMessage.java b/processor/src/main/java/com/hannesdorfmann/fragmentargs/processor/ProcessorMessage.java
similarity index 96%
rename from processor/src/main/java/com/hannesdorfmann/fragargs/processor/ProcessorMessage.java
rename to processor/src/main/java/com/hannesdorfmann/fragmentargs/processor/ProcessorMessage.java
index bfae09a..7c6e5c6 100644
--- a/processor/src/main/java/com/hannesdorfmann/fragargs/processor/ProcessorMessage.java
+++ b/processor/src/main/java/com/hannesdorfmann/fragmentargs/processor/ProcessorMessage.java
@@ -1,4 +1,4 @@
-package com.hannesdorfmann.fragargs.processor;
+package com.hannesdorfmann.fragmentargs.processor;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
diff --git a/processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor
index bd492a4..0b11a71 100644
--- a/processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor
+++ b/processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor
@@ -1 +1 @@
-com.hannesdorfmann.fragargs.processor.ArgProcessor
\ No newline at end of file
+com.hannesdorfmann.fragmentargs.processor.ArgProcessor
\ No newline at end of file