Index: pyyaml/trunk/tests/test_mark.py
===================================================================
--- pyyaml/trunk/tests/test_marker.py	(revision 47)
+++ pyyaml/trunk/tests/test_mark.py	(revision 116)
@@ -2,10 +2,10 @@
 import test_appliance
 
-from yaml.reader import Marker
+from yaml.reader import Mark
 
-class TestMarker(test_appliance.TestAppliance):
+class TestMark(test_appliance.TestAppliance):
 
-    def _testMarkers(self, test_name, markers_filename):
-        inputs = file(markers_filename, 'rb').read().split('---\n')[1:]
+    def _testMarks(self, test_name, marks_filename):
+        inputs = file(marks_filename, 'rb').read().split('---\n')[1:]
         for input in inputs:
             index = 0
@@ -19,6 +19,6 @@
                     column += 1
                 index += 1
-            marker = Marker(test_name, line, column, unicode(input), index)
-            snippet = marker.get_snippet(indent=2, max_length=79)
+            mark = Mark(test_name, line, column, unicode(input), index)
+            snippet = mark.get_snippet(indent=2, max_length=79)
             #print "INPUT:"
             #print input
@@ -31,4 +31,4 @@
             self.failUnlessEqual(data[len(pointer)-1], '*')
 
-TestMarker.add_tests('testMarkers', '.markers')
+TestMark.add_tests('testMarks', '.marks')