fix some lint errors by changing variable names

Changed some variable names so that they would be more consistent, and
fixed the package name.