Better management of result file names