Update kind names to make it easier to build select drop-down