fixing namespace refactor