Rename some variables for more clarity.

No functional change.

Resolves #131