diff --git a/jOOQ-test/launch/jOOQASETest.launch b/jOOQ-test/launch/ASETest.launch
similarity index 90%
rename from jOOQ-test/launch/jOOQASETest.launch
rename to jOOQ-test/launch/ASETest.launch
index e2d154b8de..1edf0561c3 100644
--- a/jOOQ-test/launch/jOOQASETest.launch
+++ b/jOOQ-test/launch/ASETest.launch
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/jOOQ-test/src/org/jooq/test/jOOQASETest.java"/>
+<listEntry value="/jOOQ-test/src/org/jooq/test/ASETest.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
@@ -14,7 +14,7 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.jOOQASETest"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.ASETest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djdbc.properties=/org/jooq/configuration/${env_var:USERNAME}/ase/library.properties"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/jOOQTest.launch b/jOOQ-test/launch/BasicTest.launch
similarity index 97%
rename from jOOQ-test/launch/jOOQTest.launch
rename to jOOQ-test/launch/BasicTest.launch
index 5fd7b9face..ae8653b341 100644
--- a/jOOQ-test/launch/jOOQTest.launch
+++ b/jOOQ-test/launch/BasicTest.launch
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/jOOQ/src/test/java/org/jooq/test/jOOQTest.java"/>
+<listEntry value="/jOOQ/src/test/java/org/jooq/test/BasicTest.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
@@ -32,6 +32,6 @@
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/jOOQ-test/lib/postgresql-9.0-801.jdbc4.jar&quot; path=&quot;3&quot; sourceAttachmentPath=&quot;/jOOQ-sources/postgresql-jdbc-9.0-801.src.zip&quot; sourceRootPath=&quot;&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 </listAttribute>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.jOOQTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.BasicTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/jOOQCUBRIDTest.launch b/jOOQ-test/launch/CUBRIDTest.launch
similarity index 94%
rename from jOOQ-test/launch/jOOQCUBRIDTest.launch
rename to jOOQ-test/launch/CUBRIDTest.launch
index 53f10658fe..0a949f6483 100644
--- a/jOOQ-test/launch/jOOQCUBRIDTest.launch
+++ b/jOOQ-test/launch/CUBRIDTest.launch
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/jOOQ-test/src/org/jooq/test/jOOQCUBRIDTest.java"/>
+<listEntry value="/jOOQ-test/src/org/jooq/test/CUBRIDTest.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
@@ -20,7 +20,7 @@
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/jOOQ-test/lib/JDBC-8.4.1.5002-cubrid.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 </listAttribute>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.jOOQCUBRIDTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.CUBRIDTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djdbc.properties=/org/jooq/configuration/${env_var:USERNAME}/cubrid/library.properties"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/jOOQDB2Test.launch b/jOOQ-test/launch/DB2Test.launch
similarity index 90%
rename from jOOQ-test/launch/jOOQDB2Test.launch
rename to jOOQ-test/launch/DB2Test.launch
index 0fb0acbe14..ae25062a03 100644
--- a/jOOQ-test/launch/jOOQDB2Test.launch
+++ b/jOOQ-test/launch/DB2Test.launch
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/jOOQ-test/src/org/jooq/test/jOOQDB2Test.java"/>
+<listEntry value="/jOOQ-test/src/org/jooq/test/DB2Test.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
@@ -14,7 +14,7 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.jOOQDB2Test"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.DB2Test"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djdbc.properties=/org/jooq/configuration/${env_var:USERNAME}/db2/library.properties"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/jOOQDerbyTest.launch b/jOOQ-test/launch/DerbyTest.launch
similarity index 90%
rename from jOOQ-test/launch/jOOQDerbyTest.launch
rename to jOOQ-test/launch/DerbyTest.launch
index 8a926a68ed..bdad171c82 100644
--- a/jOOQ-test/launch/jOOQDerbyTest.launch
+++ b/jOOQ-test/launch/DerbyTest.launch
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/jOOQ-test/src/org/jooq/test/jOOQDerbyTest.java"/>
+<listEntry value="/jOOQ-test/src/org/jooq/test/DerbyTest.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
@@ -14,7 +14,7 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.jOOQDerbyTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.DerbyTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djdbc.properties=/org/jooq/configuration/${env_var:USERNAME}/derby/library.properties"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/jOOQFirebirdTest.launch b/jOOQ-test/launch/FirebirdTest.launch
similarity index 90%
rename from jOOQ-test/launch/jOOQFirebirdTest.launch
rename to jOOQ-test/launch/FirebirdTest.launch
index 3723c040c6..5ad3ab538a 100644
--- a/jOOQ-test/launch/jOOQFirebirdTest.launch
+++ b/jOOQ-test/launch/FirebirdTest.launch
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/jOOQ-test/src/org/jooq/test/jOOQFirebirdTest.java"/>
+<listEntry value="/jOOQ-test/src/org/jooq/test/FirebirdTest.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
@@ -14,7 +14,7 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.jOOQFirebirdTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.FirebirdTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djdbc.properties=/org/jooq/configuration/${env_var:USERNAME}/firebird/library.properties"/>
 <stringAttribute key="yk-options" value="&#13;&#10;use-64-bit=true&#13;&#10;additional-options2=onexit\=snapshot&#13;&#10;"/>
