Rename Set and OrderedSet iterators

They're now in line with RFC 344