Refactored some Twig event names for consistency