Rename methods and variables match our intent.

Discuss!