Renamespace to match new folder names.