variable name fixes