Simplify use of tmp dirs
Improve naming and messages