Renamed outputs to work correctly with new yatsm