changed some events and process naming