Refactor names

Do the renamings discussed in Issue #18, and a couple more that follow from those.

Each renaming is done as a single commit with the rename explained in the commit message.