Update StepIterator function names for clarity