Rename back to generic Comparator