Upgrading for RC2
Fix event rename