diff --git a/addons/caldav/caldav_data.xml b/addons/caldav/caldav_data.xml
index a26c69d9c1e..ab6ef5fcc38 100644
--- a/addons/caldav/caldav_data.xml
+++ b/addons/caldav/caldav_data.xml
@@ -125,7 +125,7 @@
 			<field name="interval_type">minutes</field>
 			<field name="numbercall">-1</field>
 			<field eval="False" name="doall" />
-			<field eval="'crm.caldav.alarm'" name="model" />
+			<field eval="'calendar.alarm'" name="model" />
 			<field eval="'do_run_scheduler'" name="function" />
 			<field eval="'(False,)'" name="args" />
 		</record>
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 98a14ebc22e..6335e4ce466 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -4,7 +4,7 @@
     
 <!--    Attendee invite wizard-->
 
-		<record id="view_crm_invite_attendee_wizard" model="ir.ui.view">
+		<record id="view_calendar_invite_attendee_wizard" model="ir.ui.view">
             <field name="name">Invite Attendees</field>
             <field name="model">caldav.invite.attendee</field>
             <field name="type">form</field>
@@ -24,7 +24,7 @@
             </field>
         </record>
 
-        <record id="action_view_crm_invite_attendee_wizard" model="ir.actions.act_window">
+        <record id="action_view_calendar_invite_attendee_wizard" model="ir.actions.act_window">
             <field name="name">Invite Attendees</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">caldav.invite.attendee</field>
@@ -34,8 +34,8 @@
         </record>
 
         <record id="caldav_attendee_form_view" model="ir.ui.view">
-            <field name="name">caldav.attendee.form</field>
-            <field name="model">crm.caldav.attendee</field>
+            <field name="name">calendar.attendee.form</field>
+            <field name="model">calendar.attendee</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
             	<form string="Atendee details">
@@ -74,18 +74,18 @@
 	                        	states="NEEDS-ACTION" type="object"
 	                        	icon="gtk-cancel" />
 	                        <button
-	                        	name="%(caldav.action_view_crm_invite_attendee_wizard)d"
+	                        	name="%(caldav.action_view_calendar_invite_attendee_wizard)d"
 	                        	states="NEEDS-ACTION" string="Delegate"
 	                        	type="action" icon="gtk-sort-descending"
-	                        	context="{'model' : 'crm.caldav.attendee'}" />
+	                        	context="{'model' : 'calendar.attendee'}" />
             		</group>
             	</form>
             </field>
         </record>
 
 	 <record id="caldav_attendee_tree_view" model="ir.ui.view">
-            <field name="name">caldav.attendee.tree</field>
-            <field name="model">crm.caldav.attendee</field>
+            <field name="name">calendar.attendee.tree</field>
+            <field name="model">calendar.attendee</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
             	<tree string="Atendee details">
@@ -100,7 +100,7 @@
 	 <record id="action_view_attendee_form" model="ir.actions.act_window">
 	 	<field name="name">My Invitations</field>
 	 	<field name="type">ir.actions.act_window</field>
-	 	<field name="res_model">crm.caldav.attendee</field>
+	 	<field name="res_model">calendar.attendee</field>
 	 	<field name="view_type">form</field>
 	 	<field name="view_mode">tree,form</field>
 	 	<field name="view_id" ref="caldav_attendee_tree_view" />
@@ -124,8 +124,8 @@
 	 
 	 
 	 <record id="caldav_attendee_tree_model" model="ir.ui.view">
-            <field name="name">caldav.attendee.tree1</field>
-            <field name="model">crm.caldav.attendee</field>
+            <field name="name">calendar.attendee.tree1</field>
+            <field name="model">calendar.attendee</field>
             <field name="type">tree</field>
             <field name="priority">10</field>
             <field name="arch" type="xml">
@@ -140,8 +140,8 @@
         </record>
         
         <record id="caldav_attendee_form_model" model="ir.ui.view">
-            <field name="name">caldav.attendee.form1</field>
-            <field name="model">crm.caldav.attendee</field>
+            <field name="name">calendar.attendee.form1</field>
+            <field name="model">calendar.attendee</field>
             <field name="type">form</field>
             <field name="priority">10</field>
             <field name="arch" type="xml">
diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py
index d2a6ae1ba42..4a0e84268dd 100644
--- a/addons/caldav/calendar.py
+++ b/addons/caldav/calendar.py
@@ -127,10 +127,10 @@ class CalDAV(object):
                         uidval = common.openobjectid2uid(cr, data[map_field], model)
                         vevent.add('uid').value = uidval
                     elif field == 'attendee' and data[map_field]:
