Made names more consistent.
Added support for the Invalid event state.