Minor cleanup in naming of temp files