Simplify functions names