diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/udt/records/UAuthorTypeRecord.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/udt/records/UAuthorTypeRecord.java
index e661518755..4a28e20b32 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/udt/records/UAuthorTypeRecord.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/udt/records/UAuthorTypeRecord.java
@@ -61,7 +61,7 @@ public class UAuthorTypeRecord extends org.jooq.impl.UDTRecordImpl<org.jooq.test
 		org.jooq.test.oracle.generatedclasses.test.udt.u_author_type.CountBooks f = new org.jooq.test.oracle.generatedclasses.test.udt.u_author_type.CountBooks();
 		f.setSelf(this);
 
-		f.execute(getConfiguration());
+		f.execute(configuration());
 		return f.getReturnValue();
 	}
 
@@ -83,7 +83,7 @@ public class UAuthorTypeRecord extends org.jooq.impl.UDTRecordImpl<org.jooq.test
 		org.jooq.test.oracle.generatedclasses.test.udt.u_author_type.GetBooks p = new org.jooq.test.oracle.generatedclasses.test.udt.u_author_type.GetBooks();
 		p.setSelf(this);
 
-		p.execute(getConfiguration());
+		p.execute(configuration());
 		from(p.getSelf());
 		return p;
 	}
@@ -95,7 +95,7 @@ public class UAuthorTypeRecord extends org.jooq.impl.UDTRecordImpl<org.jooq.test
 		org.jooq.test.oracle.generatedclasses.test.udt.u_author_type.Load p = new org.jooq.test.oracle.generatedclasses.test.udt.u_author_type.Load();
 		p.setSelf(this);
 
-		p.execute(getConfiguration());
+		p.execute(configuration());
 		from(p.getSelf());
 		return p.getSelf();
 	}
diff --git a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/udt/records/U_AUTHOR_TYPE.java b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/udt/records/U_AUTHOR_TYPE.java
index 062d29ab3d..8c3486fc6e 100644
--- a/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/udt/records/U_AUTHOR_TYPE.java
+++ b/jOOQ-test/src/org/jooq/test/oracle3/generatedclasses/udt/records/U_AUTHOR_TYPE.java
@@ -61,7 +61,7 @@ public class U_AUTHOR_TYPE extends org.jooq.impl.UDTRecordImpl<org.jooq.test.ora
 		org.jooq.test.oracle3.generatedclasses.udt.u_author_type.COUNT_BOOKS f = new org.jooq.test.oracle3.generatedclasses.udt.u_author_type.COUNT_BOOKS();
 		f.setSELF(this);
 
-		f.execute(getConfiguration());
+		f.execute(configuration());
 		return f.getReturnValue();
 	}
 
@@ -83,7 +83,7 @@ public class U_AUTHOR_TYPE extends org.jooq.impl.UDTRecordImpl<org.jooq.test.ora
 		org.jooq.test.oracle3.generatedclasses.udt.u_author_type.GET_BOOKS p = new org.jooq.test.oracle3.generatedclasses.udt.u_author_type.GET_BOOKS();
 		p.setSELF(this);
 
-		p.execute(getConfiguration());
+		p.execute(configuration());
 		from(p.getSELF());
 		return p;
 	}
@@ -95,7 +95,7 @@ public class U_AUTHOR_TYPE extends org.jooq.impl.UDTRecordImpl<org.jooq.test.ora
 		org.jooq.test.oracle3.generatedclasses.udt.u_author_type.LOAD p = new org.jooq.test.oracle3.generatedclasses.udt.u_author_type.LOAD();
 		p.setSELF(this);
 
-		p.execute(getConfiguration());
+		p.execute(configuration());
 		from(p.getSELF());
 		return p.getSELF();
 	}
