removed id suffix from events