Updates to event names. Some variable updates.