Update jaxb bindings to use plurals naming convention for collections