Fix generated (and log) file names