comment tweaks
Rename custom core event