diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractTypedNamed.java b/jOOQ/src/main/java/org/jooq/impl/AbstractTypedNamed.java
index a0b897a233..e4897ca66d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractTypedNamed.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractTypedNamed.java
@@ -59,9 +59,9 @@ abstract class AbstractTypedNamed<T> extends AbstractNamed implements Typed<T> {
         super(name, comment);
 
         // [#13465] Only field references are allowed to be computed or defaulted
-        this.type = type.computed() && !(this instanceof FieldReference)
+        this.type = type.computed() && !(this instanceof TypedReference)
             ? type.generatedAlwaysAs((Generator<?, ?, T>) null)
-            : type.defaulted() && !(this instanceof FieldReference)
+            : type.defaulted() && !(this instanceof TypedReference)
             ? type.default_((Field<T>) null)
             : type;
     }
diff --git a/jOOQ/src/main/java/org/jooq/impl/ParameterImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParameterImpl.java
index 4d05a7a593..cf3c9f478e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ParameterImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ParameterImpl.java
@@ -69,7 +69,7 @@ import org.jooq.impl.QOM.UEmpty;
  *
  * @author Lukas Eder
  */
-final class ParameterImpl<T> extends AbstractField<T> implements Parameter<T>, UEmpty {
+final class ParameterImpl<T> extends AbstractField<T> implements Parameter<T>, UEmpty, TypedReference<T> {
 
     private final ParamMode   paramMode;
     private final boolean     isDefaulted;
diff --git a/jOOQ/src/main/java/org/jooq/impl/SQLField.java b/jOOQ/src/main/java/org/jooq/impl/SQLField.java
index 82221cb100..1a8636b168 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SQLField.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SQLField.java
@@ -43,7 +43,7 @@ import org.jooq.QueryPart;
 import org.jooq.SQL;
 import org.jooq.impl.QOM.UEmptyField;
 
-final class SQLField<T> extends AbstractField<T> implements UEmptyField<T>, FieldReference<T> {
+final class SQLField<T> extends AbstractField<T> implements UEmptyField<T>, TypedReference<T> {
 
     private final QueryPart delegate;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/TableFieldImpl.java b/jOOQ/src/main/java/org/jooq/impl/TableFieldImpl.java
index 6ecfa7531e..9b0ede80e6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/TableFieldImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/TableFieldImpl.java
@@ -67,7 +67,7 @@ import org.jooq.tools.StringUtils;
  *
  * @author Lukas Eder
  */
-class TableFieldImpl<R extends Record, T> extends AbstractField<T> implements TableField<R, T>, SimpleQueryPart, UNotYetImplemented, FieldReference<T> {
+class TableFieldImpl<R extends Record, T> extends AbstractField<T> implements TableField<R, T>, SimpleQueryPart, UNotYetImplemented, TypedReference<T> {
 
     private static final Clause[] CLAUSES = { FIELD, FIELD_REFERENCE };
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/FieldReference.java b/jOOQ/src/main/java/org/jooq/impl/TypedReference.java
similarity index 93%
rename from jOOQ/src/main/java/org/jooq/impl/FieldReference.java
rename to jOOQ/src/main/java/org/jooq/impl/TypedReference.java
index c8b40e77aa..b2fd0d57f9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/FieldReference.java
+++ b/jOOQ/src/main/java/org/jooq/impl/TypedReference.java
@@ -37,11 +37,11 @@
  */
 package org.jooq.impl;
 
-import org.jooq.Field;
+import org.jooq.Typed;
 
 /**
  * A marker interface for field references.
  *
  * @author Lukas Eder
  */
-interface FieldReference<T> extends Field<T> {}
+interface TypedReference<T> extends Typed<T> {}
diff --git a/jOOQ/src/main/java/org/jooq/impl/UDTFieldImpl.java b/jOOQ/src/main/java/org/jooq/impl/UDTFieldImpl.java
index 67a0047110..c03bee904f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/UDTFieldImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/UDTFieldImpl.java
@@ -53,7 +53,7 @@ import org.jooq.impl.QOM.UNotYetImplemented;
  *
  * @author Lukas Eder
  */
-final class UDTFieldImpl<R extends UDTRecord<R>, T> extends AbstractField<T> implements UDTField<R, T>, UNotYetImplemented {
+final class UDTFieldImpl<R extends UDTRecord<R>, T> extends AbstractField<T> implements UDTField<R, T>, UNotYetImplemented, TypedReference<T> {
 
     private final UDT<R> udt;