Refactoring functions name