pylint/typo fixes, renames