Fixed some variable names