remove old style guides, fix iterator guide, and change the names