r17516: Change helper function names to make more clear what they are meant to do