Clarify function name

and fix some comments ref'g old names