utils.py cleanup continued: fix some ambiguous variable/function names