diff --git a/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.10.0.xsd b/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.10.0.xsd
index 3887a01e95..a2a2a9ca95 100644
--- a/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.10.0.xsd
+++ b/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.10.0.xsd
@@ -438,6 +438,12 @@
         -->
       <element name="recordTimestampFields" type="string" default="" minOccurs="0" maxOccurs="1" />
 
+      <!--
+        A regular expression matching all columns that represent identities
+        To be used if columns are not detected as automatically as identities.
+        -->
+      <element name="syntheticIdentities" type="string" default="" minOccurs="0" maxOccurs="1"/>
+
       <!--
         A regular expression matching all columns that participate in "synthetic" primary keys,
         which should be placed on generated UpdatableRecords, to be used with
@@ -466,12 +472,6 @@
         -->
       <element name="overridePrimaryKeys" type="string" default="" minOccurs="0" maxOccurs="1" />
 
-      <!--
-        A regular expression matching all columns that represent identities
-        To be used if columns are not detected as automatically as identities.
-        -->
-      <element name="syntheticIdentities" type="string" default="" minOccurs="0" maxOccurs="1"/>
-
       <!--
         Generate java.sql.Timestamp fields for DATE columns. This is
         particularly useful for Oracle databases
@@ -528,40 +528,6 @@
         -->
       <element name="inputSchema" type="string" default="" minOccurs="0" maxOccurs="1" />
 
-      <!--
-        A custom version number that, if available, will be used to assess whether the above
-        <inputSchema/> will need to be regenerated.
-
-        There are three operation modes for this element:
-
-        - The value is a class that can be found on the classpath and that implements
-          org.jooq.util.SchemaVersionProvider. Such classes must provide a default constructor
-        - The value is a SELECT statement that returns one record with one column. The
-          SELECT statement may contain a named variable called :schema_name
-        - The value is a constant, such as a Maven property
-
-        Schema versions will be generated into the javax.annotation.Generated annotation on
-        generated artefacts.
-        -->
-      <element name="schemaVersionProvider" type="string" default="" minOccurs="0" maxOccurs="1"/>
-
-      <!--
-        A custom version number that, if available, will be used to assess whether the above
-        <inputSchema/> from a given catalog will need to be regenerated.
-
-        There are three operation modes for this element:
-
-        - The value is a class that can be found on the classpath and that implements
-          org.jooq.util.CatalogVersionProvider. Such classes must provide a default constructor
-        - The value is a SELECT statement that returns one record with one column. The
-          SELECT statement may contain a named variable called :catalog_name
-        - The value is a constant, such as a Maven property
-
-        Catalog versions will be generated into the javax.annotation.Generated annotation on
-        generated artefacts.
-        -->
-      <element name="catalogVersionProvider" type="string" default="" minOccurs="0" maxOccurs="1"/>
-
       <!--
         The schema that is used in generated source code. This will be the
         production schema. Use this to override your local development
@@ -599,6 +565,40 @@
         -->
       <element name="schemata" type="tns:Schemata" minOccurs="0" maxOccurs="1"/>
 
+      <!--
+        A custom version number that, if available, will be used to assess whether the above
+        <inputSchema/> will need to be regenerated.
+
+        There are three operation modes for this element:
+
+        - The value is a class that can be found on the classpath and that implements
+          org.jooq.util.SchemaVersionProvider. Such classes must provide a default constructor
+        - The value is a SELECT statement that returns one record with one column. The
+          SELECT statement may contain a named variable called :schema_name
+        - The value is a constant, such as a Maven property
+
+        Schema versions will be generated into the javax.annotation.Generated annotation on
+        generated artefacts.
+        -->
+      <element name="schemaVersionProvider" type="string" default="" minOccurs="0" maxOccurs="1"/>
+
+      <!--
+        A custom version number that, if available, will be used to assess whether the above
+        <inputSchema/> from a given catalog will need to be regenerated.
+
+        There are three operation modes for this element:
+
+        - The value is a class that can be found on the classpath and that implements
+          org.jooq.util.CatalogVersionProvider. Such classes must provide a default constructor
+        - The value is a SELECT statement that returns one record with one column. The
+          SELECT statement may contain a named variable called :catalog_name
+        - The value is a constant, such as a Maven property
+
+        Catalog versions will be generated into the javax.annotation.Generated annotation on
+        generated artefacts.
+        -->
+      <element name="catalogVersionProvider" type="string" default="" minOccurs="0" maxOccurs="1"/>
+
       <!--
         A configuration element to configure custom types introduced to jOOQ
         using converters