update variables for naming consistency