simplify and standardize function names