Update the kinds dictionnary.
Merge branch 'update-kinds'