more changes for namespacing