Remove mangling Iter into name except in some instances necessary for clarity