diff --git a/jOOQ-test/launch/jOOQH2Test.launch b/jOOQ-test/launch/H2Test.launch
similarity index 90%
rename from jOOQ-test/launch/jOOQH2Test.launch
rename to jOOQ-test/launch/H2Test.launch
index e41fcc42c7..2589f8a919 100644
--- a/jOOQ-test/launch/jOOQH2Test.launch
+++ b/jOOQ-test/launch/H2Test.launch
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/jOOQ-test/src/org/jooq/test/jOOQH2Test.java"/>
+<listEntry value="/jOOQ-test/src/org/jooq/test/H2Test.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
@@ -14,7 +14,7 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.jOOQH2Test"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.H2Test"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djdbc.properties=/org/jooq/configuration/${env_var:USERNAME}/h2/library.properties"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/jOOQHSQLDBTest (Oracle schema, renderSchema=false).launch b/jOOQ-test/launch/HSQLDBTest (Oracle schema, renderSchema=false).launch
similarity index 90%
rename from jOOQ-test/launch/jOOQHSQLDBTest (Oracle schema, renderSchema=false).launch
rename to jOOQ-test/launch/HSQLDBTest (Oracle schema, renderSchema=false).launch
index cedc92389e..2455662e55 100644
--- a/jOOQ-test/launch/jOOQHSQLDBTest (Oracle schema, renderSchema=false).launch	
+++ b/jOOQ-test/launch/HSQLDBTest (Oracle schema, renderSchema=false).launch	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest2.java"/>
+<listEntry value="/jOOQ-test/src/org/jooq/test/HSQLDBTest2.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
@@ -14,7 +14,7 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.jOOQHSQLDBTest2"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.HSQLDBTest2"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djdbc.properties=/org/jooq/configuration/${env_var:USERNAME}/hsqldb/library.properties -Dorg.jooq.settings.renderSchema"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/jOOQHSQLDBTest.launch b/jOOQ-test/launch/HSQLDBTest.launch
similarity index 91%
rename from jOOQ-test/launch/jOOQHSQLDBTest.launch
rename to jOOQ-test/launch/HSQLDBTest.launch
index 64ae2e22a4..eab2299e1e 100644
--- a/jOOQ-test/launch/jOOQHSQLDBTest.launch
+++ b/jOOQ-test/launch/HSQLDBTest.launch
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest.java"/>
+<listEntry value="/jOOQ-test/src/org/jooq/test/HSQLDBTest.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
@@ -14,7 +14,7 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.jOOQHSQLDBTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.HSQLDBTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djdbc.properties=/org/jooq/configuration/${env_var:USERNAME}/hsqldb/library.properties"/>
 <stringAttribute key="yk-options" value="&#13;&#10;use-64-bit=true&#13;&#10;additional-options2=onexit\=snapshot&#13;&#10;"/>
diff --git a/jOOQ-test/launch/jOOQIngresTest.launch b/jOOQ-test/launch/IngresTest.launch
similarity index 96%
rename from jOOQ-test/launch/jOOQIngresTest.launch
rename to jOOQ-test/launch/IngresTest.launch
index 0c2f990296..60a05626ab 100644
--- a/jOOQ-test/launch/jOOQIngresTest.launch
+++ b/jOOQ-test/launch/IngresTest.launch
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/jOOQ-test/src/org/jooq/test/jOOQIngresTest.java"/>
+<listEntry value="/jOOQ-test/src/org/jooq/test/IngresTest.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
@@ -27,7 +27,7 @@
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;jOOQ-console&quot; type=&quot;1&quot;/&gt;&#13;&#10;"/>
 </listAttribute>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.jOOQIngresTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.IngresTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djdbc.properties=/org/jooq/configuration/${env_var:USERNAME}/ingres/library.properties"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/jOOQMySQLTest (schema mapping).launch b/jOOQ-test/launch/MySQLTest (schema mapping).launch
