diff --git a/jOOQ-examples/jOOQ-javaee-example/README.md b/jOOQ-examples/jOOQ-javaee-example/README.md
index 945160d3db..97a1bf4a9a 100644
--- a/jOOQ-examples/jOOQ-javaee-example/README.md
+++ b/jOOQ-examples/jOOQ-javaee-example/README.md
@@ -27,4 +27,4 @@ $ cd jOOQ-examples/jOOQ-javaee-example/target
 You can deploy this war file in your WildFly AS or any other application server. The example will use an embedded H2 database, which should be pre-filled with the library example H2 database. It uses a non-managed `DataSource`, which is configured and consumed directly by the application itself.
 
 For more information about how to setup a WildFly project using EJB, please visit the WildFly Quickstart projects, e.g.:
-https://github.com/wildfly/quickstart/tree/master/ejb-in-war
+https://github.com/wildfly/quickstart/tree/master/ejb-in-war
\ No newline at end of file
diff --git a/jOOQ-meta-jpa/.gitignore b/jOOQ-meta-extensions/.gitignore
similarity index 100%
rename from jOOQ-meta-jpa/.gitignore
rename to jOOQ-meta-extensions/.gitignore
diff --git a/jOOQ-meta-jpa/LICENSE.txt b/jOOQ-meta-extensions/LICENSE.txt
similarity index 100%
rename from jOOQ-meta-jpa/LICENSE.txt
rename to jOOQ-meta-extensions/LICENSE.txt
diff --git a/jOOQ-meta-jpa/pom.xml b/jOOQ-meta-extensions/pom.xml
similarity index 97%
rename from jOOQ-meta-jpa/pom.xml
rename to jOOQ-meta-extensions/pom.xml
index c37a2d060b..4a8dabcb9d 100644
--- a/jOOQ-meta-jpa/pom.xml
+++ b/jOOQ-meta-extensions/pom.xml
@@ -10,7 +10,7 @@
     </parent>
 
     <groupId>org.jooq</groupId>
-    <artifactId>jooq-meta-jpa</artifactId>
+    <artifactId>jooq-meta-extensions</artifactId>
     <name>jOOQ Meta JPA</name>
 
     <licenses>
diff --git a/jOOQ-meta-jpa/src/main/java/org/jooq/util/jpa/JPADatabase.java b/jOOQ-meta-extensions/src/main/java/org/jooq/util/jpa/JPADatabase.java
similarity index 99%
rename from jOOQ-meta-jpa/src/main/java/org/jooq/util/jpa/JPADatabase.java
rename to jOOQ-meta-extensions/src/main/java/org/jooq/util/jpa/JPADatabase.java
index 08efa98aac..ee4df2cd25 100644
--- a/jOOQ-meta-jpa/src/main/java/org/jooq/util/jpa/JPADatabase.java
+++ b/jOOQ-meta-extensions/src/main/java/org/jooq/util/jpa/JPADatabase.java
@@ -83,7 +83,7 @@ public class JPADatabase extends H2Database {
             }
 
             try {
-                connection = DriverManager.getConnection("jdbc:h2:mem:jooq-meta-jpa", "sa", "");
+                connection = DriverManager.getConnection("jdbc:h2:mem:jooq-meta-extensions", "sa", "");
 
                 final Configuration configuration = new Configuration()
                     .setProperty("hibernate.dialect", "org.hibernate.dialect.H2Dialect")
diff --git a/jOOQ-meta-jpa/src/main/resources/META-INF/LICENSE.txt b/jOOQ-meta-extensions/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from jOOQ-meta-jpa/src/main/resources/META-INF/LICENSE.txt
rename to jOOQ-meta-extensions/src/main/resources/META-INF/LICENSE.txt
diff --git a/jOOQ-meta-jpa/src/main/resources/META-INF/README.txt b/jOOQ-meta-extensions/src/main/resources/META-INF/README.txt
similarity index 100%
rename from jOOQ-meta-jpa/src/main/resources/META-INF/README.txt
rename to jOOQ-meta-extensions/src/main/resources/META-INF/README.txt
diff --git a/pom.xml b/pom.xml
index 9a3974a146..660a04194d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -172,7 +172,7 @@
             </dependency>
             <dependency>
                 <groupId>org.jooq</groupId>
-                <artifactId>jooq-meta-jpa</artifactId>
+                <artifactId>jooq-meta-extensions</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -264,7 +264,7 @@
         <module>jOOQ-codegen</module>
         <module>jOOQ-codegen-maven</module>
         <module>jOOQ-meta</module>
-        <module>jOOQ-meta-jpa</module>
+        <module>jOOQ-meta-extensions</module>
         <module>jOOQ-scala</module>
 
         <!-- [pro] xxx