Tweak some API function names to match existing pattern.