Improved the naming of the EventFilter class.