3.0 - more namespaces update

Update again some old namespace to ease the future removal of class aliases.
Hope I got them all this time :wink: