Object renaming

New names better convey that these objects are event data and
not events themselves