Function naming refactor