diff --git a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
index c278ba169f..1518aa4b7f 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
@@ -9209,7 +9209,7 @@ public abstract class jOOQAbstractTest<
         create().select()
                 .from(TBookToBookStore()
                 .pivot(count())
-                .of(TBookToBookStore_BOOK_STORE_NAME())
+                .over(TBookToBookStore_BOOK_STORE_NAME())
                 .in("Orell Füssli",
                     "Ex Libris",
                     "Buchhandlung im Volkshaus"))
@@ -9253,7 +9253,7 @@ public abstract class jOOQAbstractTest<
                        max(TBookToBookStore_STOCK()).as("MAX"),
                        sum(TBookToBookStore_STOCK()).as("SUM"),
                        count(TBookToBookStore_STOCK()).as("CNT"))
-                .of(TBookToBookStore_BOOK_STORE_NAME())
+                .over(TBookToBookStore_BOOK_STORE_NAME())
                 .in(val("Orell Füssli").as("BS1"),
                     val("Ex Libris").as("BS2"),
                     val("Buchhandlung im Volkshaus").as("BS3")))
@@ -9301,7 +9301,7 @@ public abstract class jOOQAbstractTest<
                 .from(table(create().select(TBook_AUTHOR_ID(), lang)
                                     .from(TBook()))
                 .pivot(count())
-                .of(lang)
+                .over(lang)
                 .in(1, 2, 3, 4))
                 .fetch();
 
diff --git a/jOOQ/src/main/java/org/jooq/PivotForStep.java b/jOOQ/src/main/java/org/jooq/PivotForStep.java
index 92a1b420b5..701b44d244 100644
--- a/jOOQ/src/main/java/org/jooq/PivotForStep.java
+++ b/jOOQ/src/main/java/org/jooq/PivotForStep.java
@@ -48,12 +48,12 @@ public interface PivotForStep {
     /**
      * Add a list of fields to the <code>PIVOT</code> clause. Normally, the
      * keyword used here would be <code>FOR</code>, but <code>for</code> is a
-     * reserved word in Java and cannot be used. <code>of</code> is close
+     * reserved word in Java and cannot be used. <code>over</code> is close
      * enough.
      *
      * @param field The pivoting field
      * @return A DSL object to create the <code>PIVOT</code> expression
      */
     @Support({ ORACLE })
-    <T> PivotInStep<T> of(Field<T> field);
+    <T> PivotInStep<T> over(Field<T> field);
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/Pivot.java b/jOOQ/src/main/java/org/jooq/impl/Pivot.java
index 2a1654c532..0acd23b764 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Pivot.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Pivot.java
@@ -68,7 +68,7 @@ implements
 
     private final Table<?>    table;
     private final FieldList   aggregateFunctions;
-    private Field<T>          of;
+    private Field<T>          over;
     private FieldList         in;
 
     Pivot(Table<?> table, Field<?>... aggregateFunctions) {
@@ -100,7 +100,7 @@ implements
                .declareFields(true)
                .sql(aggregateFunctions)
                .sql(" for ")
-               .literal(of.getName())
+               .literal(over.getName())
                .sql(" in (")
                .sql(in)
                .declareFields(declare)
@@ -130,7 +130,7 @@ implements
 
     @Override
     protected final List<Attachable> getAttachables0() {
-        return getAttachables(table, aggregateFunctions, of, in);
+        return getAttachables(table, aggregateFunctions, over, in);
     }
 
     // ------------------------------------------------------------------------
@@ -139,9 +139,9 @@ implements
 
     @SuppressWarnings("unchecked")
     @Override
-    public final <Z> Pivot<Z> of(Field<Z> field) {
+    public final <Z> Pivot<Z> over(Field<Z> field) {
         // The previous bound of <T> is Object, but that's irrelevant
-        this.of = (Field<T>) field;
+        this.over = (Field<T>) field;
         return (Pivot<Z>) this;
     }