Rename variables to keep them more consistent.