Correcting namespaces.