Switch kind name fields to enums to be smaller and eliminate Checks