Simpler namespace type collection

Simpler namespace type collection #980