Stronger match on file name format