Correct the namespaces