More conservative approach to new filenames