Renaming a few events for consistency