--- a/java/sql-dk/src/info/globalcode/sql/dk/CLIOptions.java	Tue Dec 24 14:23:22 2013 +0100
+++ b/java/sql-dk/src/info/globalcode/sql/dk/CLIOptions.java	Tue Dec 24 14:36:14 2013 +0100
@@ -33,7 +33,7 @@
 public class CLIOptions {
 
 	public static final String DEFAULT_NAME_PREFIX = ":";
-	public static final String DEFAULT_NAME_SUFFIX = "";
+	public static final String DEFAULT_NAME_SUFFIX = "(?=([^\\w]|$))";
 	private String sql;
 	private String databaseName;
 	private String databaseNameToTest;
@@ -172,18 +172,30 @@
 		namedParameters.add(p);
 	}
 
+	/**
+	 * @return regular expression describing the name prefix
+	 */
 	public String getNamePrefix() {
 		return namePrefix;
 	}
 
+	/**
+	 * @see #getNamePrefix()
+	 */
 	public void setNamePrefix(String namePrefix) {
 		this.namePrefix = namePrefix;
 	}
 
+	/**
+	 * @return regular expression describing the name prefix
+	 */
 	public String getNameSuffix() {
 		return nameSuffix;
 	}
 
+	/**
+	 * @see #getNameSuffix()
+	 */
 	public void setNameSuffix(String nameSuffix) {
 		this.nameSuffix = nameSuffix;
 	}