Deepen namespacing