ref #10447 rename HomotypicalGroupComparator-> HomotypicGroupComparator (cont.)