diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/AbstractLoaderTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/AbstractLoaderTests.java
index 4252d66b6d..5981fb9916 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/AbstractLoaderTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/AbstractLoaderTests.java
@@ -43,6 +43,7 @@ package org.jooq.test._.testcases;
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNotNull;
 import static junit.framework.Assert.assertNull;
+// ...
 import static org.jooq.impl.DSL.count;
 
 import java.sql.Date;
@@ -102,7 +103,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
 
         // Empty CSV file
         // --------------
-        Loader<A> loader = createLoader1();
+        Loader<A> loader = createForEmptyFile();
 
         assertEquals(0, loader.processed());
         assertEquals(0, loader.errors().size());
@@ -113,8 +114,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         // Constraint violations (LAST_NAME is NOT NULL)
         // Loading is aborted
         // ---------------------------------------------
-        loader =
-                createLoader2();
+        loader = createLoaderAbortingOnConstraintViolationOnLAST_NAME();
 
         // [#812] Reset stale connection. Seems to be necessary in Postgres
         resetLoaderConnection();
@@ -129,7 +129,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         // Constraint violations (LAST_NAME is NOT NULL)
         // Errors are ignored
         // ---------------------------------------------
-        loader = createLoader3();
+        loader = createLoaderIgnoringConstraintViolationOnLAST_NAME();
 
         // [#812] Reset stale connection. Seems to be necessary in Postgres
         resetLoaderConnection();
@@ -145,8 +145,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         // Constraint violations (Duplicate records)
         // Loading is aborted
         // -----------------------------------------
-        loader =
-                createLoader4();
+        loader = createLoaderAbortingOnDuplicateRecords();
 
         // [#812] Reset stale connection. Seems to be necessary in Postgres
         resetLoaderConnection();
@@ -161,7 +160,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         // Constraint violations (Duplicate records)
         // Errors are ignored
         // -----------------------------------------
-        loader = createLoader5();
+        loader = createLoaderIgnoringDuplicateRecords();
 
         assertEquals(2, loader.processed());
         assertEquals(0, loader.errors().size());
@@ -170,8 +169,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
 
         // Two records with different NULL representations for FIRST_NAME
         // --------------------------------------------------------------
-        loader =
-                createLoader6();
+        loader = createLoaderWithDifferentNulls();
 
         assertEquals(2, loader.processed());
         assertEquals(2, loader.stored());
@@ -198,7 +196,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
 
         // Two records but don't load one column, and specify a value for NULL
         // -------------------------------------------------------------------
-        loader = createLoader7();
+        loader = createLoaderButDontLoadAllColumns();
 
         assertEquals(2, loader.processed());
         assertEquals(2, loader.stored());
@@ -238,7 +236,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
                 break;
 
             default: {
-                loader = createLoader8();
+                loader = createLoaderUpdatingDuplicateRecords();
 
                 assertEquals(2, loader.processed());
                 assertEquals(2, loader.stored());
@@ -268,7 +266,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
 
         // Rollback on duplicate keys
         // --------------------------
-        loader = createLoader9();
+        loader = createLoaderWithRollbackOnDuplicateKeys();
 
         assertEquals(2, loader.processed());
         assertEquals(0, loader.stored());
@@ -289,7 +287,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
 
         // Commit and ignore duplicates
         // ----------------------------
-        loader = createLoader10();
+        loader = createLoaderCommittingAndIgnoringDuplicates();
 
         assertEquals(3, loader.processed());
         assertEquals(1, loader.stored());
@@ -309,25 +307,25 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         assertEquals("Coelho", result.getValue(1, TAuthor_LAST_NAME()));
     }
 
-    protected abstract Loader<A> createLoader9() throws java.io.IOException;
+    protected abstract Loader<A> createLoaderWithRollbackOnDuplicateKeys() throws java.io.IOException;
 
-    protected abstract Loader<A> createLoader8() throws java.io.IOException;
+    protected abstract Loader<A> createLoaderUpdatingDuplicateRecords() throws java.io.IOException;
 
