Update names
Update events
Fix conflicts