Change iterator name and method