Namespaces correction