Finish the refactor by actually changing the method names in the calls.