Add the script name to the tmp directory name.

Move trap up now that the dir is more unique.