We want to be able to track down any left-behind tmp files, so ensure we're creating them with according file names. Change-Id: I1aa0ccdb8834e8aef919f1f028028c1bb14cbd01