From 618b889787d97cabcb906378074cfc8828e7f5ab Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Mon, 23 Aug 2010 15:48:21 +0200
Subject: [PATCH] Driver -> Base

---
 framework/Lock/lib/Horde/Lock.php                            |  2 +-
 framework/Lock/lib/Horde/Lock/Driver.php                     |  4 ++--
 framework/Lock/lib/Horde/Lock/Null.php                       |  2 +-
 framework/Lock/lib/Horde/Lock/Sql.php                        | 12 ++++++------
 framework/SessionHandler/lib/Horde/SessionHandler.php        |  2 +-
 .../lib/Horde/SessionHandler/{Driver.php => Base.php}        |  6 +++---
 .../SessionHandler/lib/Horde/SessionHandler/Builtin.php      |  4 ++--
 .../SessionHandler/lib/Horde/SessionHandler/External.php     |  4 ++--
 framework/SessionHandler/lib/Horde/SessionHandler/Ldap.php   |  4 ++--
 .../SessionHandler/lib/Horde/SessionHandler/Memcache.php     |  4 ++--
 framework/SessionHandler/lib/Horde/SessionHandler/Sql.php    |  4 ++--
 framework/SessionHandler/lib/Horde/SessionHandler/Stack.php  |  6 +++---
 framework/SessionHandler/package.xml                         |  4 ++--
 framework/Token/lib/Horde/Token/{Driver.php => Base.php}     |  0
 framework/Token/package.xml                                  |  6 +++---
 imp/lib/Compose.php                                          |  2 +-
 imp/lib/Quota/{Driver.php => Base.php}                       |  4 ++--
 imp/lib/Quota/Command.php                                    |  2 +-
 imp/lib/Quota/Hook.php                                       |  2 +-
 imp/lib/Quota/Imap.php                                       |  2 +-
 imp/lib/Quota/Maildir.php                                    |  2 +-
 imp/lib/Quota/Mdaemon.php                                    |  2 +-
 imp/lib/Quota/Mercury32.php                                  |  2 +-
 imp/lib/Quota/Null.php                                       |  2 +-
 imp/lib/Quota/Sql.php                                        |  2 +-
 imp/lib/Sentmail/{Driver.php => Base.php}                    |  4 ++--
 imp/lib/Sentmail/Null.php                                    |  2 +-
 imp/lib/Sentmail/Sql.php                                     |  2 +-
 28 files changed, 47 insertions(+), 47 deletions(-)
 rename framework/SessionHandler/lib/Horde/SessionHandler/{Driver.php => Base.php} (98%)
 rename framework/Token/lib/Horde/Token/{Driver.php => Base.php} (100%)
 rename imp/lib/Quota/{Driver.php => Base.php} (96%)
 rename imp/lib/Sentmail/{Driver.php => Base.php} (97%)

diff --git a/framework/Lock/lib/Horde/Lock.php b/framework/Lock/lib/Horde/Lock.php
index fd3588b0d..92219c8ae 100644
--- a/framework/Lock/lib/Horde/Lock.php
+++ b/framework/Lock/lib/Horde/Lock.php
@@ -27,7 +27,7 @@ class Horde_Lock
      * @param array $params  A hash containing any additional configuration or
      *                       connection parameters a subclass might need.
      *
-     * @return Horde_Lock_Driver  The newly created concrete instance.
+     * @return Horde_Lock_Base  The newly created concrete instance.
      * @throws Horde_Lock_Exception
      */
     static public function factory($driver, $params = array())
