Renamed kind to type.