-                        attendee_obj = self.pool.get('caldav.attendee')
+                        attendee_obj = self.pool.get('basic.calendar.attendee')
                         vevent = attendee_obj.export_ical(cr, uid, data[map_field], vevent, context=context)
                     elif field == 'valarm' and data[map_field]:
-                        alarm_obj = self.pool.get('caldav.alarm')
+                        alarm_obj = self.pool.get('basic.calendar.alarm')
                         vevent = alarm_obj.export_ical(cr, uid, data[map_field][0], vevent, context=context)
                     elif data[map_field]:
                         if map_type == "text":
@@ -155,12 +155,12 @@ class CalDAV(object):
         for child in parsedCal.getChildren():
             for cal_data in child.getChildren():
                 if cal_data.name.lower() == 'attendee':
-                    attendee = self.pool.get('caldav.attendee')
+                    attendee = self.pool.get('basic.calendar.attendee')
                     att_data.append(attendee.import_ical(cr, uid, cal_data))
                     self.ical_set(cal_data.name.lower(), att_data, 'value')
                     continue
                 if cal_data.name.lower() == 'valarm':
-                    alarm = self.pool.get('caldav.alarm')
+                    alarm = self.pool.get('basic.calendar.alarm')
                     vals = alarm.import_ical(cr, uid, cal_data)
                     self.ical_set(cal_data.name.lower(), vals, 'value')
                     continue
@@ -177,7 +177,7 @@ class CalDAV(object):
 
 
 class Calendar(CalDAV, osv.osv_memory):
