Re-write the name of the service for correct lookups