Rename a few variables and function names for clarity Closes #8 See merge request mpsd-cs/mpsd-software-environments!40