diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractAggregateFunction.java b/jOOQ/src/main/java/org/jooq/impl/AbstractAggregateFunction.java
index c59e140e1a..e35bc5ffb6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractAggregateFunction.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractAggregateFunction.java
@@ -111,7 +111,7 @@ implements
     // -------------------------------------------------------------------------
 
     final void acceptArguments(Context<?> ctx) {
-        ctx.sql(getName());
+        ctx.visit(getQualifiedName());
         ctx.sql('(');
         acceptArguments0(ctx);
         ctx.sql(')');
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultAggregateFunction.java b/jOOQ/src/main/java/org/jooq/impl/DefaultAggregateFunction.java
index 995f0c72cf..ce8c08e962 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultAggregateFunction.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultAggregateFunction.java
@@ -81,7 +81,7 @@ class DefaultAggregateFunction<T> extends AbstractAggregateFunction<T> {
     }
 
     DefaultAggregateFunction(boolean distinct, String name, DataType<T> type, Field<?>... arguments) {
-        this(distinct, DSL.name(name), type, arguments);
+        this(distinct, DSL.unquotedName(name), type, arguments);
     }
 
     DefaultAggregateFunction(boolean distinct, Name name, DataType<T> type, Field<?>... arguments) {
@@ -153,6 +153,6 @@ class DefaultAggregateFunction<T> extends AbstractAggregateFunction<T> {
         if (term != null)
             ctx.sql(term.translate(ctx.dialect()));
         else
-            ctx.sql(getName());
+            ctx.visit(getQualifiedName());
     }
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/Term.java b/jOOQ/src/main/java/org/jooq/impl/Term.java
index c673358755..c8be13718f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Term.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Term.java
@@ -240,7 +240,7 @@ enum Term {
     private final String  translation;
 
     private Term() {
-        this.name = DSL.name(name());
+        this.name = DSL.unquotedName(name());
         this.keyword = DSL.keyword(name());
         this.translation = name().toLowerCase();
     }