refactor event names

refactor event names and handler layouts so they are consistent and
intuitive