Fixing old references to "variant"
Adding "service_name" to fedex metadata list