More output standardization

There should only be output string changes in this commit and therefore
should be riskless.
Merge pull request #717 from sigurdteigen/cleanup/more-output-standardization

More output standardization