Rename variables to be less confusing.