2207: using namespace refactor