Fixes to output names (were missing stage part)