Fix overlapping filenames