Rename Comparator and JdbcType enums to plural form in preparation for drop 'Use' word in the annotations name
Drop 'Use' word in the annotations name