Make namespaces much more explicit