* Rename packages
* Complete XML validation
* Differentiate failure output when on running on production