Rename `data kind` declarations