Simplify some function names