Change type to kind

One of the fields is named type, which is a python built-in. We could modify it to e.g. kind.