Fix typo in function call names after refactoring function def names