Fix EVA reset and EVA event names