Renamed some sort classes for consistency