More consistent iterator naming

* RangeIterator -> BasicIterator, like BasicStrategy
* BatchRangeIterator -> BatchIterator, like BatchStrategy