Fix duplicate function names