Cleanup of comparator naming.