refactor utility names