Better names for HeuristicResolver class.