diff -r 67581ec4396e -r ce33736066b1 java/sql-dk/test/info/globalcode/sql/dk/CLIParserTest.java
--- a/java/sql-dk/test/info/globalcode/sql/dk/CLIParserTest.java	Mon Dec 23 20:15:23 2013 +0100
+++ b/java/sql-dk/test/info/globalcode/sql/dk/CLIParserTest.java	Tue Dec 24 00:12:53 2013 +0100
@@ -19,6 +19,7 @@
 
 import info.globalcode.sql.dk.CLIParser.Tokens;
 import static info.globalcode.sql.dk.CLIParser.TYPE_NAME_SEPARATOR;
+import static info.globalcode.sql.dk.CLIOptions.DEFAULT_NAME_PREFIX;
 import java.sql.Types;
 import java.util.Collection;
 import static org.testng.Assert.*;
@@ -109,7 +110,7 @@
 		String[] args = new String[]{
 			Tokens.DB, DATABASE_NAME_1,
 			Tokens.SQL, SQL_1,
-			Tokens.DATA, TYPE_NAME_SEPARATOR + NAME_1, DATA_1, TYPE_NAME_SEPARATOR + NAME_2, DATA_2, TYPE_NAME_SEPARATOR + NAME_3, DATA_3};
+			Tokens.DATA, DEFAULT_NAME_PREFIX + NAME_1, DATA_1, DEFAULT_NAME_PREFIX + NAME_2, DATA_2, DEFAULT_NAME_PREFIX + NAME_3, DATA_3};
 		CLIOptions options = parser.parseOptions(args);
 		options.validate();