Changed "kind" to "type"