Followup from PR #139 which was closed due to 9 merge conflicts. The renames are still valid. See PR #139 for the full list of identifiers to rename. Do NOT change the kind JSON tag to type as that breaks the results schema.