Add collection types; remove obsolete stuff from type creation.
Cosmetics - shorten a couple of names