Improved the namig of the Comparators