Make Facility Name 1..1
Facility Name is a USCDI Data element under Facility Information. ParticipantRole.name is 0...1, though marked as USCDI, it is optional. Not having a name of the facility in the representation defeats the purpose of the intent of the USCDI data element.
In addition, and perhaps more compelling, is that in US Core Location Profile, Name is required and MS

Address:
ParticipantRole.addr is 0...*, in US Core its 0...1,
Address should be 0..1.
Fringe cases that truly are a single encounter with 2 different addresses, are extremely rare. The intent of the USCDI Facility Information class is to identify the Physical Location of a facility