small refactor to function names