Fix variable names.
Less repetition.