Fixing up of namespaces