Index: pyyaml/trunk/lib/yaml/loader.py
===================================================================
--- pyyaml/trunk/lib/yaml/loader.py	(revision 136)
+++ pyyaml/trunk/lib/yaml/loader.py	(revision 137)
@@ -7,8 +7,7 @@
 from composer import *
 from constructor import *
-from detector import *
+from resolver import *
 
-class BaseLoader(Reader, Scanner, Parser,
-        BaseComposer, BaseConstructor, BaseDetector):
+class BaseLoader(Reader, Scanner, Parser, Composer, BaseConstructor, BaseResolver):
 
     def __init__(self, stream):
@@ -16,9 +15,9 @@
         Scanner.__init__(self)
         Parser.__init__(self)
-        BaseComposer.__init__(self)
+        Composer.__init__(self)
         BaseConstructor.__init__(self)
-        BaseDetector.__init__(self)
+        BaseResolver.__init__(self)
 
-class SafeLoader(Reader, Scanner, Parser, Composer, SafeConstructor, Detector):
+class SafeLoader(Reader, Scanner, Parser, Composer, SafeConstructor, Resolver):
 
     def __init__(self, stream):
@@ -28,7 +27,7 @@
         Composer.__init__(self)
         SafeConstructor.__init__(self)
-        Detector.__init__(self)
+        Resolver.__init__(self)
 
-class Loader(Reader, Scanner, Parser, Composer, Constructor, Detector):
+class Loader(Reader, Scanner, Parser, Composer, Constructor, Resolver):
 
     def __init__(self, stream):
@@ -38,4 +37,4 @@
         Composer.__init__(self)
         Constructor.__init__(self)
-        Detector.__init__(self)
+        Resolver.__init__(self)