Fix errors with variable names