When reviewing the v2-to-FHIR mapping fo ORC-18 Entering Device, the v2 specification would imply that the device referenced is a DeviceDefinition as ORC-18 is a CWE. Clearly, in reality identifier information of an actual device may have been included, but that was not the intent. Provenance.agent.who has Device as a choice, but not DeviceDefinition. We suggest that DeviceDefinition should be added given v2's intent, but then still enable situations where the transformer knows for use it actually references an actual Device, that still could be used instead.