Updated event naming for all products