diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/GeneratorStrategy.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/GeneratorStrategy.java
index 176a017351..fd768bc70e 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/codegen/GeneratorStrategy.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/GeneratorStrategy.java
@@ -44,6 +44,8 @@ import java.util.List;
 import org.jooq.meta.AttributeDefinition;
 import org.jooq.meta.ColumnDefinition;
 import org.jooq.meta.Definition;
+import org.jooq.meta.DomainDefinition;
+import org.jooq.meta.EnumDefinition;
 import org.jooq.meta.ParameterDefinition;
 import org.jooq.meta.RoutineDefinition;
 import org.jooq.meta.TableDefinition;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Database.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Database.java
index b8e2d2ae92..e9d79d76a2 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Database.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Database.java
@@ -773,7 +773,7 @@ public class Database implements Serializable
      * All table and view columns that are used as "version" fields for optimistic locking.
      * <p>
      * This is a Java regular expression. Use the pipe to separate several expressions.
-     * See {@link org.jooq.UpdatableRecord.store()} and {@link org.jooq.UpdatableRecord.delete()} for details about optimistic locking.
+     * See {@link org.jooq.UpdatableRecord#store()} and {@link org.jooq.UpdatableRecord#delete()} for details about optimistic locking.
      *
      * @return
      *     possible object is
@@ -800,7 +800,7 @@ public class Database implements Serializable
      * All table and view columns that are used as "timestamp" fields for optimistic locking.
      * <p>
      * This is a Java regular expression. Use the pipe to separate several expressions.
-     * See {@link org.jooq.UpdatableRecord.store()} and {@link org.jooq.UpdatableRecord.delete()} for details about optimistic locking.
+     * See {@link org.jooq.UpdatableRecord#store()} and {@link org.jooq.UpdatableRecord#delete()} for details about optimistic locking.
      *
      * @return
      *     possible object is
@@ -855,10 +855,10 @@ public class Database implements Serializable
      * <p>
      * To be used with:
      * <ul>
-     * <li>{@link org.jooq.UpdatableRecord.store()}</li>
-     * <li>{@link org.jooq.UpdatableRecord.update()}</li>
-     * <li>{@link org.jooq.UpdatableRecord.delete()}</li>
-     * <li>{@link org.jooq.UpdatableRecord.refresh()}</li>
+     * <li>{@link org.jooq.UpdatableRecord#store()}</li>
+     * <li>{@link org.jooq.UpdatableRecord#update()}</li>
+     * <li>{@link org.jooq.UpdatableRecord#delete()}</li>
+     * <li>{@link org.jooq.UpdatableRecord#refresh()}</li>
      * </ul>
      * <p>
      * Synthetic primary keys will override existing primary keys.
@@ -890,10 +890,10 @@ public class Database implements Serializable
      * <p>
      * To be used with:
      * <ul>
-     * <li>{@link org.jooq.UpdatableRecord.store()}</li>
-     * <li>{@link org.jooq.UpdatableRecord.update()}</li>
-     * <li>{@link org.jooq.UpdatableRecord.delete()}</li>
-     * <li>{@link org.jooq.UpdatableRecord.refresh()}</li>
+     * <li>{@link org.jooq.UpdatableRecord#store()}</li>
+     * <li>{@link org.jooq.UpdatableRecord#update()}</li>
+     * <li>{@link org.jooq.UpdatableRecord#delete()}</li>
+     * <li>{@link org.jooq.UpdatableRecord#refresh()}</li>
      * </ul>
      * <p>
      * If several keys match, a warning is emitted and the first one encountered will be used.
diff --git a/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.12.0.xsd b/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.12.0.xsd
index 89724d06f1..da9b126fc1 100644
--- a/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.12.0.xsd
+++ b/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.12.0.xsd
@@ -557,14 +557,14 @@ Excludes match before includes, i.e. excludes have a higher priority.]]></jxb:ja
         <annotation><appinfo><jxb:property><jxb:javadoc><![CDATA[All table and view columns that are used as "version" fields for optimistic locking.
 <p>
 This is a Java regular expression. Use the pipe to separate several expressions.
-See {@link org.jooq.UpdatableRecord.store()} and {@link org.jooq.UpdatableRecord.delete()} for details about optimistic locking.]]></jxb:javadoc></jxb:property></appinfo></annotation>
+See {@link org.jooq.UpdatableRecord#store()} and {@link org.jooq.UpdatableRecord#delete()} for details about optimistic locking.]]></jxb:javadoc></jxb:property></appinfo></annotation>
       </element>
 
       <element name="recordTimestampFields" type="string" default="" minOccurs="0" maxOccurs="1">
         <annotation><appinfo><jxb:property><jxb:javadoc><![CDATA[All table and view columns that are used as "timestamp" fields for optimistic locking.
 <p>
 This is a Java regular expression. Use the pipe to separate several expressions.
-See {@link org.jooq.UpdatableRecord.store()} and {@link org.jooq.UpdatableRecord.delete()} for details about optimistic locking.]]></jxb:javadoc></jxb:property></appinfo></annotation>
+See {@link org.jooq.UpdatableRecord#store()} and {@link org.jooq.UpdatableRecord#delete()} for details about optimistic locking.]]></jxb:javadoc></jxb:property></appinfo></annotation>
       </element>
 
       <element name="syntheticIdentities" type="string" default="" minOccurs="0" maxOccurs="1">
@@ -579,10 +579,10 @@ which should be placed on generated {@link org.jooq.UpdatableRecord}
 <p>
 To be used with:
 <ul>
-<li>{@link org.jooq.UpdatableRecord.store()}</li>
-<li>{@link org.jooq.UpdatableRecord.update()}</li>
-<li>{@link org.jooq.UpdatableRecord.delete()}</li>
-<li>{@link org.jooq.UpdatableRecord.refresh()}</li>
+<li>{@link org.jooq.UpdatableRecord#store()}</li>
+<li>{@link org.jooq.UpdatableRecord#update()}</li>
+<li>{@link org.jooq.UpdatableRecord#delete()}</li>
+<li>{@link org.jooq.UpdatableRecord#refresh()}</li>
 </ul>
 <p>
 Synthetic primary keys will override existing primary keys.]]></jxb:javadoc></jxb:property></appinfo></annotation>
@@ -594,10 +594,10 @@ generated {@link org.jooq.UpdatableRecord}.
 <p>
 To be used with:
 <ul>
-<li>{@link org.jooq.UpdatableRecord.store()}</li>
-<li>{@link org.jooq.UpdatableRecord.update()}</li>
-<li>{@link org.jooq.UpdatableRecord.delete()}</li>
-<li>{@link org.jooq.UpdatableRecord.refresh()}</li>
+<li>{@link org.jooq.UpdatableRecord#store()}</li>
+<li>{@link org.jooq.UpdatableRecord#update()}</li>
+<li>{@link org.jooq.UpdatableRecord#delete()}</li>
+<li>{@link org.jooq.UpdatableRecord#refresh()}</li>
 </ul>
 <p>
 If several keys match, a warning is emitted and the first one encountered will be used.