rename variables again