Make the naming scheme for dispatched functions more consistent