Rename calling functions