Folder renaming cleanup