Update for new function names.