Event hooks naming system update