Changed adaptEnumerable/adaptEnumerableT to iterator/iteratorT