Rename HandlesEvent annotation
Finish renaming HandlesEvent annotation