Adjust variable names.