Reformat and fix remapping and WSDL reference