diff --git a/htdocs/caldav.php b/htdocs/caldav.php
index f489a048..ccecb73f 100644
--- a/htdocs/caldav.php
+++ b/htdocs/caldav.php
@@ -10,8 +10,8 @@
 */
 require_once("../inc/always.php");
 dbg_error_log( "caldav", " User agent: %s", ((isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : "Unfortunately Mulberry does not send a 'User-agent' header with its requests :-(")) );
-require_once("BasicAuthSession.php");
-$session = new BasicAuthSession();
+require_once("HTTPAuthSession.php");
+$session = new HTTPAuthSession();
 dbg_log_array( "headers", '_SERVER', $_SERVER, true );
 
 require_once("CalDAVRequest.php");
diff --git a/htdocs/freebusy.php b/htdocs/freebusy.php
index d0fa1f23..eaa04739 100644
--- a/htdocs/freebusy.php
+++ b/htdocs/freebusy.php
@@ -1,8 +1,8 @@
 <?php
 require_once("../inc/always.php");
 dbg_error_log( "freebusy", " User agent: %s", ((isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : "Unfortunately Mulberry and Chandler don't send a 'User-agent' header with their requests :-(")) );
-require_once("BasicAuthSession.php");
-$session = new BasicAuthSession();
+require_once("HTTPAuthSession.php");
+$session = new HTTPAuthSession();
 dbg_log_array( "headers", '_SERVER', $_SERVER, true );
 
 require_once("CalDAVRequest.php");
diff --git a/inc/BasicAuthSession.php b/inc/HTTPAuthSession.php
similarity index 100%
rename from inc/BasicAuthSession.php
rename to inc/HTTPAuthSession.php
diff --git a/inc/always.php b/inc/always.php
index 5fb40e10..6b84ffe5 100644
--- a/inc/always.php
+++ b/inc/always.php
@@ -14,6 +14,7 @@ $c->sysabbr     = 'rscds';
 $c->admin_email = 'andrew@catalyst.net.nz';
 $c->system_name = "Really Simple CalDAV Store";
 $c->domain_name = $_SERVER['SERVER_NAME'];
+// $c->http_auth_mode = "Basic";
 $c->save_time_zone_defs = true;
 $c->collections_always_exist = true;
 $c->home_calendar_name = 'home';