Minor followup to r79649. Rename variables