fix conflicting function names