Fixed category for namespace refactoring