update variable names to avoid lint warnings

Changed the variable names so that they are more consistent.  This
fixes all of the lint errors.