similarity index 84%
rename from jOOQ-test/launch/jOOQMySQLTest (schema mapping).launch
rename to jOOQ-test/launch/MySQLTest (schema mapping).launch
index 35bfde51c2..cea84877aa 100644
--- a/jOOQ-test/launch/jOOQMySQLTest (schema mapping).launch	
+++ b/jOOQ-test/launch/MySQLTest (schema mapping).launch	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/jOOQ-test/src/org/jooq/test/jOOQMySQLTestSchemaMapping.java"/>
+<listEntry value="/jOOQ-test/src/org/jooq/test/MySQLTestSchemaMapping.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
@@ -14,8 +14,8 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.jOOQMySQLTestSchemaMapping"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_Torg.jooq.test.jOOQMySQLTestSchemaMappingOQMySQLTestSchemaMapping" value=""/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.MySQLTestSchemaMapping"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_Torg.jooq.test.MySQLTestSchemaMappingOQMySQLTestSchemaMapping" value=""/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djdbc.properties=/org/jooq/configuration/${env_var:USERNAME}/mysql/library.properties"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/jOOQMySQLTest (schema rewrite).launch b/jOOQ-test/launch/MySQLTest (schema rewrite).launch
similarity index 84%
rename from jOOQ-test/launch/jOOQMySQLTest (schema rewrite).launch
rename to jOOQ-test/launch/MySQLTest (schema rewrite).launch
index 7ba33e5552..21db6a3227 100644
--- a/jOOQ-test/launch/jOOQMySQLTest (schema rewrite).launch	
+++ b/jOOQ-test/launch/MySQLTest (schema rewrite).launch	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/jOOQ-test/src/org/jooq/test/jOOQMySQLTestSchemaRewrite.java"/>
+<listEntry value="/jOOQ-test/src/org/jooq/test/MySQLTestSchemaRewrite.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
@@ -14,8 +14,8 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.jOOQMySQLTestSchemaRewrite"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_Torg.jooq.test.jOOQMySQLTestSchemaMappingOQMySQLTestSchemaMapping" value=""/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.MySQLTestSchemaRewrite"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_Torg.jooq.test.MySQLTestSchemaMappingOQMySQLTestSchemaMapping" value=""/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djdbc.properties=/org/jooq/configuration/${env_var:USERNAME}/mysql/library-schema-rewrite.properties"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/jOOQMySQLTest.launch b/jOOQ-test/launch/MySQLTest.launch
similarity index 90%
rename from jOOQ-test/launch/jOOQMySQLTest.launch
rename to jOOQ-test/launch/MySQLTest.launch
index 2379c9f2c6..c192981977 100644
--- a/jOOQ-test/launch/jOOQMySQLTest.launch
+++ b/jOOQ-test/launch/MySQLTest.launch
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/jOOQ-test/src/org/jooq/test/jOOQMySQLTest.java"/>
+<listEntry value="/jOOQ-test/src/org/jooq/test/MySQLTest.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
@@ -14,7 +14,7 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.jOOQMySQLTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.MySQLTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djdbc.properties=/org/jooq/configuration/${env_var:USERNAME}/mysql/library.properties"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/jOOQOracleTest (No bind variables).launch b/jOOQ-test/launch/OracleTest (No bind variables).launch
similarity index 89%
rename from jOOQ-test/launch/jOOQOracleTest (No bind variables).launch
rename to jOOQ-test/launch/OracleTest (No bind variables).launch
index c863635ea5..1816686ddb 100644
--- a/jOOQ-test/launch/jOOQOracleTest (No bind variables).launch	
+++ b/jOOQ-test/launch/OracleTest (No bind variables).launch	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/jOOQ-test/src/org/jooq/test/jOOQOracleTestInline.java"/>
+<listEntry value="/jOOQ-test/src/org/jooq/test/OracleTestInline.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
@@ -14,7 +14,7 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.jOOQOracleTestInline"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.OracleTestInline"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djdbc.properties=/org/jooq/configuration/${env_var:USERNAME}/oracle/library.properties"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/jOOQOracleTest (default schema).launch b/jOOQ-test/launch/OracleTest (default schema).launch
similarity index 90%
rename from jOOQ-test/launch/jOOQOracleTest (default schema).launch
rename to jOOQ-test/launch/OracleTest (default schema).launch
index dded35dad8..9d9b7d9941 100644
--- a/jOOQ-test/launch/jOOQOracleTest (default schema).launch	
+++ b/jOOQ-test/launch/OracleTest (default schema).launch	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/jOOQ-test/src/org/jooq/test/jOOQOracleTest.java"/>
+<listEntry value="/jOOQ-test/src/org/jooq/test/OracleTest.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
@@ -14,7 +14,7 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.jOOQOracleTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.OracleTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djdbc.properties=/org/jooq/configuration/${env_var:USERNAME}/oracle/library.properties -Dorg.jooq.settings.defaultSchema=TEST"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/jOOQOracleTest.launch b/jOOQ-test/launch/OracleTest.launch
similarity index 90%
rename from jOOQ-test/launch/jOOQOracleTest.launch
rename to jOOQ-test/launch/OracleTest.launch
index 195f202099..70d1671133 100644
--- a/jOOQ-test/launch/jOOQOracleTest.launch
+++ b/jOOQ-test/launch/OracleTest.launch
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/jOOQ-test/src/org/jooq/test/jOOQOracleTest.java"/>
+<listEntry value="/jOOQ-test/src/org/jooq/test/OracleTest.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
@@ -14,7 +14,7 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.jOOQOracleTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.OracleTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djdbc.properties=/org/jooq/configuration/${env_var:USERNAME}/oracle/library.properties"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/jOOQPostgresTest.launch b/jOOQ-test/launch/PostgresTest.launch
similarity index 89%
rename from jOOQ-test/launch/jOOQPostgresTest.launch
rename to jOOQ-test/launch/PostgresTest.launch
index fe957b7a78..51ff2a4ee9 100644
--- a/jOOQ-test/launch/jOOQPostgresTest.launch
+++ b/jOOQ-test/launch/PostgresTest.launch
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/jOOQ-test/src/org/jooq/test/jOOQPostgresTest.java"/>
+<listEntry value="/jOOQ-test/src/org/jooq/test/PostgresTest.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
@@ -14,7 +14,7 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.jOOQPostgresTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.PostgresTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djdbc.properties=/org/jooq/configuration/${env_var:USERNAME}/postgres/library.properties"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/jOOQSQLServerTest (No bind variables).launch b/jOOQ-test/launch/SQLServerTest (No bind variables).launch
similarity index 89%
rename from jOOQ-test/launch/jOOQSQLServerTest (No bind variables).launch
rename to jOOQ-test/launch/SQLServerTest (No bind variables).launch
index 57b3ff934c..68525bb497 100644
--- a/jOOQ-test/launch/jOOQSQLServerTest (No bind variables).launch	
+++ b/jOOQ-test/launch/SQLServerTest (No bind variables).launch	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/jOOQ-test/src/org/jooq/test/jOOQSQLServerTestInline.java"/>
+<listEntry value="/jOOQ-test/src/org/jooq/test/SQLServerTestInline.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
@@ -14,7 +14,7 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.jOOQSQLServerTestInline"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.SQLServerTestInline"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djdbc.properties=/org/jooq/configuration/${env_var:USERNAME}/sqlserver/library.properties&#13;&#10;-Djava.library.path=C:\sqljdbc_3.0\enu\auth\x64"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/jOOQSQLServerTest.launch b/jOOQ-test/launch/SQLServerTest.launch
similarity index 90%
rename from jOOQ-test/launch/jOOQSQLServerTest.launch
rename to jOOQ-test/launch/SQLServerTest.launch
index b133de0bb9..93b5eb0747 100644
--- a/jOOQ-test/launch/jOOQSQLServerTest.launch
+++ b/jOOQ-test/launch/SQLServerTest.launch
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/jOOQ-test/src/org/jooq/test/jOOQSQLServerTest.java"/>
+<listEntry value="/jOOQ-test/src/org/jooq/test/SQLServerTest.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
@@ -14,7 +14,7 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.jOOQSQLServerTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.SQLServerTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djdbc.properties=/org/jooq/configuration/${env_var:USERNAME}/sqlserver/library.properties&#13;&#10;-Djava.library.path=C:\sqljdbc_3.0\enu\auth\x64"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/jOOQSQLiteTest.launch b/jOOQ-test/launch/SQLiteTest.launch
similarity index 90%
rename from jOOQ-test/launch/jOOQSQLiteTest.launch
rename to jOOQ-test/launch/SQLiteTest.launch
index f14e925f08..98fcf1642e 100644
--- a/jOOQ-test/launch/jOOQSQLiteTest.launch
+++ b/jOOQ-test/launch/SQLiteTest.launch
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/jOOQ-test/src/org/jooq/test/jOOQSQLiteTest.java"/>
+<listEntry value="/jOOQ-test/src/org/jooq/test/SQLiteTest.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
@@ -14,7 +14,7 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.jOOQSQLiteTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.SQLiteTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djdbc.properties=/org/jooq/configuration/${env_var:USERNAME}/sqlite/library.properties"/>
 </launchConfiguration>
