diff --git a/jOOQ/src/main/java/org/jooq/Package.java b/jOOQ/src/main/java/org/jooq/Package.java
index 0fd8b983fa..454ec06893 100644
--- a/jOOQ/src/main/java/org/jooq/Package.java
+++ b/jOOQ/src/main/java/org/jooq/Package.java
@@ -42,6 +42,13 @@ package org.jooq;
  *
  * @author Lukas Eder
  */
-public interface Package extends NamedQueryPart, SchemaProvider {
+@SuppressWarnings("deprecation")
+public interface Package extends NamedQueryPart, org.jooq.SchemaProvider {
+
+    /**
+     * Get the package schema
+     */
+    @Override
+    Schema getSchema();
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/Routine.java b/jOOQ/src/main/java/org/jooq/Routine.java
index a711cc3472..50cdb7653f 100644
--- a/jOOQ/src/main/java/org/jooq/Routine.java
+++ b/jOOQ/src/main/java/org/jooq/Routine.java
@@ -82,7 +82,24 @@ import org.jooq.exception.DataAccessException;
  *
  * @author Lukas Eder
  */
-public interface Routine<T> extends NamedQueryPart, SchemaProvider {
+@SuppressWarnings("deprecation")
+public interface Routine<T> extends NamedQueryPart, org.jooq.SchemaProvider {
+
+    /**
+     * Get the routine schema
+     */
+    @Override
+    Schema getSchema();
+
+    /**
+     * The container package of this stored procedure or function.
+     * <p>
+     * This is only supported in the {@link SQLDialect#ORACLE} dialect.
+     *
+     * @return The container package of this object, or <code>null</code> if
+     *         there is no such container.
+     */
+    Package getPackage();
 
     /**
      * A list of OUT parameters passed to the stored procedure as argument. This
@@ -114,16 +131,6 @@ public interface Routine<T> extends NamedQueryPart, SchemaProvider {
      */
     List<Parameter<?>> getParameters();
 
-    /**
-     * The container package of this stored procedure or function.
-     * <p>
-     * This is only supported in the {@link SQLDialect#ORACLE} dialect.
-     *
-     * @return The container package of this object, or <code>null</code> if
-     *         there is no such container.
-     */
-    Package getPackage();
-
     /**
      * Execute the stored object using a {@link Configuration} object
      *
diff --git a/jOOQ/src/main/java/org/jooq/SchemaProvider.java b/jOOQ/src/main/java/org/jooq/SchemaProvider.java
index af474d7d81..cdb694f528 100644
--- a/jOOQ/src/main/java/org/jooq/SchemaProvider.java
+++ b/jOOQ/src/main/java/org/jooq/SchemaProvider.java
@@ -41,7 +41,12 @@ package org.jooq;
  *
  * @author Lukas Eder
  * @since 1.5.2
+ * @deprecated - 2.5.0 [#1580] - The <code>org.jooq.SchemaProvider</code> marker
+ *             interface has not proven to be useful to the public API so far.
+ *             There is no real need to abstract its implementations with a
+ *             single interface
  */
+@Deprecated
 public interface SchemaProvider {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/Table.java b/jOOQ/src/main/java/org/jooq/Table.java
index 83ff268606..1773f0108f 100644
--- a/jOOQ/src/main/java/org/jooq/Table.java
+++ b/jOOQ/src/main/java/org/jooq/Table.java
@@ -63,6 +63,12 @@ import org.jooq.impl.Factory;
 @SuppressWarnings("deprecation")
 public interface Table<R extends Record> extends org.jooq.Type<R>, AliasProvider<Table<R>>, TableLike<R> {
 
+    /**
+     * Get the table schema
+     */
+    @Override
+    Schema getSchema();
+
     /**
      * @return The record type produced by this table
      */
diff --git a/jOOQ/src/main/java/org/jooq/Type.java b/jOOQ/src/main/java/org/jooq/Type.java
index 0d22ac8a2e..955039e9b3 100644
--- a/jOOQ/src/main/java/org/jooq/Type.java
+++ b/jOOQ/src/main/java/org/jooq/Type.java
@@ -46,7 +46,7 @@ package org.jooq;
  *             {@link org.jooq.UDT} with a single interface
  */
 @Deprecated
-public interface Type<R extends Record> extends NamedQueryPart, FieldProvider, SchemaProvider {
+public interface Type<R extends Record> extends NamedQueryPart, FieldProvider, org.jooq.SchemaProvider {
 
     /**
      * @return The record type produced by this table
diff --git a/jOOQ/src/main/java/org/jooq/UDT.java b/jOOQ/src/main/java/org/jooq/UDT.java
index be27fd5021..7e40b7718d 100644
--- a/jOOQ/src/main/java/org/jooq/UDT.java
+++ b/jOOQ/src/main/java/org/jooq/UDT.java
@@ -48,6 +48,12 @@ import java.util.Map;
 @SuppressWarnings("deprecation")
 public interface UDT<R extends UDTRecord<R>> extends org.jooq.Type<R> {
 
+    /**
+     * Get the UDT schema
+     */
+    @Override
+    Schema getSchema();
+
     /**
      * @return The record type produced by this table
      */
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractSchemaProviderQueryPart.java b/jOOQ/src/main/java/org/jooq/impl/AbstractSchemaProviderQueryPart.java
index e2fab297ec..5935ae9222 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractSchemaProviderQueryPart.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractSchemaProviderQueryPart.java
@@ -40,12 +40,12 @@ import java.util.List;
 
 import org.jooq.Attachable;
 import org.jooq.Schema;
-import org.jooq.SchemaProvider;
 
 /**
  * @author Lukas Eder
  */
-abstract class AbstractSchemaProviderQueryPart extends AbstractNamedQueryPart implements SchemaProvider {
+@SuppressWarnings("deprecation")
+abstract class AbstractSchemaProviderQueryPart extends AbstractNamedQueryPart implements org.jooq.SchemaProvider {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Util.java b/jOOQ/src/main/java/org/jooq/impl/Util.java
index 62f3226dd2..0e97a5952f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Util.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Util.java
@@ -155,14 +155,14 @@ final class Util {
     }
 
     /**
-     * Create a new record
+     * Create a new UDT record
      */
     static final <R extends UDTRecord<R>> R newRecord(UDT<R> type) {
         return newRecord(type, null);
     }
 
     /**
-     * Create a new record
+     * Create a new UDT record
      */
     static final <R extends UDTRecord<R>> R newRecord(UDT<R> type, Configuration configuration) {
         return newRecord(type.getRecordType(), type, configuration);