diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-2.6.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-2.6.xml
index 0a1cbd4f71..68026feaa5 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-2.6.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-2.6.xml
@@ -614,7 +614,7 @@ CREATE TABLE `posts` (
 
     <database>
       <!-- The database type. The format here is:
-           org.util.[database].[database]Database -->
+           org.jooq.util.[database].[database]Database -->
       <name>org.jooq.util.mysql.MySQLDatabase</name>
 
       <!-- The database schema (or in the absence of schema support, in your RDBMS this
@@ -7603,7 +7603,7 @@ Finishing                : Total: 4.814ms, +3.375ms
   <generator>
     <database>
       <!-- The database dialect from jooq-meta. Available dialects are
-           named org.util.[database].[database]Database. Known values are:
+           named org.jooq.util.[database].[database]Database. Known values are:
 
            org.jooq.util.ase.ASEDatabase (to be used with Sybase ASE)
            org.jooq.util.cubrid.CUBRIDDatabase
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.10.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.10.xml
index b7b03b05e8..e6143fdb04 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.10.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.10.xml
@@ -857,7 +857,7 @@ CREATE TABLE `author` (
 
     <database>
       <!-- The database type. The format here is:
-           org.util.[database].[database]Database -->
+           org.jooq.util.[database].[database]Database -->
       <name>org.jooq.util.mysql.MySQLDatabase</name>
 
       <!-- The database schema (or in the absence of schema support, in your RDBMS this
@@ -14620,7 +14620,7 @@ result.forEach((Object[] entities) -> {
   <generator>
     <database>
       <!-- The database dialect from jooq-meta. Available dialects are
-           named org.util.[database].[database]Database.
+           named org.jooq.util.[database].[database]Database.
 
            Natively supported values are:
 
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.11.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.11.xml
index 84abc80b8f..105593d59b 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.11.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.11.xml
@@ -856,7 +856,7 @@ CREATE TABLE `author` (
 
     <database>
       <!-- The database type. The format here is:
-           org.util.[database].[database]Database -->
+           org.jooq.meta.[database].[database]Database -->
       <name>org.jooq.meta.mysql.MySQLDatabase</name>
 
       <!-- The database schema (or in the absence of schema support, in your RDBMS this
@@ -15233,7 +15233,7 @@ result.forEach((Object[] entities) -> {
   <generator>
     <database>
       <!-- The database dialect from jooq-meta. Available dialects are
-           named org.util.[database].[database]Database.
+           named org.jooq.meta.[database].[database]Database.
 
            Natively supported values are:
 
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.12.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.12.xml
index 3fd59c8c11..1a6d5a1171 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.12.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.12.xml
@@ -875,7 +875,7 @@ CREATE TABLE `author` (
 
     <database>
       <!-- The database type. The format here is:
-           org.util.[database].[database]Database -->
+           org.jooq.meta.[database].[database]Database -->
       <name>org.jooq.meta.mysql.MySQLDatabase</name>
 
       <!-- The database schema (or in the absence of schema support, in your RDBMS this
@@ -15501,7 +15501,7 @@ result.forEach((Object[] entities) -> {
   <generator>
     <database>
       <!-- The database dialect from jooq-meta. Available dialects are
-           named org.util.[database].[database]Database.
+           named org.jooq.meta.[database].[database]Database.
 
            Natively supported values are:
 
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.2.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.2.xml
index 3d99d17ad1..865f3939a8 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.2.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.2.xml
@@ -786,7 +786,7 @@ CREATE TABLE `author` (
 
     <database>
       <!-- The database type. The format here is:
-           org.util.[database].[database]Database -->
+           org.jooq.util.[database].[database]Database -->
       <name>org.jooq.util.mysql.MySQLDatabase</name>
 
       <!-- The database schema (or in the absence of schema support, in your RDBMS this
@@ -10187,7 +10187,7 @@ Finishing                : Total: 4.814ms, +3.375ms
   <generator>
     <database>
       <!-- The database dialect from jooq-meta. Available dialects are
-           named org.util.[database].[database]Database. Known values are:
+           named org.jooq.util.[database].[database]Database. Known values are:
 
            org.jooq.util.ase.ASEDatabase (to be used with Sybase ASE)
            org.jooq.util.cubrid.CUBRIDDatabase
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.3.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.3.xml
index 5f206004ba..6f8f8854bd 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.3.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.3.xml
@@ -792,7 +792,7 @@ CREATE TABLE `author` (
 
     <database>
       <!-- The database type. The format here is:
-           org.util.[database].[database]Database -->
+           org.jooq.util.[database].[database]Database -->
       <name>org.jooq.util.mysql.MySQLDatabase</name>
 
       <!-- The database schema (or in the absence of schema support, in your RDBMS this
@@ -11050,7 +11050,7 @@ Finishing                : Total: 4.814ms, +3.375ms
   <generator>
     <database>
       <!-- The database dialect from jooq-meta. Available dialects are
-           named org.util.[database].[database]Database. Known values are:
+           named org.jooq.util.[database].[database]Database. Known values are:
 
            org.jooq.util.ase.ASEDatabase (to be used with Sybase ASE)
            org.jooq.util.cubrid.CUBRIDDatabase
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.4.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.4.xml
index 75d5b13afa..5b57190011 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.4.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.4.xml
@@ -793,7 +793,7 @@ CREATE TABLE `author` (
 
     <database>
       <!-- The database type. The format here is:
-           org.util.[database].[database]Database -->
+           org.jooq.util.[database].[database]Database -->
       <name>org.jooq.util.mysql.MySQLDatabase</name>
 
       <!-- The database schema (or in the absence of schema support, in your RDBMS this
@@ -12160,7 +12160,7 @@ Finishing                : Total: 4.814ms, +3.375ms
   <generator>
     <database>
       <!-- The database dialect from jooq-meta. Available dialects are
-           named org.util.[database].[database]Database. Known values are:
+           named org.jooq.util.[database].[database]Database. Known values are:
 
            org.jooq.util.ase.ASEDatabase (to be used with Sybase ASE)
            org.jooq.util.cubrid.CUBRIDDatabase
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.5.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.5.xml
index 3f3598bacc..a57c7583b4 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.5.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.5.xml
@@ -793,7 +793,7 @@ CREATE TABLE `author` (
 
     <database>
       <!-- The database type. The format here is:
-           org.util.[database].[database]Database -->
+           org.jooq.util.[database].[database]Database -->
       <name>org.jooq.util.mysql.MySQLDatabase</name>
 
       <!-- The database schema (or in the absence of schema support, in your RDBMS this
@@ -12594,7 +12594,7 @@ Finishing                : Total: 4.814ms, +3.375ms
   <generator>
     <database>
       <!-- The database dialect from jooq-meta. Available dialects are
-           named org.util.[database].[database]Database.
+           named org.jooq.util.[database].[database]Database.
 
            Natively supported values are:
 
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.6.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.6.xml
index 314c73e08c..835ab3f1fc 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.6.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.6.xml
@@ -797,7 +797,7 @@ CREATE TABLE `author` (
 
     <database>
       <!-- The database type. The format here is:
-           org.util.[database].[database]Database -->
+           org.jooq.util.[database].[database]Database -->
       <name>org.jooq.util.mysql.MySQLDatabase</name>
 
       <!-- The database schema (or in the absence of schema support, in your RDBMS this
@@ -13421,7 +13421,7 @@ result.forEach((Object[] entities) -> {
   <generator>
     <database>
       <!-- The database dialect from jooq-meta. Available dialects are
-           named org.util.[database].[database]Database.
+           named org.jooq.util.[database].[database]Database.
 
            Natively supported values are:
 
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.7.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.7.xml
index 658c034ecb..acc3d47882 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.7.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.7.xml
@@ -857,7 +857,7 @@ CREATE TABLE `author` (
 
     <database>
       <!-- The database type. The format here is:
-           org.util.[database].[database]Database -->
+           org.jooq.util.[database].[database]Database -->
       <name>org.jooq.util.mysql.MySQLDatabase</name>
 
       <!-- The database schema (or in the absence of schema support, in your RDBMS this
@@ -13822,7 +13822,7 @@ result.forEach((Object[] entities) -> {
   <generator>
     <database>
       <!-- The database dialect from jooq-meta. Available dialects are
-           named org.util.[database].[database]Database.
+           named org.jooq.util.[database].[database]Database.
 
            Natively supported values are:
 
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.8.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.8.xml
index 72b65e679f..b1fb19ffbe 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.8.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.8.xml
@@ -857,7 +857,7 @@ CREATE TABLE `author` (
 
     <database>
       <!-- The database type. The format here is:
-           org.util.[database].[database]Database -->
+           org.jooq.util.[database].[database]Database -->
       <name>org.jooq.util.mysql.MySQLDatabase</name>
 
       <!-- The database schema (or in the absence of schema support, in your RDBMS this
@@ -14048,7 +14048,7 @@ result.forEach((Object[] entities) -> {
   <generator>
     <database>
       <!-- The database dialect from jooq-meta. Available dialects are
-           named org.util.[database].[database]Database.
+           named org.jooq.util.[database].[database]Database.
 
            Natively supported values are:
 
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.9.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.9.xml
index 6bd77077b4..9fb365f55f 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.9.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.9.xml
@@ -857,7 +857,7 @@ CREATE TABLE `author` (
 
     <database>
       <!-- The database type. The format here is:
-           org.util.[database].[database]Database -->
+           org.jooq.util.[database].[database]Database -->
       <name>org.jooq.util.mysql.MySQLDatabase</name>
 
       <!-- The database schema (or in the absence of schema support, in your RDBMS this
@@ -14209,7 +14209,7 @@ result.forEach((Object[] entities) -> {
   <generator>
     <database>
       <!-- The database dialect from jooq-meta. Available dialects are
-           named org.util.[database].[database]Database.
+           named org.jooq.util.[database].[database]Database.
 
            Natively supported values are:
 
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual.xml
index ebaa9ef5b5..4a6eecaccd 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual.xml
@@ -1516,7 +1516,7 @@ public void bind(BindContext context) throws DataAccessException;</java><html>
   <generator>
     <database>
       <!-- The database dialect from jooq-meta. Available dialects are
-           named org.util.[database].[database]Database. Known values are:
+           named org.jooq.util.[database].[database]Database. Known values are:
 
            org.jooq.util.ase.ASEDatabase (to be used with Sybase ASE)
            org.jooq.util.cubrid.CUBRIDDatabase