Addon updates to not rely on event_name

Also misc. changes to _addon for different addons.