Fix api names