diff --git a/injectfx-example/pom.xml b/neitzelfx-example/pom.xml
similarity index 98%
rename from injectfx-example/pom.xml
rename to neitzelfx-example/pom.xml
index 0040265..158609d 100644
--- a/injectfx-example/pom.xml
+++ b/neitzelfx-example/pom.xml
@@ -6,11 +6,11 @@
 
     <parent>
         <groupId>de.neitzel</groupId>
-        <artifactId>injectfx</artifactId>
+        <artifactId>neitzelfx</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>injectfx-example</artifactId>
+    <artifactId>neitzelfx-example</artifactId>
 
     <properties>
         <link.name>${project.artifactId}</link.name>
@@ -21,10 +21,10 @@
     </properties>
 
     <dependencies>
-        <!-- InjectFX dependency -->
+        <!-- NeitzelFX dependency -->
         <dependency>
             <groupId>de.neitzel</groupId>
-            <artifactId>injectfx-lib</artifactId>
+            <artifactId>neitzelfx-lib</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/injectfx-example/src/main/java/de/neitzel/neitzelfx/component/example/Address.java b/neitzelfx-example/src/main/java/de/neitzel/neitzelfx/component/example/Address.java
similarity index 100%
rename from injectfx-example/src/main/java/de/neitzel/neitzelfx/component/example/Address.java
rename to neitzelfx-example/src/main/java/de/neitzel/neitzelfx/component/example/Address.java
diff --git a/injectfx-example/src/main/java/de/neitzel/neitzelfx/component/example/ExampleApp.java b/neitzelfx-example/src/main/java/de/neitzel/neitzelfx/component/example/ExampleApp.java
similarity index 100%
rename from injectfx-example/src/main/java/de/neitzel/neitzelfx/component/example/ExampleApp.java
rename to neitzelfx-example/src/main/java/de/neitzel/neitzelfx/component/example/ExampleApp.java
diff --git a/injectfx-example/src/main/java/de/neitzel/neitzelfx/component/example/Main.java b/neitzelfx-example/src/main/java/de/neitzel/neitzelfx/component/example/Main.java
similarity index 100%
rename from injectfx-example/src/main/java/de/neitzel/neitzelfx/component/example/Main.java
rename to neitzelfx-example/src/main/java/de/neitzel/neitzelfx/component/example/Main.java
diff --git a/injectfx-example/src/main/java/de/neitzel/neitzelfx/component/example/Person.java b/neitzelfx-example/src/main/java/de/neitzel/neitzelfx/component/example/Person.java
similarity index 100%
rename from injectfx-example/src/main/java/de/neitzel/neitzelfx/component/example/Person.java
rename to neitzelfx-example/src/main/java/de/neitzel/neitzelfx/component/example/Person.java
diff --git a/injectfx-example/src/main/java/de/neitzel/neitzelfx/injectfx/example/JavaFXApp.java b/neitzelfx-example/src/main/java/de/neitzel/neitzelfx/injectfx/example/JavaFXApp.java
similarity index 100%
rename from injectfx-example/src/main/java/de/neitzel/neitzelfx/injectfx/example/JavaFXApp.java
rename to neitzelfx-example/src/main/java/de/neitzel/neitzelfx/injectfx/example/JavaFXApp.java
diff --git a/injectfx-example/src/main/java/de/neitzel/neitzelfx/injectfx/example/Main.java b/neitzelfx-example/src/main/java/de/neitzel/neitzelfx/injectfx/example/Main.java
similarity index 100%
rename from injectfx-example/src/main/java/de/neitzel/neitzelfx/injectfx/example/Main.java
rename to neitzelfx-example/src/main/java/de/neitzel/neitzelfx/injectfx/example/Main.java
diff --git a/injectfx-example/src/main/java/de/neitzel/neitzelfx/injectfx/example/MainWindow.java b/neitzelfx-example/src/main/java/de/neitzel/neitzelfx/injectfx/example/MainWindow.java
similarity index 100%
rename from injectfx-example/src/main/java/de/neitzel/neitzelfx/injectfx/example/MainWindow.java
rename to neitzelfx-example/src/main/java/de/neitzel/neitzelfx/injectfx/example/MainWindow.java
diff --git a/injectfx-example/src/main/resources/address.fxml b/neitzelfx-example/src/main/resources/address.fxml
similarity index 100%
rename from injectfx-example/src/main/resources/address.fxml
rename to neitzelfx-example/src/main/resources/address.fxml
diff --git a/injectfx-example/src/main/resources/de/neitzel/neitzelfx/injectfx/example/MainWindow.fxml b/neitzelfx-example/src/main/resources/de/neitzel/neitzelfx/injectfx/example/MainWindow.fxml
similarity index 100%
rename from injectfx-example/src/main/resources/de/neitzel/neitzelfx/injectfx/example/MainWindow.fxml
rename to neitzelfx-example/src/main/resources/de/neitzel/neitzelfx/injectfx/example/MainWindow.fxml
diff --git a/injectfx-example/src/main/resources/person.fxml b/neitzelfx-example/src/main/resources/person.fxml
similarity index 100%
rename from injectfx-example/src/main/resources/person.fxml
rename to neitzelfx-example/src/main/resources/person.fxml
diff --git a/injectfx-example/src/test/resources/testlevel.png b/neitzelfx-example/src/test/resources/testlevel.png
similarity index 100%
rename from injectfx-example/src/test/resources/testlevel.png
rename to neitzelfx-example/src/test/resources/testlevel.png
diff --git a/injectfx-lib/pom.xml b/neitzelfx-lib/pom.xml
similarity index 94%
rename from injectfx-lib/pom.xml
rename to neitzelfx-lib/pom.xml
index f9ddcdc..1faa180 100644
--- a/injectfx-lib/pom.xml
+++ b/neitzelfx-lib/pom.xml
@@ -6,11 +6,11 @@
 
     <parent>
         <groupId>de.neitzel</groupId>
