Use a more consistent name for lockfile and logfile