Rename variables, 2nd try