I needed make different renames and merge some types and specific case about “Witness” - “Witness for” pairs: