Adjusted GetFolderName()