Added formatting to filenames