diff --git a/htdocs/collection.php b/htdocs/collection.php
index f24e3053..cc4a0e12 100644
--- a/htdocs/collection.php
+++ b/htdocs/collection.php
@@ -1,6 +1,6 @@
 <?php
 require_once("../inc/always.php");
-require_once("RSCDSSession.php");
+require_once("DAViCalSession.php");
 $session->LoginRequired();
 
 require_once("interactive-page.php");
@@ -50,4 +50,4 @@ include("page-header.php");
 echo $browser->Render();
 
 include("page-footer.php");
-?>
\ No newline at end of file
+?>
diff --git a/htdocs/help.php b/htdocs/help.php
index c7aa4d52..61705b1f 100644
--- a/htdocs/help.php
+++ b/htdocs/help.php
@@ -1,6 +1,6 @@
 <?php
 require_once("../inc/always.php");
-require_once("RSCDSSession.php");
+require_once("DAViCalSession.php");
 $session->LoginRequired();
 
 require_once("interactive-page.php");
@@ -17,4 +17,4 @@ post your problem in the DAViCal forums on Sourceforge itself.</p>
 
 include("page-footer.php");
 
-?>
\ No newline at end of file
+?>
diff --git a/htdocs/index.php b/htdocs/index.php
index cab00912..9d7a3e6f 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -8,7 +8,7 @@ if ( $_SERVER['REQUEST_METHOD'] != "GET" && $_SERVER['REQUEST_METHOD'] != "POST"
 }
 
 include("../inc/always.php");
-include("RSCDSSession.php");
+include("DAViCalSession.php");
 $session->LoginRequired();
 
 include("interactive-page.php");
diff --git a/htdocs/relationship_types.php b/htdocs/relationship_types.php
index 31f4fd44..254fa521 100644
--- a/htdocs/relationship_types.php
+++ b/htdocs/relationship_types.php
@@ -1,6 +1,6 @@
 <?php
 require_once("../inc/always.php");
-require_once("RSCDSSession.php");
+require_once("DAViCalSession.php");
 $session->LoginRequired();
 
 require_once("interactive-page.php");
diff --git a/htdocs/roles.php b/htdocs/roles.php
index 628a7104..d8d161e1 100644
--- a/htdocs/roles.php
+++ b/htdocs/roles.php
@@ -1,6 +1,6 @@
 <?php
 require_once("../inc/always.php");
-require_once("RSCDSSession.php");
+require_once("DAViCalSession.php");
 $session->LoginRequired();
 
 require_once("interactive-page.php");
@@ -37,4 +37,4 @@ include("page-header.php");
 
 echo $browser->Render();
 include("page-footer.php");
-?>
\ No newline at end of file
+?>
diff --git a/htdocs/tools.php b/htdocs/tools.php
index c3ed7ebd..d2d05c97 100644
--- a/htdocs/tools.php
+++ b/htdocs/tools.php
@@ -3,14 +3,14 @@
 * Tools for manipulating calendars
 *
 * @package   davical
-* @subpackage   RSCDSSession
+* @subpackage   DAViCalSession
 * @author    Maxime Delorme <mdelorme@tennaxia.com>
 * @copyright Maxime Delorme
 * @license   http://gnu.org/copyleft/gpl.html GNU GPL v2
 */
 
 require_once("../inc/always.php");
-require_once("RSCDSSession.php");
+require_once("DAViCalSession.php");
 $session->LoginRequired();
 
 require_once("DataEntry.php");
diff --git a/htdocs/users.php b/htdocs/users.php
index 5f9a82dc..1e0599bb 100644
--- a/htdocs/users.php
+++ b/htdocs/users.php
@@ -9,7 +9,7 @@
 * @license   http://gnu.org/copyleft/gpl.html GNU GPL v2
 */
 require_once("../inc/always.php");
-require_once("RSCDSSession.php");
+require_once("DAViCalSession.php");
 $session->LoginRequired();
 
 require_once("interactive-page.php");
diff --git a/htdocs/usr.php b/htdocs/usr.php
index 9ec3b5d4..3db41adf 100644
--- a/htdocs/usr.php
+++ b/htdocs/usr.php
@@ -1,6 +1,6 @@
 <?php
   require_once("../inc/always.php");
-  require_once("RSCDSSession.php");
+  require_once("DAViCalSession.php");
 
   // This page requires login.
   $session->LoginRequired();
diff --git a/inc/RSCDSSession.php b/inc/DAViCalSession.php
similarity index 90%
rename from inc/RSCDSSession.php
rename to inc/DAViCalSession.php
index a3c33883..bda8ed47 100644
--- a/inc/RSCDSSession.php
+++ b/inc/DAViCalSession.php
@@ -3,7 +3,7 @@
 * DAViCal extensions to AWL Session handling
 *
 * @package   davical
-* @subpackage   RSCDSSession
+* @subpackage   DAViCalSession
 * @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
@@ -48,18 +48,18 @@ require_once('Session.php');
 *
 * @package   davical
 */
-class RSCDSSession extends Session
+class DAViCalSession extends Session
 {
 
   /**
-  * Create a new RSCDSSession object.
+  * Create a new DAViCalSession object.
   *
   * We create a Session and extend it with some additional useful RSCDS
   * related information.
   *
   * @param string $sid A session identifier.
   */
-  function RSCDSSession( $sid="" ) {
+  function DAViCalSession( $sid="" ) {
     $this->Session($sid);
   }
 
@@ -85,7 +85,7 @@ class RSCDSSession extends Session
     $this->roles = array();
     $sql = 'SELECT role_name FROM roles JOIN role_member ON roles.role_no=role_member.role_no WHERE user_no = '.$this->user_no.';';
     $qry = new PgQuery( $sql );
-    if ( $qry->Exec('RSCDSSession') && $qry->rows > 0 ) {
+    if ( $qry->Exec('DAViCalSession') && $qry->rows > 0 ) {
       while( $role = $qry->Fetch() ) {
         $this->roles[$role->role_name] = 1;
       }
@@ -100,10 +100,10 @@ class RSCDSSession extends Session
     $this->relationships = array();
     $sql = 'SELECT relationship.rt_id, rt_name, confers FROM relationship JOIN relationship_type USING (rt_id) WHERE from_user = '.$this->user_no;
     $qry = new PgQuery( $sql );
-    if ( $qry->Exec('RSCDSSession') && $qry->rows > 0 ) {
+    if ( $qry->Exec('DAViCalSession') && $qry->rows > 0 ) {
       while( $relationship = $qry->Fetch() ) {
         $this->relationships[$relationship->rt_id] = $relationship;
-        dbg_error_log( "RSCDSSession", "Relationships: %d - %s - %d - %s - %s -", $relationship->rt_id, $relationship->rt_name, $relationship->confers );
+        dbg_error_log( "DAViCalSession", "Relationships: %d - %s - %d - %s - %s -", $relationship->rt_id, $relationship->rt_name, $relationship->confers );
       }
     }
   }
@@ -155,7 +155,7 @@ class RSCDSSession extends Session
   }
 }
 
-$session = new RSCDSSession();
+$session = new DAViCalSession();
 $session->_CheckLogin();
 
 ?>