Moved and renamed Salesforce variables