More helpful variable names

Don't forget to:

git fetch upstream
git merge origin/master