Correct a couple of namespaces