diff --git a/jOOQ-test/launch/jOOQSybaseTest.launch b/jOOQ-test/launch/SybaseTest.launch
similarity index 91%
rename from jOOQ-test/launch/jOOQSybaseTest.launch
rename to jOOQ-test/launch/SybaseTest.launch
index 4f9e44222f..e61e9520fc 100644
--- a/jOOQ-test/launch/jOOQSybaseTest.launch
+++ b/jOOQ-test/launch/SybaseTest.launch
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/jOOQ-test/src/org/jooq/test/jOOQSybaseTest.java"/>
+<listEntry value="/jOOQ-test/src/org/jooq/test/SybaseTest.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
@@ -14,7 +14,7 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.jOOQSybaseTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.SybaseTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djdbc.properties=/org/jooq/configuration/${env_var:USERNAME}/sybase/library.properties"/>
 </launchConfiguration>
diff --git a/jOOQ-test/src/org/jooq/test/jOOQASETest.java b/jOOQ-test/src/org/jooq/test/ASETest.java
similarity index 99%
rename from jOOQ-test/src/org/jooq/test/jOOQASETest.java
rename to jOOQ-test/src/org/jooq/test/ASETest.java
index 156b7ae2d9..e45a2c865d 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQASETest.java
+++ b/jOOQ-test/src/org/jooq/test/ASETest.java
@@ -102,7 +102,7 @@ import org.jooq.util.ase.ASEFactory;
  *
  * @author Lukas Eder
  */
