Clean up of xml names and sync with the workflow.