diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGenerator.java
index 346bc9ad2b..cc1d6c3d48 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGenerator.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGenerator.java
@@ -1275,7 +1275,14 @@ public class DefaultGenerator implements Generator {
                     out.println();
                     out.println("\t@Override");
                     out.println("\tpublic java.lang.String getName() {");
-                    out.println("\t\treturn \"" + e.getName() + "\";");
+
+                    if (e.isSynthetic()) {
+                        out.println("\t\treturn null;");
+                    }
+                    else {
+                        out.println("\t\treturn \"" + e.getName() + "\";");
+                    }
+
                     out.println("\t}");
                     out.println();
                     out.println("\t@Override");
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java
index 684d422b0f..99ed2d4e9f 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java
@@ -275,7 +275,7 @@ public abstract class AbstractDatabase implements Database {
         for (String property : properties.stringPropertyNames()) {
             if (property.startsWith("generator.database.enum-type.")) {
                 String name = property.replace("generator.database.enum-type.", "");
-                DefaultEnumDefinition e = new DefaultEnumDefinition(this, name, null);
+                DefaultEnumDefinition e = new DefaultEnumDefinition(this, name, null, true);
 
                 String literals = properties.getProperty(property);
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/DefaultEnumDefinition.java b/jOOQ-meta/src/main/java/org/jooq/util/DefaultEnumDefinition.java
index b9d0c5f43f..fcaf80a365 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/DefaultEnumDefinition.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/DefaultEnumDefinition.java
@@ -42,11 +42,17 @@ import java.util.List;
 public class DefaultEnumDefinition extends AbstractDefinition implements EnumDefinition {
 
     private final List<String> literals;
+    private final boolean isSynthetic;
 
     public DefaultEnumDefinition(Database database, String name, String comment) {
+        this(database, name, comment, false);
+    }
+
+    public DefaultEnumDefinition(Database database, String name, String comment, boolean isSynthetic) {
         super(database, name, comment);
 
-        literals = new ArrayList<String>();
+        this.literals = new ArrayList<String>();
+        this.isSynthetic = isSynthetic;
     }
 
     public void addLiteral(String literal) {
@@ -61,4 +67,9 @@ public class DefaultEnumDefinition extends AbstractDefinition implements EnumDef
     public List<String> getLiterals() {
         return literals;
     }
+
+    @Override
+    public boolean isSynthetic() {
+        return isSynthetic;
+    }
 }
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/EnumDefinition.java b/jOOQ-meta/src/main/java/org/jooq/util/EnumDefinition.java
index f0ba049903..0aed3140ef 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/EnumDefinition.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/EnumDefinition.java
@@ -48,4 +48,10 @@ public interface EnumDefinition extends Definition {
      * @return The literals defined in this enum
      */
     List<String> getLiterals();
+
+    /**
+     * @return Whether this enum type is "synthetic", i.e. not defined in the
+     *         database, but in code generation configurations.
+     */
+    boolean isSynthetic();
 }
diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/BooleanTrueFalseLc.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/BooleanTrueFalseLc.java
index 72c50e2fa1..427836bbe6 100644
--- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/BooleanTrueFalseLc.java
+++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/BooleanTrueFalseLc.java
@@ -23,7 +23,7 @@ public enum BooleanTrueFalseLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_TRUE_FALSE_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/BooleanTrueFalseUc.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/BooleanTrueFalseUc.java
index 63525838d1..cd50109a30 100644
--- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/BooleanTrueFalseUc.java
+++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/BooleanTrueFalseUc.java
@@ -23,7 +23,7 @@ public enum BooleanTrueFalseUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_TRUE_FALSE_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/BooleanYesNoLc.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/BooleanYesNoLc.java
index 04c4fa7e20..a47b966d33 100644
--- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/BooleanYesNoLc.java
+++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/BooleanYesNoLc.java
@@ -23,7 +23,7 @@ public enum BooleanYesNoLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YES_NO_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/BooleanYesNoUc.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/BooleanYesNoUc.java
index 5d1f55c5f5..7e21625c1f 100644
--- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/BooleanYesNoUc.java
+++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/BooleanYesNoUc.java
@@ -23,7 +23,7 @@ public enum BooleanYesNoUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YES_NO_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/BooleanYnLc.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/BooleanYnLc.java
index fc437f125c..bd2e8a6ddf 100644
--- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/BooleanYnLc.java
+++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/BooleanYnLc.java
@@ -23,7 +23,7 @@ public enum BooleanYnLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YN_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/BooleanYnUc.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/BooleanYnUc.java
index a36546318c..620ac7bdbb 100644
--- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/BooleanYnUc.java
+++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/BooleanYnUc.java
@@ -23,7 +23,7 @@ public enum BooleanYnUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YN_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/Boolean_10.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/Boolean_10.java
index 825124b036..95c43ea3cc 100644
--- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/Boolean_10.java
+++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/enums/Boolean_10.java
@@ -23,7 +23,7 @@ public enum Boolean_10 implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_10";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/enums/BooleanTrueFalseLc.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/enums/BooleanTrueFalseLc.java
index 367ece2346..6900a268e6 100644
--- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/enums/BooleanTrueFalseLc.java
+++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/enums/BooleanTrueFalseLc.java
@@ -23,7 +23,7 @@ public enum BooleanTrueFalseLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_TRUE_FALSE_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/enums/BooleanTrueFalseUc.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/enums/BooleanTrueFalseUc.java
index 6f9f00de34..72fc989be5 100644
--- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/enums/BooleanTrueFalseUc.java
+++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/enums/BooleanTrueFalseUc.java
@@ -23,7 +23,7 @@ public enum BooleanTrueFalseUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_TRUE_FALSE_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/enums/BooleanYesNoLc.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/enums/BooleanYesNoLc.java
index 7717c4a458..ee2dc12808 100644
--- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/enums/BooleanYesNoLc.java
+++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/enums/BooleanYesNoLc.java
@@ -23,7 +23,7 @@ public enum BooleanYesNoLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YES_NO_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/enums/BooleanYesNoUc.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/enums/BooleanYesNoUc.java
index 7ae1b001ff..64774fc8b1 100644
--- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/enums/BooleanYesNoUc.java
+++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/enums/BooleanYesNoUc.java
@@ -23,7 +23,7 @@ public enum BooleanYesNoUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YES_NO_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/enums/BooleanYnLc.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/enums/BooleanYnLc.java
index e03d2a0392..37cb3c8a34 100644
--- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/enums/BooleanYnLc.java
+++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/enums/BooleanYnLc.java
@@ -23,7 +23,7 @@ public enum BooleanYnLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YN_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/enums/BooleanYnUc.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/enums/BooleanYnUc.java
index 2e4dec3f73..8bb144398a 100644
--- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/enums/BooleanYnUc.java
+++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/enums/BooleanYnUc.java
@@ -23,7 +23,7 @@ public enum BooleanYnUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YN_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/enums/Boolean_10.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/enums/Boolean_10.java
index 7e243026d7..1a81b0e849 100644
--- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/enums/Boolean_10.java
+++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/enums/Boolean_10.java
@@ -23,7 +23,7 @@ public enum Boolean_10 implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_10";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/derby/generatedclasses/enums/BooleanTrueFalseLc.java b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/enums/BooleanTrueFalseLc.java
index 6d277b1746..5cae0d692c 100644
--- a/jOOQ-test/src/org/jooq/test/derby/generatedclasses/enums/BooleanTrueFalseLc.java
+++ b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/enums/BooleanTrueFalseLc.java
@@ -23,7 +23,7 @@ public enum BooleanTrueFalseLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_TRUE_FALSE_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/derby/generatedclasses/enums/BooleanTrueFalseUc.java b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/enums/BooleanTrueFalseUc.java
index a9a60f242f..a601f28f72 100644
--- a/jOOQ-test/src/org/jooq/test/derby/generatedclasses/enums/BooleanTrueFalseUc.java
+++ b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/enums/BooleanTrueFalseUc.java
@@ -23,7 +23,7 @@ public enum BooleanTrueFalseUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_TRUE_FALSE_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/derby/generatedclasses/enums/BooleanYesNoLc.java b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/enums/BooleanYesNoLc.java
index 519dad0637..0e7614d78e 100644
--- a/jOOQ-test/src/org/jooq/test/derby/generatedclasses/enums/BooleanYesNoLc.java
+++ b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/enums/BooleanYesNoLc.java
@@ -23,7 +23,7 @@ public enum BooleanYesNoLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YES_NO_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/derby/generatedclasses/enums/BooleanYesNoUc.java b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/enums/BooleanYesNoUc.java
index 12583f22a3..8e89162676 100644
--- a/jOOQ-test/src/org/jooq/test/derby/generatedclasses/enums/BooleanYesNoUc.java
+++ b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/enums/BooleanYesNoUc.java
@@ -23,7 +23,7 @@ public enum BooleanYesNoUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YES_NO_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/derby/generatedclasses/enums/BooleanYnLc.java b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/enums/BooleanYnLc.java
index 3812d65f7c..176bcd104a 100644
--- a/jOOQ-test/src/org/jooq/test/derby/generatedclasses/enums/BooleanYnLc.java
+++ b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/enums/BooleanYnLc.java
@@ -23,7 +23,7 @@ public enum BooleanYnLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YN_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/derby/generatedclasses/enums/BooleanYnUc.java b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/enums/BooleanYnUc.java
index eb6ed29354..c16977c3ec 100644
--- a/jOOQ-test/src/org/jooq/test/derby/generatedclasses/enums/BooleanYnUc.java
+++ b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/enums/BooleanYnUc.java
@@ -23,7 +23,7 @@ public enum BooleanYnUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YN_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/derby/generatedclasses/enums/Boolean_10.java b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/enums/Boolean_10.java
index ce13f00fd0..0aafa98d48 100644
--- a/jOOQ-test/src/org/jooq/test/derby/generatedclasses/enums/Boolean_10.java
+++ b/jOOQ-test/src/org/jooq/test/derby/generatedclasses/enums/Boolean_10.java
@@ -23,7 +23,7 @@ public enum Boolean_10 implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_10";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/enums/BooleanTrueFalseLc.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/enums/BooleanTrueFalseLc.java
index 87c7a31067..880b462e20 100644
--- a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/enums/BooleanTrueFalseLc.java
+++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/enums/BooleanTrueFalseLc.java
@@ -23,7 +23,7 @@ public enum BooleanTrueFalseLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_TRUE_FALSE_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/enums/BooleanTrueFalseUc.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/enums/BooleanTrueFalseUc.java
index 95d98b7cf9..c8a16dfa1c 100644
--- a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/enums/BooleanTrueFalseUc.java
+++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/enums/BooleanTrueFalseUc.java
@@ -23,7 +23,7 @@ public enum BooleanTrueFalseUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_TRUE_FALSE_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/enums/BooleanYesNoLc.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/enums/BooleanYesNoLc.java
index 4662f743d0..46ea0e8e58 100644
--- a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/enums/BooleanYesNoLc.java
+++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/enums/BooleanYesNoLc.java
@@ -23,7 +23,7 @@ public enum BooleanYesNoLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YES_NO_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/enums/BooleanYesNoUc.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/enums/BooleanYesNoUc.java
index db946e88e8..64897f9540 100644
--- a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/enums/BooleanYesNoUc.java
+++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/enums/BooleanYesNoUc.java
@@ -23,7 +23,7 @@ public enum BooleanYesNoUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YES_NO_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/enums/BooleanYnLc.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/enums/BooleanYnLc.java
index 556770f6f6..fba331de1a 100644
--- a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/enums/BooleanYnLc.java
+++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/enums/BooleanYnLc.java
@@ -23,7 +23,7 @@ public enum BooleanYnLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YN_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/enums/BooleanYnUc.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/enums/BooleanYnUc.java
index 3ddc333773..8988ac77a9 100644
--- a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/enums/BooleanYnUc.java
+++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/enums/BooleanYnUc.java
@@ -23,7 +23,7 @@ public enum BooleanYnUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YN_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/enums/Boolean_10.java b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/enums/Boolean_10.java
index 4109b06ece..8038d2db39 100644
--- a/jOOQ-test/src/org/jooq/test/h2/generatedclasses/enums/Boolean_10.java
+++ b/jOOQ-test/src/org/jooq/test/h2/generatedclasses/enums/Boolean_10.java
@@ -23,7 +23,7 @@ public enum Boolean_10 implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_10";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanTrueFalseLc.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanTrueFalseLc.java
index 5573dd382f..052b679374 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanTrueFalseLc.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanTrueFalseLc.java
@@ -23,7 +23,7 @@ public enum BooleanTrueFalseLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_TRUE_FALSE_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanTrueFalseUc.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanTrueFalseUc.java
index 327d06f484..797ba8df96 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanTrueFalseUc.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanTrueFalseUc.java
@@ -23,7 +23,7 @@ public enum BooleanTrueFalseUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_TRUE_FALSE_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanYesNoLc.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanYesNoLc.java
index 7be4fdf8e6..2262e3ed47 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanYesNoLc.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanYesNoLc.java
@@ -23,7 +23,7 @@ public enum BooleanYesNoLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YES_NO_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanYesNoUc.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanYesNoUc.java
index 32da5c0d09..eb35488c2a 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanYesNoUc.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanYesNoUc.java
@@ -23,7 +23,7 @@ public enum BooleanYesNoUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YES_NO_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanYnLc.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanYnLc.java
index a8fdc62b8b..1825fc0a99 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanYnLc.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanYnLc.java
@@ -23,7 +23,7 @@ public enum BooleanYnLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YN_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanYnUc.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanYnUc.java
index a09bcd1a72..47b37d58fc 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanYnUc.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/BooleanYnUc.java
@@ -23,7 +23,7 @@ public enum BooleanYnUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YN_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/Boolean_10.java b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/Boolean_10.java
index c81f03329c..42855359cf 100644
--- a/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/Boolean_10.java
+++ b/jOOQ-test/src/org/jooq/test/hsqldb/generatedclasses/enums/Boolean_10.java
@@ -23,7 +23,7 @@ public enum Boolean_10 implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_10";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/enums/BooleanTrueFalseLc.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/enums/BooleanTrueFalseLc.java
index 2f48d8bf14..8190d81455 100644
--- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/enums/BooleanTrueFalseLc.java
+++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/enums/BooleanTrueFalseLc.java
@@ -23,7 +23,7 @@ public enum BooleanTrueFalseLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_TRUE_FALSE_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/enums/BooleanTrueFalseUc.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/enums/BooleanTrueFalseUc.java
index edb2d41047..5647fc5c40 100644
--- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/enums/BooleanTrueFalseUc.java
+++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/enums/BooleanTrueFalseUc.java
@@ -23,7 +23,7 @@ public enum BooleanTrueFalseUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_TRUE_FALSE_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/enums/BooleanYesNoLc.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/enums/BooleanYesNoLc.java
index 6761454e44..6848dfad35 100644
--- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/enums/BooleanYesNoLc.java
+++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/enums/BooleanYesNoLc.java
@@ -23,7 +23,7 @@ public enum BooleanYesNoLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YES_NO_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/enums/BooleanYesNoUc.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/enums/BooleanYesNoUc.java
index 8255c3f05a..0cb1d0c857 100644
--- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/enums/BooleanYesNoUc.java
+++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/enums/BooleanYesNoUc.java
@@ -23,7 +23,7 @@ public enum BooleanYesNoUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YES_NO_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/enums/BooleanYnLc.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/enums/BooleanYnLc.java
index 8c4866cdc3..5e44076138 100644
--- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/enums/BooleanYnLc.java
+++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/enums/BooleanYnLc.java
@@ -23,7 +23,7 @@ public enum BooleanYnLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YN_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/enums/BooleanYnUc.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/enums/BooleanYnUc.java
index f024bfc890..0b7d3f4641 100644
--- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/enums/BooleanYnUc.java
+++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/enums/BooleanYnUc.java
@@ -23,7 +23,7 @@ public enum BooleanYnUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YN_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/enums/Boolean_10.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/enums/Boolean_10.java
index 690431fdf8..a1fa99f67e 100644
--- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/enums/Boolean_10.java
+++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/enums/Boolean_10.java
@@ -23,7 +23,7 @@ public enum Boolean_10 implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_10";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/enums/BooleanTrueFalseLc.java b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/enums/BooleanTrueFalseLc.java
index c00450a2a0..f8d3858377 100644
--- a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/enums/BooleanTrueFalseLc.java
+++ b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/enums/BooleanTrueFalseLc.java
@@ -23,7 +23,7 @@ public enum BooleanTrueFalseLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_TRUE_FALSE_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/enums/BooleanTrueFalseUc.java b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/enums/BooleanTrueFalseUc.java
index 7aa02633bd..94a80228ec 100644
--- a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/enums/BooleanTrueFalseUc.java
+++ b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/enums/BooleanTrueFalseUc.java
@@ -23,7 +23,7 @@ public enum BooleanTrueFalseUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_TRUE_FALSE_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/enums/BooleanYesNoLc.java b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/enums/BooleanYesNoLc.java
index c40557710d..69f4eec568 100644
--- a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/enums/BooleanYesNoLc.java
+++ b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/enums/BooleanYesNoLc.java
@@ -23,7 +23,7 @@ public enum BooleanYesNoLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YES_NO_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/enums/BooleanYesNoUc.java b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/enums/BooleanYesNoUc.java
index bb939a8db9..7883bc4922 100644
--- a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/enums/BooleanYesNoUc.java
+++ b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/enums/BooleanYesNoUc.java
@@ -23,7 +23,7 @@ public enum BooleanYesNoUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YES_NO_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/enums/BooleanYnLc.java b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/enums/BooleanYnLc.java
index 7a2b06a88e..0475e3a8d2 100644
--- a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/enums/BooleanYnLc.java
+++ b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/enums/BooleanYnLc.java
@@ -23,7 +23,7 @@ public enum BooleanYnLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YN_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/enums/BooleanYnUc.java b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/enums/BooleanYnUc.java
index 308d746deb..c20e26ac1b 100644
--- a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/enums/BooleanYnUc.java
+++ b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/enums/BooleanYnUc.java
@@ -23,7 +23,7 @@ public enum BooleanYnUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YN_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/enums/Boolean_10.java b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/enums/Boolean_10.java
index 8797724aa2..fb17cfa756 100644
--- a/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/enums/Boolean_10.java
+++ b/jOOQ-test/src/org/jooq/test/mysql/generatedclasses/enums/Boolean_10.java
@@ -23,7 +23,7 @@ public enum Boolean_10 implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_10";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/enums/BooleanTrueFalseLc.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/enums/BooleanTrueFalseLc.java
index 61df48eda1..0d4bcc665d 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/enums/BooleanTrueFalseLc.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/enums/BooleanTrueFalseLc.java
@@ -23,7 +23,7 @@ public enum BooleanTrueFalseLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_TRUE_FALSE_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/enums/BooleanTrueFalseUc.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/enums/BooleanTrueFalseUc.java
index 9892d7ebc9..4a9b41efe4 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/enums/BooleanTrueFalseUc.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/enums/BooleanTrueFalseUc.java
@@ -23,7 +23,7 @@ public enum BooleanTrueFalseUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_TRUE_FALSE_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/enums/BooleanYesNoLc.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/enums/BooleanYesNoLc.java
index dd2ebad886..1cb579ffc9 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/enums/BooleanYesNoLc.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/enums/BooleanYesNoLc.java
@@ -23,7 +23,7 @@ public enum BooleanYesNoLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YES_NO_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/enums/BooleanYesNoUc.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/enums/BooleanYesNoUc.java
index 233fab75b2..267ebeab88 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/enums/BooleanYesNoUc.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/enums/BooleanYesNoUc.java
@@ -23,7 +23,7 @@ public enum BooleanYesNoUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YES_NO_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/enums/BooleanYnLc.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/enums/BooleanYnLc.java
index 4a51c769de..57f275cb4c 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/enums/BooleanYnLc.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/enums/BooleanYnLc.java
@@ -23,7 +23,7 @@ public enum BooleanYnLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YN_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/enums/BooleanYnUc.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/enums/BooleanYnUc.java
index 8019a3824f..27719abf18 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/enums/BooleanYnUc.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/enums/BooleanYnUc.java
@@ -23,7 +23,7 @@ public enum BooleanYnUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YN_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/enums/Boolean_10.java b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/enums/Boolean_10.java
index 3971aa0d63..0b24c0b1ba 100644
--- a/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/enums/Boolean_10.java
+++ b/jOOQ-test/src/org/jooq/test/mysql2/generatedclasses/enums/Boolean_10.java
@@ -23,7 +23,7 @@ public enum Boolean_10 implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_10";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/enums/BooleanTrueFalseLc.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/enums/BooleanTrueFalseLc.java
index 9e3d05ca9f..eedd254df9 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/enums/BooleanTrueFalseLc.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/enums/BooleanTrueFalseLc.java
@@ -23,7 +23,7 @@ public enum BooleanTrueFalseLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_TRUE_FALSE_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/enums/BooleanTrueFalseUc.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/enums/BooleanTrueFalseUc.java
index 5a1db19b46..795d537ce0 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/enums/BooleanTrueFalseUc.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/enums/BooleanTrueFalseUc.java
@@ -23,7 +23,7 @@ public enum BooleanTrueFalseUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_TRUE_FALSE_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/enums/BooleanYesNoLc.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/enums/BooleanYesNoLc.java
index 6b439e7153..cd773de71c 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/enums/BooleanYesNoLc.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/enums/BooleanYesNoLc.java
@@ -23,7 +23,7 @@ public enum BooleanYesNoLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YES_NO_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/enums/BooleanYesNoUc.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/enums/BooleanYesNoUc.java
index 26f3b65a58..6f0feb1ece 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/enums/BooleanYesNoUc.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/enums/BooleanYesNoUc.java
@@ -23,7 +23,7 @@ public enum BooleanYesNoUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YES_NO_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/enums/BooleanYnLc.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/enums/BooleanYnLc.java
index 69cd39eeab..a8d083e7c1 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/enums/BooleanYnLc.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/enums/BooleanYnLc.java
@@ -23,7 +23,7 @@ public enum BooleanYnLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YN_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/enums/BooleanYnUc.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/enums/BooleanYnUc.java
index 6997c2c735..58e233824c 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/enums/BooleanYnUc.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/enums/BooleanYnUc.java
@@ -23,7 +23,7 @@ public enum BooleanYnUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YN_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/enums/Boolean_10.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/enums/Boolean_10.java
index 1163b936ad..27de47c6ea 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/enums/Boolean_10.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/enums/Boolean_10.java
@@ -23,7 +23,7 @@ public enum Boolean_10 implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_10";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/enums/BooleanTrueFalseLc.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/enums/BooleanTrueFalseLc.java
index 597f16ee5b..a96de6c22e 100644
--- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/enums/BooleanTrueFalseLc.java
+++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/enums/BooleanTrueFalseLc.java
@@ -23,7 +23,7 @@ public enum BooleanTrueFalseLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_TRUE_FALSE_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/enums/BooleanTrueFalseUc.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/enums/BooleanTrueFalseUc.java
index eebd242ed3..9134e62e51 100644
--- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/enums/BooleanTrueFalseUc.java
+++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/enums/BooleanTrueFalseUc.java
@@ -23,7 +23,7 @@ public enum BooleanTrueFalseUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_TRUE_FALSE_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/enums/BooleanYesNoLc.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/enums/BooleanYesNoLc.java
index bf94a335f2..1a25c2f78d 100644
--- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/enums/BooleanYesNoLc.java
+++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/enums/BooleanYesNoLc.java
@@ -23,7 +23,7 @@ public enum BooleanYesNoLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YES_NO_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/enums/BooleanYesNoUc.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/enums/BooleanYesNoUc.java
index 97f2d7a525..2a230fb91a 100644
--- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/enums/BooleanYesNoUc.java
+++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/enums/BooleanYesNoUc.java
@@ -23,7 +23,7 @@ public enum BooleanYesNoUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YES_NO_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/enums/BooleanYnLc.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/enums/BooleanYnLc.java
index 46349ab696..f3fb1e5f5c 100644
--- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/enums/BooleanYnLc.java
+++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/enums/BooleanYnLc.java
@@ -23,7 +23,7 @@ public enum BooleanYnLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YN_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/enums/BooleanYnUc.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/enums/BooleanYnUc.java
index fb4ddf7c67..1631eb1422 100644
--- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/enums/BooleanYnUc.java
+++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/enums/BooleanYnUc.java
@@ -23,7 +23,7 @@ public enum BooleanYnUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YN_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/enums/Boolean_10.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/enums/Boolean_10.java
index 4f4860a597..8b0de31dc9 100644
--- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/enums/Boolean_10.java
+++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/enums/Boolean_10.java
@@ -23,7 +23,7 @@ public enum Boolean_10 implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_10";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/records/TAuthorRecord.java b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/records/TAuthorRecord.java
index e0ec8b0b0d..a9bc97a8d6 100644
--- a/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/records/TAuthorRecord.java
+++ b/jOOQ-test/src/org/jooq/test/postgres/generatedclasses/tables/records/TAuthorRecord.java
@@ -10,7 +10,7 @@ package org.jooq.test.postgres.generatedclasses.tables.records;
                             comments = "This class is generated by jOOQ")
 public class TAuthorRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.test.postgres.generatedclasses.tables.records.TAuthorRecord> {
 
-	private static final long serialVersionUID = -1841669987;
+	private static final long serialVersionUID = -240388905;
 
 	/**
 	 * An uncommented item
@@ -35,10 +35,10 @@ public class TAuthorRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	 * 
 	 * PRIMARY KEY
 	 */
-	public java.util.List<org.jooq.test.postgres.generatedclasses.tables.records.TBookRecord> fetchTBookListByCoAuthorId() {
+	public java.util.List<org.jooq.test.postgres.generatedclasses.tables.records.TBookRecord> fetchTBookListByAuthorId() {
 		return create()
 			.selectFrom(org.jooq.test.postgres.generatedclasses.tables.TBook.T_BOOK)
-			.where(org.jooq.test.postgres.generatedclasses.tables.TBook.T_BOOK.CO_AUTHOR_ID.equal(getValue(org.jooq.test.postgres.generatedclasses.tables.TAuthor.T_AUTHOR.ID)))
+			.where(org.jooq.test.postgres.generatedclasses.tables.TBook.T_BOOK.AUTHOR_ID.equal(getValue(org.jooq.test.postgres.generatedclasses.tables.TAuthor.T_AUTHOR.ID)))
 			.fetch();
 	}
 
@@ -47,10 +47,10 @@ public class TAuthorRecord extends org.jooq.impl.UpdatableRecordImpl<org.jooq.te
 	 * 
 	 * PRIMARY KEY
 	 */
-	public java.util.List<org.jooq.test.postgres.generatedclasses.tables.records.TBookRecord> fetchTBookListByAuthorId() {
+	public java.util.List<org.jooq.test.postgres.generatedclasses.tables.records.TBookRecord> fetchTBookListByCoAuthorId() {
 		return create()
 			.selectFrom(org.jooq.test.postgres.generatedclasses.tables.TBook.T_BOOK)
-			.where(org.jooq.test.postgres.generatedclasses.tables.TBook.T_BOOK.AUTHOR_ID.equal(getValue(org.jooq.test.postgres.generatedclasses.tables.TAuthor.T_AUTHOR.ID)))
+			.where(org.jooq.test.postgres.generatedclasses.tables.TBook.T_BOOK.CO_AUTHOR_ID.equal(getValue(org.jooq.test.postgres.generatedclasses.tables.TAuthor.T_AUTHOR.ID)))
 			.fetch();
 	}
 
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/Keys.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/Keys.java
index 777481a7f2..e52bf1e300 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/Keys.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/Keys.java
@@ -14,6 +14,7 @@ package org.jooq.test.sqlite.generatedclasses;
 public class Keys extends org.jooq.impl.AbstractKeys {
 
 	// IDENTITY definitions
+	public static final org.jooq.Identity<org.jooq.test.sqlite.generatedclasses.tables.records.TTriggersRecord, java.lang.Integer> IDENTITY_t_triggers = createIdentity(org.jooq.test.sqlite.generatedclasses.tables.TTriggers.T_TRIGGERS, org.jooq.test.sqlite.generatedclasses.tables.TTriggers.ID_GENERATED);
 
 	// UNIQUE and PRIMARY KEY definitions
 	public static final org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.T_639NumbersTableRecord> pk_t_639_numbers_table_ID = createUniqueKey(org.jooq.test.sqlite.generatedclasses.tables.T_639NumbersTable.T_639_NUMBERS_TABLE, org.jooq.test.sqlite.generatedclasses.tables.T_639NumbersTable.ID);
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/enums/BooleanTrueFalseLc.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/enums/BooleanTrueFalseLc.java
index 3ee6389178..72d241ceee 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/enums/BooleanTrueFalseLc.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/enums/BooleanTrueFalseLc.java
@@ -23,7 +23,7 @@ public enum BooleanTrueFalseLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_TRUE_FALSE_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/enums/BooleanTrueFalseUc.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/enums/BooleanTrueFalseUc.java
index 5d62dd6657..b8be793baf 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/enums/BooleanTrueFalseUc.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/enums/BooleanTrueFalseUc.java
@@ -23,7 +23,7 @@ public enum BooleanTrueFalseUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_TRUE_FALSE_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/enums/BooleanYesNoLc.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/enums/BooleanYesNoLc.java
index 960d4ecc62..f7ed919eeb 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/enums/BooleanYesNoLc.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/enums/BooleanYesNoLc.java
@@ -23,7 +23,7 @@ public enum BooleanYesNoLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YES_NO_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/enums/BooleanYesNoUc.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/enums/BooleanYesNoUc.java
index 09353b1d39..5f5ab72509 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/enums/BooleanYesNoUc.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/enums/BooleanYesNoUc.java
@@ -23,7 +23,7 @@ public enum BooleanYesNoUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YES_NO_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/enums/BooleanYnLc.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/enums/BooleanYnLc.java
index b4a1a7edc8..6d326639f6 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/enums/BooleanYnLc.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/enums/BooleanYnLc.java
@@ -23,7 +23,7 @@ public enum BooleanYnLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YN_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/enums/BooleanYnUc.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/enums/BooleanYnUc.java
index dcc86d5be4..f44214ea1f 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/enums/BooleanYnUc.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/enums/BooleanYnUc.java
@@ -23,7 +23,7 @@ public enum BooleanYnUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YN_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/enums/Boolean_10.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/enums/Boolean_10.java
index 3f092063ef..eebe248994 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/enums/Boolean_10.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/enums/Boolean_10.java
@@ -23,7 +23,7 @@ public enum Boolean_10 implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_10";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TTriggers.java b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TTriggers.java
index 39fa8a9454..be44529a3f 100644
--- a/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TTriggers.java
+++ b/jOOQ-test/src/org/jooq/test/sqlite/generatedclasses/tables/TTriggers.java
@@ -10,7 +10,7 @@ package org.jooq.test.sqlite.generatedclasses.tables;
                             comments = "This class is generated by jOOQ")
 public class TTriggers extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sqlite.generatedclasses.tables.records.TTriggersRecord> {
 
-	private static final long serialVersionUID = 2031756274;
+	private static final long serialVersionUID = 1709423919;
 
 	/**
 	 * The singleton instance of t_triggers
@@ -54,6 +54,11 @@ public class TTriggers extends org.jooq.impl.UpdatableTableImpl<org.jooq.test.sq
 		super("t_triggers");
 	}
 
+	@Override
+	public org.jooq.Identity<org.jooq.test.sqlite.generatedclasses.tables.records.TTriggersRecord, java.lang.Integer> getIdentity() {
+		return org.jooq.test.sqlite.generatedclasses.Keys.IDENTITY_t_triggers;
+	}
+
 	@Override
 	public org.jooq.UniqueKey<org.jooq.test.sqlite.generatedclasses.tables.records.TTriggersRecord> getMainKey() {
 		return org.jooq.test.sqlite.generatedclasses.Keys.pk_t_triggers_id_generated;
diff --git a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/enums/BooleanTrueFalseLc.java b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/enums/BooleanTrueFalseLc.java
index 22c2a88241..d256b4a887 100644
--- a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/enums/BooleanTrueFalseLc.java
+++ b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/enums/BooleanTrueFalseLc.java
@@ -23,7 +23,7 @@ public enum BooleanTrueFalseLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_TRUE_FALSE_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/enums/BooleanTrueFalseUc.java b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/enums/BooleanTrueFalseUc.java
index a3049db36d..d4e09165b6 100644
--- a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/enums/BooleanTrueFalseUc.java
+++ b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/enums/BooleanTrueFalseUc.java
@@ -23,7 +23,7 @@ public enum BooleanTrueFalseUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_TRUE_FALSE_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/enums/BooleanYesNoLc.java b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/enums/BooleanYesNoLc.java
index 2b89a63bf6..6bc98a40f4 100644
--- a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/enums/BooleanYesNoLc.java
+++ b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/enums/BooleanYesNoLc.java
@@ -23,7 +23,7 @@ public enum BooleanYesNoLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YES_NO_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/enums/BooleanYesNoUc.java b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/enums/BooleanYesNoUc.java
index b207cca5f4..282dc0f62b 100644
--- a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/enums/BooleanYesNoUc.java
+++ b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/enums/BooleanYesNoUc.java
@@ -23,7 +23,7 @@ public enum BooleanYesNoUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YES_NO_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/enums/BooleanYnLc.java b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/enums/BooleanYnLc.java
index 005d052892..2d471e7253 100644
--- a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/enums/BooleanYnLc.java
+++ b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/enums/BooleanYnLc.java
@@ -23,7 +23,7 @@ public enum BooleanYnLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YN_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/enums/BooleanYnUc.java b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/enums/BooleanYnUc.java
index 49d031fb67..017152d1ac 100644
--- a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/enums/BooleanYnUc.java
+++ b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/enums/BooleanYnUc.java
@@ -23,7 +23,7 @@ public enum BooleanYnUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YN_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/enums/Boolean_10.java b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/enums/Boolean_10.java
index 56d78a1a67..63d58c27ad 100644
--- a/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/enums/Boolean_10.java
+++ b/jOOQ-test/src/org/jooq/test/sqlserver/generatedclasses/enums/Boolean_10.java
@@ -23,7 +23,7 @@ public enum Boolean_10 implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_10";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/enums/BooleanTrueFalseLc.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/enums/BooleanTrueFalseLc.java
index da62ab8495..839c483b6a 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/enums/BooleanTrueFalseLc.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/enums/BooleanTrueFalseLc.java
@@ -23,7 +23,7 @@ public enum BooleanTrueFalseLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_TRUE_FALSE_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/enums/BooleanTrueFalseUc.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/enums/BooleanTrueFalseUc.java
index 7b420882b2..0174603fd9 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/enums/BooleanTrueFalseUc.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/enums/BooleanTrueFalseUc.java
@@ -23,7 +23,7 @@ public enum BooleanTrueFalseUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_TRUE_FALSE_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/enums/BooleanYesNoLc.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/enums/BooleanYesNoLc.java
index 8fc4f294db..d0405bd0d2 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/enums/BooleanYesNoLc.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/enums/BooleanYesNoLc.java
@@ -23,7 +23,7 @@ public enum BooleanYesNoLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YES_NO_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/enums/BooleanYesNoUc.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/enums/BooleanYesNoUc.java
index c68310214e..05e70b5d3e 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/enums/BooleanYesNoUc.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/enums/BooleanYesNoUc.java
@@ -23,7 +23,7 @@ public enum BooleanYesNoUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YES_NO_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/enums/BooleanYnLc.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/enums/BooleanYnLc.java
index ac7b64ffb9..e4f4aa189a 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/enums/BooleanYnLc.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/enums/BooleanYnLc.java
@@ -23,7 +23,7 @@ public enum BooleanYnLc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YN_LC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/enums/BooleanYnUc.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/enums/BooleanYnUc.java
index 65b1acef67..5551072991 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/enums/BooleanYnUc.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/enums/BooleanYnUc.java
@@ -23,7 +23,7 @@ public enum BooleanYnUc implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_YN_UC";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/enums/Boolean_10.java b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/enums/Boolean_10.java
index 0385bb4bbb..8d1d6517a2 100644
--- a/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/enums/Boolean_10.java
+++ b/jOOQ-test/src/org/jooq/test/sybase/generatedclasses/enums/Boolean_10.java
@@ -23,7 +23,7 @@ public enum Boolean_10 implements org.jooq.EnumType {
 
 	@Override
 	public java.lang.String getName() {
-		return "BOOLEAN_10";
+		return null;
 	}
 
 	@Override
diff --git a/jOOQ/src/main/java/org/jooq/EnumType.java b/jOOQ/src/main/java/org/jooq/EnumType.java
index 450b04a0f3..368bb169e5 100644
--- a/jOOQ/src/main/java/org/jooq/EnumType.java
+++ b/jOOQ/src/main/java/org/jooq/EnumType.java
@@ -36,7 +36,13 @@
 package org.jooq;
 
 /**
- * A SQL enum type
+ * A SQL enum type. This can be any of the following:
+ * <ul>
+ * <li>In {@link SQLDialect#MYSQL}, this can be a column-scope enum type</li>
+ * <li>In {@link SQLDialect#POSTGRES}, this can be a schema-scope enum type</li>
+ * <li>In all other dialects, this can be an enum type as defined in the code
+ * generation configuration [#968]</li>
+ * </ul>
  *
  * @author Lukas Eder
  */
@@ -48,7 +54,8 @@ public interface EnumType {
     String getLiteral();
 
     /**
-     * The type name as registered in the database, if applicable
+     * The type name as registered in the database, if applicable (Postgres
+     * schema-scope enum type only). Otherwise, this returns <code>null</code>
      */
     String getName();
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/Val.java b/jOOQ/src/main/java/org/jooq/impl/Val.java
index 9fc0ac9f11..178e7c8ea4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Val.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Val.java
@@ -255,8 +255,12 @@ class Val<T> extends AbstractField<T> implements Param<T> {
             // ... and also for enum types
             else if (EnumType.class.isAssignableFrom(type)) {
                 context.sql(getBindVariable(context));
-                context.sql("::");
-                context.literal(((EnumType) val).getName());
+
+                // [#968] Don't cast "synthetic" enum types
+                if (!StringUtils.isBlank(((EnumType) val).getName())) {
+                    context.sql("::");
+                    context.literal(((EnumType) val).getName());
+                }
             }
 
             else {