Rename event descriptor
Rename some event descriptors
Remove unused event action