Changed all the variable names