Using more general terms for instance variables.
Merge branch 'generalize-terms'
Merge branch 'origin/staging'