Updated missed refactored function names