diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
index beae734e8d..52eb782597 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DSL.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -19506,7 +19506,7 @@ public class DSL {
     @NotNull
     @Support({ POSTGRES })
     public static Field<XML> xmlcomment(@Stringly.Param String comment) {
-        return new Xmlcomment(Tools.field(comment));
+        return new XMLComment(Tools.field(comment));
     }
 
     /**
@@ -19515,7 +19515,7 @@ public class DSL {
     @NotNull
     @Support({ POSTGRES })
     public static Field<XML> xmlcomment(Field<String> comment) {
-        return new Xmlcomment(comment);
+        return new XMLComment(comment);
     }
 
     /**
@@ -19524,7 +19524,7 @@ public class DSL {
     @NotNull
     @Support({ POSTGRES })
     public static Field<XML> xmlconcat(Field<?>... args) {
-        return new Xmlconcat(Arrays.asList(args));
+        return new XMLConcat(Arrays.asList(args));
     }
 
     /**
@@ -19533,7 +19533,7 @@ public class DSL {
     @NotNull
     @Support({ POSTGRES })
     public static Field<XML> xmlconcat(Collection<? extends Field<?>> args) {
-        return new Xmlconcat(new QueryPartList<>(args));
+        return new XMLConcat(new QueryPartList<>(args));
     }
 
 
@@ -19556,7 +19556,7 @@ public class DSL {
     @NotNull
     @Support({ POSTGRES })
     public static Field<XML> xmlforest(Field<?>... fields) {
-        return new Xmlforest(Arrays.asList(fields));
+        return new XMLForest(Arrays.asList(fields));
     }
 
     /**
@@ -19565,7 +19565,7 @@ public class DSL {
     @NotNull
     @Support({ POSTGRES })
     public static Field<XML> xmlforest(Collection<? extends Field<?>> fields) {
-        return new Xmlforest(new QueryPartList<>(fields));
+        return new XMLForest(new QueryPartList<>(fields));
     }
 
     /**
@@ -19574,7 +19574,7 @@ public class DSL {
     @NotNull
     @Support({ POSTGRES })
     public static Field<XML> xmlpi(@Stringly.Name String target, Field<?> content) {
-        return new Xmlpi(DSL.name(target), content);
+        return new XMLPi(DSL.name(target), content);
     }
 
     /**
@@ -19583,7 +19583,7 @@ public class DSL {
     @NotNull
     @Support({ POSTGRES })
     public static Field<XML> xmlpi(Name target, Field<?> content) {
-        return new Xmlpi(target, content);
+        return new XMLPi(target, content);
     }
 
     /**
@@ -19592,7 +19592,7 @@ public class DSL {
     @NotNull
     @Support({ POSTGRES })
     public static Field<XML> xmlpi(@Stringly.Name String target) {
-        return new Xmlpi(DSL.name(target));
+        return new XMLPi(DSL.name(target));
     }
 
     /**
@@ -19601,7 +19601,7 @@ public class DSL {
     @NotNull
     @Support({ POSTGRES })
     public static Field<XML> xmlpi(Name target) {
-        return new Xmlpi(target);
+        return new XMLPi(target);
     }
 
     /**
@@ -19612,7 +19612,7 @@ public class DSL {
     @NotNull
     @Support({ POSTGRES })
     public static <T> Field<T> xmlserializeDocument(XML value, DataType<T> type) {
-        return new Xmlserialize<>(false, Tools.field(value), type);
+        return new XMLSerialize<>(false, Tools.field(value), type);
     }
 
     /**
@@ -19621,7 +19621,7 @@ public class DSL {
     @NotNull
     @Support({ POSTGRES })
     public static <T> Field<T> xmlserializeDocument(Field<XML> value, DataType<T> type) {
-        return new Xmlserialize<>(false, value, type);
+        return new XMLSerialize<>(false, value, type);
     }
 
     /**
@@ -19632,7 +19632,7 @@ public class DSL {
     @NotNull
     @Support({ POSTGRES })
     public static <T> Field<T> xmlserializeContent(XML value, DataType<T> type) {
-        return new Xmlserialize<>(true, Tools.field(value), type);
+        return new XMLSerialize<>(true, Tools.field(value), type);
     }
 
     /**
@@ -19641,7 +19641,7 @@ public class DSL {
     @NotNull
     @Support({ POSTGRES })
     public static <T> Field<T> xmlserializeContent(Field<XML> value, DataType<T> type) {
-        return new Xmlserialize<>(true, value, type);
+        return new XMLSerialize<>(true, value, type);
     }
 
     // -------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
index 0a405bd9b6..08a700fe80 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
@@ -371,8 +371,8 @@ import static org.jooq.impl.QOM.JSONOnNull.NULL_ON_NULL;
 // ...
 // ...
 // ...
-import static org.jooq.impl.QOM.XmlPassingMechanism.BY_REF;
-import static org.jooq.impl.QOM.XmlPassingMechanism.BY_VALUE;
+import static org.jooq.impl.QOM.XMLPassingMechanism.BY_REF;
+import static org.jooq.impl.QOM.XMLPassingMechanism.BY_VALUE;
 import static org.jooq.impl.SQLDataType.BIGINT;
 import static org.jooq.impl.SQLDataType.INTEGER;
 import static org.jooq.impl.SQLDataType.NVARCHAR;
@@ -631,7 +631,7 @@ import org.jooq.impl.QOM.JSONOnNull;
 // ...
 import org.jooq.impl.QOM.UEmpty;
 import org.jooq.impl.QOM.UTransient;
-import org.jooq.impl.QOM.XmlPassingMechanism;
+import org.jooq.impl.QOM.XMLPassingMechanism;
 import org.jooq.impl.ScopeStack.Value;
 import org.jooq.tools.StringUtils;
 import org.jooq.tools.reflect.Reflect;
@@ -6161,7 +6161,7 @@ final class DefaultParseContext extends AbstractScope implements ParseContext {
         else if (parseKeywordIf("XMLEXISTS")) {
             parse('(');
             Field<String> xpath = (Field<String>) parseField();
-            XmlPassingMechanism m = parseXMLPassingMechanism();
+            XMLPassingMechanism m = parseXMLPassingMechanism();
             Field<XML> xml = (Field<XML>) parseField();
             parse(')');
 
@@ -6586,7 +6586,7 @@ final class DefaultParseContext extends AbstractScope implements ParseContext {
             parse('(');
 
             XMLTablePassingStep s1 = xmltable((Field) toField(parseConcat()));
-            XmlPassingMechanism m = parseXMLPassingMechanismIf();
+            XMLPassingMechanism m = parseXMLPassingMechanismIf();
             Field<XML> passing = m == null ? null : (Field<XML>) parseField();
 
             XMLTableColumnsStep s2 = (XMLTableColumnsStep) (
@@ -6594,7 +6594,7 @@ final class DefaultParseContext extends AbstractScope implements ParseContext {
                 ? s1.passingByRef(passing)
                 : m == BY_VALUE
                 ? s1.passingByValue(passing)
-                : m == XmlPassingMechanism.DEFAULT
+                : m == XMLPassingMechanism.DEFAULT
                 ? s1.passing(passing)
                 : s1
             );
@@ -8658,7 +8658,7 @@ final class DefaultParseContext extends AbstractScope implements ParseContext {
         if (parseFunctionNameIf("XMLQUERY")) {
             parse('(');
             Field<String> xpath = (Field<String>) parseField();
-            XmlPassingMechanism m = parseXMLPassingMechanism();
+            XMLPassingMechanism m = parseXMLPassingMechanism();
             Field<XML> xml = (Field<XML>) parseField();
             parseKeywordIf("RETURNING CONTENT");
             parse(')');
@@ -8678,8 +8678,8 @@ final class DefaultParseContext extends AbstractScope implements ParseContext {
         return null;
     }
 
-    private final XmlPassingMechanism parseXMLPassingMechanism() {
-        XmlPassingMechanism result = parseXMLPassingMechanismIf();
+    private final XMLPassingMechanism parseXMLPassingMechanism() {
+        XMLPassingMechanism result = parseXMLPassingMechanismIf();
 
         if (result == null)
             throw expected("PASSING");
@@ -8687,11 +8687,11 @@ final class DefaultParseContext extends AbstractScope implements ParseContext {
         return result;
     }
 
-    private final XmlPassingMechanism parseXMLPassingMechanismIf() {
+    private final XMLPassingMechanism parseXMLPassingMechanismIf() {
         if (!parseKeywordIf("PASSING"))
             return null;
         else if (!parseKeywordIf("BY"))
-            return XmlPassingMechanism.DEFAULT;
+            return XMLPassingMechanism.DEFAULT;
         else if (parseKeywordIf("REF"))
             return BY_REF;
         else if (parseKeywordIf("VALUE"))
diff --git a/jOOQ/src/main/java/org/jooq/impl/QOM.java b/jOOQ/src/main/java/org/jooq/impl/QOM.java
index d7035cfabe..e304dafb10 100644
--- a/jOOQ/src/main/java/org/jooq/impl/QOM.java
+++ b/jOOQ/src/main/java/org/jooq/impl/QOM.java
@@ -964,7 +964,7 @@ public final class QOM {
     {
         @NotNull Field<String> $xpath();
         @NotNull Field<XML> $passing();
-        @Nullable XmlPassingMechanism $passingMechanism();
+        @Nullable XMLPassingMechanism $passingMechanism();
     }
 
     public /*sealed*/ interface XMLElement
@@ -986,7 +986,7 @@ public final class QOM {
     {
         @NotNull Field<String> $xpath();
         @NotNull Field<XML> $passing();
-        @Nullable XmlPassingMechanism $passingMechanism();
+        @Nullable XMLPassingMechanism $passingMechanism();
     }
 
     public /*sealed*/ interface XMLParse
@@ -2888,24 +2888,24 @@ public final class QOM {
 
 
 
-    public /*sealed*/ interface Xmlcomment
+    public /*sealed*/ interface XMLComment
         extends
             Field<XML>
         //permits
-        //    Xmlcomment
+        //    XMLComment
     {
         @NotNull  Field<String> $comment();
-        @NotNull  Xmlcomment $comment(Field<String> comment);
+        @NotNull  XMLComment $comment(Field<String> comment);
     }
 
-    public /*sealed*/ interface Xmlconcat
+    public /*sealed*/ interface XMLConcat
         extends
             Field<XML>
         //permits
-        //    Xmlconcat
+        //    XMLConcat
     {
         @NotNull  MList<? extends Field<?>> $args();
-        @NotNull  Xmlconcat $args(MList<? extends Field<?>> args);
+        @NotNull  XMLConcat $args(MList<? extends Field<?>> args);
     }
 
 
@@ -2921,40 +2921,40 @@ public final class QOM {
 
 
 
-    public /*sealed*/ interface Xmlforest
+    public /*sealed*/ interface XMLForest
         extends
             Field<XML>
         //permits
-        //    Xmlforest
+        //    XMLForest
     {
         @NotNull  MList<? extends Field<?>> $fields();
-        @NotNull  Xmlforest $fields(MList<? extends Field<?>> fields);
+        @NotNull  XMLForest $fields(MList<? extends Field<?>> fields);
     }
 
-    public /*sealed*/ interface Xmlpi
+    public /*sealed*/ interface XMLPi
         extends
             Field<XML>
         //permits
-        //    Xmlpi
+        //    XMLPi
     {
         @NotNull  Name $target();
         @Nullable Field<?> $content();
-        @NotNull  Xmlpi $target(Name target);
-        @NotNull  Xmlpi $content(Field<?> content);
+        @NotNull  XMLPi $target(Name target);
+        @NotNull  XMLPi $content(Field<?> content);
     }
 
-    public /*sealed*/ interface Xmlserialize<T>
+    public /*sealed*/ interface XMLSerialize<T>
         extends
             Field<T>
         //permits
-        //    Xmlserialize
+        //    XMLSerialize
     {
                   boolean $content();
         @NotNull  Field<XML> $value();
         @NotNull  DataType<T> $type();
-        @NotNull  Xmlserialize<T> $content(boolean content);
-        @NotNull  Xmlserialize<T> $value(Field<XML> value);
-        @NotNull  Xmlserialize<T> $type(DataType<T> type);
+        @NotNull  XMLSerialize<T> $content(boolean content);
+        @NotNull  XMLSerialize<T> $value(Field<XML> value);
+        @NotNull  XMLSerialize<T> $type(DataType<T> type);
     }
 
     public /*sealed*/ interface JSONArray<T>
@@ -3634,11 +3634,11 @@ public final class QOM {
     }
 
     /**
-     * The <code>XmlPassingMechanism</code> type.
+     * The <code>XMLPassingMechanism</code> type.
      * <p>
      * Specify how XML contents should be passed to certain XML functions.
      */
-    public enum XmlPassingMechanism {
+    public enum XMLPassingMechanism {
         BY_REF(keyword("by ref")),
         BY_VALUE(keyword("by value")),
         DEFAULT(keyword("default")),
@@ -3646,7 +3646,7 @@ public final class QOM {
 
         final Keyword keyword;
 
-        private XmlPassingMechanism(Keyword keyword) {
+        private XMLPassingMechanism(Keyword keyword) {
             this.keyword = keyword;
         }
     }
diff --git a/jOOQ/src/main/java/org/jooq/impl/XMLComment.java b/jOOQ/src/main/java/org/jooq/impl/XMLComment.java
index 45611c956a..937fa44471 100644
--- a/jOOQ/src/main/java/org/jooq/impl/XMLComment.java
+++ b/jOOQ/src/main/java/org/jooq/impl/XMLComment.java
@@ -65,16 +65,16 @@ import java.util.stream.*;
  * The <code>XMLCOMMENT</code> statement.
  */
 @SuppressWarnings({ "rawtypes", "unchecked", "unused" })
-final class Xmlcomment
+final class XMLComment
 extends
     AbstractField<XML>
 implements
-    QOM.Xmlcomment
+    QOM.XMLComment
 {
 
     final Field<String> comment;
 
-    Xmlcomment(
+    XMLComment(
         Field<String> comment
     ) {
         super(
@@ -124,12 +124,12 @@ implements
     }
 
     @Override
-    public final QOM.Xmlcomment $comment(Field<String> newValue) {
+    public final QOM.XMLComment $comment(Field<String> newValue) {
         return constructor().apply(newValue);
     }
 
-    public final Function1<? super Field<String>, ? extends QOM.Xmlcomment> constructor() {
-        return (a1) -> new Xmlcomment(a1);
+    public final Function1<? super Field<String>, ? extends QOM.XMLComment> constructor() {
+        return (a1) -> new XMLComment(a1);
     }
 
     @Override
@@ -165,9 +165,9 @@ implements
 
     @Override
     public boolean equals(Object that) {
-        if (that instanceof Xmlcomment) {
+        if (that instanceof XMLComment) {
             return
-                StringUtils.equals($comment(), ((Xmlcomment) that).$comment())
+                StringUtils.equals($comment(), ((XMLComment) that).$comment())
             ;
         }
         else
diff --git a/jOOQ/src/main/java/org/jooq/impl/XMLExists.java b/jOOQ/src/main/java/org/jooq/impl/XMLExists.java
index bd3023a455..a2c291fab3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/XMLExists.java
+++ b/jOOQ/src/main/java/org/jooq/impl/XMLExists.java
@@ -38,8 +38,8 @@
 package org.jooq.impl;
 
 import static org.jooq.impl.Keywords.K_XMLEXISTS;
-import static org.jooq.impl.QOM.XmlPassingMechanism.BY_REF;
-import static org.jooq.impl.QOM.XmlPassingMechanism.BY_VALUE;
+import static org.jooq.impl.QOM.XMLPassingMechanism.BY_REF;
+import static org.jooq.impl.QOM.XMLPassingMechanism.BY_VALUE;
 import static org.jooq.impl.XMLTable.acceptPassing;
 import static org.jooq.impl.XMLTable.acceptXPath;
 
@@ -54,7 +54,7 @@ import org.jooq.QueryPart;
 import org.jooq.XML;
 import org.jooq.XMLExistsPassingStep;
 import org.jooq.impl.QOM.UNotYetImplemented;
-import org.jooq.impl.QOM.XmlPassingMechanism;
+import org.jooq.impl.QOM.XMLPassingMechanism;
 
 
 /**
@@ -63,13 +63,13 @@ import org.jooq.impl.QOM.XmlPassingMechanism;
 final class XMLExists extends AbstractCondition implements XMLExistsPassingStep, QOM.XMLExists, UNotYetImplemented {
     private final Field<String>       xpath;
     private final Field<XML>          passing;
-    private final XmlPassingMechanism passingMechanism;
+    private final XMLPassingMechanism passingMechanism;
 
     XMLExists(Field<String> xpath) {
         this(xpath, null, null);
     }
 
-    private XMLExists(Field<String> xpath, Field<XML> passing, XmlPassingMechanism passingMechanism) {
+    private XMLExists(Field<String> xpath, Field<XML> passing, XMLPassingMechanism passingMechanism) {
         this.xpath = xpath;
         this.passing = passing;
         this.passingMechanism = passingMechanism;
@@ -135,7 +135,7 @@ final class XMLExists extends AbstractCondition implements XMLExistsPassingStep,
     }
 
     @Override
-    public final XmlPassingMechanism $passingMechanism() {
+    public final XMLPassingMechanism $passingMechanism() {
         return passingMechanism;
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/XMLForest.java b/jOOQ/src/main/java/org/jooq/impl/XMLForest.java
index fc8c994b96..8b4b7e47ae 100644
--- a/jOOQ/src/main/java/org/jooq/impl/XMLForest.java
+++ b/jOOQ/src/main/java/org/jooq/impl/XMLForest.java
@@ -65,16 +65,16 @@ import java.util.stream.*;
  * The <code>XMLFOREST</code> statement.
  */
 @SuppressWarnings({ "rawtypes", "unused" })
-final class Xmlforest
+final class XMLForest
 extends
     AbstractField<XML>
 implements
-    QOM.Xmlforest
+    QOM.XMLForest
 {
 
     final QueryPartListView<? extends Field<?>> fields;
 
-    Xmlforest(
+    XMLForest(
         Collection<? extends Field<?>> fields
     ) {
         super(
@@ -128,12 +128,12 @@ implements
     }
 
     @Override
-    public final QOM.Xmlforest $fields(MList<? extends Field<?>> newValue) {
+    public final QOM.XMLForest $fields(MList<? extends Field<?>> newValue) {
         return constructor().apply(newValue);
     }
 
-    public final Function1<? super MList<? extends Field<?>>, ? extends QOM.Xmlforest> constructor() {
-        return (a1) -> new Xmlforest((Collection<? extends Field<?>>) a1);
+    public final Function1<? super MList<? extends Field<?>>, ? extends QOM.XMLForest> constructor() {
+        return (a1) -> new XMLForest(a1);
     }
 
     @Override
@@ -169,9 +169,9 @@ implements
 
     @Override
     public boolean equals(Object that) {
-        if (that instanceof Xmlforest) {
+        if (that instanceof XMLForest) {
             return
-                StringUtils.equals($fields(), ((Xmlforest) that).$fields())
+                StringUtils.equals($fields(), ((XMLForest) that).$fields())
             ;
         }
         else
diff --git a/jOOQ/src/main/java/org/jooq/impl/XMLQuery.java b/jOOQ/src/main/java/org/jooq/impl/XMLQuery.java
index ce94b393d7..643b226067 100644
--- a/jOOQ/src/main/java/org/jooq/impl/XMLQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/XMLQuery.java
@@ -44,8 +44,8 @@ import static org.jooq.impl.DSL.xmlagg;
 import static org.jooq.impl.Keywords.K_CONTENT;
 import static org.jooq.impl.Keywords.K_RETURNING;
 import static org.jooq.impl.Names.N_XMLQUERY;
-import static org.jooq.impl.QOM.XmlPassingMechanism.BY_REF;
-import static org.jooq.impl.QOM.XmlPassingMechanism.BY_VALUE;
+import static org.jooq.impl.QOM.XMLPassingMechanism.BY_REF;
+import static org.jooq.impl.QOM.XMLPassingMechanism.BY_VALUE;
 import static org.jooq.impl.SQLDataType.XML;
 import static org.jooq.impl.XMLTable.acceptPassing;
 import static org.jooq.impl.XMLTable.acceptXPath;
@@ -59,7 +59,7 @@ import org.jooq.Function1;
 import org.jooq.QueryPart;
 import org.jooq.XML;
 import org.jooq.XMLQueryPassingStep;
-import org.jooq.impl.QOM.XmlPassingMechanism;
+import org.jooq.impl.QOM.XMLPassingMechanism;
 
 /**
  * @author Lukas Eder
@@ -67,13 +67,13 @@ import org.jooq.impl.QOM.XmlPassingMechanism;
 final class XMLQuery extends AbstractField<XML> implements XMLQueryPassingStep, QOM.XMLQuery {
     private final Field<String>       xpath;
     private final Field<XML>          passing;
-    private final XmlPassingMechanism passingMechanism;
+    private final XMLPassingMechanism passingMechanism;
 
     XMLQuery(Field<String> xpath) {
         this(xpath, null, null);
     }
 
-    private XMLQuery(Field<String> xpath, Field<XML> passing, XmlPassingMechanism passingMechanism) {
+    private XMLQuery(Field<String> xpath, Field<XML> passing, XMLPassingMechanism passingMechanism) {
         super(N_XMLQUERY, SQLDataType.XML);
 
         this.xpath = xpath;
@@ -167,7 +167,7 @@ final class XMLQuery extends AbstractField<XML> implements XMLQueryPassingStep,
     }
 
     @Override
-    public final XmlPassingMechanism $passingMechanism() {
+    public final XMLPassingMechanism $passingMechanism() {
         return passingMechanism;
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/XMLTable.java b/jOOQ/src/main/java/org/jooq/impl/XMLTable.java
index 931fcd9603..a4c77f7f3b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/XMLTable.java
+++ b/jOOQ/src/main/java/org/jooq/impl/XMLTable.java
@@ -56,14 +56,11 @@ import static org.jooq.impl.Keywords.K_REF;
 import static org.jooq.impl.Keywords.K_VALUE;
 import static org.jooq.impl.Keywords.K_XMLTABLE;
 import static org.jooq.impl.Names.N_XMLTABLE;
+import static org.jooq.impl.QOM.XMLPassingMechanism.BY_REF;
+import static org.jooq.impl.QOM.XMLPassingMechanism.BY_VALUE;
 import static org.jooq.impl.SQLDataType.XML;
 import static org.jooq.impl.Tools.map;
 import static org.jooq.impl.Tools.visitSubquery;
-import static org.jooq.impl.QOM.XmlPassingMechanism.BY_REF;
-import static org.jooq.impl.QOM.XmlPassingMechanism.BY_VALUE;
-
-import java.util.ArrayList;
-import java.util.List;
 
 import org.jooq.Context;
 import org.jooq.DataType;
@@ -75,9 +72,8 @@ import org.jooq.TableOptions;
 import org.jooq.XML;
 import org.jooq.XMLTableColumnPathStep;
 import org.jooq.XMLTablePassingStep;
-import org.jooq.conf.ParamType;
 import org.jooq.impl.QOM.UNotYetImplemented;
-import org.jooq.impl.QOM.XmlPassingMechanism;
+import org.jooq.impl.QOM.XMLPassingMechanism;
 
 /**
  * @author Lukas Eder
@@ -92,7 +88,7 @@ implements
 {
     private final Field<String>                 xpath;
     private final Field<XML>                    passing;
-    private final XmlPassingMechanism           passingMechanism;
+    private final XMLPassingMechanism           passingMechanism;
     private final QueryPartList<XMLTableColumn> columns;
     private final boolean                       hasOrdinality;
     private transient FieldsImpl<Record>        fields;
@@ -104,7 +100,7 @@ implements
     private XMLTable(
         Field<String> xpath,
         Field<XML> passing,
-        XmlPassingMechanism passingMechanism,
+        XMLPassingMechanism passingMechanism,
         QueryPartList<XMLTableColumn> columns,
         boolean hasOrdinality
     ) {
@@ -289,7 +285,7 @@ implements
         ctx.visit(xpath);
     }
 
-    static final void acceptPassing(Context<?> ctx, Field<XML> passing, XmlPassingMechanism passingMechanism) {
+    static final void acceptPassing(Context<?> ctx, Field<XML> passing, XMLPassingMechanism passingMechanism) {
         ctx.formatSeparator()
            .visit(K_PASSING);
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Xmlconcat.java b/jOOQ/src/main/java/org/jooq/impl/Xmlconcat.java
index 84a208bfbc..09c6176a89 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Xmlconcat.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Xmlconcat.java
@@ -65,16 +65,16 @@ import java.util.stream.*;
  * The <code>XMLCONCAT</code> statement.
  */
 @SuppressWarnings({ "rawtypes", "unused" })
-final class Xmlconcat
+final class XMLConcat
 extends
     AbstractField<XML>
 implements
-    QOM.Xmlconcat
+    QOM.XMLConcat
 {
 
     final QueryPartListView<? extends Field<?>> args;
 
-    Xmlconcat(
+    XMLConcat(
         Collection<? extends Field<?>> args
     ) {
         super(
@@ -126,12 +126,12 @@ implements
     }
 
     @Override
-    public final QOM.Xmlconcat $args(MList<? extends Field<?>> newValue) {
+    public final QOM.XMLConcat $args(MList<? extends Field<?>> newValue) {
         return constructor().apply(newValue);
     }
 
-    public final Function1<? super MList<? extends Field<?>>, ? extends QOM.Xmlconcat> constructor() {
-        return (a1) -> new Xmlconcat((Collection<? extends Field<?>>) a1);
+    public final Function1<? super MList<? extends Field<?>>, ? extends QOM.XMLConcat> constructor() {
+        return (a1) -> new XMLConcat(a1);
     }
 
     @Override
@@ -167,9 +167,9 @@ implements
 
     @Override
     public boolean equals(Object that) {
-        if (that instanceof Xmlconcat) {
+        if (that instanceof XMLConcat) {
             return
-                StringUtils.equals($args(), ((Xmlconcat) that).$args())
+                StringUtils.equals($args(), ((XMLConcat) that).$args())
             ;
         }
         else
diff --git a/jOOQ/src/main/java/org/jooq/impl/Xmlpi.java b/jOOQ/src/main/java/org/jooq/impl/Xmlpi.java
index 553ce363e8..aa33f00436 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Xmlpi.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Xmlpi.java
@@ -65,17 +65,17 @@ import java.util.stream.*;
  * The <code>XMLPI</code> statement.
  */
 @SuppressWarnings({ "rawtypes", "unused" })
-final class Xmlpi
+final class XMLPi
 extends
     AbstractField<XML>
 implements
-    QOM.Xmlpi
+    QOM.XMLPi
 {
 
     final Name     target;
     final Field<?> content;
 
-    Xmlpi(
+    XMLPi(
         Name target
     ) {
         super(
@@ -87,7 +87,7 @@ implements
         this.content = null;
     }
 
-    Xmlpi(
+    XMLPi(
         Name target,
         Field<?> content
     ) {
@@ -153,17 +153,17 @@ implements
     }
 
     @Override
-    public final QOM.Xmlpi $target(Name newValue) {
+    public final QOM.XMLPi $target(Name newValue) {
         return constructor().apply(newValue, $content());
     }
 
     @Override
-    public final QOM.Xmlpi $content(Field<?> newValue) {
+    public final QOM.XMLPi $content(Field<?> newValue) {
         return constructor().apply($target(), newValue);
     }
 
-    public final Function2<? super Name, ? super Field<?>, ? extends QOM.Xmlpi> constructor() {
-        return (a1, a2) -> new Xmlpi(a1, a2);
+    public final Function2<? super Name, ? super Field<?>, ? extends QOM.XMLPi> constructor() {
+        return (a1, a2) -> new XMLPi(a1, a2);
     }
 
     @Override
@@ -201,10 +201,10 @@ implements
 
     @Override
     public boolean equals(Object that) {
-        if (that instanceof Xmlpi) {
+        if (that instanceof XMLPi) {
             return
-                StringUtils.equals($target(), ((Xmlpi) that).$target()) &&
-                StringUtils.equals($content(), ((Xmlpi) that).$content())
+                StringUtils.equals($target(), ((XMLPi) that).$target()) &&
+                StringUtils.equals($content(), ((XMLPi) that).$content())
             ;
         }
         else
diff --git a/jOOQ/src/main/java/org/jooq/impl/Xmlserialize.java b/jOOQ/src/main/java/org/jooq/impl/Xmlserialize.java
index 60dbf41cef..cbf6bd799d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Xmlserialize.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Xmlserialize.java
@@ -65,18 +65,18 @@ import java.util.stream.*;
  * The <code>XMLSERIALIZE</code> statement.
  */
 @SuppressWarnings({ "rawtypes", "unchecked", "unused" })
-final class Xmlserialize<T>
+final class XMLSerialize<T>
 extends
     AbstractField<T>
 implements
-    QOM.Xmlserialize<T>
+    QOM.XMLSerialize<T>
 {
 
     final boolean     content;
     final Field<XML>  value;
     final DataType<T> type;
 
-    Xmlserialize(
+    XMLSerialize(
         boolean content,
         Field<XML> value,
         DataType<T> type
@@ -158,22 +158,22 @@ implements
     }
 
     @Override
-    public final QOM.Xmlserialize<T> $content(boolean newValue) {
+    public final QOM.XMLSerialize<T> $content(boolean newValue) {
         return constructor().apply(newValue, $value(), $type());
     }
 
     @Override
-    public final QOM.Xmlserialize<T> $value(Field<XML> newValue) {
+    public final QOM.XMLSerialize<T> $value(Field<XML> newValue) {
         return constructor().apply($content(), newValue, $type());
     }
 
     @Override
-    public final QOM.Xmlserialize<T> $type(DataType<T> newValue) {
+    public final QOM.XMLSerialize<T> $type(DataType<T> newValue) {
         return constructor().apply($content(), $value(), newValue);
     }
 
-    public final Function3<? super Boolean, ? super Field<XML>, ? super DataType<T>, ? extends QOM.Xmlserialize<T>> constructor() {
-        return (a1, a2, a3) -> new Xmlserialize<>(a1, a2, a3);
+    public final Function3<? super Boolean, ? super Field<XML>, ? super DataType<T>, ? extends QOM.XMLSerialize<T>> constructor() {
+        return (a1, a2, a3) -> new XMLSerialize<>(a1, a2, a3);
     }
 
     @Override
@@ -212,11 +212,11 @@ implements
 
     @Override
     public boolean equals(Object that) {
-        if (that instanceof Xmlserialize) {
+        if (that instanceof XMLSerialize) {
             return
-                $content() == ((Xmlserialize) that).$content() &&
-                StringUtils.equals($value(), ((Xmlserialize) that).$value()) &&
-                StringUtils.equals($type(), ((Xmlserialize) that).$type())
+                $content() == ((XMLSerialize) that).$content() &&
+                StringUtils.equals($value(), ((XMLSerialize) that).$value()) &&
+                StringUtils.equals($type(), ((XMLSerialize) that).$type())
             ;
         }
         else