Using OutputName more (closes #3065)
Merge pull request #3066 from aeslaughter/yak

Using OutputName more