clean up service names