Change the service name as in dev branch