fixup output file name generation closes #2685