make C function names consistent