fixed changes to namespaces