Now have correct output file names.