Renames events for consistency