Refactor variable names

A few argument variable names and local variable names edited for style
and consistency.