PERF-8 Change event name and data objects.