Change likely typo in variable names to be consistent.

Now leaving the realm of simple typos in comments and strings to real code changes.