Minor fixes to out file names.