Changes addressing pull request comments
- Also, renamed "events" to "triggers"