Bad variable names fixed