Rename some functions

Summary: Ref T5655. This is a bit unconventional.

Test Plan: Unit tests still pass.

Reviewers: Blessed Reviewers, epriestley

Reviewed By: Blessed Reviewers, epriestley

Subscribers: Korvin, epriestley

Maniphest Tasks: T5655

Differential Revision: https://secure.phabricator.com/D12568