diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java b/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java
index efd1d37246..34da0f7c6a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java
@@ -52,7 +52,6 @@ import static org.jooq.JoinType.OUTER_APPLY;
 import static org.jooq.JoinType.RIGHT_OUTER_JOIN;
 import static org.jooq.JoinType.STRAIGHT_JOIN;
 // ...
-import static org.jooq.impl.DSL.name;
 import static org.jooq.impl.DSL.table;
 import static org.jooq.impl.DSL.val;
 import static org.jooq.impl.Tools.EMPTY_FIELD;
@@ -389,7 +388,7 @@ abstract class AbstractTable<R extends Record> extends AbstractNamed implements
         if (tableschema == null)
             tableschema = getQualifiedName().qualified()
                         ? DSL.schema(getQualifiedName().qualifier())
-                        : DSL.schema(name(""));
+                        : null;
 
         return tableschema;
     }
diff --git a/jOOQ/src/main/java/org/jooq/impl/PackageImpl.java b/jOOQ/src/main/java/org/jooq/impl/PackageImpl.java
index 874174d442..0d384f9e18 100644
--- a/jOOQ/src/main/java/org/jooq/impl/PackageImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/PackageImpl.java
@@ -37,8 +37,6 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.DSL.name;
-
 import org.jooq.Catalog;
 import org.jooq.Clause;
 import org.jooq.Context;
@@ -81,7 +79,7 @@ public class PackageImpl extends AbstractNamed implements Package {
         if (schema == null)
             schema = getQualifiedName().qualified()
                    ? DSL.schema(getQualifiedName().qualifier())
-                   : DSL.schema(name(""));
+                   : null;
 
         return schema;
     }
diff --git a/jOOQ/src/main/java/org/jooq/impl/SchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/SchemaImpl.java
index 66125f1145..4199f089bd 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SchemaImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SchemaImpl.java
@@ -40,7 +40,6 @@ package org.jooq.impl;
 
 import static org.jooq.Clause.SCHEMA;
 import static org.jooq.Clause.SCHEMA_REFERENCE;
-import static org.jooq.impl.DSL.name;
 
 import java.util.Collections;
 import java.util.List;
@@ -101,7 +100,7 @@ public class SchemaImpl extends AbstractNamed implements Schema {
         if (catalog == null)
             catalog = getQualifiedName().qualified()
                     ? DSL.catalog(getQualifiedName().qualifier())
-                    : DSL.catalog(name(""));
+                    : null;
 
         return catalog;
     }