Adjust the names of helper function objects to represent better what they do, as suggested in the review of D107098.