diff --git a/cmis/__openerp__.py b/cmis/__openerp__.py
index d0336961..80471990 100644
--- a/cmis/__openerp__.py
+++ b/cmis/__openerp__.py
@@ -24,9 +24,9 @@
     'name': 'CMIS',
     'version': '0.1',
     'category': 'Connector',
-    'summary': 'Cmis Connector',
+    'summary': 'CMIS Connector',
     'description': """
-Cmis Connector
+CMIS Connector
 ==============
 
 This module is the base for OpenERP modules implementing different integration scenario with a CMIS server.
@@ -39,7 +39,8 @@ Create a new CMIS backend with the host, login and password.
 
 Contributors
 ------------
-* El Hadji Dem (elhadji.dem@savoirfairelinux.com)
+* El Hadji Dem <elhadji.dem@savoirfairelinux.com>
+* Maxime Chambreuil <maxime.chambreuil@savoirfairelinux.com>
 """,
     'author': 'Savoir-faire Linux',
     'website': 'www.savoirfairelinux.com',
diff --git a/cmis/cmis_menu.xml b/cmis/cmis_menu.xml
index 9613d0d7..b198d68e 100644
--- a/cmis/cmis_menu.xml
+++ b/cmis/cmis_menu.xml
@@ -4,7 +4,7 @@
 
     <menuitem id="menu_cmis_root"
               parent="connector.menu_connector_root"
-              name="Cmis"
+              name="CMIS"
               sequence="10"
               groups="connector.group_connector_manager"/>
 
diff --git a/cmis/cmis_model.py b/cmis/cmis_model.py
index 7a4e8d78..457589f0 100644
--- a/cmis/cmis_model.py
+++ b/cmis/cmis_model.py
@@ -53,11 +53,11 @@ class cmis_backend(orm.Model):
         try:
             return client.defaultRepository
         except cmislib.exceptions.ObjectNotFoundException:
-            raise orm.except_orm(_('Cmis connection Error!'),
-                                 _("Check your cmis account configuration."))
+            raise orm.except_orm(_('CMIS connection Error!'),
+                                 _("Check your CMIS account configuration."))
         except cmislib.exceptions.PermissionDeniedException:
-            raise orm.except_orm(_('Cmis connection Error!'),
-                                 _("Check your cmis account configuration."))
+            raise orm.except_orm(_('CMIS connection Error!'),
+                                 _("Check your CMIS account configuration."))
 
     def check_directory_of_write(self, cr, uid, ids, context=None):
         if context is None:
@@ -71,7 +71,7 @@ class cmis_backend(orm.Model):
             context=context)[0]
         folder_path_write = cmis_backend_rec['initial_directory_write']
         # Testing the path
-        rs = repo.query("SELECT cmis:path FROM  cmis:folder")
+        rs = repo.query("SELECT cmis:path FROM cmis:folder")
         bool_path_write = self.check_existing_path(rs, folder_path_write)
         # Check if we can create a doc from OE to EDM
         # Document properties
@@ -105,7 +105,7 @@ class cmis_backend(orm.Model):
         repo = self._auth(cr, uid, context=context)
         folder_path_read = cmis_backend_rec['initial_directory_read']
         # Testing the path
-        rs = repo.query("SELECT cmis:path FROM  cmis:folder ")
+        rs = repo.query("SELECT cmis:path FROM cmis:folder ")
         bool_path_read = self.check_existing_path(rs, folder_path_read)
         file_name = 'testdoc'
         # Add testdoc in the context just to check if it is as test
@@ -141,10 +141,10 @@ class cmis_backend(orm.Model):
 
     def get_error_for_path(self, bool, path):
         if bool:
-            raise orm.except_orm(_('Cmis  Message'),
+            raise orm.except_orm(_('CMIS Message'),
                                  _("Path is correct for : " + path))
         else:
-            raise orm.except_orm(_('Cmis  Error!'),
+            raise orm.except_orm(_('CMIS Error!'),
                                  _("Error path for : " + path))
 
     _columns = {
@@ -173,5 +173,3 @@ class cmis_backend(orm.Model):
         'initial_directory_read': '/',
         'initial_directory_write': '/',
     }
-
-# vim:expandtab:smartindent:toabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/cmis/cmis_model_view.xml b/cmis/cmis_model_view.xml
index b2c334d8..e991da5c 100644
--- a/cmis/cmis_model_view.xml
+++ b/cmis/cmis_model_view.xml
@@ -12,7 +12,7 @@
               <h1>
                 <field name="name" class="oe_inline" />
               </h1>
-              <group name="cmis" string="Cmis Configuration">
+              <group name="cmis" string="CMIS Configuration">
                 <group colspan="4" col="4">
                   <field name="version" colspan="4"/>
                   <field name="location" placeholder="e.g. http://localhost:8081/alfresco/s/cmis"