-        <artifactId>injectfx</artifactId>
+        <artifactId>neitzelfx</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>injectfx-lib</artifactId>
+    <artifactId>neitzelfx-lib</artifactId>
 
     <properties>
         <!-- Application Properties -->
diff --git a/injectfx-lib/src/main/java/de/neitzel/neitzelfx/component/AutoViewModel.java b/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/component/AutoViewModel.java
similarity index 100%
rename from injectfx-lib/src/main/java/de/neitzel/neitzelfx/component/AutoViewModel.java
rename to neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/component/AutoViewModel.java
diff --git a/injectfx-lib/src/main/java/de/neitzel/neitzelfx/component/ComponentController.java b/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/component/ComponentController.java
similarity index 100%
rename from injectfx-lib/src/main/java/de/neitzel/neitzelfx/component/ComponentController.java
rename to neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/component/ComponentController.java
diff --git a/injectfx-lib/src/main/java/de/neitzel/neitzelfx/component/ComponentLoader.java b/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/component/ComponentLoader.java
similarity index 100%
rename from injectfx-lib/src/main/java/de/neitzel/neitzelfx/component/ComponentLoader.java
rename to neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/component/ComponentLoader.java
diff --git a/injectfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/FXMLComponentInstances.java b/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/FXMLComponentInstances.java
similarity index 100%
rename from injectfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/FXMLComponentInstances.java
rename to neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/FXMLComponentInstances.java
diff --git a/injectfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/InjectableComponentScanner.java b/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/InjectableComponentScanner.java
similarity index 100%
rename from injectfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/InjectableComponentScanner.java
rename to neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/InjectableComponentScanner.java
diff --git a/injectfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/InjectingControllerFactory.java b/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/InjectingControllerFactory.java
similarity index 100%
rename from injectfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/InjectingControllerFactory.java
rename to neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/InjectingControllerFactory.java
diff --git a/injectfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/InjectingFXMLLoader.java b/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/InjectingFXMLLoader.java
similarity index 100%
rename from injectfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/InjectingFXMLLoader.java
rename to neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/InjectingFXMLLoader.java
diff --git a/injectfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/annotation/FXMLComponent.java b/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/annotation/FXMLComponent.java
similarity index 100%
rename from injectfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/annotation/FXMLComponent.java
rename to neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/annotation/FXMLComponent.java
diff --git a/injectfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/annotation/FXMLConfig.java b/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/annotation/FXMLConfig.java
similarity index 100%
rename from injectfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/annotation/FXMLConfig.java
rename to neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/injectfx/annotation/FXMLConfig.java
diff --git a/injectfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/BindDirection.java b/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/BindDirection.java
similarity index 100%
rename from injectfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/BindDirection.java
rename to neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/BindDirection.java
diff --git a/injectfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/BindingAwareFXMLLoader.java b/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/BindingAwareFXMLLoader.java
similarity index 100%
rename from injectfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/BindingAwareFXMLLoader.java
rename to neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/BindingAwareFXMLLoader.java
diff --git a/injectfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/GenericViewController.java b/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/GenericViewController.java
similarity index 100%
rename from injectfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/GenericViewController.java
rename to neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/GenericViewController.java
diff --git a/injectfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/GenericViewModel.java b/neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/GenericViewModel.java
similarity index 100%
rename from injectfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/GenericViewModel.java
rename to neitzelfx-lib/src/main/java/de/neitzel/neitzelfx/mvvm/GenericViewModel.java
diff --git a/injectfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/InjectableComponentScannerTest.java b/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/InjectableComponentScannerTest.java
similarity index 100%
rename from injectfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/InjectableComponentScannerTest.java
rename to neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/InjectableComponentScannerTest.java
diff --git a/injectfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/SuperClass.java b/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/SuperClass.java
similarity index 100%
rename from injectfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/SuperClass.java
rename to neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/SuperClass.java
diff --git a/injectfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestComponent1_1.java b/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestComponent1_1.java
similarity index 100%
rename from injectfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestComponent1_1.java
rename to neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestComponent1_1.java
diff --git a/injectfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestInterface1_1.java b/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestInterface1_1.java
similarity index 100%
rename from injectfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestInterface1_1.java
rename to neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestInterface1_1.java
diff --git a/injectfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestInterface1_2.java b/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestInterface1_2.java
similarity index 100%
rename from injectfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestInterface1_2.java
rename to neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/TestInterface1_2.java
diff --git a/injectfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/sub/TestComponent1_2.java b/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/sub/TestComponent1_2.java
similarity index 100%
rename from injectfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/sub/TestComponent1_2.java
rename to neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test1ok/sub/TestComponent1_2.java
diff --git a/injectfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test2fail/TestComponent2_1.java b/neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test2fail/TestComponent2_1.java
similarity index 100%
rename from injectfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test2fail/TestComponent2_1.java
rename to neitzelfx-lib/src/test/java/de/neitzel/neitzelfx/injectfx/testcomponents/test2fail/TestComponent2_1.java
diff --git a/pom.xml b/pom.xml
index 1d7799e..9970037 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,14 +5,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>de.neitzel</groupId>
-    <artifactId>injectfx</artifactId>
+    <artifactId>neitzelfx</artifactId>
     <version>1.0-SNAPSHOT</version>
 
     <packaging>pom</packaging>
 
     <modules>
-        <module>injectfx-lib</module>
-        <module>injectfx-example</module>
+        <module>neitzelfx-lib</module>
+        <module>neitzelfx-example</module>
     </modules>
 
     <properties>