Index: maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorGoal.java
diff -u maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorGoal.java:1.17 maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorGoal.java:1.18
--- maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorGoal.java:1.17	Tue Mar 18 22:56:32 2008
+++ maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorGoal.java	Wed Mar 19 00:30:19 2008
@@ -21,15 +21,22 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.maven.plugin.MojoFailureException;
 import static org.codelutin.i18n.I18n._;
+import org.codelutin.option.Config;
 import org.codelutin.option.Option;
 import org.codelutin.option.OptionAction;
 import org.codelutin.option.OptionParser;
-import org.codelutin.option.Config;
 import org.codelutin.option.def.DefinitionParser;
 import org.codelutin.option.def.DefinitionParserContexts.ConfigContext;
 import org.codelutin.option.def.DefinitionParserContexts.OptionContext;
 import org.codelutin.option.def.DefinitionParserUtil.TypeSource;
-import org.codelutin.option.generate.java.*;
+import org.codelutin.option.generate.java.AbstractConfigJavaGenerator;
+import org.codelutin.option.generate.java.AbstractContextJavaGenerator;
+import org.codelutin.option.generate.java.AbstractOptionActionJavaGenerator;
+import org.codelutin.option.generate.java.ConfigJavaGenerator;
+import org.codelutin.option.generate.java.OptionActionJavaGenerator;
+import org.codelutin.option.generate.java.OptionJavaGenerator;
+import org.codelutin.option.generate.java.OptionKeyJavaGenerator;
+import org.codelutin.option.generate.java.OptionParserJavaGenerator;
 
 import java.io.File;
 import java.io.StringWriter;
@@ -183,7 +190,7 @@
 
     protected void prepare() throws Exception {
 
-        
+
         //I18n.initISO88591(System.getProperty("user.language"), System.getProperty("user.country"));
 
         checkInstanceOf(parserSuperClass, OptionParser.class);
@@ -242,7 +249,7 @@
         log.info(_("commandline.parser.result.info", parser.getClass().getSimpleName(), parser.getOptions().length, parser.getConfigs().length));
 
         //TODO Do same exception handling than the OptionPArser
-        
+
         // show errors
         if (showErrors) {
             if (parser.hasFailed()) {
@@ -299,6 +306,8 @@
             actionSuperClass = actionSimpleName;
         }
 
+        configSimpleName = prefix + (concreteConfig ? "" : "Abstract") + "Config";
+        
         // generate specialized abstract SimpleConfigImpl for this parser
         if (needSpecializedAbstractConfig()) {
             AbstractConfigJavaGenerator.doGenerate(out, t0, i18nPrefix,
@@ -306,7 +315,7 @@
                     parserPackageName,
                     contextPackageName,
                     optionPackageName,
-                    configPackageName, 
+                    configPackageName,
                     parserSimpleName,
                     contextSimpleName,
                     optionKeySimpleName + "<?, ?>",
@@ -346,11 +355,11 @@
         AbstractContextJavaGenerator.doGenerate(out, t0, i18nPrefix,
                 configContexts,
                 parserPackageName,
-                configPackageName, 
+                configPackageName,
                 parserSimpleName,
                 configSimpleName,
                 contextSimpleName,
-                contextSuperClass                
+                contextSuperClass
         );
 
         // generate Config implementations
@@ -360,7 +369,7 @@
                     context,
                     parserPackageName,
                     configPackageName,
-                    configSimpleName + suffix,
+                    configSimpleName+ suffix,
                     parserSimpleName,
                     configSuperClass,
                     concreteConfig