pylint variable naming fixes