Using OutputName more

 (closes #3065)