Improve file name matching