Ok I will do that for now and probably open another PR to change event names.