Change event types to capitalized