Events grouping and renaming, value parameters are added to a lot of events