Made namespacing more... canonical?