Rename to include JAXB on class' names