Index: branches/pyyaml3000/tests/test_tokens.py
===================================================================
--- branches/pyyaml3000/tests/test_tokens.py	(revision 43)
+++ branches/pyyaml3000/tests/test_tokens.py	(revision 44)
@@ -26,23 +26,23 @@
 
     replaces = {
-        YAMLDirective: '%',
-        TagDirective: '%',
-        ReservedDirective: '%',
-        DocumentStart: '---',
-        DocumentEnd: '...',
-        Alias: '*',
-        Anchor: '&',
-        Tag: '!',
-        Scalar: '_',
-        BlockSequenceStart: '[[',
-        BlockMappingStart: '{{',
-        BlockEnd: ']}',
-        FlowSequenceStart: '[',
-        FlowSequenceEnd: ']',
-        FlowMappingStart: '{',
-        FlowMappingEnd: '}',
-        Entry: ',',
-        Key: '?',
-        Value: ':',
+        YAMLDirectiveToken: '%',
+        TagDirectiveToken: '%',
+        ReservedDirectiveToken: '%',
+        DocumentStartToken: '---',
+        DocumentEndToken: '...',
+        AliasToken: '*',
+        AnchorToken: '&',
+        TagToken: '!',
+        ScalarToken: '_',
+        BlockSequenceStartToken: '[[',
+        BlockMappingStartToken: '{{',
+        BlockEndToken: ']}',
+        FlowSequenceStartToken: '[',
+        FlowSequenceEndToken: ']',
+        FlowMappingStartToken: '{',
+        FlowMappingEndToken: '}',
+        EntryToken: ',',
+        KeyToken: '?',
+        ValueToken: ':',
     }
 
@@ -53,5 +53,5 @@
             scanner = Scanner(data_filename, file(data_filename, 'rb').read())
             tokens1 = []
-            while not isinstance(scanner.peek_token(), End):
+            while not isinstance(scanner.peek_token(), EndToken):
                 tokens1.append(scanner.get_token())
             tokens1 = [self.replaces[t.__class__] for t in tokens1]
@@ -75,5 +75,5 @@
                 scanner = Scanner(filename, file(filename, 'rb').read())
                 tokens = []
-                while not isinstance(scanner.peek_token(), End):
+                while not isinstance(scanner.peek_token(), EndToken):
                     tokens.append(scanner.get_token().__class__.__name__)
             except: