Changed the names of the variables and methods