Rename some variables (fix pylint warnings)