Sync code changes with master
Update variable name, going to change in master to match