Refactoring of function names.