FOP-3160: Rename events to avoid conflicts with events module
8 files changed