diff --git a/mrp_bom_note/README.rst b/mrp_bom_note/README.rst
index 3b465ed1c..0fcfd3a88 100644
--- a/mrp_bom_note/README.rst
+++ b/mrp_bom_note/README.rst
@@ -32,7 +32,7 @@ Contributors
 ------------
 
 * Oihane Crucelaegui <oihanecrucelaegi@avanzosc.es>
-* Pedro M. Baeza <pedro.baeza@serviciosbaeza.com>
+* Pedro M. Baeza <pedro.baeza@tecnativa.com>
 * Ana Juaristi <anajuaristi@avanzosc.es>
 
 Maintainer
diff --git a/mrp_bom_note/__openerp__.py b/mrp_bom_note/__openerp__.py
index 7b771120f..9b0df8c17 100644
--- a/mrp_bom_note/__openerp__.py
+++ b/mrp_bom_note/__openerp__.py
@@ -5,14 +5,13 @@
 {
     "name": "Notes in Bill of Materials",
     "version": "9.0.1.0.0",
-    "author": "OdooMRP team,"
-              "AvanzOSC,"
-              "Serv. Tecnol. Avanzados - Pedro M. Baeza, "
+    "author": "AvanzOSC,"
+              "Tecnativa, "
               "Odoo Community Association (OCA)",
     "website": "http://www.odoomrp.com",
     "contributors": [
         "Oihane Crucelaegui <oihanecrucelaegi@avanzosc.es>",
-        "Pedro M. Baeza <pedro.baeza@serviciosbaeza.com>",
+        "Pedro M. Baeza <pedro.baeza@tecnativa.com>",
         "Ana Juaristi <anajuaristi@avanzosc.es>",
     ],
     "category": "Tools",
diff --git a/mrp_production_note/README.rst b/mrp_production_note/README.rst
index 586378ba4..f1e9acc33 100644
--- a/mrp_production_note/README.rst
+++ b/mrp_production_note/README.rst
@@ -32,7 +32,7 @@ Contributors
 ------------
 
 * Oihane Crucelaegui <oihanecrucelaegi@avanzosc.es>
-* Pedro M. Baeza <pedro.baeza@serviciosbaeza.com>
+* Pedro M. Baeza <pedro.baeza@tecnativa.com>
 * Ana Juaristi <anajuaristi@avanzosc.es>
 
 Maintainer
diff --git a/mrp_production_note/__openerp__.py b/mrp_production_note/__openerp__.py
index cbc56e16d..c2d987d03 100644
--- a/mrp_production_note/__openerp__.py
+++ b/mrp_production_note/__openerp__.py
@@ -7,9 +7,8 @@
     "version": "9.0.1.0.0",
     "category": "Tools",
     "license": "AGPL-3",
-    "author": "OdooMRP team, "
-              "AvanzOSC, "
-              "Serv. Tecnol. Avanzados - Pedro M. Baeza, "
+    "author": "AvanzOSC, "
+              "Tecnativa, "
               "Odoo Community Association (OCA)",
     "website": "http://www.odoomrp.com",
     "contributors": [
diff --git a/mrp_production_partner_note/README.rst b/mrp_production_partner_note/README.rst
index 66be923d6..2a2eb8a12 100644
--- a/mrp_production_partner_note/README.rst
+++ b/mrp_production_partner_note/README.rst
@@ -35,7 +35,7 @@ Contributors
 ------------
 
 * Oihane Crucelaegui <oihanecrucelaegi@avanzosc.es>
-* Pedro M. Baeza <pedro.baeza@serviciosbaeza.com>
+* Pedro M. Baeza <pedro.baeza@tecnativa.com>
 * Ana Juaristi <anajuaristi@avanzosc.es>
 
 Maintainer
diff --git a/mrp_production_partner_note/__openerp__.py b/mrp_production_partner_note/__openerp__.py
index edae41847..d8412f2d6 100644
--- a/mrp_production_partner_note/__openerp__.py
+++ b/mrp_production_partner_note/__openerp__.py
@@ -6,14 +6,13 @@
     "name": "MRP - Partner production notes",
     "version": "9.0.1.0.0",
     "license": "AGPL-3",
-    "author": "OdooMRP team,"
-              "AvanzOSC,"
-              "Serv. Tecnol. Avanzados - Pedro M. Baeza, "
+    "author": "AvanzOSC,"
+              "Tecnativa, "
               "Odoo Community Association (OCA)",
     "website": "http://www.odoomrp.com",
     "contributors": [
         "Oihane Crucelaegui <oihanecrucelaegi@avanzosc.es>",
-        "Pedro M. Baeza <pedro.baeza@serviciosbaeza.com>",
+        "Pedro M. Baeza <pedro.baeza@tecnativa.com>",
         "Ana Juaristi <anajuaristi@avanzosc.es>",
     ],
     "category": "Tools",