if we're cleaning things up, it might be a good idea to standardize on a particular nomenclature, either folder or iterator.  We use a mix, which is bound to confuse someone at some point.  I lean towards iterator, fwiw.