Adjust some variable names.