changed event names to FMI style in m2