diff --git a/contract/README.rst b/contract/README.rst
index 1c10286e..e369c2dc 100644
--- a/contract/README.rst
+++ b/contract/README.rst
@@ -51,8 +51,8 @@ Credits
 Contributors
 ------------
 
-* Pedro M. Baeza <pedro.baeza@serviciosbaeza.com>
-* Carlos Dauden <carlos@incaser.es>
+* Pedro M. Baeza <pedro.baeza@tecnativa.com>
+* Carlos Dauden <carlos.dauden@tecnativa.com>
 * Angel Moya <angel.moya@domatix.com>
 
 Maintainer
diff --git a/contract/__openerp__.py b/contract/__openerp__.py
index a01d51ed..76011715 100644
--- a/contract/__openerp__.py
+++ b/contract/__openerp__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
-# © 2004-2010 OpenERP SA (<http://openerp.com>)
-# © 2016 Incaser Informatica S.L. - Carlos Dauden
-# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
+# © 2004-2010 OpenERP SA
+# © 2016 Carlos Dauden <carlos.dauden@tecnativa.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
     'name': 'Contracts Management recurring',
@@ -9,7 +9,7 @@
     'category': 'Other',
     'license': 'AGPL-3',
     'author': "OpenERP SA,"
-              "Incaser Informatica S.L.,"
+              "Tecnativa,"
               "Odoo Community Association (OCA)",
     'website': 'http://openerp.com',
     'depends': ['base', 'account', 'analytic'],
diff --git a/contract/models/__init__.py b/contract/models/__init__.py
index 27ee6307..8deef410 100644
--- a/contract/models/__init__.py
+++ b/contract/models/__init__.py
@@ -1,3 +1,6 @@
 # -*- coding: utf-8 -*-
+# © 2016 Carlos Dauden <carlos.dauden@tecnativa.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
 from . import contract
 from . import invoice
diff --git a/contract/models/contract.py b/contract/models/contract.py
index add71894..618bf8e5 100644
--- a/contract/models/contract.py
+++ b/contract/models/contract.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
-# © 2016 Incaser Informatica S.L. - Carlos Dauden
-# © 2015 Serv. Tecnol. Avanzados - Pedro M. Baeza
-# © 2014 Domatix Technologies  S.L. - Angel Moya <angel.moya@domatix.com>
-# © 2004-2010 OpenERP SA (<http://openerp.com>)
-# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
+# © 2004-2010 OpenERP SA
+# © 2014 Angel Moya <angel.moya@domatix.com>
+# © 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
+# © 2016 Carlos Dauden <carlos.dauden@tecnativa.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from dateutil.relativedelta import relativedelta
 import logging
diff --git a/contract/models/invoice.py b/contract/models/invoice.py
index f8365f06..8761dfa3 100644
--- a/contract/models/invoice.py
+++ b/contract/models/invoice.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-# © 2016 Incaser Informatica S.L. - Carlos Dauden
-# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
+# © 2016 Carlos Dauden <carlos.dauden@tecnativa.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from openerp import fields, models
 
diff --git a/contract/tests/__init__.py b/contract/tests/__init__.py
index 2b43f40b..2002a1d8 100644
--- a/contract/tests/__init__.py
+++ b/contract/tests/__init__.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
-# (c) 2015 Antiun Ingeniería S.L. - Sergio Teruel
-# (c) 2015 Antiun Ingeniería S.L. - Carlos Dauden
-# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
+# © 2016 Carlos Dauden <carlos.dauden@tecnativa.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import test_contract
diff --git a/contract/tests/test_contract.py b/contract/tests/test_contract.py
index ea68192f..7adb7335 100644
--- a/contract/tests/test_contract.py
+++ b/contract/tests/test_contract.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
-# © 2016 Incaser Informatica S.L. - Carlos Dauden
-# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
+# © 2016 Carlos Dauden <carlos.dauden@tecnativa.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
 from dateutil.relativedelta import relativedelta
 import datetime