Fix use of namespaces