Simplify namespacing