Fixup for service name being used as service_name.