Re #9684 Make sure the output names are correct