diff --git a/all/pom.xml b/all/pom.xml
index 4506a90e..80afdc27 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -17,7 +17,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>KeePassJava2-parent</artifactId>
+        <artifactId>KeePassJava2.parent</artifactId>
         <groupId>org.linguafranca.pwdb</groupId>
         <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
@@ -32,12 +32,12 @@
     <dependencies>
         <dependency>
             <groupId>org.linguafranca.pwdb</groupId>
-            <artifactId>KeePassJava2-kdb</artifactId>
+            <artifactId>KeePassJava2.kdb</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.linguafranca.pwdb</groupId>
-            <artifactId>KeePassJava2-kdbx-database</artifactId>
+            <artifactId>KeePassJava2.kdbx.database</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/database/pom.xml b/database/pom.xml
index 20176b5c..1eaf0e20 100644
--- a/database/pom.xml
+++ b/database/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>KeePassJava2-parent</artifactId>
+        <artifactId>KeePassJava2.parent</artifactId>
         <groupId>org.linguafranca.pwdb</groupId>
         <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
diff --git a/example/pom.xml b/example/pom.xml
index 587cffc4..5062e9b1 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -17,7 +17,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>KeePassJava2-parent</artifactId>
+        <artifactId>KeePassJava2.parent</artifactId>
         <groupId>org.linguafranca.pwdb</groupId>
         <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
diff --git a/kdb/pom.xml b/kdb/pom.xml
index 6e84458d..78774dbe 100644
--- a/kdb/pom.xml
+++ b/kdb/pom.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>KeePassJava2-parent</artifactId>
+        <artifactId>KeePassJava2.parent</artifactId>
         <groupId>org.linguafranca.pwdb</groupId>
         <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>KeePassJava2-kdb</artifactId>
+    <artifactId>KeePassJava2.kdb</artifactId>
     <name>KeePassJava2 :: KDB</name>
     <description>Contains an implementaion that can load KDB files.</description>
 
diff --git a/kdbx-database/pom.xml b/kdbx-database/pom.xml
index 23088415..9be2385d 100644
--- a/kdbx-database/pom.xml
+++ b/kdbx-database/pom.xml
@@ -16,21 +16,21 @@
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-    <artifactId>KeePassJava2-parent</artifactId>
+    <artifactId>KeePassJava2.parent</artifactId>
     <groupId>org.linguafranca.pwdb</groupId>
     <version>3.0.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>KeePassJava2-kdbx-database</artifactId>
+  <artifactId>KeePassJava2.kdbx.database</artifactId>
   <name>KeePassJava2 :: Jackson</name>
   <description>Contains a Jackson XML implementation for KDBX.</description>
 
   <dependencies>
     <dependency>
       <groupId>org.linguafranca.pwdb</groupId>
-      <artifactId>KeePassJava2-kdbx-io</artifactId>
+      <artifactId>KeePassJava2.kdbx.io</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/kdbx-io/pom.xml b/kdbx-io/pom.xml
index 3c286552..89eb663b 100644
--- a/kdbx-io/pom.xml
+++ b/kdbx-io/pom.xml
@@ -17,14 +17,14 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>KeePassJava2-parent</artifactId>
+        <artifactId>KeePassJava2.parent</artifactId>
         <groupId>org.linguafranca.pwdb</groupId>
         <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>KeePassJava2-kdbx-io</artifactId>
+    <artifactId>KeePassJava2.kdbx.io</artifactId>
     <name>KeePassJava2 :: KDBX</name>
     <description>Base classes and resources for other KDBX modules.
         KDBX Stream Support.
diff --git a/pom.xml b/pom.xml
index d342e95a..652dbe34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.linguafranca.pwdb</groupId>
-    <artifactId>KeePassJava2-parent</artifactId>
+    <artifactId>KeePassJava2.parent</artifactId>
     <version>3.0.0-SNAPSHOT</version>
     <modules>
         <module>database</module>
@@ -106,6 +106,18 @@
                         </properties>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>${maven-jar-plugin.version}</version>
+                    <configuration>
+                        <archive>
+                            <manifestEntries>
+                                <Automatic-Module-Name>${project.groupId}.${project.artifactId}</Automatic-Module-Name>
+                            </manifestEntries>
+                        </archive>
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
 
diff --git a/test/pom.xml b/test/pom.xml
index 28ec611a..3ebff937 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>KeePassJava2-parent</artifactId>
+        <artifactId>KeePassJava2.parent</artifactId>
         <groupId>org.linguafranca.pwdb</groupId>
         <version>3.0.0-SNAPSHOT</version>
     </parent>