More namespace refactoring"