Draft: Resolve "Issue with some ContactPerson elements"
Closes #302 (closed) by modifying various entities to have consistency with the GivenName field.
Closes #302 (closed) by modifying various entities to have consistency with the GivenName field.