Move towards old style rendering; event => entry