Changed events to have a better naming system.