diff --git a/htdocs/testpdo.php b/htdocs/testpdo.php
new file mode 100644
index 00000000..704468ae
--- /dev/null
+++ b/htdocs/testpdo.php
@@ -0,0 +1,5 @@
+<?php
+require_once("../inc/always.php");
+
+require("PdoQuery.php");
+
diff --git a/htdocs/usr.php b/htdocs/usr.php
index e6e32ded..9ec3b5d4 100644
--- a/htdocs/usr.php
+++ b/htdocs/usr.php
@@ -6,10 +6,10 @@
   $session->LoginRequired();
   require_once("interactive-page.php");
 
-  require_once("RSCDSUser.php");
+  require_once("DAViCalUser.php");
 
   $user_no = intval(isset($_POST['user_no']) ? $_POST['user_no'] : (isset($_GET['user_no'])?$_GET['user_no']:0) );
-  $user = new RSCDSUser($user_no);
+  $user = new DAViCalUser($user_no);
   if ( $user->user_no == 0 ) {
     $c->page_title = ( $user_no != "" ? translate("User Unavailable") : translate("New User") );
   }
@@ -26,7 +26,7 @@
         $user->PostToValues();
         if ( $user->Validate() ) {
           $user->Write();
-          $user = new RSCDSUser($user->user_no);
+          $user = new DAViCalUser($user->user_no);
           $user->EditMode = true;
           if ( $user->user_no == 0 ) {
             $c->page_title = ( $user_no != "" ? translate("User Unavailable") : translate("New User") );
@@ -70,7 +70,7 @@
         * Handle any actions, such as 'delete_relation'
         */
         if ( $user->HandleAction($_GET['action']) ) {
-          $user = new RSCDSUser($user->user_no);
+          $user = new DAViCalUser($user->user_no);
           $user->EditMode = true;
         }
       }
diff --git a/inc/RSCDSUser.php b/inc/DAViCalUser.php
similarity index 99%
rename from inc/RSCDSUser.php
rename to inc/DAViCalUser.php
index 565d551a..b4d5c85b 100644
--- a/inc/RSCDSUser.php
+++ b/inc/DAViCalUser.php
@@ -3,7 +3,7 @@
 * User maintain / view with DAViCal specific associated tables
 *
 * @package   davical
-* @subpackage   RSCDSUser
+* @subpackage   DAViCalUser
 * @author    Andrew McMillan <andrew@mcmillan.net.nz>
 * @copyright Catalyst .Net Ltd, Morphoss Ltd <http://www.morphoss.com/>
 * @license   http://gnu.org/copyleft/gpl.html GNU GPL v2
@@ -21,7 +21,7 @@ $c->scripts[] = "$c->base_url/js/browse.js";
 *
 * @package   davical
 */
-class RSCDSUser extends User
+class DAViCalUser extends User
 {
 
   var $delete_collection_confirmation_required;
@@ -29,7 +29,7 @@ class RSCDSUser extends User
   /**
   * Constructor - nothing fancy as yet.
   */
-  function RSCDSUser( $id , $prefix = "") {
+  function DAViCalUser( $id , $prefix = "") {
     global $c;
     $this->delete_collection_confirmation_required = null;
     parent::User( $id, $prefix );
diff --git a/inc/drivers_ldap.php b/inc/drivers_ldap.php
index 7b6d4535..666eebec 100644
--- a/inc/drivers_ldap.php
+++ b/inc/drivers_ldap.php
@@ -334,7 +334,7 @@ function sync_LDAP(){
       $db_users[] = $db_user['username'];
       $db_users_info[$db_user['username']] = array('user_no' => $db_user['user_no'], 'updated' => $db_user['updated']);
     }
-    include_once("RSCDSUser.php");
+    include_once("DAViCalUser.php");
 
     $ldap_users = array_keys($ldap_users_info);
     // users only in ldap