small changes to namespaces