Renamed variables to remove numbers from the name