Fix the build for new service name