CDI-364, improve language around EventMetadata