diff --git a/jOOQ-test/launch/GenerationTool DB2 syscat.launch b/jOOQ-test/launch/Meta-Generate DB2 syscat.launch
similarity index 100%
rename from jOOQ-test/launch/GenerationTool DB2 syscat.launch
rename to jOOQ-test/launch/Meta-Generate DB2 syscat.launch
diff --git a/jOOQ-test/launch/GenerationTool Derby sys.launch b/jOOQ-test/launch/Meta-Generate Derby sys.launch
similarity index 100%
rename from jOOQ-test/launch/GenerationTool Derby sys.launch
rename to jOOQ-test/launch/Meta-Generate Derby sys.launch
diff --git a/jOOQ-test/launch/GenerationTool H2 information_schema.launch b/jOOQ-test/launch/Meta-Generate H2 information_schema.launch
similarity index 100%
rename from jOOQ-test/launch/GenerationTool H2 information_schema.launch
rename to jOOQ-test/launch/Meta-Generate H2 information_schema.launch
diff --git a/jOOQ-test/launch/GenerationTool HSQLDB information_schema.launch b/jOOQ-test/launch/Meta-Generate HSQLDB information_schema.launch
similarity index 100%
rename from jOOQ-test/launch/GenerationTool HSQLDB information_schema.launch
rename to jOOQ-test/launch/Meta-Generate HSQLDB information_schema.launch
diff --git a/jOOQ-test/launch/GenerationTool Ingres $ingres.launch b/jOOQ-test/launch/Meta-Generate Ingres $ingres.launch
similarity index 100%
rename from jOOQ-test/launch/GenerationTool Ingres $ingres.launch
rename to jOOQ-test/launch/Meta-Generate Ingres $ingres.launch
diff --git a/jOOQ-test/launch/GenerationTool MySQL information_schema.launch b/jOOQ-test/launch/Meta-Generate MySQL information_schema.launch
similarity index 100%
rename from jOOQ-test/launch/GenerationTool MySQL information_schema.launch
rename to jOOQ-test/launch/Meta-Generate MySQL information_schema.launch
diff --git a/jOOQ-test/launch/GenerationTool MySQL mysql.launch b/jOOQ-test/launch/Meta-Generate MySQL mysql.launch
similarity index 100%
rename from jOOQ-test/launch/GenerationTool MySQL mysql.launch
rename to jOOQ-test/launch/Meta-Generate MySQL mysql.launch
diff --git a/jOOQ-test/launch/GenerationTool Oracle sys.launch b/jOOQ-test/launch/Meta-Generate Oracle sys.launch
similarity index 100%
rename from jOOQ-test/launch/GenerationTool Oracle sys.launch
rename to jOOQ-test/launch/Meta-Generate Oracle sys.launch
diff --git a/jOOQ-test/launch/GenerationTool Postgres information_schema.launch b/jOOQ-test/launch/Meta-Generate Postgres information_schema.launch
similarity index 100%
rename from jOOQ-test/launch/GenerationTool Postgres information_schema.launch
rename to jOOQ-test/launch/Meta-Generate Postgres information_schema.launch
diff --git a/jOOQ-test/launch/GenerationTool Postgres pg_catalog.launch b/jOOQ-test/launch/Meta-Generate Postgres pg_catalog.launch
similarity index 100%
rename from jOOQ-test/launch/GenerationTool Postgres pg_catalog.launch
rename to jOOQ-test/launch/Meta-Generate Postgres pg_catalog.launch
diff --git a/jOOQ-test/launch/GenerationTool SQLServer information_schema.launch b/jOOQ-test/launch/Meta-Generate SQLServer information_schema.launch
similarity index 100%
rename from jOOQ-test/launch/GenerationTool SQLServer information_schema.launch
rename to jOOQ-test/launch/Meta-Generate SQLServer information_schema.launch
diff --git a/jOOQ-test/launch/GenerationTool Sybase sys.launch b/jOOQ-test/launch/Meta-Generate Sybase sys.launch
similarity index 99%
rename from jOOQ-test/launch/GenerationTool Sybase sys.launch
rename to jOOQ-test/launch/Meta-Generate Sybase sys.launch
index d8658f1448..c7efc68821 100644
--- a/jOOQ-test/launch/GenerationTool Sybase sys.launch	
+++ b/jOOQ-test/launch/Meta-Generate Sybase sys.launch	
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<stringAttribute key="bad_container_name" value="/jOOQ-codegen/launch"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/jOOQ-meta"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6&quot; javaProject=&quot;jOOQ-codegen&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;jOOQ&quot; type=&quot;1&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;jOOQ-codegen&quot; type=&quot;1&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;jOOQ-test&quot; type=&quot;1&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/jOOQ-test/lib/jconn3.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;jOOQ-meta&quot; type=&quot;1&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER&quot; javaProject=&quot;jOOQ-meta&quot; path=&quot;3&quot; type=&quot;4&quot;/&gt;&#10;"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.classpathProvider"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.util.GenerationTool"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="/org/jooq/configuration/${env_var:USERNAME}/sybase/sys.properties"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-meta"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.sourcepathProvider"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<stringAttribute key="bad_container_name" value="/jOOQ-codegen/launch"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/jOOQ-meta"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+</listAttribute>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6&quot; javaProject=&quot;jOOQ-codegen&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;jOOQ&quot; type=&quot;1&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;jOOQ-codegen&quot; type=&quot;1&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;jOOQ-test&quot; type=&quot;1&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/jOOQ-test/lib/jconn3.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;jOOQ-meta&quot; type=&quot;1&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER&quot; javaProject=&quot;jOOQ-meta&quot; path=&quot;3&quot; type=&quot;4&quot;/&gt;&#10;"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.classpathProvider"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.util.GenerationTool"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="/org/jooq/configuration/${env_var:USERNAME}/sybase/sys.properties"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-meta"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.sourcepathProvider"/>
+</launchConfiguration>
diff --git a/jOOQ-test/launch/H2 Server Start.launch b/jOOQ-test/launch/Server Client H2.launch
similarity index 100%
rename from jOOQ-test/launch/H2 Server Start.launch
rename to jOOQ-test/launch/Server Client H2.launch
diff --git a/jOOQ-test/launch/HSQLDB DatabaseManager.launch b/jOOQ-test/launch/Server Client HSQLDB.launch
similarity index 91%
rename from jOOQ-test/launch/HSQLDB DatabaseManager.launch
rename to jOOQ-test/launch/Server Client HSQLDB.launch
index 2050f360a6..92b6b279ce 100644
--- a/jOOQ-test/launch/HSQLDB DatabaseManager.launch	
+++ b/jOOQ-test/launch/Server Client HSQLDB.launch	
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<stringAttribute key="bad_container_name" value="/jOOQ-test/lua"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/jOOQ-test/lib/hsqldb.jar"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.hsqldb.util.DatabaseManagerSwing"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:jOOQ-test/hsqldb}"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<stringAttribute key="bad_container_name" value="/jOOQ-test/lua"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/jOOQ-test/lib/hsqldb.jar"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.hsqldb.util.DatabaseManagerSwing"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:jOOQ-test/hsqldb}"/>
+</launchConfiguration>
diff --git a/jOOQ-test/launch/Derby Server Start.launch b/jOOQ-test/launch/Server Start Derby.launch
similarity index 100%
rename from jOOQ-test/launch/Derby Server Start.launch
rename to jOOQ-test/launch/Server Start Derby.launch
diff --git a/jOOQ-test/launch/HSQLDB Server Start.launch b/jOOQ-test/launch/Server Start HSQLDB.launch
similarity index 100%
rename from jOOQ-test/launch/HSQLDB Server Start.launch
rename to jOOQ-test/launch/Server Start HSQLDB.launch