Renamed some identifiers for consistency

And events will appear on All Events on save