Correct entry namespaces