Modify variable names to match.