Fix the variables' names