-    _name = 'caldav.calendar'
+    _name = 'basic.calendar'
     __attribute__ = {
         'prodid': None, # Use: R-1, Type: TEXT, Specifies the identifier for the product that created the iCalendar object.
         'version': None, # Use: R-1, Type: TEXT, Specifies the identifier corresponding to the highest version number
@@ -196,7 +196,7 @@ class Calendar(CalDAV, osv.osv_memory):
 Calendar()
 
 class Event(CalDAV, osv.osv_memory):
-    _name = 'caldav.event'
+    _name = 'basic.calendar.event'
     __attribute__ = {
         'class': None, # Use: O-1, Type: TEXT, Defines the access classification for a calendar  component like "PUBLIC" / "PRIVATE" / "CONFIDENTIAL"
         'created': None, # Use: O-1, Type: DATE-TIME, Specifies the date and time that the calendar information  was created by the calendar user agent in the calendar store.
@@ -238,7 +238,7 @@ class Event(CalDAV, osv.osv_memory):
 Event()
 
 class ToDo(CalDAV, osv.osv_memory):
-    _name = 'caldav.todo'
+    _name = 'basic.calendar.todo'
 
     __attribute__ = {
                 'class': None, 
@@ -314,7 +314,7 @@ class Timezone(CalDAV):
 
 
 class Alarm(CalDAV, osv.osv_memory):
-    _name = 'caldav.alarm'
+    _name = 'basic.calendar.alarm'
     __attribute__ = {
     'action': None, # Use: R-1, Type: Text, defines the action to be invoked when an alarm is triggered LIKE "AUDIO" / "DISPLAY" / "EMAIL" / "PROCEDURE"
     'description': None, #      Type: Text, Provides a more complete description of the calendar component, than that provided by the "SUMMARY" property. Use:- R-1 for DISPLAY,Use:- R-1 for EMAIL,Use:- R-1 for PROCEDURE
@@ -329,7 +329,7 @@ class Alarm(CalDAV, osv.osv_memory):
 
     def export_ical(self, cr, uid, alarm_id, vevent, context={}):
         valarm = vevent.add('valarm')
-        alarm_object = self.pool.get('crm.caldav.alarm')
+        alarm_object = self.pool.get('calendar.alarm')
         alarm_data = alarm_object.read(cr, uid, alarm_id, [])
 
         # Compute trigger data
@@ -386,7 +386,7 @@ class Alarm(CalDAV, osv.osv_memory):
 Alarm()
 
 class Attendee(CalDAV, osv.osv_memory):
-    _name = 'caldav.attendee'
+    _name = 'basic.calendar.attendee'
     __attribute__ = {
     'cutype': None, # Use: 0-1    Specify the type of calendar user specified by the property like "INDIVIDUAL"/"GROUP"/"RESOURCE"/"ROOM"/"UNKNOWN".
     'member': None, # Use: 0-1    Specify the group or list membership of the calendar user specified by the property.
@@ -413,7 +413,7 @@ class Attendee(CalDAV, osv.osv_memory):
         return vals
 
     def export_ical(self, cr, uid, attendee_id, vevent, context={}):
-        attendee_object = self.pool.get('crm.caldav.attendee')
+        attendee_object = self.pool.get('calendar.attendee')
         for attendee in attendee_object.read(cr, uid, attendee_id, []):
             attendee_add = vevent.add('attendee')
             for a_key, a_val in attendee_object.__attribute__.items():
diff --git a/addons/caldav/common.py b/addons/caldav/common.py
index 19317c46c0a..e655b5c3fb2 100644
--- a/addons/caldav/common.py
+++ b/addons/caldav/common.py
@@ -69,8 +69,8 @@ def openobjectid2uid(cr, uidval, oomodel):
     value = 'OpenObject-%s_%s@%s' % (oomodel, uidval, cr.dbname)
     return value
 
-class crm_caldav_attendee(osv.osv):
-    _name = 'crm.caldav.attendee'
+class calendar_attendee(osv.osv):
+    _name = 'calendar.attendee'
     _description = 'Attendee information'
     _rec_name = 'cutype'
 
@@ -180,7 +180,7 @@ was delegated to"),
     def do_decline(self, cr, uid, ids, context=None, *args):
         self.write(cr, uid, ids, {'state': 'DECLINED'}, context)
 
-crm_caldav_attendee()
+calendar_attendee()
 
 class res_alarm(osv.osv):
     _name = 'res.alarm'
@@ -211,8 +211,8 @@ are both optional, but if one occurs, so MUST the other"""),
 
 res_alarm()
 
-class crm_caldav_alarm(osv.osv):
-    _name = 'crm.caldav.alarm'
+class calendar_alarm(osv.osv):
+    _name = 'calendar.alarm'
     _description = 'Event alarm information'
 
     __attribute__ = {
@@ -236,7 +236,7 @@ or contains the text to be used for DISPLAY"""),
                     ('PROCEDURE', 'PROCEDURE'), ('EMAIL', 'EMAIL') ], 'Action', \
                     required=True, help="Defines the action to be invoked when an alarm is triggered"), 
             'description': fields.text('Description', help='Provides a more complete description of the calendar component, than that provided by the "SUMMARY" property'), 
-            'attendee_ids': fields.many2many('crm.caldav.attendee', 'alarm_attendee_rel', \
+            'attendee_ids': fields.many2many('calendar.attendee', 'alarm_attendee_rel', \
                                           'alarm_id', 'attendee_id', 'Attendees', readonly=True), 
             'trigger_occurs': fields.selection([('BEFORE', 'BEFORE'), ('AFTER', 'AFTER')], \
                                         'Trigger time', required=True), 
@@ -285,7 +285,7 @@ are both optional, but if one occurs, so MUST the other"""),
                 delta = datetime.timedelta(minutes=vals['trigger_duration'])
             trigger_date =  dtstart + (vals['trigger_occurs'] == 'AFTER' and delta or -delta)
             vals['trigger_date'] = trigger_date
-        res = super(crm_caldav_alarm, self).create(cr, uid, vals, context)        
+        res = super(calendar_alarm, self).create(cr, uid, vals, context)        
         return res
 
     def do_run_scheduler(self, cr, uid, automatic=False, use_new_cursor=False, \
@@ -294,11 +294,11 @@ are both optional, but if one occurs, so MUST the other"""),
             context = {}
         current_datetime = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
         cr.execute("select alarm.id as id \
-                    from crm_caldav_alarm alarm \
+                    from calendar_alarm alarm \
                     where alarm.state = %s and alarm.trigger_date <= %s", ('run', current_datetime))
         res = cr.dictfetchall()  
         alarm_ids = map(lambda x: x['id'], res)      
-        attendee_obj = self.pool.get('crm.caldav.attendee')
+        attendee_obj = self.pool.get('calendar.attendee')
         request_obj = self.pool.get('res.request')
         mail_to = []
         for alarm in self.browse(cr, uid, alarm_ids):            
@@ -344,7 +344,7 @@ are both optional, but if one occurs, so MUST the other"""),
             self.write(cr, uid, [alarm.id], {'state':'done'})
         return True
 
-crm_caldav_alarm()
+calendar_alarm()
 
 class ir_attachment(osv.osv):
     _name = 'ir.attachment'
@@ -556,7 +556,7 @@ favor of a reply is requested"),
         obj = self.pool.get(model)
         res_obj = obj.browse(cr, uid, context['active_id'])
         user_obj = self.pool.get('res.users')
-        attendee_obj = self.pool.get('crm.caldav.attendee')
+        attendee_obj = self.pool.get('calendar.attendee')
         for user_id in datas.get('users', []):
             user = user_obj.browse(cr, uid, user_id)
             if not user.address_id.email:
diff --git a/addons/caldav/security/ir.model.access.csv b/addons/caldav/security/ir.model.access.csv
index 8c38869bd6b..00855f665e9 100644
--- a/addons/caldav/security/ir.model.access.csv
+++ b/addons/caldav/security/ir.model.access.csv
@@ -1,6 +1,6 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"caldav_calendar_all","caldav.calendar","model_caldav_calendar",,1,1,1,1
-"caldav_event_all","caldav.event","model_caldav_event",,1,1,1,1
-"caldav_attendee_all","caldav.attendee","model_caldav_attendee",,1,1,1,1
-"access_crm_caldav_attendee","crm.caldav.attendee","model_crm_caldav_attendee",,1,1,1,1
-"access_crm_caldav_alarm","crm.caldav.alarm","model_crm_caldav_alarm",,1,1,1,1
+"basic_calendar_all","basic.calendar","model_basic_calendar",,1,1,1,1
+"basic_calendar_event_all","basic.calendar.event","model_basic_calendar_event",,1,1,1,1
+"basic_calendar_attendee_all","basic.calendar.attendee","model_basic_calendar_attendee",,1,1,1,1
+"access_basic_calendar_attendee","calendar.attendee","model_basic_calendar_attendee",,1,1,1,1
+"access_basic_calendar_alarm","calendar.alarm","model_basic_calendar_alarm",,1,1,1,1
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 0f6c84614cc..31a639c6be4 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -52,7 +52,7 @@ class crm_meeting(osv.osv):
         'url': {'field': 'caldav_url', 'type': 'text'}, 
         'recurid': None, 
 #        'attach': {'field': 'attachment_ids', 'sub-field': 'datas', 'type': 'list'},
-        'attendee': {'field': 'attendee_ids', 'type': 'many2many', 'object': 'crm.caldav.attendee'}, 
+        'attendee': {'field': 'attendee_ids', 'type': 'many2many', 'object': 'calendar.attendee'}, 
 #        'categories': {'field': 'categ_id', 'sub-field': 'name'},
 #        'categories': {'field':None , 'sub-field': 'name', 'type': 'text'},
         'comment': None, 
@@ -67,7 +67,7 @@ class crm_meeting(osv.osv):
         'x-openobject-model': {'value': _name, 'type': 'text'}, 
 #        'duration': {'field': 'duration'},
         'dtend': {'field': 'date_closed', 'type': 'datetime'}, 
-        'valarm': {'field': 'caldav_alarm_id', 'type': 'many2one', 'object': 'crm.caldav.alarm'}, 
+        'valarm': {'field': 'caldav_alarm_id', 'type': 'many2one', 'object': 'calendar.alarm'}, 
     }
     
     def _get_attendee_data(self, cr, uid, ids, name, arg, context):
@@ -91,7 +91,7 @@ class crm_meeting(osv.osv):
             for attendee in eventdata.attendee_ids[len(value.split(',')):]:
                 self.write(cr, uid, id, {'attendee_ids': [(3, attendee.id)]})
             return 
-        attendee_obj = self.pool.get('crm.caldav.attendee') 
+        attendee_obj = self.pool.get('calendar.attendee') 
         for val in value.split(',')[att_len:]:
             attendee_id = attendee_obj.create(cr, uid, {'cn': val.strip()})
             self.write(cr, uid, id, {'attendee_ids': [(4, attendee_id)]})
@@ -118,8 +118,8 @@ class crm_meeting(osv.osv):
         'attendees': fields.function(_get_attendee_data, method=True,\
                 fnct_inv=_set_attendee_data, string='Attendees', type="text"), 
         'alarm_id': fields.many2one('res.alarm', 'Alarm'), 
-        'caldav_alarm_id': fields.many2one('crm.caldav.alarm', 'Alarm'), 
-        'attendee_ids': fields.many2many('crm.caldav.attendee', 'crm_attendee_rel', 'case_id', \
+        'caldav_alarm_id': fields.many2one('calendar.alarm', 'Alarm'), 
+        'attendee_ids': fields.many2many('calendar.attendee', 'crm_attendee_rel', 'case_id', \
                                       'attendee_id', 'Attendees'), 
     }
 
@@ -128,7 +128,7 @@ class crm_meeting(osv.osv):
     }
 
     def do_alarm_create(self, cr, uid, ids, context={}):
-        alarm_obj = self.pool.get('crm.caldav.alarm')
+        alarm_obj = self.pool.get('calendar.alarm')
         model_obj = self.pool.get('ir.model')
         model_id = model_obj.search(cr, uid, [('model','=',self._name)])[0]
        
@@ -159,7 +159,7 @@ class crm_meeting(osv.osv):
         return True              
     
     def do_alarm_unlink(self, cr, uid, ids, context={}):
-        alarm_obj = self.pool.get('crm.caldav.alarm')
+        alarm_obj = self.pool.get('calendar.alarm')
         model_obj = self.pool.get('ir.model')
         model_id = model_obj.search(cr, uid, [('model','=',self._name)])[0]
         for meeting in self.browse(cr, uid, ids):
@@ -187,15 +187,15 @@ class crm_meeting(osv.osv):
 
     def export_cal(self, cr, uid, ids, context={}):
         crm_data = self.read(cr, uid, ids, [], context ={'read':True})
-        event_obj = self.pool.get('caldav.event')
+        event_obj = self.pool.get('basic.calendar.event')
         event_obj.__attribute__.update(self.__attribute__)
 
-        attendee_obj = self.pool.get('caldav.attendee')
-        crm_attendee = self.pool.get('crm.caldav.attendee')
+        attendee_obj = self.pool.get('basic.calendar.attendee')
+        crm_attendee = self.pool.get('calendar.attendee')
         attendee_obj.__attribute__.update(crm_attendee.__attribute__)
 
-        alarm_obj = self.pool.get('caldav.alarm')
-        crm_alarm = self.pool.get('crm.caldav.alarm')
+        alarm_obj = self.pool.get('basic.calendar.alarm')
+        crm_alarm = self.pool.get('calendar.alarm')
         alarm_obj.__attribute__.update(crm_alarm.__attribute__)
 
         ical = event_obj.export_ical(cr, uid, crm_data, {'model': 'crm.meeting'})
@@ -205,15 +205,15 @@ class crm_meeting(osv.osv):
 
     def import_cal(self, cr, uid, data, context={}):
         file_content = base64.decodestring(data)
-        event_obj = self.pool.get('caldav.event')
+        event_obj = self.pool.get('basic.calendar.event')
         event_obj.__attribute__.update(self.__attribute__)
 
-        attendee_obj = self.pool.get('caldav.attendee')
-        crm_attendee = self.pool.get('crm.caldav.attendee')
+        attendee_obj = self.pool.get('basic.calendar.attendee')
+        crm_attendee = self.pool.get('calendar.attendee')
         attendee_obj.__attribute__.update(crm_attendee.__attribute__)
 
-        alarm_obj = self.pool.get('caldav.alarm')
-        crm_alarm = self.pool.get('crm.caldav.alarm')
+        alarm_obj = self.pool.get('basic.calendar.alarm')
+        crm_alarm = self.pool.get('calendar.alarm')
         alarm_obj.__attribute__.update(crm_alarm.__attribute__)
         vals = event_obj.import_ical(cr, uid, file_content)
         for val in vals:            
@@ -251,7 +251,7 @@ class crm_meeting(osv.osv):
                     count += 1
                 else:
                     exdate = data['exdate'] and data['exdate'].split(',') or []
-                    event_obj = self.pool.get('caldav.event')
+                    event_obj = self.pool.get('basic.calendar.event')
                     rrule_str = data['rrule']
                     new_rrule_str = []
                     rrule_until_date = False
@@ -539,7 +539,7 @@ class res_users(osv.osv):
             
 #        check for attendee added already
             cr.execute("""select att.user_id , c.id
-                from crm_caldav_attendee att 
+                from calendar_attendee att 
                 inner join crm_attendee_rel rel on (rel.attendee_id=att.id) 
                 join crm_meeting m on (rel.case_id=m.id)
                 join crm_case c on (m.inherit_case_id = c.id )
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 093c69bf3a8..18272464cec 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -108,7 +108,7 @@
             			<separator string="Attendees" colspan="4"/>
             			<field name="attendee_ids" colspan="4" nolabel="1"/>    
             			<button string="Invite Attendees"
-            				name="%(caldav.action_view_crm_invite_attendee_wizard)d"
+            				name="%(caldav.action_view_calendar_invite_attendee_wizard)d"
             				icon="terp-partner" type="action"
             				context="{'model' : 'crm.meeting'}" />
                     </page>