Fix resolution of service name