Rename FolderIterator & fix iteration behavior