update usage of namespaces