Minor changes to output file name