Rename variables to be clearer