Tweaks to namespaces