Clean up event fields naming.