Rename busy events

rebased continuation of #437