Improve file name