minor simplification of iterator names