-public class jOOQASETest extends jOOQAbstractTest<
+public class ASETest extends jOOQAbstractTest<
         TAuthorRecord,
         Object,
         TBookRecord,
diff --git a/jOOQ-test/src/org/jooq/test/jOOQCUBRIDTest.java b/jOOQ-test/src/org/jooq/test/CUBRIDTest.java
similarity index 99%
rename from jOOQ-test/src/org/jooq/test/jOOQCUBRIDTest.java
rename to jOOQ-test/src/org/jooq/test/CUBRIDTest.java
index f7b2422120..9caf345fde 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQCUBRIDTest.java
+++ b/jOOQ-test/src/org/jooq/test/CUBRIDTest.java
@@ -106,7 +106,7 @@ import org.jooq.util.cubrid.CUBRIDFactory;
  *
  * @author Lukas Eder
  */
-public class jOOQCUBRIDTest extends jOOQAbstractTest<
+public class CUBRIDTest extends jOOQAbstractTest<
         TAuthorRecord,
         Object,
         TBookRecord,
diff --git a/jOOQ-test/src/org/jooq/test/jOOQDB2Test.java b/jOOQ-test/src/org/jooq/test/DB2Test.java
similarity index 99%
rename from jOOQ-test/src/org/jooq/test/jOOQDB2Test.java
rename to jOOQ-test/src/org/jooq/test/DB2Test.java
index 5807da93e5..ce92b6a9b9 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQDB2Test.java
+++ b/jOOQ-test/src/org/jooq/test/DB2Test.java
@@ -109,7 +109,7 @@ import org.jooq.util.db2.DB2Factory;
  *
  * @author Espen Stromsnes
  */
-public class jOOQDB2Test extends jOOQAbstractTest<
+public class DB2Test extends jOOQAbstractTest<
         TAuthorRecord,
         Object,
         TBookRecord,
diff --git a/jOOQ-test/src/org/jooq/test/jOOQDerbyTest.java b/jOOQ-test/src/org/jooq/test/DerbyTest.java
similarity index 99%
rename from jOOQ-test/src/org/jooq/test/jOOQDerbyTest.java
rename to jOOQ-test/src/org/jooq/test/DerbyTest.java
index 7f65005f09..6b6d544789 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQDerbyTest.java
+++ b/jOOQ-test/src/org/jooq/test/DerbyTest.java
@@ -106,7 +106,7 @@ import org.jooq.util.derby.DerbyFactory;
 /**
  * @author Lukas Eder
  */
-public class jOOQDerbyTest extends jOOQAbstractTest<
+public class DerbyTest extends jOOQAbstractTest<
         TAuthorRecord,
         Object,
         TBookRecord,
diff --git a/jOOQ-test/src/org/jooq/test/jOOQFirebirdTest.java b/jOOQ-test/src/org/jooq/test/FirebirdTest.java
similarity index 99%
rename from jOOQ-test/src/org/jooq/test/jOOQFirebirdTest.java
rename to jOOQ-test/src/org/jooq/test/FirebirdTest.java
index 2f490df82f..a5afa4c8ab 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQFirebirdTest.java
+++ b/jOOQ-test/src/org/jooq/test/FirebirdTest.java
@@ -99,7 +99,7 @@ import org.jooq.util.firebird.FirebirdFactory;
  *
  * @author Lukas Eder
  */
