Refactored function names