Fixup filenames