FIX Folder Title not being exactly the same as Name field

Backport to 3.0 of PR #3086