Renaming to match other folder names