Add event classes
Rename events