Improve `@XmlElement` notation consistency
Merge pull request #219 from ajgarlag/xml-element-notation-consistency

@XmlElement notation consistency