continued refactoring of namespace management