Improved naming (closes #3848)
Merge pull request #3849 from aeslaughter/output-3848

Improved naming in Output object
Merge commit '05f7907abd6fcb8158b7a6e5f8d389fff50ce5f5'