Further Iterator -> Counter rename