Rename variables as per reek's advice.