Renamed some more NSIv2 namespaces