-public class jOOQFirebirdTest extends jOOQAbstractTest<
+public class FirebirdTest extends jOOQAbstractTest<
         TAuthorRecord,
         Object,
         TBookRecord,
diff --git a/jOOQ-test/src/org/jooq/test/jOOQH2Test.java b/jOOQ-test/src/org/jooq/test/H2Test.java
similarity index 99%
rename from jOOQ-test/src/org/jooq/test/jOOQH2Test.java
rename to jOOQ-test/src/org/jooq/test/H2Test.java
index 9388c78e4a..1df2327604 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQH2Test.java
+++ b/jOOQ-test/src/org/jooq/test/H2Test.java
@@ -113,7 +113,7 @@ import org.jooq.util.h2.H2Factory;
  *
  * @author Espen Stromsnes
  */
-public class jOOQH2Test extends jOOQAbstractTest<
+public class H2Test extends jOOQAbstractTest<
         TAuthorRecord,
         org.jooq.test.h2.generatedclasses.tables.pojos.TAuthor,
         TBookRecord,
diff --git a/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest.java b/jOOQ-test/src/org/jooq/test/HSQLDBTest.java
similarity index 99%
rename from jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest.java
rename to jOOQ-test/src/org/jooq/test/HSQLDBTest.java
index 092223575a..b7c104ad8b 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest.java
+++ b/jOOQ-test/src/org/jooq/test/HSQLDBTest.java
@@ -105,7 +105,7 @@ import org.jooq.util.hsqldb.HSQLDBFactory;
 /**
  * @author Lukas Eder
  */
-public class jOOQHSQLDBTest extends jOOQAbstractTest<
+public class HSQLDBTest extends jOOQAbstractTest<
         TAuthorRecord,
         Object,
         TBookRecord,
diff --git a/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest2.java b/jOOQ-test/src/org/jooq/test/HSQLDBTest2.java
similarity index 99%
rename from jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest2.java
rename to jOOQ-test/src/org/jooq/test/HSQLDBTest2.java
index 39f8b52c3a..7d395d704f 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQHSQLDBTest2.java
+++ b/jOOQ-test/src/org/jooq/test/HSQLDBTest2.java
@@ -104,7 +104,7 @@ import org.jooq.util.hsqldb.HSQLDBFactory;
  * @author Lukas Eder
  */
 @SuppressWarnings("static-access")
-public class jOOQHSQLDBTest2 extends jOOQAbstractTest<
+public class HSQLDBTest2 extends jOOQAbstractTest<
         TAuthorRecord,
         Object,
         TBookRecord,
diff --git a/jOOQ-test/src/org/jooq/test/jOOQIngresTest.java b/jOOQ-test/src/org/jooq/test/IngresTest.java
similarity index 99%
rename from jOOQ-test/src/org/jooq/test/jOOQIngresTest.java
rename to jOOQ-test/src/org/jooq/test/IngresTest.java
index 706a535d04..123eef694b 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQIngresTest.java
+++ b/jOOQ-test/src/org/jooq/test/IngresTest.java
@@ -106,7 +106,7 @@ import org.jooq.util.ingres.IngresFactory;
 /**
  * @author Lukas Eder
  */
-public class jOOQIngresTest extends jOOQAbstractTest<
+public class IngresTest extends jOOQAbstractTest<
         TAuthorRecord,
         Object,
         TBookRecord,
diff --git a/jOOQ-test/src/org/jooq/test/jOOQMySQLTest.java b/jOOQ-test/src/org/jooq/test/MySQLTest.java
similarity index 99%
rename from jOOQ-test/src/org/jooq/test/jOOQMySQLTest.java
rename to jOOQ-test/src/org/jooq/test/MySQLTest.java
index 89b901bf59..a433cbff95 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQMySQLTest.java
+++ b/jOOQ-test/src/org/jooq/test/MySQLTest.java
@@ -130,7 +130,7 @@ import org.junit.Test;
 /**
  * @author Lukas Eder
  */
-public class jOOQMySQLTest extends jOOQAbstractTest<
+public class MySQLTest extends jOOQAbstractTest<
         TAuthorRecord,
         org.jooq.test.mysql.generatedclasses.tables.pojos.TAuthor,
         TBookRecord,
diff --git a/jOOQ-test/src/org/jooq/test/jOOQMySQLTestSchemaMapping.java b/jOOQ-test/src/org/jooq/test/MySQLTestSchemaMapping.java
similarity index 97%
rename from jOOQ-test/src/org/jooq/test/jOOQMySQLTestSchemaMapping.java
rename to jOOQ-test/src/org/jooq/test/MySQLTestSchemaMapping.java
index 2f0fabe611..1e6d61df22 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQMySQLTestSchemaMapping.java
+++ b/jOOQ-test/src/org/jooq/test/MySQLTestSchemaMapping.java
@@ -48,7 +48,7 @@ import org.jooq.util.mysql.MySQLFactory;
 /**
  * @author Lukas Eder
  */
