[BUGFIX] Folder rename follow-up: More missing case changes