Better handle namespaces.