Replace sorting classes with better naming convention