Op. name change, jaxb dependency include