Minor changes to namespaces