FL-610 Standardize JSON field names across event structures and update corresponding tests for consistency