1 files changed, 16 insertions, 16 deletions

diff --git a/Auth/Yadis/Manager.php b/Auth/Yadis/Manager.php
index d6e3e37..60a4cf3 100644
--- a/Auth/Yadis/Manager.php
+++ b/Auth/Yadis/Manager.php
@@ -8,13 +8,13 @@
  */
 
 /**
- * The base session class used by the Services_Yadis_Manager.  This
+ * The base session class used by the Auth_Yadis_Manager.  This
  * class wraps the default PHP session machinery and should be
  * subclassed if your application doesn't use PHP sessioning.
  *
  * @package Yadis
  */
-class Services_Yadis_PHPSession {
+class Auth_Yadis_PHPSession {
     /**
      * Set a session key/value pair.
      *
@@ -71,7 +71,7 @@ class Services_Yadis_PHPSession {
  * is that you'll subclass this and override $this->check($data) ->
  * bool to implement your own session data validation.
  */
-class Services_Yadis_SessionLoader {
+class Auth_Yadis_SessionLoader {
     /**
      * Override this.
      */
@@ -174,7 +174,7 @@ class Services_Yadis_SessionLoader {
     }
 }
 
-class Auth_OpenID_ServiceEndpointLoader extends Services_Yadis_SessionLoader {
+class Auth_OpenID_ServiceEndpointLoader extends Auth_Yadis_SessionLoader {
     function newObject($data)
     {
         return new Auth_OpenID_ServiceEndpoint();
@@ -196,7 +196,7 @@ class Auth_OpenID_ServiceEndpointLoader extends Services_Yadis_SessionLoader {
     }
 }
 
-class Services_Yadis_ManagerLoader extends Services_Yadis_SessionLoader {
+class Auth_Yadis_ManagerLoader extends Auth_Yadis_SessionLoader {
     function requiredKeys()
     {
         return array('starting_url',
@@ -209,7 +209,7 @@ class Services_Yadis_ManagerLoader extends Services_Yadis_SessionLoader {
 
     function newObject($data)
     {
-        return new Services_Yadis_Manager($data['starting_url'],
+        return new Auth_Yadis_Manager($data['starting_url'],
                                           $data['yadis_url'],
                                           $data['services'],
                                           $data['session_key']);
@@ -249,14 +249,14 @@ class Services_Yadis_ManagerLoader extends Services_Yadis_SessionLoader {
  *
  * @package Yadis
  */
-class Services_Yadis_Manager {
+class Auth_Yadis_Manager {
 
     /**
      * Intialize a new yadis service manager.
      *
      * @access private
      */
-    function Services_Yadis_Manager($starting_url, $yadis_url,
+    function Auth_Yadis_Manager($starting_url, $yadis_url,
                                     $services, $session_key)
     {
         // The URL that was used to initiate the Yadis protocol
@@ -342,7 +342,7 @@ class Services_Yadis_Manager {
  *
  * @package Yadis
  */
-class Services_Yadis_Discovery {
+class Auth_Yadis_Discovery {
 
     /**
      * @access private
@@ -357,13 +357,13 @@ class Services_Yadis_Discovery {
     /**
      * Initialize a discovery object.
      *
-     * @param Services_Yadis_PHPSession $session An object which
-     * implements the Services_Yadis_PHPSession API.
+     * @param Auth_Yadis_PHPSession $session An object which
+     * implements the Auth_Yadis_PHPSession API.
      * @param string $url The URL on which to attempt discovery.
      * @param string $session_key_suffix The optional session key
      * suffix override.
      */
-    function Services_Yadis_Discovery(&$session, $url,
+    function Auth_Yadis_Discovery(&$session, $url,
                                       $session_key_suffix = null)
     {
         /// Initialize a discovery object
@@ -396,7 +396,7 @@ class Services_Yadis_Discovery {
         }
 
         if ($manager) {
-            $loader = new Services_Yadis_ManagerLoader();
+            $loader = new Auth_Yadis_ManagerLoader();
             $service = $manager->nextService();
             $this->session->set($this->session_key,
                                 serialize($loader->toSession($manager)));
@@ -446,7 +446,7 @@ class Services_Yadis_Discovery {
         $manager = null;
 
         if ($manager_str !== null) {
-            $loader = new Services_Yadis_ManagerLoader();
+            $loader = new Auth_Yadis_ManagerLoader();
             $manager = $loader->fromSession(unserialize($manager_str));
         }
 
@@ -469,8 +469,8 @@ class Services_Yadis_Discovery {
         }
 
         if ($services) {
-            $loader = new Services_Yadis_ManagerLoader();
-            $manager = new Services_Yadis_Manager($this->url, $yadis_url,
+            $loader = new Auth_Yadis_ManagerLoader();
+            $manager = new Auth_Yadis_Manager($this->url, $yadis_url,
                                               $services, $key);
             $this->session->set($this->session_key,
                                 serialize($loader->toSession($manager)));