SACM22 — "ID" never defined in Annex C graphical notation. Is it the gid?

Annex C repeatedly refers to an "ID". However, nowhere is an "ID" defined.

Section 8.1 page 17, figure 8.1, show that every SACMElement has an optional "gid", and that is subclass ModelElement has an optional "name". Either might be an ID, but I can't find any specific statement making that clear. I'm guessing that the gid is the ID, since otherwise you'd have to match all the possible language strings. However, that should be made clear.

Even more confusingly, an asCited Claim must state a package as well as the claim ID, so it appears that an ID is unique within a package but not between packages. A gid must be unique across the whole model. If IDs are unique across entire model, then in annex C it should made clear that package names are optional in an asCited Claim since they aren't needed to make it unique.

ID for graphical elements - should be name not ID

The figures mistakenly labelled with ID are revised to use name.