Fix factory method names for re-named JAXB items.