More namespace refactoring.