another namespace refactoring