Lose extraneous output param
Fix ordering
Made name consistent