Index: pyyaml/trunk/lib/yaml/reader.py
===================================================================
--- pyyaml/trunk/lib/yaml/reader.py	(revision 52)
+++ pyyaml/trunk/lib/yaml/reader.py	(revision 116)
@@ -4,5 +4,5 @@
 # We define two classes here.
 #
-#   Marker(source, line, column)
+#   Mark(source, line, column)
 # It's just a record and its only use is producing nice error messages.
 # Parser does not use it for any other purposes.
@@ -18,5 +18,5 @@
 __all__ = ['Reader', 'ReaderError']
 
-from error import YAMLError, Marker
+from error import YAMLError, Mark
 
 import codecs, re
@@ -143,10 +143,10 @@
                 self.column += 1
 
-    def get_marker(self):
+    def get_mark(self):
         if self.stream is None:
-            return Marker(self.name, self.line, self.column,
+            return Mark(self.name, self.line, self.column,
                     self.buffer, self.pointer)
         else:
-            return Marker(self.name, self.line, self.column, None, None)
+            return Mark(self.name, self.line, self.column, None, None)
 
     def determine_encoding(self):