Rename some output files to be clearer