Make the file names make more sense.