--- a/java/sql-dk/src/main/java/info/globalcode/sql/dk/formatting/XmlFormatter.java	Tue Mar 05 21:22:33 2019 +0100
+++ b/java/sql-dk/src/main/java/info/globalcode/sql/dk/formatting/XmlFormatter.java	Tue Mar 05 22:03:02 2019 +0100
@@ -184,8 +184,11 @@
 	}
 
 	private String getCurrentRelationName() {
-		// TODO: support custom names (add CLI option)
-		return "r" + resultSetCounter;
+		if (getFormatterContext().getRelationNames() == null || getFormatterContext().getRelationNames().size() < resultSetCounter) {
+			return "r" + resultSetCounter;
+		} else {
+			return getFormatterContext().getRelationNames().get(resultSetCounter - 1);
+		}
 	}
 
 	@Override