Refactoring Id -> EntityId in EventDatagram.