Change function invocations to fit new names