Fix global namespaces style

in addition to #1734