GCP-8643 - Fix the folder name when being saved in the root folder