Make sure the namespaces are correct