Fixed proper naming in Java/JAXB json output