Added name attributes to JAXB annotations