Clean up and update names to include webservice type