Feature #5157 - refactoring a misplaced folder name computing