Issue #4242: correct typo & logs, change var names