Renaming some namespaces