Tidy up service names