Use new function names