--- a/java/sql-dk/src/info/globalcode/sql/dk/CLIOptions.java	Fri Jan 10 20:13:16 2014 +0100
+++ b/java/sql-dk/src/info/globalcode/sql/dk/CLIOptions.java	Fri Jan 10 23:21:28 2014 +0100
@@ -34,6 +34,8 @@
 import java.util.regex.PatternSyntaxException;
 
 /**
+ * Holds options from command line, validates them, combines with configuration and provides derived
+ * objects.
  *
  * @author Ing. František Kučera (frantovo.cz)
  */
@@ -43,7 +45,7 @@
 	public static final String DEFAULT_NAME_SUFFIX = "(?=([^\\w]|$))";
 	private String sql;
 	private String databaseName;
-	private Set<String> databaseNameToTest = new HashSet<>();
+	private Set<String> databaseNamesToTest = new HashSet<>();
 	private String namePrefix = DEFAULT_NAME_PREFIX;
 	private String nameSuffix = DEFAULT_NAME_SUFFIX;
 	private String formatterName;
@@ -90,7 +92,7 @@
 			if (!equalz(nameSuffix, DEFAULT_NAME_SUFFIX)) {
 				e.addProblem(new InvalidOptionsException.OptionProblem("Do not specify name suffix if just showing info."));
 			}
-			if (showInfo.contains(InfoType.CONNECTION) && databaseNameToTest.isEmpty()) {
+			if (showInfo.contains(InfoType.CONNECTION) && databaseNamesToTest.isEmpty()) {
 				e.addProblem(new InvalidOptionsException.OptionProblem("Please specify which database should be tested."));
 			}
 		}
@@ -232,12 +234,12 @@
 		return showInfo;
 	}
 
-	public Set<String> getDatabaseNameToTest() {
-		return databaseNameToTest;
+	public Set<String> getDatabaseNamesToTest() {
+		return databaseNamesToTest;
 	}
 
-	public void addDatabaseNameToTest(String databaseNameToTest) {
-		this.databaseNameToTest.add(databaseNameToTest);
+	public void addDatabaseNamesToTest(String databaseNameToTest) {
+		this.databaseNamesToTest.add(databaseNameToTest);
 	}
 
 	public SQLCommand getSQLCommand() {