Finish renaming namespaces