diff --git a/jOOQ-tools/src/org/jooq/xtend/InsertDSL.xtend b/jOOQ-tools/src/org/jooq/xtend/InsertDSL.xtend
index e11d354209..0eef61c965 100644
--- a/jOOQ-tools/src/org/jooq/xtend/InsertDSL.xtend
+++ b/jOOQ-tools/src/org/jooq/xtend/InsertDSL.xtend
@@ -188,7 +188,7 @@ class InsertDSL extends Generators {
         
             @Override
             public final Insert<R> select(Select select) {
-                Configuration configuration = ((AttachableInternal) getDelegate()).getConfiguration();
+                Configuration configuration = ((AttachableInternal) getDelegate()).configuration();
                 return new InsertSelectQueryImpl<R>(configuration, into, fields, select);
             }
             «FOR degree : (1..Constants::MAX_ROW_DEGREE)»
diff --git a/jOOQ/src/main/java/org/jooq/AttachableInternal.java b/jOOQ/src/main/java/org/jooq/AttachableInternal.java
index 2d024009f3..afe1e69d11 100644
--- a/jOOQ/src/main/java/org/jooq/AttachableInternal.java
+++ b/jOOQ/src/main/java/org/jooq/AttachableInternal.java
@@ -48,6 +48,6 @@ public interface AttachableInternal extends Attachable {
     /**
      * Get the underlying configuration
      */
-    Configuration getConfiguration();
+    Configuration configuration();
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractDelegatingQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractDelegatingQuery.java
index de4ed6aba7..68281bd3c7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractDelegatingQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractDelegatingQuery.java
@@ -61,12 +61,12 @@ abstract class AbstractDelegatingQuery<Q extends Query> extends AbstractQueryPar
     }
 
     @Override
-    public final Configuration getConfiguration() {
+    public final Configuration configuration() {
         if (delegate instanceof AttachableInternal) {
-            return ((AttachableInternal) delegate).getConfiguration();
+            return ((AttachableInternal) delegate).configuration();
         }
 
-        return super.getConfiguration();
+        return super.configuration();
     }
 
     @Override
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java
index f3abcc60d7..d56d29a70c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java
@@ -83,7 +83,7 @@ abstract class AbstractQuery extends AbstractQueryPart implements Query, Attacha
     }
 
     @Override
-    public final Configuration getConfiguration() {
+    public final Configuration configuration() {
         return configuration;
     }
 
@@ -171,7 +171,7 @@ abstract class AbstractQuery extends AbstractQueryPart implements Query, Attacha
 
             // If all params are inlined, the previous statement always has to
             // be closed
-            else if (SettingsTools.executeStaticStatements(getConfiguration().settings())) {
+            else if (SettingsTools.executeStaticStatements(configuration().settings())) {
                 close();
             }
         }
@@ -233,7 +233,7 @@ abstract class AbstractQuery extends AbstractQueryPart implements Query, Attacha
         if (isExecutable()) {
 
             // Get the attached configuration of this query
-            Configuration c = getConfiguration();
+            Configuration c = configuration();
 
             // [#1191] The following triggers a start event on all listeners.
             // This may be used to provide jOOQ with a JDBC connection, in case
@@ -360,7 +360,7 @@ abstract class AbstractQuery extends AbstractQueryPart implements Query, Attacha
      */
     @Override
     public final String getSQL() {
-        if (executePreparedStatements(getConfiguration().settings())) {
+        if (executePreparedStatements(configuration().settings())) {
             return getSQL(false);
         }
         else {
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractQueryPart.java b/jOOQ/src/main/java/org/jooq/impl/AbstractQueryPart.java
index 00a27d4d0b..942f669a31 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractQueryPart.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractQueryPart.java
@@ -58,7 +58,7 @@ abstract class AbstractQueryPart implements QueryPartInternal {
     // [#1544] The deprecated Attachable and Attachable internal API
     // -------------------------------------------------------------------------
 
-    Configuration getConfiguration() {
+    Configuration configuration() {
         return new DefaultConfiguration();
     }
 
@@ -130,7 +130,7 @@ abstract class AbstractQueryPart implements QueryPartInternal {
      * Internal convenience method
      */
     protected final DSLContext create() {
-        return create(getConfiguration());
+        return create(configuration());
     }
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java b/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java
index 3207a78b5e..6618f08484 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java
@@ -324,7 +324,7 @@ abstract class AbstractRecord extends AbstractStore implements Record {
      */
     @Override
     public Record original() {
-        AbstractRecord result = Utils.newRecord(getClass(), fields.fields.fields, getConfiguration());
+        AbstractRecord result = Utils.newRecord(getClass(), fields.fields.fields, configuration());
         Value<?>[] v = getValues();
 
         for (int i = 0; i < v.length; i++) {
@@ -471,7 +471,7 @@ abstract class AbstractRecord extends AbstractStore implements Record {
     @Override
     public final <R extends Record> R into(Table<R> table) {
         try {
-            R result = Utils.newRecord(table, getConfiguration());
+            R result = Utils.newRecord(table, configuration());
 
             for (Field<?> targetField : table.fields()) {
                 Field<?> sourceField = field(targetField);
@@ -511,7 +511,7 @@ abstract class AbstractRecord extends AbstractStore implements Record {
 
     @Override
     public final ResultSet intoResultSet() {
-        ResultImpl<Record> result = new ResultImpl<Record>(getConfiguration(), fields.fields.fields);
+        ResultImpl<Record> result = new ResultImpl<Record>(configuration(), fields.fields.fields);
         result.add(this);
         return result.intoResultSet();
     }
@@ -654,7 +654,7 @@ abstract class AbstractRecord extends AbstractStore implements Record {
 
     @Override
     public String toString() {
-        Result<AbstractRecord> result = new ResultImpl<AbstractRecord>(getConfiguration(), fields.fields.fields);
+        Result<AbstractRecord> result = new ResultImpl<AbstractRecord>(configuration(), fields.fields.fields);
         result.add(this);
         return result.toString();
     }
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java b/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java
index 91836f0bc4..9516a70f17 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java
@@ -185,7 +185,7 @@ public abstract class AbstractRoutine<T> extends AbstractQueryPart implements Ro
     }
 
     @Override
-    public final Configuration getConfiguration() {
+    public final Configuration configuration() {
         return configuration;
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractSelect.java b/jOOQ/src/main/java/org/jooq/impl/AbstractSelect.java
index 9cf0363336..ffccca7d04 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractSelect.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractSelect.java
@@ -65,27 +65,27 @@ abstract class AbstractSelect<R extends Record> extends AbstractResultQuery<R> i
 
     @Override
     public final int fetchCount() throws DataAccessException {
-        return DSL.using(getConfiguration()).fetchCount(this);
+        return DSL.using(configuration()).fetchCount(this);
     }
 
     @Override
     public final Select<R> union(Select<? extends R> select) {
-        return new Union<R>(getConfiguration(), this, select, CombineOperator.UNION);
+        return new Union<R>(configuration(), this, select, CombineOperator.UNION);
     }
 
     @Override
     public final Select<R> unionAll(Select<? extends R> select) {
-        return new Union<R>(getConfiguration(), this, select, CombineOperator.UNION_ALL);
+        return new Union<R>(configuration(), this, select, CombineOperator.UNION_ALL);
     }
 
     @Override
     public final Select<R> except(Select<? extends R> select) {
-        return new Union<R>(getConfiguration(), this, select, CombineOperator.EXCEPT);
+        return new Union<R>(configuration(), this, select, CombineOperator.EXCEPT);
     }
 
     @Override
     public final Select<R> intersect(Select<? extends R> select) {
-        return new Union<R>(getConfiguration(), this, select, CombineOperator.INTERSECT);
+        return new Union<R>(configuration(), this, select, CombineOperator.INTERSECT);
     }
 
     @SuppressWarnings("unchecked")
@@ -155,7 +155,7 @@ abstract class AbstractSelect<R extends Record> extends AbstractResultQuery<R> i
         // If no projection was specified explicitly, create fields from result
         // set meta data instead. This is typically the case for SELECT * ...
         if (fields.isEmpty()) {
-            Configuration configuration = getConfiguration();
+            Configuration configuration = configuration();
             return new MetaDataFieldProvider(configuration, meta).getFields();
         }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractStore.java b/jOOQ/src/main/java/org/jooq/impl/AbstractStore.java
index 148e392562..3ab81ad738 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractStore.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractStore.java
@@ -86,7 +86,7 @@ abstract class AbstractStore implements AttachableInternal {
     }
 
     @Override
-    public final Configuration getConfiguration() {
+    public final Configuration configuration() {
         return configuration;
     }
 
@@ -94,7 +94,7 @@ abstract class AbstractStore implements AttachableInternal {
      * This method is used in generated code!
      */
     protected final DSLContext create() {
-        return DSL.using(getConfiguration());
+        return DSL.using(configuration());
     }
 
     // -------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractStoreQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractStoreQuery.java
index b0a24d3b67..022901cb07 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractStoreQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractStoreQuery.java
@@ -142,7 +142,7 @@ abstract class AbstractStoreQuery<R extends Record> extends AbstractQuery implem
     @Override
     public final Result<R> getReturnedRecords() {
         if (returned == null) {
-            returned = new ResultImpl<R>(getConfiguration(), returning);
+            returned = new ResultImpl<R>(configuration(), returning);
         }
 
         return returned;
diff --git a/jOOQ/src/main/java/org/jooq/impl/BatchCRUD.java b/jOOQ/src/main/java/org/jooq/impl/BatchCRUD.java
index e4056e8c36..50e8558fa5 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BatchCRUD.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BatchCRUD.java
@@ -110,7 +110,7 @@ class BatchCRUD implements Batch {
         local.settings().setExecuteLogging(false);
 
         for (int i = 0; i < records.length; i++) {
-            Configuration previous = ((AttachableInternal) records[i]).getConfiguration();
+            Configuration previous = ((AttachableInternal) records[i]).configuration();
 
             try {
                 records[i].attach(local);
@@ -172,7 +172,7 @@ class BatchCRUD implements Batch {
         Configuration local = configuration.derive(new DefaultExecuteListenerProvider(listeners));
 
         for (int i = 0; i < records.length; i++) {
-            Configuration previous = ((AttachableInternal) records[i]).getConfiguration();
+            Configuration previous = ((AttachableInternal) records[i]).configuration();
 
             try {
                 records[i].attach(local);
diff --git a/jOOQ/src/main/java/org/jooq/impl/InsertImpl.java b/jOOQ/src/main/java/org/jooq/impl/InsertImpl.java
index 392fe4e416..0f019b1e6f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/InsertImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/InsertImpl.java
@@ -138,7 +138,7 @@ class InsertImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
 
     @Override
     public final Insert<R> select(Select select) {
-        Configuration configuration = ((AttachableInternal) getDelegate()).getConfiguration();
+        Configuration configuration = ((AttachableInternal) getDelegate()).configuration();
         return new InsertSelectQueryImpl<R>(configuration, into, fields, select);
     }
     
diff --git a/jOOQ/src/main/java/org/jooq/impl/ReferenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/ReferenceImpl.java
index 0bc34e507e..6dd180af59 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ReferenceImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ReferenceImpl.java
@@ -189,7 +189,7 @@ class ReferenceImpl<R extends Record, O extends Record> extends AbstractKey<R> i
         R first = first(records);
 
         if (first instanceof AttachableInternal) {
-            return DSL.using(((AttachableInternal) first).getConfiguration());
+            return DSL.using(((AttachableInternal) first).configuration());
         }
         else {
             throw new DetachedException("Supply at least one attachable record");
diff --git a/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java b/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java
index d2388f20b9..a09c2f4aae 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java
@@ -124,7 +124,7 @@ class ResultImpl<R extends Record> implements Result<R>, AttachableInternal {
     }
 
     @Override
-    public final Configuration getConfiguration() {
+    public final Configuration configuration() {
         return configuration;
     }
 
@@ -857,7 +857,7 @@ class ResultImpl<R extends Record> implements Result<R>, AttachableInternal {
 
             Result<R> result = map.get(key);
             if (result == null) {
-                result = new ResultImpl<R>(getConfiguration(), this.fields);
+                result = new ResultImpl<R>(configuration(), this.fields);
                 map.put(key, result);
             }
 
@@ -1001,7 +1001,7 @@ class ResultImpl<R extends Record> implements Result<R>, AttachableInternal {
 
     @Override
     public final <Z extends Record> Result<Z> into(Table<Z> table) {
-        Result<Z> list = new ResultImpl<Z>(getConfiguration(), table.fields());
+        Result<Z> list = new ResultImpl<Z>(configuration(), table.fields());
 
         for (R record : this) {
             list.add(record.into(table));
diff --git a/jOOQ/src/main/java/org/jooq/impl/SQLResultQuery.java b/jOOQ/src/main/java/org/jooq/impl/SQLResultQuery.java
index 87a2312204..8094eff260 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SQLResultQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SQLResultQuery.java
@@ -88,7 +88,7 @@ class SQLResultQuery extends AbstractResultQuery<Record> {
 
     @Override
     protected final Field<?>[] getFields(ResultSetMetaData meta) {
-        Configuration configuration = getConfiguration();
+        Configuration configuration = configuration();
         return new MetaDataFieldProvider(configuration, meta).getFields();
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/UpdatableRecordImpl.java b/jOOQ/src/main/java/org/jooq/impl/UpdatableRecordImpl.java
index 5e431bd204..e4b61a4257 100644
--- a/jOOQ/src/main/java/org/jooq/impl/UpdatableRecordImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/UpdatableRecordImpl.java
@@ -399,7 +399,7 @@ public class UpdatableRecordImpl<R extends UpdatableRecord<R>> extends TableReco
     }
 
     private final boolean isExecuteWithOptimisticLocking() {
-        Configuration configuration = getConfiguration();
+        Configuration configuration = configuration();
 
         // This can be null when the current record is detached
         if (configuration != null) {
diff --git a/jOOQ/src/main/java/org/jooq/impl/Utils.java b/jOOQ/src/main/java/org/jooq/impl/Utils.java
index 122ab30d7b..d9cc343728 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Utils.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Utils.java
@@ -1196,7 +1196,7 @@ final class Utils {
      */
     static final Configuration getConfiguration(Attachable attachable) {
         if (attachable instanceof AttachableInternal) {
-            return ((AttachableInternal) attachable).getConfiguration();
+            return ((AttachableInternal) attachable).configuration();
         }
 
         return null;
diff --git a/jOOQ/src/main/java/org/jooq/tools/jdbc/MockResultSetMetaData.java b/jOOQ/src/main/java/org/jooq/tools/jdbc/MockResultSetMetaData.java
index df1bab190d..54ea83032b 100644
--- a/jOOQ/src/main/java/org/jooq/tools/jdbc/MockResultSetMetaData.java
+++ b/jOOQ/src/main/java/org/jooq/tools/jdbc/MockResultSetMetaData.java
@@ -165,7 +165,7 @@ public class MockResultSetMetaData implements ResultSetMetaData, Serializable {
                 Schema schema = table.getSchema();
 
                 if (schema != null) {
-                    Configuration configuration = ((AttachableInternal) rs.result).getConfiguration();
+                    Configuration configuration = ((AttachableInternal) rs.result).configuration();
                     Schema mapped = null;
 
                     if (configuration != null) {