more changes for namespaces