Quick cleanup, re-did event rename.