-public class jOOQMySQLTestSchemaMapping extends jOOQMySQLTest {
+public class MySQLTestSchemaMapping extends MySQLTest {
 
     @Override
     public void setUp() throws Exception {
diff --git a/jOOQ-test/src/org/jooq/test/jOOQMySQLTestSchemaRewrite.java b/jOOQ-test/src/org/jooq/test/MySQLTestSchemaRewrite.java
similarity index 99%
rename from jOOQ-test/src/org/jooq/test/jOOQMySQLTestSchemaRewrite.java
rename to jOOQ-test/src/org/jooq/test/MySQLTestSchemaRewrite.java
index 687ad26cca..9e285db0e3 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQMySQLTestSchemaRewrite.java
+++ b/jOOQ-test/src/org/jooq/test/MySQLTestSchemaRewrite.java
@@ -101,7 +101,7 @@ import org.jooq.util.mysql.MySQLFactory;
 /**
  * @author Lukas Eder
  */
-public class jOOQMySQLTestSchemaRewrite extends jOOQAbstractTest<
+public class MySQLTestSchemaRewrite extends jOOQAbstractTest<
         TAuthorRecord,
         org.jooq.test.mysql2.generatedclasses.tables.pojos.TAuthor,
         TBookRecord,
diff --git a/jOOQ-test/src/org/jooq/test/jOOQOracleTest.java b/jOOQ-test/src/org/jooq/test/OracleTest.java
similarity index 99%
rename from jOOQ-test/src/org/jooq/test/jOOQOracleTest.java
rename to jOOQ-test/src/org/jooq/test/OracleTest.java
index 5c8d4e6bfa..706246c090 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQOracleTest.java
+++ b/jOOQ-test/src/org/jooq/test/OracleTest.java
@@ -165,7 +165,7 @@ import org.junit.Test;
 /**
  * @author Lukas Eder
  */
-public class jOOQOracleTest extends jOOQAbstractTest<
+public class OracleTest extends jOOQAbstractTest<
         TAuthorRecord,
         org.jooq.test.oracle.generatedclasses.test.tables.pojos.TAuthor,
         TBookRecord,
diff --git a/jOOQ-test/src/org/jooq/test/jOOQOracleTestInline.java b/jOOQ-test/src/org/jooq/test/OracleTestInline.java
similarity index 97%
rename from jOOQ-test/src/org/jooq/test/jOOQOracleTestInline.java
rename to jOOQ-test/src/org/jooq/test/OracleTestInline.java
index a5fe8109a0..82110fdd96 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQOracleTestInline.java
+++ b/jOOQ-test/src/org/jooq/test/OracleTestInline.java
@@ -44,7 +44,7 @@ import org.jooq.util.oracle.OracleFactory;
 /**
  * @author Lukas Eder
  */
-public class jOOQOracleTestInline extends jOOQOracleTest {
+public class OracleTestInline extends OracleTest {
 
     @Override
     protected OracleFactory create(Settings settings) {
diff --git a/jOOQ-test/src/org/jooq/test/jOOQPostgresTest.java b/jOOQ-test/src/org/jooq/test/PostgresTest.java
similarity index 99%
rename from jOOQ-test/src/org/jooq/test/jOOQPostgresTest.java
rename to jOOQ-test/src/org/jooq/test/PostgresTest.java
index 3f4189c02c..834aa99e5c 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQPostgresTest.java
+++ b/jOOQ-test/src/org/jooq/test/PostgresTest.java
@@ -113,7 +113,7 @@ import org.junit.Test;
 /**
  * @author Lukas Eder
  */
-public class jOOQPostgresTest extends jOOQAbstractTest<
+public class PostgresTest extends jOOQAbstractTest<
         TAuthorRecord,
         Object,
         TBookRecord,
diff --git a/jOOQ-test/src/org/jooq/test/jOOQSQLServerTest.java b/jOOQ-test/src/org/jooq/test/SQLServerTest.java
similarity index 99%
rename from jOOQ-test/src/org/jooq/test/jOOQSQLServerTest.java
rename to jOOQ-test/src/org/jooq/test/SQLServerTest.java
index 9ab942ec03..87eb9c2925 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQSQLServerTest.java
+++ b/jOOQ-test/src/org/jooq/test/SQLServerTest.java
@@ -101,7 +101,7 @@ import org.jooq.util.sqlserver.SQLServerFactory;
 /**
  * @author Lukas Eder
  */
-public class jOOQSQLServerTest extends jOOQAbstractTest<
+public class SQLServerTest extends jOOQAbstractTest<
         TAuthorRecord,
         Object,
         TBookRecord,
diff --git a/jOOQ-test/src/org/jooq/test/jOOQSQLServerTestInline.java b/jOOQ-test/src/org/jooq/test/SQLServerTestInline.java
similarity index 97%
rename from jOOQ-test/src/org/jooq/test/jOOQSQLServerTestInline.java
rename to jOOQ-test/src/org/jooq/test/SQLServerTestInline.java
index 5d0e431af8..9522b6e343 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQSQLServerTestInline.java
+++ b/jOOQ-test/src/org/jooq/test/SQLServerTestInline.java
@@ -44,7 +44,7 @@ import org.jooq.util.sqlserver.SQLServerFactory;
 /**
  * @author Lukas Eder
  */
-public class jOOQSQLServerTestInline extends jOOQSQLServerTest {
+public class SQLServerTestInline extends SQLServerTest {
 
     @Override
     protected SQLServerFactory create(Settings settings) {
diff --git a/jOOQ-test/src/org/jooq/test/jOOQSQLiteTest.java b/jOOQ-test/src/org/jooq/test/SQLiteTest.java
similarity index 99%
rename from jOOQ-test/src/org/jooq/test/jOOQSQLiteTest.java
rename to jOOQ-test/src/org/jooq/test/SQLiteTest.java
index b5c8ade59f..ffd65ae8f2 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQSQLiteTest.java
+++ b/jOOQ-test/src/org/jooq/test/SQLiteTest.java
@@ -100,7 +100,7 @@ import org.jooq.util.sqlite.SQLiteFactory;
  *
  * @author Lukas Eder
  */
-public class jOOQSQLiteTest extends jOOQAbstractTest<
+public class SQLiteTest extends jOOQAbstractTest<
         TAuthorRecord,
         Object,
         TBookRecord,
diff --git a/jOOQ-test/src/org/jooq/test/jOOQSybaseTest.java b/jOOQ-test/src/org/jooq/test/SybaseTest.java
similarity index 99%
rename from jOOQ-test/src/org/jooq/test/jOOQSybaseTest.java
rename to jOOQ-test/src/org/jooq/test/SybaseTest.java
index 7c464acccf..ad64d94a76 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQSybaseTest.java
+++ b/jOOQ-test/src/org/jooq/test/SybaseTest.java
@@ -100,7 +100,7 @@ import org.jooq.util.sybase.SybaseFactory;
  *
  * @author Espen Stromsnes
  */
-public class jOOQSybaseTest extends jOOQAbstractTest<
+public class SybaseTest extends jOOQAbstractTest<
         TAuthorRecord,
         Object,
         TBookRecord,
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/SchemaAndMappingTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/SchemaAndMappingTests.java
index e202ca010c..88bd7ab590 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/SchemaAndMappingTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/SchemaAndMappingTests.java
@@ -60,7 +60,7 @@ import org.jooq.conf.Settings;
 import org.jooq.impl.Factory;
 import org.jooq.test.BaseTest;
 import org.jooq.test.jOOQAbstractTest;
-import org.jooq.test.jOOQMySQLTestSchemaRewrite;
+import org.jooq.test.MySQLTestSchemaRewrite;
 
 import org.junit.Test;
 
@@ -214,7 +214,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658,
             case MYSQL:
 
                 // But not when the schema is already re-written
-                if (delegate.getClass() == jOOQMySQLTestSchemaRewrite.class) {
+                if (delegate.getClass() == MySQLTestSchemaRewrite.class) {
                     log.info("SKIPPING", "Schema mapping test");
                     return;
                 }
diff --git a/jOOQ/src/test/java/org/jooq/test/jOOQTest.java b/jOOQ/src/test/java/org/jooq/test/BasicTest.java
similarity index 99%
rename from jOOQ/src/test/java/org/jooq/test/jOOQTest.java
rename to jOOQ/src/test/java/org/jooq/test/BasicTest.java
index 3ef3db949e..3ce2ca2496 100644
--- a/jOOQ/src/test/java/org/jooq/test/jOOQTest.java
+++ b/jOOQ/src/test/java/org/jooq/test/BasicTest.java
@@ -133,7 +133,7 @@ import org.junit.Test;
  *
  * @author Lukas Eder
  */
-public class jOOQTest {
+public class BasicTest {
 
     private Mockery context;
     private PreparedStatement statement;