Index: pyyaml/trunk/lib/yaml/events.py
===================================================================
--- pyyaml/trunk/lib/yaml/events.py	(revision 53)
+++ pyyaml/trunk/lib/yaml/events.py	(revision 116)
@@ -1,10 +1,10 @@
 
 class Event:
-    def __init__(self, start_marker, end_marker):
-        self.start_marker = start_marker
-        self.end_marker = end_marker
+    def __init__(self, start_mark, end_mark):
+        self.start_mark = start_mark
+        self.end_mark = end_mark
     def __repr__(self):
         attributes = [key for key in self.__dict__
-                if not key.endswith('_marker')]
+                if not key.endswith('_mark')]
         attributes.sort()
         arguments = ', '.join(['%s=%r' % (key, getattr(self, key))
@@ -13,8 +13,8 @@
 
 class NodeEvent(Event):
-    def __init__(self, anchor, start_marker, end_marker):
+    def __init__(self, anchor, start_mark, end_mark):
         self.anchor = anchor
-        self.start_marker = start_marker
-        self.end_marker = end_marker
+        self.start_mark = start_mark
+        self.end_mark = end_mark
 
 class AliasEvent(NodeEvent):
@@ -22,17 +22,17 @@
 
 class ScalarEvent(NodeEvent):
-    def __init__(self, anchor, tag, value, start_marker, end_marker):
+    def __init__(self, anchor, tag, value, start_mark, end_mark):
         self.anchor = anchor
         self.tag = tag
         self.value = value
-        self.start_marker = start_marker
-        self.end_marker = end_marker
+        self.start_mark = start_mark
+        self.end_mark = end_mark
 
 class CollectionEvent(NodeEvent):
-    def __init__(self, anchor, tag, start_marker, end_marker):
+    def __init__(self, anchor, tag, start_mark, end_mark):
         self.anchor = anchor
         self.tag = tag
-        self.start_marker = start_marker
-        self.end_marker = end_marker
+        self.start_mark = start_mark
+        self.end_mark = end_mark
 
 class SequenceEvent(CollectionEvent):