diff --git a/auth_admin_passkey/README.rst b/auth_admin_passkey/README.rst
index 15be819dc..e49ec6635 100644
--- a/auth_admin_passkey/README.rst
+++ b/auth_admin_passkey/README.rst
@@ -4,7 +4,7 @@ Admin password become a passkey for all active logins
 Functionality :
 ---------------
     * Administrator has now the possibility to login in with any login;
-    * By default, OpenERP will send a mail to user and admin to indicate them;
+    * By default, Odoo will send a mail to user and admin to indicate them;
     * If a user and the admin have the same password, admin will be informed;
 
 Technical information :
diff --git a/auth_admin_passkey/data/ir_config_parameter.xml b/auth_admin_passkey/data/ir_config_parameter.xml
index 7c7f3625d..6b32557a3 100644
--- a/auth_admin_passkey/data/ir_config_parameter.xml
+++ b/auth_admin_passkey/data/ir_config_parameter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- ********************************************************************** -->
-<!--Admin Passkey module for OpenERP                                        -->
+<!--Admin Passkey module for Odoo                                        -->
 <!--Copyright (C) 2013-2014 GRAP (http://www.grap.coop)                     -->
 <!--@author Sylvain LE GAL (https://twitter.com/legalsylvain)               -->
 
diff --git a/auth_admin_passkey/i18n/auth_admin_passkey.pot b/auth_admin_passkey/i18n/auth_admin_passkey.pot
index 04b30e9a5..1cef0a00a 100644
--- a/auth_admin_passkey/i18n/auth_admin_passkey.pot
+++ b/auth_admin_passkey/i18n/auth_admin_passkey.pot
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-#    Admin Passkey module for OpenERP
+#    Admin Passkey module for Odoo
 #    Copyright (C) 2013-2014 GRAP (http://www.grap.coop)
 #    @author Sylvain LE GAL (https://twitter.com/legalsylvain)
 #
@@ -85,17 +85,17 @@ msgstr ""
 
 #. module: auth_admin_passkey
 #: help:base.config.settings,auth_admin_passkey_send_to_user:0
-msgid "When the administrator use his password to login in with a different account, OpenERP will send an email to the account user."
+msgid "When the administrator use his password to login in with a different account, Odoo will send an email to the account user."
 msgstr ""
 
 #. module: auth_admin_passkey
 #: help:base.config.settings,auth_admin_passkey_send_to_admin:0
-msgid "When the administrator use his password to login in with a different account, OpenERP will send an email to the admin user."
+msgid "When the administrator use his password to login in with a different account, Odoo will send an email to the admin user."
 msgstr ""
 
 #. module: auth_admin_passkey
 #: code:addons/auth_admin_passkey/model/res_users.py:64
 #, python-format
-msgid "[WARNING] OpenERP Security Risk"
+msgid "[WARNING] Odoo Security Risk"
 msgstr ""
 
diff --git a/auth_admin_passkey/i18n/de.po b/auth_admin_passkey/i18n/de.po
index 7b4731add..5396ea7f1 100644
--- a/auth_admin_passkey/i18n/de.po
+++ b/auth_admin_passkey/i18n/de.po
@@ -74,18 +74,18 @@ msgstr "Benutzer"
 #: help:base.config.settings,auth_admin_passkey_send_to_user:0
 msgid ""
 "When the administrator use his password to login in with a different "
-"account, OpenERP will send an email to the account user."
+"account, Odoo will send an email to the account user."
 msgstr "Wenn der Administrator sein Passwort verwendet, um sich mit anderem Konto anzumelden, sendet das System dem Kontoinhaber eine Email."
 
 #. module: auth_admin_passkey
 #: help:base.config.settings,auth_admin_passkey_send_to_admin:0
 msgid ""
 "When the administrator use his password to login in with a different "
-"account, OpenERP will send an email to the admin user."
+"account, Odoo will send an email to the admin user."
 msgstr "Wenn der Administrator sein Passwort verwendet, um sich als anderer Benutzer anzumelden, wird Oddoeine entsprechende Email an den Admin-Nutzer senden."
 
 #. module: auth_admin_passkey
 #: code:addons/auth_admin_passkey/models/res_users.py:67
 #, python-format
-msgid "[WARNING] OpenERP Security Risk"
+msgid "[WARNING] Odoo Security Risk"
 msgstr "[Warnung] Odoo Sicherheitsrisiko"
diff --git a/auth_admin_passkey/i18n/es.po b/auth_admin_passkey/i18n/es.po
index a5aec3564..313b5c154 100644
--- a/auth_admin_passkey/i18n/es.po
+++ b/auth_admin_passkey/i18n/es.po
@@ -76,18 +76,18 @@ msgstr "Usuarios"
 #: help:base.config.settings,auth_admin_passkey_send_to_user:0
 msgid ""
 "When the administrator use his password to login in with a different "
-"account, OpenERP will send an email to the account user."
+"account, Odoo will send an email to the account user."
 msgstr ""
 
 #. module: auth_admin_passkey
 #: help:base.config.settings,auth_admin_passkey_send_to_admin:0
 msgid ""
 "When the administrator use his password to login in with a different "
-"account, OpenERP will send an email to the admin user."
+"account, Odoo will send an email to the admin user."
 msgstr ""
 
 #. module: auth_admin_passkey
 #: code:addons/auth_admin_passkey/models/res_users.py:67
 #, python-format
-msgid "[WARNING] OpenERP Security Risk"
+msgid "[WARNING] Odoo Security Risk"
 msgstr ""
diff --git a/auth_admin_passkey/i18n/fi.po b/auth_admin_passkey/i18n/fi.po
index 3c6fb209b..3d8d95a0f 100644
--- a/auth_admin_passkey/i18n/fi.po
+++ b/auth_admin_passkey/i18n/fi.po
@@ -67,18 +67,18 @@ msgstr "Käyttäjät"
 #: help:base.config.settings,auth_admin_passkey_send_to_user:0
 msgid ""
 "When the administrator use his password to login in with a different "
-"account, OpenERP will send an email to the account user."
+"account, Odoo will send an email to the account user."
 msgstr ""
 
 #. module: auth_admin_passkey
 #: help:base.config.settings,auth_admin_passkey_send_to_admin:0
 msgid ""
 "When the administrator use his password to login in with a different "
-"account, OpenERP will send an email to the admin user."
+"account, Odoo will send an email to the admin user."
 msgstr ""
 
 #. module: auth_admin_passkey
 #: code:addons/auth_admin_passkey/model/res_users.py:86
 #, python-format
-msgid "[WARNING] OpenERP Security Risk"
+msgid "[WARNING] Odoo Security Risk"
 msgstr ""
diff --git a/auth_admin_passkey/i18n/fr.po b/auth_admin_passkey/i18n/fr.po
index 4ffa0a4b6..c5354f83d 100644
--- a/auth_admin_passkey/i18n/fr.po
+++ b/auth_admin_passkey/i18n/fr.po
@@ -74,18 +74,18 @@ msgstr "Utilisateurs"
 #: help:base.config.settings,auth_admin_passkey_send_to_user:0
 msgid ""
 "When the administrator use his password to login in with a different "
-"account, OpenERP will send an email to the account user."
-msgstr "Quand l'administrateur utilise son mot de passe pour s'authentifier avec un compte différent, OpenERP lui enverra un mail."
+"account, Odoo will send an email to the account user."
+msgstr "Quand l'administrateur utilise son mot de passe pour s'authentifier avec un compte différent, Odoo lui enverra un mail."
 
 #. module: auth_admin_passkey
 #: help:base.config.settings,auth_admin_passkey_send_to_admin:0
 msgid ""
 "When the administrator use his password to login in with a different "
-"account, OpenERP will send an email to the admin user."
-msgstr "Quand l'administrateur utilise son mot de passe pour s'authentifier avec un compte différent, OpenERP enverra un mail à l'utilisateur."
+"account, Odoo will send an email to the admin user."
+msgstr "Quand l'administrateur utilise son mot de passe pour s'authentifier avec un compte différent, Odoo enverra un mail à l'utilisateur."
 
 #. module: auth_admin_passkey
 #: code:addons/auth_admin_passkey/models/res_users.py:67
 #, python-format
-msgid "[WARNING] OpenERP Security Risk"
-msgstr "[WARNING] Faille de sécurité sur OpenERP"
+msgid "[WARNING] Odoo Security Risk"
+msgstr "[WARNING] Faille de sécurité sur Odoo"
diff --git a/auth_admin_passkey/i18n/fr_CH.po b/auth_admin_passkey/i18n/fr_CH.po
index 794ebf864..57e68351f 100644
--- a/auth_admin_passkey/i18n/fr_CH.po
+++ b/auth_admin_passkey/i18n/fr_CH.po
@@ -67,18 +67,18 @@ msgstr "Utilisateurs"
 #: help:base.config.settings,auth_admin_passkey_send_to_user:0
 msgid ""
 "When the administrator use his password to login in with a different "
-"account, OpenERP will send an email to the account user."
+"account, Odoo will send an email to the account user."
 msgstr ""
 
 #. module: auth_admin_passkey
 #: help:base.config.settings,auth_admin_passkey_send_to_admin:0
 msgid ""
 "When the administrator use his password to login in with a different "
-"account, OpenERP will send an email to the admin user."
+"account, Odoo will send an email to the admin user."
 msgstr ""
 
 #. module: auth_admin_passkey
 #: code:addons/auth_admin_passkey/models/res_users.py:67
 #, python-format
-msgid "[WARNING] OpenERP Security Risk"
+msgid "[WARNING] Odoo Security Risk"
 msgstr ""
diff --git a/auth_admin_passkey/i18n/it.po b/auth_admin_passkey/i18n/it.po
index 99ce54fbe..880e1e2db 100644
--- a/auth_admin_passkey/i18n/it.po
+++ b/auth_admin_passkey/i18n/it.po
@@ -68,18 +68,18 @@ msgstr "Utenti"
 #: help:base.config.settings,auth_admin_passkey_send_to_user:0
 msgid ""
 "When the administrator use his password to login in with a different "
-"account, OpenERP will send an email to the account user."
+"account, Odoo will send an email to the account user."
 msgstr ""
 
 #. module: auth_admin_passkey
 #: help:base.config.settings,auth_admin_passkey_send_to_admin:0
 msgid ""
 "When the administrator use his password to login in with a different "
-"account, OpenERP will send an email to the admin user."
+"account, Odoo will send an email to the admin user."
 msgstr ""
 
 #. module: auth_admin_passkey
 #: code:addons/auth_admin_passkey/model/res_users.py:86
 #, python-format
-msgid "[WARNING] OpenERP Security Risk"
+msgid "[WARNING] Odoo Security Risk"
 msgstr ""
diff --git a/auth_admin_passkey/i18n/pt_BR.po b/auth_admin_passkey/i18n/pt_BR.po
index ac24c3633..c38ebaead 100644
--- a/auth_admin_passkey/i18n/pt_BR.po
+++ b/auth_admin_passkey/i18n/pt_BR.po
@@ -76,18 +76,18 @@ msgstr "Usuários"
 #: help:base.config.settings,auth_admin_passkey_send_to_user:0
 msgid ""
 "When the administrator use his password to login in with a different "
-"account, OpenERP will send an email to the account user."
+"account, Odoo will send an email to the account user."
 msgstr "Quando o administrador usa sua senha para dar login com uma conta diferente, OPENERP irá enviar um email para a conta do usuário."
 
 #. module: auth_admin_passkey
 #: help:base.config.settings,auth_admin_passkey_send_to_admin:0
 msgid ""
 "When the administrator use his password to login in with a different "
-"account, OpenERP will send an email to the admin user."
+"account, Odoo will send an email to the admin user."
 msgstr "Quando o administrador usa sua senha para dar login com uma conta diferente, OPENERP irá enviar um email para a conta do administrador."
 
 #. module: auth_admin_passkey
 #: code:addons/auth_admin_passkey/models/res_users.py:67
 #, python-format
-msgid "[WARNING] OpenERP Security Risk"
-msgstr "[AVISO] OpenERP Risco de Segurança"
+msgid "[WARNING] Odoo Security Risk"
+msgstr "[AVISO] Odoo Risco de Segurança"
diff --git a/auth_admin_passkey/i18n/sl.po b/auth_admin_passkey/i18n/sl.po
index 6763bec43..906144241 100644
--- a/auth_admin_passkey/i18n/sl.po
+++ b/auth_admin_passkey/i18n/sl.po
@@ -76,18 +76,18 @@ msgstr "Uporabniki"
 #: help:base.config.settings,auth_admin_passkey_send_to_user:0
 msgid ""
 "When the administrator use his password to login in with a different "
-"account, OpenERP will send an email to the account user."
-msgstr "Ko administrator uporabi svoje geslo za prijavo v drug račun, bo OpenERP poslal e-pošto uporabniku računa."
+"account, Odoo will send an email to the account user."
+msgstr "Ko administrator uporabi svoje geslo za prijavo v drug račun, bo Odoo poslal e-pošto uporabniku računa."
 
 #. module: auth_admin_passkey
 #: help:base.config.settings,auth_admin_passkey_send_to_admin:0
 msgid ""
 "When the administrator use his password to login in with a different "
-"account, OpenERP will send an email to the admin user."
-msgstr "Ko administrator uporabi svoje geslo za prijavo v drug račun, bo OpenERP poslal e-pošto administratorju."
+"account, Odoo will send an email to the admin user."
+msgstr "Ko administrator uporabi svoje geslo za prijavo v drug račun, bo Odoo poslal e-pošto administratorju."
 
 #. module: auth_admin_passkey
 #: code:addons/auth_admin_passkey/models/res_users.py:67
 #, python-format
-msgid "[WARNING] OpenERP Security Risk"
-msgstr "[OPOZORILO] OpenERP varnostno tveganje"
+msgid "[WARNING] Odoo Security Risk"
+msgstr "[OPOZORILO] Odoo varnostno tveganje"
diff --git a/auth_admin_passkey/i18n/tr.po b/auth_admin_passkey/i18n/tr.po
index 9cf30e4ed..aa2cb2a96 100644
--- a/auth_admin_passkey/i18n/tr.po
+++ b/auth_admin_passkey/i18n/tr.po
@@ -75,18 +75,18 @@ msgstr "Kullanıcılar"
 #: help:base.config.settings,auth_admin_passkey_send_to_user:0
 msgid ""
 "When the administrator use his password to login in with a different "
-"account, OpenERP will send an email to the account user."
+"account, Odoo will send an email to the account user."
 msgstr "Yönetici farklı bir hesaba şifresiyle giriş yaparsa. Odoo hesap sahibine e-posta gönderecek."
 
 #. module: auth_admin_passkey
 #: help:base.config.settings,auth_admin_passkey_send_to_admin:0
 msgid ""
 "When the administrator use his password to login in with a different "
-"account, OpenERP will send an email to the admin user."
+"account, Odoo will send an email to the admin user."
 msgstr "Yönetici şifresiyle farklı bir kullanıcının hesabına giriş yaparsa, Odoo yöneticiye e-posta gönderir."
 
 #. module: auth_admin_passkey
 #: code:addons/auth_admin_passkey/models/res_users.py:67
 #, python-format
-msgid "[WARNING] OpenERP Security Risk"
+msgid "[WARNING] Odoo Security Risk"
 msgstr "[UYARI] Odoo Güvenlik Riski"
diff --git a/auth_admin_passkey/i18n/tr_TR.po b/auth_admin_passkey/i18n/tr_TR.po
index 941541286..0b2214a0f 100644
--- a/auth_admin_passkey/i18n/tr_TR.po
+++ b/auth_admin_passkey/i18n/tr_TR.po
@@ -67,18 +67,18 @@ msgstr "Kullanıcılar"
 #: help:base.config.settings,auth_admin_passkey_send_to_user:0
 msgid ""
 "When the administrator use his password to login in with a different "
-"account, OpenERP will send an email to the account user."
+"account, Odoo will send an email to the account user."
 msgstr ""
 
 #. module: auth_admin_passkey
 #: help:base.config.settings,auth_admin_passkey_send_to_admin:0
 msgid ""
 "When the administrator use his password to login in with a different "
-"account, OpenERP will send an email to the admin user."
+"account, Odoo will send an email to the admin user."
 msgstr ""
 
 #. module: auth_admin_passkey
 #: code:addons/auth_admin_passkey/models/res_users.py:67
 #, python-format
-msgid "[WARNING] OpenERP Security Risk"
+msgid "[WARNING] Odoo Security Risk"
 msgstr ""
diff --git a/auth_admin_passkey/models/__init__.py b/auth_admin_passkey/models/__init__.py
index 60c3790aa..364290a16 100644
--- a/auth_admin_passkey/models/__init__.py
+++ b/auth_admin_passkey/models/__init__.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    Admin Passkey module for OpenERP
+#    Admin Passkey module for Odoo
 #    Copyright (C) 2013-2014 GRAP (http://www.grap.coop)
 #    @author Sylvain LE GAL (https://twitter.com/legalsylvain)
 #
diff --git a/auth_admin_passkey/models/res_config.py b/auth_admin_passkey/models/res_config.py
index 62c34d287..f521bf7d9 100644
--- a/auth_admin_passkey/models/res_config.py
+++ b/auth_admin_passkey/models/res_config.py
@@ -43,11 +43,11 @@ class BaseConfigSettings(models.TransientModel):
     auth_admin_passkey_send_to_admin = fields.Boolean(
         string='Send email to admin user.',
         help="""When the administrator use his password to login in """
-             """with a different account, OpenERP will send an email """
+             """with a different account, Odoo will send an email """
              """to the admin user.""")
 
     auth_admin_passkey_send_to_user = fields.Boolean(
         string='Send email to user.',
         help="""When the administrator use his password to login in """
-             """with a different account, OpenERP will send an email """
+             """with a different account, Odoo will send an email """
              """to the account user.""")
diff --git a/auth_admin_passkey/models/res_users.py b/auth_admin_passkey/models/res_users.py
index e2495143e..44f84859f 100644
--- a/auth_admin_passkey/models/res_users.py
+++ b/auth_admin_passkey/models/res_users.py
@@ -64,7 +64,7 @@ class ResUsers(models.Model):
             mail = mail_obj.sudo().create({
                 'email_to': admin_user.email,
                 'subject': self._get_translation(
-                    admin_user.lang, _('[WARNING] OpenERP Security Risk')),
+                    admin_user.lang, _('[WARNING] Odoo Security Risk')),
                 'body_html': self._get_translation(
                     admin_user.lang, _(
                         """<pre>User with login '%s' has the same """
diff --git a/auth_admin_passkey/tests/__init__.py b/auth_admin_passkey/tests/__init__.py
index 8150785b1..48547d84d 100644
--- a/auth_admin_passkey/tests/__init__.py
+++ b/auth_admin_passkey/tests/__init__.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    Admin Passkey module for OpenERP
+#    Admin Passkey module for Odoo
 #    Copyright (C) 2013-2014 GRAP (http://www.grap.coop)
 #    @author Sylvain LE GAL (https://twitter.com/legalsylvain)
 #
diff --git a/auth_admin_passkey/views/res_config_view.xml b/auth_admin_passkey/views/res_config_view.xml
index 990729705..2fec2a6ff 100644
--- a/auth_admin_passkey/views/res_config_view.xml
+++ b/auth_admin_passkey/views/res_config_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- ********************************************************************** -->
-<!--Admin Passkey module for OpenERP                                        -->
+<!--Admin Passkey module for Odoo                                        -->
 <!--Copyright (C) 2013-2014 GRAP (http://www.grap.coop)                     -->
 <!--@author Sylvain LE GAL (https://twitter.com/legalsylvain)               -->