Functions name refactoring