Add predictable and discoverable event names