Restore proper output names