Refactor the service name