Index: pyyaml/trunk/tests/test_appliance.py
===================================================================
--- pyyaml/trunk/tests/test_appliance.py	(revision 118)
+++ pyyaml/trunk/tests/test_appliance.py	(revision 130)
@@ -244,8 +244,8 @@
                 self.events.append(ScalarEvent(anchor, tag, self.get_value(), None, None))
             elif self.test_token(FlowSequenceStartToken):
-                self.events.append(SequenceEvent(anchor, tag, None, None))
+                self.events.append(SequenceStartEvent(anchor, tag, None, None))
                 self.parse_sequence()
             elif self.test_token(FlowMappingStartToken):
-                self.events.append(MappingEvent(anchor, tag, None, None))
+                self.events.append(MappingStartEvent(anchor, tag, None, None))
                 self.parse_mapping()
             else:
@@ -262,5 +262,5 @@
                     self.parse_node()
         self.consume_token(FlowSequenceEndToken)
-        self.events.append(CollectionEndEvent(None, None))
+        self.events.append(SequenceEndEvent(None, None))
 
     # mapping: MAPPING-START (map_entry (ENTRY map_entry)*)? ENTRY? MAPPING-END
@@ -274,5 +274,5 @@
                     self.parse_map_entry()
         self.consume_token(FlowMappingEndToken)
-        self.events.append(CollectionEndEvent(None, None))
+        self.events.append(MappingEndEvent(None, None))
 
     # map_entry: KEY node VALUE node