Changed some of the variable names