tweak a few variable names to make pylint happy