Rename filenames to make more meaningful