diff --git a/apache-rat-tools/src/main/java/org/apache/rat/tools/AntGenerator.java b/apache-rat-tools/src/main/java/org/apache/rat/tools/AntGenerator.java
index c73bf6de0..321be3510 100644
--- a/apache-rat-tools/src/main/java/org/apache/rat/tools/AntGenerator.java
+++ b/apache-rat-tools/src/main/java/org/apache/rat/tools/AntGenerator.java
@@ -21,6 +21,7 @@
 import org.apache.commons.cli.Option;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.LineIterator;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.text.WordUtils;
 import org.apache.rat.OptionCollection;
 import org.apache.rat.utils.CasedString;
@@ -35,7 +36,10 @@
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
@@ -57,6 +61,12 @@ public class AntGenerator {
      */
     public static Predicate<Option> ANT_FILTER = option -> !(ANT_FILTER_LIST.contains(option) || option.getLongOpt() == null);
 
+    /** A mapping of external name to internal name if not standard */
+    private static Map<String,String> RENAME_MAP = new HashMap<>();
+
+    static {
+        RENAME_MAP.put("addLicense", "add-license");
+    }
 
     private AntGenerator() {}
 
@@ -144,77 +154,9 @@ private static String getElementClass(AntOption option) throws IOException {
         return format("    public class %1$s extends Child { %1$s() {super(%2$s);}}%n%n", WordUtils.capitalize(option.name), option.keyValue());
     }
 
-    /**
-     * A class that wraps the CLI option and provides Ant specific values.
-     */
-    private static class AntOption {
-        final Option option;
-        /** An uncapitalized name */
-        final String name;
-
-        AntOption(Option option) {
-            this.option = option;
-            name = new CasedString(StringCase.KEBAB, option.getLongOpt()).toCase(StringCase.CAMEL);
-        }
-
-        /**
-         * Returns {@code true} if the option should be an attribute of the &lt;rat:report> element.
-         * @return {@code true} if the option should be an attribute of the &lt;rat:report> element.
-         */
-        public boolean isAttribute() {
-            return (!option.hasArgs());
-        }
-        /**
-         * Returns {@code true} if the option should be a child element of the &lt;rat:report> element.
-         * @return {@code true} if the option should be a child element of the &lt;rat:report> element.
-         */
-        public boolean isElement() {
-            return !isAttribute() || option.getType() != String.class;
-        }
-
-        /**
-         * Returns {@code true} if the enclosed option has one or more arguments.
-         * @return {@code true} if the enclosed option has one or more arguments.
-         */
-        public boolean hasArg() {
-            return option.hasArg();
-        }
-
-        /**
-         * Returns The key value for the option.   This is the long opt enclosed in quotes and with leading dashes.
-         * @return The key value for the option.
-         */
-        public String keyValue() {
-            return format("\"--%s\"", option.getLongOpt());
-        }
-
-        /**
-         * Get the method comment for this option.
-         * @param addParam if {@code true} the param annotation is added.
-         * @return the Comment block for the function.
-         */
-        public String getComment(boolean addParam) {
-            StringBuilder sb = new StringBuilder()
-            .append(format("    /**%n     * %s%n", option.getDescription().replaceAll("<", "&lt;").replaceAll(">", "&gt;")));
-            if (option.isDeprecated()) {
-                sb.append(format("     * %s%n     * @deprecated%n",option.getDeprecated()));
-            }
-            if (addParam && option.hasArg()) {
-                sb.append(format("     * @param %s The value to set%n", name));
-            }
-            return sb.append(format("     */%n")).toString();
-        }
-
-        /**
-         * Get the signature of th eattribute function.
-         * @return the signature of the attribue function.
-         */
-        public String getAttributeFunctionName() {
-            return "set" +
-                    WordUtils.capitalize(name) +
-                    (option.hasArg() ?"(String " : "(boolean ") +
-                    name +
-                    ")";
-        }
+    static String createName(Option option) {
+        String name = option.getLongOpt();
+        name = StringUtils.defaultIfEmpty(RENAME_MAP.get(name), name).toLowerCase(Locale.ROOT);
+        return new CasedString(StringCase.KEBAB, name).toCase(StringCase.CAMEL);
     }
 }
diff --git a/apache-rat-tools/src/main/java/org/apache/rat/tools/AntOption.java b/apache-rat-tools/src/main/java/org/apache/rat/tools/AntOption.java
new file mode 100644
index 000000000..c84537faa
--- /dev/null
+++ b/apache-rat-tools/src/main/java/org/apache/rat/tools/AntOption.java
@@ -0,0 +1,90 @@
+package org.apache.rat.tools;
+
+import org.apache.commons.cli.Option;
+import org.apache.commons.text.WordUtils;
+import org.apache.rat.utils.CasedString;
+
+import static java.lang.String.format;
+
+/**
+ * A class that wraps the CLI option and provides Ant specific values.
+ */
+public class AntOption {
+    final Option option;
+    /**
+     * An uncapitalized name
+     */
+    final String name;
+
+    AntOption(Option option) {
+        this.option = option;
+        name = AntGenerator.createName(option);
+    }
+
+    /**
+     * Returns {@code true} if the option should be an attribute of the &lt;rat:report> element.
+     *
+     * @return {@code true} if the option should be an attribute of the &lt;rat:report> element.
+     */
+    public boolean isAttribute() {
+        return (!option.hasArgs());
+    }
+
+    /**
+     * Returns {@code true} if the option should be a child element of the &lt;rat:report> element.
+     *
+     * @return {@code true} if the option should be a child element of the &lt;rat:report> element.
+     */
+    public boolean isElement() {
+        return !isAttribute() || option.getType() != String.class;
+    }
+
+    /**
+     * Returns {@code true} if the enclosed option has one or more arguments.
+     *
+     * @return {@code true} if the enclosed option has one or more arguments.
+     */
+    public boolean hasArg() {
+        return option.hasArg();
+    }
+
+    /**
+     * Returns The key value for the option.   This is the long opt enclosed in quotes and with leading dashes.
+     *
+     * @return The key value for the option.
+     */
+    public String keyValue() {
+        return format("\"--%s\"", option.getLongOpt());
+    }
+
+    /**
+     * Get the method comment for this option.
+     *
+     * @param addParam if {@code true} the param annotation is added.
+     * @return the Comment block for the function.
+     */
+    public String getComment(boolean addParam) {
+        StringBuilder sb = new StringBuilder()
+                .append(format("    /**%n     * %s%n", option.getDescription().replaceAll("<", "&lt;").replaceAll(">", "&gt;")));
+        if (option.isDeprecated()) {
+            sb.append(format("     * %s%n     * @deprecated%n", option.getDeprecated()));
+        }
+        if (addParam && option.hasArg()) {
+            sb.append(format("     * @param %s The value to set%n", name));
+        }
+        return sb.append(format("     */%n")).toString();
+    }
+
+    /**
+     * Get the signature of th eattribute function.
+     *
+     * @return the signature of the attribue function.
+     */
+    public String getAttributeFunctionName() {
+        return "set" +
+                WordUtils.capitalize(name) +
+                (option.hasArg() ? "(String " : "(boolean ") +
+                name +
+                ")";
+    }
+}
diff --git a/apache-rat-tools/src/main/java/org/apache/rat/tools/MavenGenerator.java b/apache-rat-tools/src/main/java/org/apache/rat/tools/MavenGenerator.java
index 21980054a..bda5b2945 100644
--- a/apache-rat-tools/src/main/java/org/apache/rat/tools/MavenGenerator.java
+++ b/apache-rat-tools/src/main/java/org/apache/rat/tools/MavenGenerator.java
@@ -35,6 +35,7 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
@@ -50,7 +51,8 @@ public class MavenGenerator {
     private static Map<String,String> RENAME_MAP = new HashMap<>();
 
     static {
-        RENAME_MAP.put("licenses", "configuration");
+        RENAME_MAP.put("licenses", "config");
+        RENAME_MAP.put("addLicense", "add-license");
     }
     /**
      * List of CLI Options that are not supported by Maven.
@@ -84,7 +86,6 @@ public static void main(String[] args) throws IOException {
         String className = args[1];
         String destDir = args[2];
         List<MavenOption> options = OptionCollection.buildOptions().getOptions().stream().filter(MAVEN_FILTER).map(MavenOption::new).collect(Collectors.toList());
-        Map<String,String> renameMap = new HashMap<>();
         String pkgName = String.join(File.separator, new CasedString(StringCase.DOT, packageName).getSegments());
         File file = new File(new File(new File(destDir), pkgName), className + ".java");
         System.out.println("Creating " + file);
@@ -104,7 +105,7 @@ public static void main(String[] args) throws IOException {
                         }
                         break;
                     case "${methods}":
-                        writeMethods(writer, options, renameMap);
+                        writeMethods(writer, options);
                         break;
                     case "${package}":
                         writer.append(format("package %s;%n", packageName));
@@ -123,22 +124,26 @@ public static void main(String[] args) throws IOException {
         }
     }
 
-    private static void writeMethods(FileWriter writer, List<MavenOption> options, Map<String,String> renameMap) throws IOException {
-        for (MavenOption option : options) {
-            String desc = option.getDescription().replace("<", "&lt;").replace(">", "&gt;");
+    private static String getComment(MavenOption option) {
+        String desc = option.getDescription().replace("<", "&lt;").replace(">", "&gt;");
+        StringBuilder sb = new StringBuilder()
+            .append(format("    /**%n     * %s%n     * @param %s the argument.%n", desc, option.name));
+        if (option.isDeprecated()) {
+            sb.append(format("     * %s%n     * @deprecated%n", option.getDeprecated()));
+        }
+        return sb.append(format("     */%n")).toString();
+    }
 
-            writer.append(format("    /**%n     * %s%n     * @param %s the argument.%n", desc, option.name));
-            if (option.isDeprecated()) {
-                writer.append(format("     * %s%n     * @deprecated", option.getDeprecated()));
-            }
-            writer.append(format("     */%n    @Parameter(property = \"rat.%2$s\")%n    public void set%1$s(%3$s %2$s) {%n",
-                            WordUtils.capitalize(option.name), option.name, option.hasArg() ? "String" : "boolean"))
+    private static void writeMethods(FileWriter writer, List<MavenOption> options) throws IOException {
+        for (MavenOption option : options) {
+            writer.append(getComment(option))
+                    .append(option.getMethodSignature("    ")).append(" {").append(System.lineSeparator())
                     .append(getBody(option))
-                    .append(format("    }%n"));
+                    .append("    }").append(System.lineSeparator());
         }
     }
 
-    private static String getBody(MavenOption option) throws IOException {
+    private static String getBody(MavenOption option) {
         if (option.hasArg()) {
             return format("        %sArg(%s, %s);%n", option.option.hasArgs() ? "add" : "set" , option.keyValue(), option.name);
         } else {
@@ -148,89 +153,10 @@ private static String getBody(MavenOption option) throws IOException {
         }
     }
 
-//    private static String getImports(List<MavenOption> options) {
-//        Set<Class<?>> includes = new TreeSet<>((o1, o2) -> o1.getName().compareTo(o2.getName()));
-//        includes.add(java.util.ArrayList.class);
-//        includes.add(java.util.List.class);
-//        options.stream().map(o -> ((Class<?>)o.option.getType())).filter(t -> !t.getName().startsWith("java.lang.")).forEach(includes::add);
-//        StringBuilder sb = new StringBuilder();
-//        includes.stream().map(t -> format("import %s;%n", t.getName())).forEach(sb::append);
-//        return sb.toString();
-//    }
-
-    private static class MavenOption {
-        final Option option;
-        final String name;
-
-        public static String createName(Option option) {
-            String name = option.getLongOpt();
-            name = StringUtils.defaultIfEmpty(RENAME_MAP.get(name), name);
-            return new CasedString(CasedString.StringCase.KEBAB, name).toCase(CasedString.StringCase.CAMEL);
-        }
-
-        /**
-         * Constructor.
-         *
-         * @param option The CLI option
-         */
-        MavenOption(Option option) {
-            this.option = option;
-            this.name = createName(option);
-        }
-
-        /**
-         * Get the description escaped for XML format.
-         *
-         * @return the description.
-         */
-        public String getDescription() {
-            return option.getDescription().replace("<", "&lt;").replace(">", "&gt;");
-        }
-
-        /**
-         * Returns the value as an POM xml node.
-         *
-         * @param value the value
-         * @return the pom xml node.
-         */
-        public String xmlNode(String value) {
-            return format("<%1$s>%2$s</%1$s>%n", name, value == null ? "false" : value);//: format("<%s>%n", name);
-        }
-
-        /**
-         * Gets the simple class name for the data type for this option.
-         * Normally "String".
-         *
-         * @return the simple class name for the type.
-         */
-        public Class<?> getType() {
-            return option.hasArg() ? ((Class<?>) option.getType()) : boolean.class;
-        }
-
-        public boolean isDeprecated() {
-            return option.isDeprecated();
-        }
-
-        /**
-         * Determine if true if the enclosed option expects an argument.
-         *
-         * @return {@code true} if the enclosed option expects at least one argument.
-         */
-        public boolean hasArg() {
-            return option.hasArg();
-        }
-
-        /**
-         * the key value for the option.
-         *
-         * @return the key value for the CLI argument map.
-         */
-        public String keyValue() {
-            return "\"--" + option.getLongOpt() + "\"";
-        }
-
-        public String getDeprecated() {
-            return option.getDeprecated().toString();
-        }
+    static String createName(Option option) {
+        String name = option.getLongOpt();
+        name = StringUtils.defaultIfEmpty(RENAME_MAP.get(name), name).toLowerCase(Locale.ROOT);
+        return new CasedString(StringCase.KEBAB, name).toCase(StringCase.CAMEL);
     }
+
 }
diff --git a/apache-rat-tools/src/main/java/org/apache/rat/tools/MavenOption.java b/apache-rat-tools/src/main/java/org/apache/rat/tools/MavenOption.java
new file mode 100644
index 000000000..8f1515718
--- /dev/null
+++ b/apache-rat-tools/src/main/java/org/apache/rat/tools/MavenOption.java
@@ -0,0 +1,86 @@
+package org.apache.rat.tools;
+
+import org.apache.commons.cli.Option;
+import org.apache.commons.text.WordUtils;
+
+import static java.lang.String.format;
+
+public class MavenOption {
+    final Option option;
+    final String name;
+
+    /**
+     * Constructor.
+     *
+     * @param option The CLI option
+     */
+    MavenOption(Option option) {
+        this.option = option;
+        this.name = MavenGenerator.createName(option);
+    }
+
+    /**
+     * Get the description escaped for XML format.
+     *
+     * @return the description.
+     */
+    public String getDescription() {
+        return option.getDescription().replace("<", "&lt;").replace(">", "&gt;");
+    }
+
+    /**
+     * Returns the value as an POM xml node.
+     *
+     * @param value the value
+     * @return the pom xml node.
+     */
+    public String xmlNode(String value) {
+        return format("<%1$s>%2$s</%1$s>%n", name, value == null ? "false" : value);//: format("<%s>%n", name);
+    }
+
+    /**
+     * Gets the simple class name for the data type for this option.
+     * Normally "String".
+     *
+     * @return the simple class name for the type.
+     */
+    public Class<?> getType() {
+        return option.hasArg() ? ((Class<?>) option.getType()) : boolean.class;
+    }
+
+    public boolean isDeprecated() {
+        return option.isDeprecated();
+    }
+
+    /**
+     * Determine if true if the enclosed option expects an argument.
+     *
+     * @return {@code true} if the enclosed option expects at least one argument.
+     */
+    public boolean hasArg() {
+        return option.hasArg();
+    }
+
+    /**
+     * the key value for the option.
+     *
+     * @return the key value for the CLI argument map.
+     */
+    public String keyValue() {
+        return "\"--" + option.getLongOpt() + "\"";
+    }
+
+    public String getDeprecated() {
+        return option.getDeprecated().toString();
+    }
+
+    public String getMethodSignature(String indent) {
+        StringBuilder sb = new StringBuilder();
+        if (isDeprecated()) {
+            sb.append(format("%s@Deprecated%n", indent));
+        }
+        return sb.append(format("%1$s@Parameter(property = \"rat.%2$s\")%n%1$spublic void set%3$s(%3$s %2$s)",
+                        indent, name, WordUtils.capitalize(name), option.hasArg() ? "String" : "boolean"))
+                .toString();
+    }
+}
diff --git a/apache-rat-tools/src/main/java/org/apache/rat/tools/Naming.java b/apache-rat-tools/src/main/java/org/apache/rat/tools/Naming.java
index f582b2ed5..03d6d98f0 100644
--- a/apache-rat-tools/src/main/java/org/apache/rat/tools/Naming.java
+++ b/apache-rat-tools/src/main/java/org/apache/rat/tools/Naming.java
@@ -57,39 +57,33 @@ public static void main(String[] args) throws IOException {
             printer.printRecord("CLI", "Maven", "Ant", "Description");
             for (Option option : options.getOptions()) {
                 if (option.getLongOpt() != null) {
-                    CasedString opt = new CasedString(StringCase.KEBAB, option.getLongOpt());
-                    String mavenCell = mavenFilter.test(option) ? mavenFunctionName(option, opt) : "-- not supported --";
-                    String antCell = antFilter.test(option) ? antFunctionName(option, opt) : "-- not supported --";
-                    printer.printRecord(opt, mavenCell, antCell, option.getDescription());
+                    String mavenCell = mavenFilter.test(option) ? mavenFunctionName(option) : "-- not supported --";
+                    String antCell = antFilter.test(option) ? antFunctionName(option) : "-- not supported --";
+                    printer.printRecord("--"+option.getLongOpt(), mavenCell, antCell, option.getDescription());
                 }
             }
         }
     }
 
-    public static String mavenFunctionName(Option option, CasedString name) {
+    public static String mavenFunctionName(Option option) {
+        MavenOption mavenOption = new MavenOption(option);
         StringBuilder sb = new StringBuilder();
-        if (option.isDeprecated()) {
+        if (mavenOption.isDeprecated()) {
             sb.append("@Deprecated").append(System.lineSeparator());
         }
-        sb.append(format("@Parameter(property = 'rat.%s'", name.toCase(StringCase.CAMEL)));
-        if (option.isRequired()) {
-            sb.append(" required = true");
-        }
-        sb.append(format(")%n public void %s%s(%s %s)", option.hasArgs() ? "add" : "set",
-                WordUtils.capitalize(name.toCase(StringCase.CAMEL)), option.hasArg() ? "String " : "boolean ",
-               name.toCase(StringCase.CAMEL)));
-        return sb.toString();
+        return sb.append(format("<%s>", mavenOption.name)).toString();
     }
 
-    private static String antFunctionName(Option option, CasedString name) {
+    private static String antFunctionName(Option option) {
         StringBuilder sb = new StringBuilder();
+        AntOption antOption = new AntOption(option);
         if (option.isDeprecated()) {
             sb.append("@Deprecated").append(System.lineSeparator());
         }
         if (option.hasArgs()) {
-            sb.append(format("<rat:report>%n  <%1$s>text</%1$s>%n</rat:report>", name.toCase(StringCase.CAMEL)));
+            sb.append(format("<rat:report>%n  <%1$s>text</%1$s>%n</rat:report>", antOption.name));
         } else {
-            sb.append(format("<rat:report %s = 'text'/>", name.toCase(StringCase.CAMEL)));
+            sb.append(format("<rat:report %s = 'text'/>", antOption.name));
         }
         return sb.toString();
     }