Fix an issue with conflicting names

Explicit is better than implicit
Use pre-increment for iterators (cppcheck complains otherwise)