No issue assigned

- fixed naming
- moved XML reader configuration outside of the XML scope into Java based configuration