Rename variables that change type and make them obsolete.