Renamed the kind classes