Small changes to output naming.