Updated function names in function calls affected by previous commit