Rejiggered namespaces