Fix mess-up with variable names.