rename event types
remove event types
rename event data structures