QName refactoring