Corrected compile error from last round of changes -- OutputNameEntry is no more.