Merge "Updates Tempest to match Zaqar's API name change"