This patch fixes two name typos and a style issue (which makes pylint
complain).

Reviewed-by: ultrotter