Rename variables for consistency.