Merge "Renaming the second active event to avoid confusion."