Rename existing iterators to get rid of the Iterator suffix and to give them names that better describe the things being iterated over.