diff --git a/jOOQ-spring/src/main/java/org/jooq/util/spring/FactoryProxy.java b/jOOQ-spring/src/main/java/org/jooq/util/spring/FactoryProxy.java
index b88390e2f4..31d0026b0b 100644
--- a/jOOQ-spring/src/main/java/org/jooq/util/spring/FactoryProxy.java
+++ b/jOOQ-spring/src/main/java/org/jooq/util/spring/FactoryProxy.java
@@ -286,12 +286,12 @@ public class FactoryProxy implements FactoryOperations, MethodInterceptor {
     }
 
     @Override
-    public final <R extends TableRecord<R>> UpdateQuery<R> updateQuery(Table<R> table) {
+    public final <R extends Record> UpdateQuery<R> updateQuery(Table<R> table) {
         return getDelegate().updateQuery(table);
     }
 
     @Override
-    public final <R extends TableRecord<R>> UpdateSetStep<R> update(Table<R> table) {
+    public final <R extends Record> UpdateSetStep<R> update(Table<R> table) {
         return getDelegate().update(table);
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/FactoryOperations.java b/jOOQ/src/main/java/org/jooq/FactoryOperations.java
index 9d365d50cd..1326e6929d 100644
--- a/jOOQ/src/main/java/org/jooq/FactoryOperations.java
+++ b/jOOQ/src/main/java/org/jooq/FactoryOperations.java
@@ -387,7 +387,7 @@ public interface FactoryOperations extends Configuration {
      * @param table The table to update data into
      * @return The new {@link UpdateQuery}
      */
-    <R extends TableRecord<R>> UpdateQuery<R> updateQuery(Table<R> table);
+    <R extends Record> UpdateQuery<R> updateQuery(Table<R> table);
 
     /**
      * Create a new DSL update statement.
@@ -402,7 +402,7 @@ public interface FactoryOperations extends Configuration {
      *       .execute();
      * </pre></code>
      */
-    <R extends TableRecord<R>> UpdateSetStep<R> update(Table<R> table);
+    <R extends Record> UpdateSetStep<R> update(Table<R> table);
 
     /**
      * Create a new DSL merge statement.
diff --git a/jOOQ/src/main/java/org/jooq/StoreQuery.java b/jOOQ/src/main/java/org/jooq/StoreQuery.java
index 18bc962a09..49fc39c9de 100644
--- a/jOOQ/src/main/java/org/jooq/StoreQuery.java
+++ b/jOOQ/src/main/java/org/jooq/StoreQuery.java
@@ -45,7 +45,7 @@ import java.util.Map;
  * @param <R> The record type of the table being modified
  * @author Lukas Eder
  */
-public interface StoreQuery<R extends TableRecord<R>> extends Query {
+public interface StoreQuery<R extends Record> extends Query {
 
     /**
      * Add values to the store statement
diff --git a/jOOQ/src/main/java/org/jooq/UpdateConditionStep.java b/jOOQ/src/main/java/org/jooq/UpdateConditionStep.java
index 0b209f3a03..9f5b710218 100644
--- a/jOOQ/src/main/java/org/jooq/UpdateConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/UpdateConditionStep.java
@@ -52,7 +52,7 @@ import org.jooq.impl.Factory;
  *
  * @author Lukas Eder
  */
-public interface UpdateConditionStep<R extends TableRecord<R>> extends UpdateFinalStep<R> {
+public interface UpdateConditionStep<R extends Record> extends UpdateFinalStep<R> {
 
     /**
      * Combine the currently assembled conditions with another one using the
diff --git a/jOOQ/src/main/java/org/jooq/UpdateFinalStep.java b/jOOQ/src/main/java/org/jooq/UpdateFinalStep.java
index 57384e38b0..6c4439cfed 100644
--- a/jOOQ/src/main/java/org/jooq/UpdateFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/UpdateFinalStep.java
@@ -50,6 +50,6 @@ package org.jooq;
  *
  * @author Lukas Eder
  */
-public interface UpdateFinalStep<R extends TableRecord<R>> extends Update<R> {
+public interface UpdateFinalStep<R extends Record> extends Update<R> {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/UpdateQuery.java b/jOOQ/src/main/java/org/jooq/UpdateQuery.java
index 6ee7e3923f..d3ce402862 100644
--- a/jOOQ/src/main/java/org/jooq/UpdateQuery.java
+++ b/jOOQ/src/main/java/org/jooq/UpdateQuery.java
@@ -42,6 +42,6 @@ package org.jooq;
  * @param <R> The record type of the table being updated
  * @author Lukas Eder
  */
-public interface UpdateQuery<R extends TableRecord<R>> extends StoreQuery<R>, ConditionProvider, Update<R> {
+public interface UpdateQuery<R extends Record> extends StoreQuery<R>, ConditionProvider, Update<R> {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/UpdateSetMoreStep.java b/jOOQ/src/main/java/org/jooq/UpdateSetMoreStep.java
index 91337acdc1..a5f03b6e62 100644
--- a/jOOQ/src/main/java/org/jooq/UpdateSetMoreStep.java
+++ b/jOOQ/src/main/java/org/jooq/UpdateSetMoreStep.java
@@ -50,6 +50,6 @@ package org.jooq;
  *
  * @author Lukas Eder
  */
-public interface UpdateSetMoreStep<R extends TableRecord<R>> extends UpdateSetStep<R>, UpdateWhereStep<R> {
+public interface UpdateSetMoreStep<R extends Record> extends UpdateSetStep<R>, UpdateWhereStep<R> {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/UpdateSetStep.java b/jOOQ/src/main/java/org/jooq/UpdateSetStep.java
index b17c14bbbf..13fc641d3e 100644
--- a/jOOQ/src/main/java/org/jooq/UpdateSetStep.java
+++ b/jOOQ/src/main/java/org/jooq/UpdateSetStep.java
@@ -52,7 +52,7 @@ import java.util.Map;
  *
  * @author Lukas Eder
  */
-public interface UpdateSetStep<R extends TableRecord<R>> {
+public interface UpdateSetStep<R extends Record> {
 
     /**
      * Set a value for a field in the <code>UPDATE</code> statement
diff --git a/jOOQ/src/main/java/org/jooq/UpdateWhereStep.java b/jOOQ/src/main/java/org/jooq/UpdateWhereStep.java
index 19657c2f22..260cab4bdb 100644
--- a/jOOQ/src/main/java/org/jooq/UpdateWhereStep.java
+++ b/jOOQ/src/main/java/org/jooq/UpdateWhereStep.java
@@ -54,7 +54,7 @@ import org.jooq.impl.Factory;
  *
  * @author Lukas Eder
  */
-public interface UpdateWhereStep<R extends TableRecord<R>> extends UpdateFinalStep<R> {
+public interface UpdateWhereStep<R extends Record> extends UpdateFinalStep<R> {
 
     /**
      * Add conditions to the query
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractStoreQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractStoreQuery.java
index 087a71625e..e0c9b30702 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractStoreQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractStoreQuery.java
@@ -46,16 +46,16 @@ import org.jooq.ArrayRecord;
 import org.jooq.Attachable;
 import org.jooq.Configuration;
 import org.jooq.Field;
+import org.jooq.Record;
 import org.jooq.StoreQuery;
 import org.jooq.Table;
-import org.jooq.TableRecord;
 
 /**
  * A default implementation for store queries.
  *
  * @author Lukas Eder
  */
-abstract class AbstractStoreQuery<R extends TableRecord<R>> extends AbstractQuery implements StoreQuery<R> {
+abstract class AbstractStoreQuery<R extends Record> extends AbstractQuery implements StoreQuery<R> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Factory.java b/jOOQ/src/main/java/org/jooq/impl/Factory.java
index 4a39973971..58aaa3c4bb 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Factory.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Factory.java
@@ -964,7 +964,7 @@ public class Factory implements FactoryOperations {
      * {@inheritDoc}
      */
     @Override
-    public final <R extends TableRecord<R>> UpdateQuery<R> updateQuery(Table<R> table) {
+    public final <R extends Record> UpdateQuery<R> updateQuery(Table<R> table) {
         return new UpdateQueryImpl<R>(this, table);
     }
 
@@ -972,7 +972,7 @@ public class Factory implements FactoryOperations {
      * {@inheritDoc}
      */
     @Override
-    public final <R extends TableRecord<R>> UpdateSetStep<R> update(Table<R> table) {
+    public final <R extends Record> UpdateSetStep<R> update(Table<R> table) {
         return new UpdateImpl<R>(this, table);
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/UpdateImpl.java b/jOOQ/src/main/java/org/jooq/impl/UpdateImpl.java
index 21344f745c..6946570a76 100644
--- a/jOOQ/src/main/java/org/jooq/impl/UpdateImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/UpdateImpl.java
@@ -46,9 +46,9 @@ import org.jooq.Condition;
 import org.jooq.Configuration;
 import org.jooq.Field;
 import org.jooq.Operator;
+import org.jooq.Record;
 import org.jooq.Select;
 import org.jooq.Table;
-import org.jooq.TableRecord;
 import org.jooq.UpdateConditionStep;
 import org.jooq.UpdateQuery;
 import org.jooq.UpdateSetMoreStep;
@@ -58,7 +58,7 @@ import org.jooq.UpdateSetMoreStep;
  *
  * @author Lukas Eder
  */
-final class UpdateImpl<R extends TableRecord<R>>
+final class UpdateImpl<R extends Record>
     extends AbstractDelegatingQueryPart<UpdateQuery<R>>
     implements
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java
index 0f69fa54e8..6fd2e088a5 100644
--- a/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java
@@ -46,15 +46,15 @@ import org.jooq.Condition;
 import org.jooq.Configuration;
 import org.jooq.Field;
 import org.jooq.Operator;
+import org.jooq.Record;
 import org.jooq.RenderContext;
 import org.jooq.Table;
-import org.jooq.TableRecord;
 import org.jooq.UpdateQuery;
 
 /**
  * @author Lukas Eder
  */
-class UpdateQueryImpl<R extends TableRecord<R>> extends AbstractStoreQuery<R> implements UpdateQuery<R> {
+class UpdateQueryImpl<R extends Record> extends AbstractStoreQuery<R> implements UpdateQuery<R> {
 
     private static final long           serialVersionUID = -660460731970074719L;