Smarter namespacing