Tidy up some of the naming of iterators.

Long type names, I know, but IMHO by necessity.