Refactor function naming