Fix service name resolution.