refactor of function names