Refactor the names of the variables