-    protected abstract Loader<A> createLoader7() throws java.io.IOException;
+    protected abstract Loader<A> createLoaderButDontLoadAllColumns() throws java.io.IOException;
 
-    protected abstract Loader<A> createLoader6() throws java.io.IOException;
+    protected abstract Loader<A> createLoaderWithDifferentNulls() throws java.io.IOException;
 
-    protected abstract Loader<A> createLoader5() throws java.io.IOException;
+    protected abstract Loader<A> createLoaderIgnoringDuplicateRecords() throws java.io.IOException;
 
-    protected abstract Loader<A> createLoader4() throws java.io.IOException;
+    protected abstract Loader<A> createLoaderAbortingOnDuplicateRecords() throws java.io.IOException;
 
-    protected abstract Loader<A> createLoader3() throws java.io.IOException;
+    protected abstract Loader<A> createLoaderIgnoringConstraintViolationOnLAST_NAME() throws java.io.IOException;
 
-    protected abstract Loader<A> createLoader10() throws java.io.IOException;
+    protected abstract Loader<A> createLoaderCommittingAndIgnoringDuplicates() throws java.io.IOException;
 
-    protected abstract Loader<A> createLoader2() throws java.io.IOException;
+    protected abstract Loader<A> createLoaderAbortingOnConstraintViolationOnLAST_NAME() throws java.io.IOException;
 
-    protected abstract Loader<A> createLoader1() throws java.io.IOException;
+    protected abstract Loader<A> createForEmptyFile() throws java.io.IOException;
 
     private void resetLoaderConnection() throws SQLException {
         jOOQAbstractTest.connection.rollback();
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/CsvLoaderTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/CsvLoaderTests.java
index b61b81a817..21a62a2e65 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/CsvLoaderTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/CsvLoaderTests.java
@@ -82,7 +82,7 @@ extends AbstractLoaderTests<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU,
     }
 
     @Override
