Bad variable name fixes