Namespace refactoring.