Renaming name/service_type to service_name