Renamed a bunch of namespaces