Shortify some names
Remove useless Collection type and add Iterator type instead