More namespace refactorings