MDL-37641 repository: Improve file name suggestion when file exists