Small refactor to use a better name for our utility class.