Simplify function names