unify function names