Refactoring of some function names