Fix feature for namespace refactoring