- Namespace refactoring