Bring back the use of the inline C functions.
Minor naming change.