Bugfix: output file naming.