Use original event name syntax again

This effectively reverts 85be5ccf3e08650f4a45ec67a3cb38db8756814c.