function names refactoring