Renamed error event triggers to be more clear.

#2693
Merge branch 'release' into dev