Rename a few iterators. No behavior change.