Correct some variable names