Added EventNameAttribute to allow consumer to provide specific event names for serialisation
Cleanup