Rename variables. No functional changes.