MDL-31220 rename events