- Change all ::ref to ::ptr
- Standardize on event names