Missed namespace refactoring