Rename the iterator types to prefixed names
Reformat