Output naming improved

I have a patch for the herd that is associated with this, so tell me when you merge.

closes #2609