Fix event naming issue