Update the names of some of the newly introduced API functions so they are more consistent with the names of pre-existing API functions.