(#16856) replace the _Foo idiom with expanded namespaces