We have some old code that uses the prefix on to handle certain events, we should rename these to handle* instead so it's clear what is an event and what is not