Change naming of fields in structures.

Events and thread waiter field names shortened for code readability.