Some renaming of namespaces