simplify function names