Make file names of data files more consistent