Rename variables so the names make more sense.