Fix Config Addon <name>
Refactor the maven boilerplate xml