Improve file names