Fix service_name