sh: Convert to new function names