#KJ-120 Rename the sort Classes to ClassTypes