switch to event-source-writer
remap property names to something friendlier