improve event model, use standart event names