Further simplify namespacing