Renamed StaticIter to StaticIterator
removed more typedefs