diff --git a/framework/Lock/lib/Horde/Lock/Driver.php b/framework/Lock/lib/Horde/Lock/Driver.php
index 86f219789..b9b3e5acd 100644
--- a/framework/Lock/lib/Horde/Lock/Driver.php
+++ b/framework/Lock/lib/Horde/Lock/Driver.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The Horde_Lock_Driver class defines the Horde_Lock driver API.
+ * The Horde_Lock_Base class defines the Horde_Lock driver API.
  *
  * Copyright 2008-2010 The Horde Project (http://www.horde.org/)
  *
@@ -11,7 +11,7 @@
  * @category Horde
  * @package  Lock
  */
-abstract class Horde_Lock_Driver
+abstract class Horde_Lock_Base
 {
     /**
      * Driver parameters.
diff --git a/framework/Lock/lib/Horde/Lock/Null.php b/framework/Lock/lib/Horde/Lock/Null.php
index 5be8789a6..b180a848e 100644
--- a/framework/Lock/lib/Horde/Lock/Null.php
+++ b/framework/Lock/lib/Horde/Lock/Null.php
@@ -11,7 +11,7 @@
  * @category Horde
  * @package  Lock
  */
-class Horde_Lock_Null extends Horde_Lock_Driver
+class Horde_Lock_Null extends Horde_Lock_Base
 {
     /**
      * Return an array of information about the requested lock.
diff --git a/framework/Lock/lib/Horde/Lock/Sql.php b/framework/Lock/lib/Horde/Lock/Sql.php
index 251beeb99..d874e8b05 100644
--- a/framework/Lock/lib/Horde/Lock/Sql.php
+++ b/framework/Lock/lib/Horde/Lock/Sql.php
@@ -28,7 +28,7 @@
  * @category Horde
  * @package  Lock
  */
-class Horde_Lock_Sql extends Horde_Lock_Driver
+class Horde_Lock_Sql extends Horde_Lock_Base
 {
     /**
      * Handle for the current database connection.
@@ -73,7 +73,7 @@ class Horde_Lock_Sql extends Horde_Lock_Driver
     /**
      * Return an array of information about the requested lock.
      *
-     * @see Horde_Lock_Driver::getLockInfo()
+     * @see Horde_Lock_Base::getLockInfo()
      */
     public function getLockInfo($lockid)
     {
@@ -95,7 +95,7 @@ class Horde_Lock_Sql extends Horde_Lock_Driver
      * Return a list of valid locks with the option to limit the results
      * by principal, scope and/or type.
      *
-     * @see Horde_Lock_Driver::getLocks()
+     * @see Horde_Lock_Base::getLocks()
      */
     public function getLocks($scope = null, $principal = null, $type = null)
     {
@@ -137,7 +137,7 @@ class Horde_Lock_Sql extends Horde_Lock_Driver
     /**
      * Extend the valid lifetime of a valid lock to now + $newtimeout.
      *
-     * @see Horde_Lock_Driver::resetLock()
+     * @see Horde_Lock_Base::resetLock()
      */
     public function resetLock($lockid, $extend)
     {
@@ -166,7 +166,7 @@ class Horde_Lock_Sql extends Horde_Lock_Driver
      * Sets a lock on the requested principal and returns the generated lock
      * ID.
      *
-     * @see Horde_Lock_Driver::setLock()
+     * @see Horde_Lock_Base::setLock()
      */
     public function setLock($requestor, $scope, $principal,
                             $lifetime = 1, $type = Horde_Lock::TYPE_SHARED)
@@ -205,7 +205,7 @@ class Horde_Lock_Sql extends Horde_Lock_Driver
     /**
      * Removes a lock given the lock ID.
      *
-     * @see Horde_Lock_Driver::clearLock()
+     * @see Horde_Lock_Base::clearLock()
      */
     public function clearLock($lockid)
     {
diff --git a/framework/SessionHandler/lib/Horde/SessionHandler.php b/framework/SessionHandler/lib/Horde/SessionHandler.php
index ce26e01f1..e6e578a41 100644
--- a/framework/SessionHandler/lib/Horde/SessionHandler.php
+++ b/framework/SessionHandler/lib/Horde/SessionHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Horde_SessionHandler:: defines an API for implementing custom PHP session
+ * Horde_SessionHandler defines an API for implementing custom PHP session
  * handlers.
  *
  * Copyright 2002-2010 The Horde Project (http://www.horde.org/)
diff --git a/framework/SessionHandler/lib/Horde/SessionHandler/Driver.php b/framework/SessionHandler/lib/Horde/SessionHandler/Base.php
similarity index 98%
rename from framework/SessionHandler/lib/Horde/SessionHandler/Driver.php
rename to framework/SessionHandler/lib/Horde/SessionHandler/Base.php
index 04bb04189..10d65fb4d 100644
--- a/framework/SessionHandler/lib/Horde/SessionHandler/Driver.php
+++ b/framework/SessionHandler/lib/Horde/SessionHandler/Base.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Horde_SessionHandler_Driver:: is the abstract class that all drivers
- * inherit from.
+ * Horde_SessionHandler_Base is the abstract class that all drivers inherit
+ * from.
  *
  * Copyright 2010 The Horde Project (http://www.horde.org/)
  *
@@ -12,7 +12,7 @@
  * @category Horde
  * @package  SessionHandler
  */
-abstract class Horde_SessionHandler_Driver
+abstract class Horde_SessionHandler_Base
 {
     /**
      * Hash containing connection parameters.
diff --git a/framework/SessionHandler/lib/Horde/SessionHandler/Builtin.php b/framework/SessionHandler/lib/Horde/SessionHandler/Builtin.php
index 06f843456..7e9c95e9d 100644
--- a/framework/SessionHandler/lib/Horde/SessionHandler/Builtin.php
+++ b/framework/SessionHandler/lib/Horde/SessionHandler/Builtin.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * SessionHandler:: implementation for PHP's built-in session handler.
+ * Horde_SessionHandler implementation for PHP's built-in session handler.
  * This doesn't do any session handling itself - instead, it exists to allow
  * utility features to be used with the built-in PHP handler.
  *
@@ -13,7 +13,7 @@
  * @category Horde
  * @package  SessionHandler
  */
-class Horde_SessionHandler_Builtin extends Horde_SessionHandler_Driver
+class Horde_SessionHandler_Builtin extends Horde_SessionHandler_Base
 {
     /**
      * Constructor.
diff --git a/framework/SessionHandler/lib/Horde/SessionHandler/External.php b/framework/SessionHandler/lib/Horde/SessionHandler/External.php
index 147e4a5cf..8f4abe11b 100644
--- a/framework/SessionHandler/lib/Horde/SessionHandler/External.php
+++ b/framework/SessionHandler/lib/Horde/SessionHandler/External.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Horde_SessionHandler_External:: implements an external save handler defined
+ * Horde_SessionHandler_External implements an external save handler defined
  * via driver configuration parameters.
  *
  * Copyright 2010 The Horde Project (http://www.horde.org/)
@@ -12,7 +12,7 @@
  * @category Horde
  * @package  SessionHandler
  */
-class Horde_SessionHandler_External extends Horde_SessionHandler_Driver
+class Horde_SessionHandler_External extends Horde_SessionHandler_Base
 {
     /**
      * Constructor.
diff --git a/framework/SessionHandler/lib/Horde/SessionHandler/Ldap.php b/framework/SessionHandler/lib/Horde/SessionHandler/Ldap.php
index 7d811c55e..ade950c6c 100644
--- a/framework/SessionHandler/lib/Horde/SessionHandler/Ldap.php
+++ b/framework/SessionHandler/lib/Horde/SessionHandler/Ldap.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * SessionHandler implementation for LDAP directories.
+ * Horde_SessionHandler implementation for LDAP directories.
  *
  * This code is adapted from the comments at
  * http://www.php.net/session-set-save-handler.
@@ -13,7 +13,7 @@
  * @category Horde
  * @package  SessionHandler
  */
-class Horde_SessionHandler_Ldap extends Horde_SessionHandler_Driver
+class Horde_SessionHandler_Ldap extends Horde_SessionHandler_Base
 {
     /**
      * Horde_Ldap object.
diff --git a/framework/SessionHandler/lib/Horde/SessionHandler/Memcache.php b/framework/SessionHandler/lib/Horde/SessionHandler/Memcache.php
index f48dff97d..59661fa65 100644
--- a/framework/SessionHandler/lib/Horde/SessionHandler/Memcache.php
+++ b/framework/SessionHandler/lib/Horde/SessionHandler/Memcache.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * SessionHandler implementation for memcache.
+ * Horde_SessionHandler implementation for memcache.
  *
  * Copyright 2005-2010 The Horde Project (http://www.horde.org/)
  *
@@ -12,7 +12,7 @@
  * @category Horde
  * @package  SessionHandler
  */
-class Horde_SessionHandler_Memcache extends Horde_SessionHandler_Driver
+class Horde_SessionHandler_Memcache extends Horde_SessionHandler_Base
 {
     /**
      * Memcache object.
diff --git a/framework/SessionHandler/lib/Horde/SessionHandler/Sql.php b/framework/SessionHandler/lib/Horde/SessionHandler/Sql.php
index 0bbbad808..61618dcaf 100644
--- a/framework/SessionHandler/lib/Horde/SessionHandler/Sql.php
+++ b/framework/SessionHandler/lib/Horde/SessionHandler/Sql.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * SessionHandler implementation for SQL databases.
+ * Horde_SessionHandler implementation for SQL databases.
  *
  * The table structure can be found in:
  *   horde/scripts/sql/horde_sessionhandler.sql.
@@ -14,7 +14,7 @@
  * @category Horde
  * @package  SessionHandler
  */
-class Horde_SessionHandler_Sql extends Horde_SessionHandler_Driver
+class Horde_SessionHandler_Sql extends Horde_SessionHandler_Base
 {
     /**
      * Handle for the current database connection.
diff --git a/framework/SessionHandler/lib/Horde/SessionHandler/Stack.php b/framework/SessionHandler/lib/Horde/SessionHandler/Stack.php
index 76c82d4a9..7e4018741 100644
--- a/framework/SessionHandler/lib/Horde/SessionHandler/Stack.php
+++ b/framework/SessionHandler/lib/Horde/SessionHandler/Stack.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Horde_SessionHandler_Stack:: is an implementation that will loop through
- * a given list of Horde_SessionHandler_Drivers to return the session
+ * Horde_SessionHandler_Stack is an implementation that will loop through a
+ * given list of Horde_SessionHandler drivers to return the session
  * information.  This driver allows for use of caching backends on top of
  * persistent backends.
  *
@@ -14,7 +14,7 @@
  * @category Horde
  * @package  SessionHandler
  */
-class Horde_SessionHandler_Stack extends Horde_SessionHandler_Driver
+class Horde_SessionHandler_Stack extends Horde_SessionHandler_Base
 {
     /**
      * Stack of sessionhandlers.
diff --git a/framework/SessionHandler/package.xml b/framework/SessionHandler/package.xml
index 2caac1bab..cce1f5ec4 100644
--- a/framework/SessionHandler/package.xml
+++ b/framework/SessionHandler/package.xml
@@ -50,7 +50,7 @@
     <dir name="Horde">
      <dir name="SessionHandler">
       <file name="Builtin.php" role="php" />
-      <file name="Driver.php" role="php" />
+      <file name="Base.php" role="php" />
       <file name="Exception.php" role="php" />
       <file name="External.php" role="php" />
       <file name="Ldap.php" role="php" />
@@ -99,7 +99,7 @@
   <filelist>
    <install as="Horde/SessionHandler.php" name="lib/Horde/SessionHandler.php" />
    <install as="Horde/SessionHandler/Builtin.php" name="lib/Horde/SessionHandler/Builtin.php" />
-   <install as="Horde/SessionHandler/Driver.php" name="lib/Horde/SessionHandler/Driver.php" />
+   <install as="Horde/SessionHandler/Base.php" name="lib/Horde/SessionHandler/Base.php" />
    <install as="Horde/SessionHandler/Exception.php" name="lib/Horde/SessionHandler/Exception.php" />
    <install as="Horde/SessionHandler/External.php" name="lib/Horde/SessionHandler/External.php" />
    <install as="Horde/SessionHandler/Ldap.php" name="lib/Horde/SessionHandler/Ldap.php" />
diff --git a/framework/Token/lib/Horde/Token/Driver.php b/framework/Token/lib/Horde/Token/Base.php
similarity index 100%
rename from framework/Token/lib/Horde/Token/Driver.php
rename to framework/Token/lib/Horde/Token/Base.php
diff --git a/framework/Token/package.xml b/framework/Token/package.xml
index 0ff03e84b..2b1614744 100644
--- a/framework/Token/package.xml
+++ b/framework/Token/package.xml
@@ -27,7 +27,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
  </stability>
  <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
  <notes>* Add Horde_Token_Exception::.
- * Move driver code into Horde_Token_Driver::.
+ * Move driver code into sub-classes.
  * Use exceptions, not PEAR_Errors.
  * Initial Horde 4 package.
  </notes>
@@ -36,7 +36,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
    <dir name="lib">
     <dir name="Horde">
      <dir name="Token">
-      <file name="Driver.php" role="php" />
+      <file name="Base.php" role="php" />
       <file name="Exception.php" role="php" />
       <file name="File.php" role="php" />
       <file name="Null.php" role="php" />
@@ -81,7 +81,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
  </dependencies>
  <phprelease>
   <filelist>
-   <install name="lib/Horde/Token/Driver.php" as="Horde/Token/Driver.php" />
+   <install name="lib/Horde/Token/Base.php" as="Horde/Token/Base.php" />
    <install name="lib/Horde/Token/Exception.php" as="Horde/Token/Exception.php" />
    <install name="lib/Horde/Token/File.php" as="Horde/Token/File.php" />
    <install name="lib/Horde/Token/Null.php" as="Horde/Token/Null.php" />
diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php
index fe0b2d348..5a95ea9b6 100644
--- a/imp/lib/Compose.php
+++ b/imp/lib/Compose.php
@@ -769,7 +769,7 @@ class IMP_Compose
         $timelimit = $GLOBALS['injector']->getInstance('Horde_Perms')->hasAppPermission('max_timelimit');
         if ($timelimit !== true) {
             $sentmail = $GLOBALS['injector']->getInstance('IMP_Sentmail');
-            if (!is_subclass_of($sentmail, 'IMP_Sentmail_Driver')) {
+            if (!($sentmail instanceof IMP_Sentmail_Base)) {
                 Horde::logMessage('The permission for the maximum number of recipients per time period has been enabled, but no backend for the sent-mail logging has been configured for IMP.', 'ERR');
                 throw new IMP_Compose_Exception(_("The system is not properly configured. A detailed error description has been logged for the administrator."));
             }
diff --git a/imp/lib/Quota/Driver.php b/imp/lib/Quota/Base.php
similarity index 96%
rename from imp/lib/Quota/Driver.php
rename to imp/lib/Quota/Base.php
index 96b11009b..513882487 100644
--- a/imp/lib/Quota/Driver.php
+++ b/imp/lib/Quota/Base.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The IMP_Quota_Driver:: class is the abstract class that all driver
+ * The IMP_Quota_Base:: class is the abstract class that all driver
  *
  * Copyright 2010 The Horde Project (http://www.horde.org/)
  *
@@ -12,7 +12,7 @@
  * @license  http://www.fsf.org/copyleft/gpl.html GPL
  * @package  IMP
  */
-abstract class IMP_Quota_Driver
+abstract class IMP_Quota_Base
 {
     /**
      * Driver parameters.
diff --git a/imp/lib/Quota/Command.php b/imp/lib/Quota/Command.php
index 070b7c69e..624d1d9cb 100644
--- a/imp/lib/Quota/Command.php
+++ b/imp/lib/Quota/Command.php
@@ -17,7 +17,7 @@
  * @license  http://www.fsf.org/copyleft/gpl.html GPL
  * @package  IMP
  */
-class IMP_Quota_Command extends IMP_Quota_Driver
+class IMP_Quota_Command extends IMP_Quota_Base
 {
     /**
      * Constructor.
diff --git a/imp/lib/Quota/Hook.php b/imp/lib/Quota/Hook.php
index 8dfcd7e48..6a0781313 100644
--- a/imp/lib/Quota/Hook.php
+++ b/imp/lib/Quota/Hook.php
@@ -19,7 +19,7 @@
  * @license  http://www.fsf.org/copyleft/gpl.html GPL
  * @package  IMP
  */
-class IMP_Quota_Hook extends IMP_Quota_Driver
+class IMP_Quota_Hook extends IMP_Quota_Base
 {
     /**
      * Get quota information (used/allocated), in bytes.
diff --git a/imp/lib/Quota/Imap.php b/imp/lib/Quota/Imap.php
index de52e90ae..404b67b4d 100644
--- a/imp/lib/Quota/Imap.php
+++ b/imp/lib/Quota/Imap.php
@@ -12,7 +12,7 @@
  * @license  http://www.fsf.org/copyleft/gpl.html GPL
  * @package  IMP
  */
-class IMP_Quota_Imap extends IMP_Quota_Driver
+class IMP_Quota_Imap extends IMP_Quota_Base
 {
     /**
      * Constructor.
diff --git a/imp/lib/Quota/Maildir.php b/imp/lib/Quota/Maildir.php
index 03aa4ec5e..885e59972 100644
--- a/imp/lib/Quota/Maildir.php
+++ b/imp/lib/Quota/Maildir.php
@@ -16,7 +16,7 @@
  * @package  IMP
  * @todo     Add config param for storage vs message quota
  */
-class IMP_Quota_Maildir extends IMP_Quota_Driver
+class IMP_Quota_Maildir extends IMP_Quota_Base
 {
     /**
      * Constructor.
diff --git a/imp/lib/Quota/Mdaemon.php b/imp/lib/Quota/Mdaemon.php
index 3e7817f43..4724f49e8 100644
--- a/imp/lib/Quota/Mdaemon.php
+++ b/imp/lib/Quota/Mdaemon.php
@@ -12,7 +12,7 @@
  * @license  http://www.fsf.org/copyleft/gpl.html GPL
  * @package  IMP
  */
-class IMP_Quota_Mdaemon extends IMP_Quota_Driver
+class IMP_Quota_Mdaemon extends IMP_Quota_Base
 {
     /**
      * Constructor.
diff --git a/imp/lib/Quota/Mercury32.php b/imp/lib/Quota/Mercury32.php
index 05764c65e..c0608d74b 100644
--- a/imp/lib/Quota/Mercury32.php
+++ b/imp/lib/Quota/Mercury32.php
@@ -30,7 +30,7 @@
  * @license  http://www.fsf.org/copyleft/gpl.html GPL
  * @package  IMP
  */
-class IMP_Quota_Mercury32 extends IMP_Quota_Driver
+class IMP_Quota_Mercury32 extends IMP_Quota_Base
 {
     /**
      * Constructor.
diff --git a/imp/lib/Quota/Null.php b/imp/lib/Quota/Null.php
index 20da3608b..bf768ee92 100644
--- a/imp/lib/Quota/Null.php
+++ b/imp/lib/Quota/Null.php
@@ -12,7 +12,7 @@
  * @license  http://www.fsf.org/copyleft/gpl.html GPL
  * @package  IMP
  */
-class IMP_Quota_Null extends IMP_Quota_Driver
+class IMP_Quota_Null extends IMP_Quota_Base
 {
     /**
      * Get quota information (used/allocated), in bytes.
diff --git a/imp/lib/Quota/Sql.php b/imp/lib/Quota/Sql.php
index 1657d4a72..8c24bfe59 100644
--- a/imp/lib/Quota/Sql.php
+++ b/imp/lib/Quota/Sql.php
@@ -15,7 +15,7 @@
  * @license  http://www.fsf.org/copyleft/gpl.html GPL
  * @package  IMP
  */
-class IMP_Quota_Sql extends IMP_Quota_Driver
+class IMP_Quota_Sql extends IMP_Quota_Base
 {
     /**
      * DB object.
diff --git a/imp/lib/Sentmail/Driver.php b/imp/lib/Sentmail/Base.php
similarity index 97%
rename from imp/lib/Sentmail/Driver.php
rename to imp/lib/Sentmail/Base.php
index d8c0bdf89..74c17928f 100644
--- a/imp/lib/Sentmail/Driver.php
+++ b/imp/lib/Sentmail/Base.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The IMP_Sentmail_Driver:: class is the abstract class that all driver
+ * The IMP_Sentmail_Base:: class is the abstract class that all driver
  * implementations inherit from.
  *
  * Copyright 2010 The Horde Project (http://www.horde.org/)
@@ -13,7 +13,7 @@
  * @category Horde
  * @package  IMP
  */
-abstract class IMP_Sentmail_Driver
+abstract class IMP_Sentmail_Base
 {
     /**
      * Hash containing configuration parameters.
diff --git a/imp/lib/Sentmail/Null.php b/imp/lib/Sentmail/Null.php
index 7066a11ba..d73f4486e 100644
--- a/imp/lib/Sentmail/Null.php
+++ b/imp/lib/Sentmail/Null.php
@@ -12,7 +12,7 @@
  * @license  http://www.fsf.org/copyleft/gpl.html GPL
  * @package  IMP
  */
-class IMP_Sentmail_Null extends IMP_Sentmail_Driver
+class IMP_Sentmail_Null extends IMP_Sentmail_Base
 {
     /**
      * Garbage collect log entries.
diff --git a/imp/lib/Sentmail/Sql.php b/imp/lib/Sentmail/Sql.php
index 722079652..80c97a27a 100644
--- a/imp/lib/Sentmail/Sql.php
+++ b/imp/lib/Sentmail/Sql.php
@@ -32,7 +32,7 @@
  * @license  http://www.fsf.org/copyleft/gpl.html GPL
  * @package  IMP
  */
-class IMP_Sentmail_Sql extends IMP_Sentmail_Driver
+class IMP_Sentmail_Sql extends IMP_Sentmail_Base
 {
     /**
      * Handle for the current database connection.
-- 
2.11.0