Clean up namespaces a bit