Switched naming to reflect events instead of messages