Fixing up namespaces