XN namespace refactoring