diff --git a/addons/caldav/__init__.py b/addons/caldav/__init__.py
index 4a870385a68..0a0787feb89 100644
--- a/addons/caldav/__init__.py
+++ b/addons/caldav/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import caldav
+import calendar
 import caldav_fs
 import wizard
 
diff --git a/addons/caldav/caldav.py b/addons/caldav/calendar.py
similarity index 100%
rename from addons/caldav/caldav.py
rename to addons/caldav/calendar.py
diff --git a/addons/project_caldav/project_caldav.py b/addons/project_caldav/project_caldav.py
index 53bd5545159..9b95ec8e9b8 100644
--- a/addons/project_caldav/project_caldav.py
+++ b/addons/project_caldav/project_caldav.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 from osv import fields, osv
-from caldav import caldav
+from caldav import calendar
 
 class project_task(osv.osv):
     _name = "project.task"
@@ -52,7 +52,7 @@ class project_task(osv.osv):
                 hours = (val['planned_hours'].seconds / float(3600)) + \
                                         (val['planned_hours'].days * 24)
                 val['planned_hours'] = hours
-            exists, r_id = caldav.uid2openobjectid(cr, val['id'], self._name, val.get('recurrent_id'))
+            exists, r_id = calendar.uid2openobjectid(cr, val['id'], self._name, val.get('recurrent_id'))
             val.pop('id')
             if exists:
                 self.write(cr, uid, [exists], val)