C++: Rename some functions to better match the C API