Renumbering events, correct eventnames