-    protected Loader<A> createLoader9() throws java.io.IOException {
+    protected Loader<A> createLoaderWithRollbackOnDuplicateKeys() throws java.io.IOException {
         Loader<A> loader;
         String csv = "\"ID\",\"First Qualifier\",\"Last Qualifier\"\r" +
                 "8,Hermann,Hesse\n" +
@@ -101,7 +101,7 @@ extends AbstractLoaderTests<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU,
     }
 
     @Override
-    protected Loader<A> createLoader8() throws java.io.IOException {
+    protected Loader<A> createLoaderUpdatingDuplicateRecords() throws java.io.IOException {
         Loader<A> loader;
         String csv = "\"ID\",\"First Qualifier\",\"Last Qualifier\"\r" +
                 "1,Hermann,Hesse\n" +
@@ -117,7 +117,7 @@ extends AbstractLoaderTests<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU,
     }
 
     @Override
-    protected Loader<A> createLoader7() throws java.io.IOException {
+    protected Loader<A> createLoaderButDontLoadAllColumns() throws java.io.IOException {
         Loader<A> loader;
         String csv = "\"ID\",ignore,\"First Qualifier\",\"Last Qualifier\"\r" +
                 "5,asdf,{null},Hesse\n" +
@@ -133,7 +133,7 @@ extends AbstractLoaderTests<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU,
     }
 
     @Override
-    protected Loader<A> createLoader6() throws java.io.IOException {
+    protected Loader<A> createLoaderWithDifferentNulls() throws java.io.IOException {
 
         String csv = "####Some Data####\n" +
                 "\"ID\",\"Last Qualifier\"\r" +
@@ -151,7 +151,7 @@ extends AbstractLoaderTests<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU,
     }
 
     @Override
-    protected Loader<A> createLoader5() throws java.io.IOException {
+    protected Loader<A> createLoaderIgnoringDuplicateRecords() throws java.io.IOException {
         Loader<A> loader;
         String csv = "1,\"Kafka\"\n" +
                 "2,Frisch";
@@ -169,7 +169,7 @@ extends AbstractLoaderTests<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU,
     }
 
     @Override
-    protected Loader<A> createLoader4() throws java.io.IOException {
+    protected Loader<A> createLoaderAbortingOnDuplicateRecords() throws java.io.IOException {
         String csv = "1;'Kafka'\n" +
                 "2;Frisch";
 
@@ -188,7 +188,7 @@ extends AbstractLoaderTests<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU,
     }
 
     @Override
-    protected Loader<A> createLoader3() throws java.io.IOException {
+    protected Loader<A> createLoaderIgnoringConstraintViolationOnLAST_NAME() throws java.io.IOException {
         Loader<A> loader;
         String csv = "3\n" +
                 "4";
@@ -204,7 +204,7 @@ extends AbstractLoaderTests<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU,
     }
 
     @Override
-    protected Loader<A> createLoader10() throws java.io.IOException {
+    protected Loader<A> createLoaderCommittingAndIgnoringDuplicates() throws java.io.IOException {
         Loader<A> loader;
 
         String csv = "\"ID\",\"First Qualifier\",\"Last Qualifier\"\r" +
@@ -224,7 +224,7 @@ extends AbstractLoaderTests<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU,
     }
 
     @Override
-    protected Loader<A> createLoader2() throws java.io.IOException {
+    protected Loader<A> createLoaderAbortingOnConstraintViolationOnLAST_NAME() throws java.io.IOException {
         String csv = "3\n" +
                 "4";
         Loader<A> execute = create().loadInto(TAuthor())
@@ -239,7 +239,7 @@ extends AbstractLoaderTests<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU,
     }
 
     @Override
-    protected Loader<A> createLoader1() throws java.io.IOException {
+    protected Loader<A> createForEmptyFile() throws java.io.IOException {
         return create().loadInto(TAuthor())
                 .loadCSV("")
                 .fields(TAuthor_ID())
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/JsonLoaderTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/JsonLoaderTests.java
index b79370813c..e1909358bb 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/JsonLoaderTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/JsonLoaderTests.java
@@ -80,7 +80,7 @@ extends AbstractLoaderTests<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU,
     }
 
     @Override
-    protected Loader<A> createLoader9() throws java.io.IOException {
+    protected Loader<A> createLoaderWithRollbackOnDuplicateKeys() throws java.io.IOException {
         String json = "{\"fields\":[{\"name\":\"ID\",\"type\":\"INTEGER\"},{\"name\":\"FIRST_NAME\",\"type\":\"VARCHAR\"},{\"name\":\"LAST_NAME\",\"type\":\"VARCHAR\"}]," +
                 "\"records\":[[8,\"Hermann\",\"Hesse\"],[1,\"Max\",\"Frisch\"],[2,\"Friedrich\",\"Dürrenmatt\"]]}";
         Loader<A> loader;
@@ -101,7 +101,7 @@ extends AbstractLoaderTests<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU,
     }
 
     @Override
-    protected Loader<A> createLoader8() throws java.io.IOException {
+    protected Loader<A> createLoaderUpdatingDuplicateRecords() throws java.io.IOException {
         String json = "{\"fields\":[{\"name\":\"ID\",\"type\":\"INTEGER\"},{\"name\":\"FIRST_NAME\",\"type\":\"VARCHAR\"},{\"name\":\"LAST_NAME\",\"type\":\"VARCHAR\"}]," +
                 "\"records\":[[1,Hermann,\"Hesse\"],[7,\"Max\",\"Frisch\"]]}";
         Loader<A> loader;
@@ -119,7 +119,7 @@ extends AbstractLoaderTests<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU,
     }
 
     @Override
-    protected Loader<A> createLoader7() throws java.io.IOException {
+    protected Loader<A> createLoaderButDontLoadAllColumns() throws java.io.IOException {
         String json = "{\"fields\":[{\"name\":\"ID\",\"type\":\"INTEGER\"},{\"name\":\"ignore\",\"type\":\"String\"},{\"name\":\"FIRST_NAME\",\"type\":\"VARCHAR\"},{\"name\":\"LAST_NAME\",\"type\":\"VARCHAR\"}]," +
                 "\"records\":[[5,\"asdf\",null,\"Hesse\"],[6,\"asdf\",\"\",\"Frisch\"]]}";
         Loader<A> loader;
@@ -136,7 +136,7 @@ extends AbstractLoaderTests<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU,
     }
 
     @Override
-    protected Loader<A> createLoader6() throws java.io.IOException {
+    protected Loader<A> createLoaderWithDifferentNulls() throws java.io.IOException {
         String json = "{\"fields\":[{\"name\":\"ID\",\"type\":\"INTEGER\"},{\"name\":\"FIRST_NAME\",\"type\":\"VARCHAR\"},{\"name\":\"LAST_NAME\",\"type\":\"VARCHAR\"}]," +
                 "\"records\":[[3,\"\",\"Hesse\"],[4,\"\",\"Frisch\"]]}";
 
@@ -156,7 +156,7 @@ extends AbstractLoaderTests<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU,
     }
 
     @Override
-    protected Loader<A> createLoader5() throws java.io.IOException {
+    protected Loader<A> createLoaderIgnoringDuplicateRecords() throws java.io.IOException {
         Loader<A> loader;
         String json = "{\"fields\":[{\"name\":\"ID\",\"type\":\"INTEGER\"},{\"name\":\"LAST_NAME\",\"type\":\"VARCHAR\"}]," +
                 "\"records\":[[1,\"Kafka\"],[2,\"Frisch\"]]}";
@@ -176,7 +176,7 @@ extends AbstractLoaderTests<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU,
     }
 
     @Override
-    protected Loader<A> createLoader4() throws java.io.IOException {
+    protected Loader<A> createLoaderAbortingOnDuplicateRecords() throws java.io.IOException {
         String csv = "1;'Kafka'\n" +
                 "2;Frisch";
         String json = "{\"fields\":[{\"name\":\"ID\",\"type\":\"INTEGER\"},{\"name\":\"LAST_NAME\",\"type\":\"VARCHAR\"}]," +
@@ -197,7 +197,7 @@ extends AbstractLoaderTests<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU,
     }
 
     @Override
-    protected Loader<A> createLoader3() throws java.io.IOException {
+    protected Loader<A> createLoaderIgnoringConstraintViolationOnLAST_NAME() throws java.io.IOException {
         Loader<A> loader;
         String json = "{\"fields\":[{\"name\":\"ID\",\"type\":\"INTEGER\"}],\"records\":[[3],[4]]}";
         String csv = "3\n" +
@@ -214,7 +214,7 @@ extends AbstractLoaderTests<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU,
     }
 
     @Override
-    protected Loader<A> createLoader10() throws java.io.IOException {
+    protected Loader<A> createLoaderCommittingAndIgnoringDuplicates() throws java.io.IOException {
         Loader<A> loader;
         String json = "{\"fields\":[{\"name\":\"ID\",\"type\":\"INTEGER\"},{\"name\":\"FIRST_NAME\",\"type\":\"VARCHAR\"},{\"name\":\"LAST_NAME\",\"type\":\"VARCHAR\"}]," +
                 "\"records\":[[8,\"Hermann\",\"Hesse\"],[1,\"Max\",\"Frisch\"],[2,\"Friedrich\",\"Dürrenmatt\"]]}";
@@ -236,7 +236,7 @@ extends AbstractLoaderTests<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU,
     }
 
     @Override
-    protected Loader<A> createLoader2() throws java.io.IOException {
+    protected Loader<A> createLoaderAbortingOnConstraintViolationOnLAST_NAME() throws java.io.IOException {
         String json = "{\"fields\":[{\"name\":\"ID\",\"type\":\"INTEGER\"}],\"records\":[[3],[4]]}";
         String csv = "3\n" +
                 "4";
@@ -252,7 +252,7 @@ extends AbstractLoaderTests<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU,
     }
 
     @Override
-    protected Loader<A> createLoader1() throws java.io.IOException {
+    protected Loader<A> createForEmptyFile() throws java.io.IOException {
         return create().loadInto(TAuthor())
                 .loadCSV("")
                 .fields(TAuthor_ID())