Fixed variable name errors