Gets rid of pid in these files and renames variables to better reflect what they are
Merge branch 'make-all-tests-green' of github.com:afred/openvault into make-all-tests-green