diff --git a/account_advanced_reconcile/__openerp__.py b/account_advanced_reconcile/__openerp__.py
index d0be8d59..625f9289 100644
--- a/account_advanced_reconcile/__openerp__.py
+++ b/account_advanced_reconcile/__openerp__.py
@@ -22,7 +22,7 @@
 
 {'name': "Advanced Reconcile",
  'version': '1.0',
- 'author': 'Camptocamp',
+ 'author': "Camptocamp,Odoo Community Association (OCA)",
  'maintainer': 'Camptocamp',
  'category': 'Finance',
  'complexity': 'normal',
diff --git a/account_advanced_reconcile_bank_statement/__openerp__.py b/account_advanced_reconcile_bank_statement/__openerp__.py
index cd62e051..1a07086b 100644
--- a/account_advanced_reconcile_bank_statement/__openerp__.py
+++ b/account_advanced_reconcile_bank_statement/__openerp__.py
@@ -31,7 +31,7 @@ reconcile the commission with credit card imports).
 
 """,
  'version': '1.0.0',
- 'author': 'Camptocamp',
+ 'author': "Camptocamp,Odoo Community Association (OCA)",
  'category': 'Finance',
  'website': 'http://www.camptocamp.com',
  'depends': ['account_advanced_reconcile'],
diff --git a/account_advanced_reconcile_transaction_ref/__openerp__.py b/account_advanced_reconcile_transaction_ref/__openerp__.py
index 16be799a..bacc13e5 100644
--- a/account_advanced_reconcile_transaction_ref/__openerp__.py
+++ b/account_advanced_reconcile_transaction_ref/__openerp__.py
@@ -26,7 +26,7 @@ Reconcile rules with transaction_ref
 
 """,
  'version': '1.0.1',
- 'author': 'Camptocamp',
+ 'author': "Camptocamp,Odoo Community Association (OCA)",
  'category': 'Finance',
  'website': 'http://www.camptocamp.com',
  'depends': ['account_advanced_reconcile'],
diff --git a/account_easy_reconcile/__openerp__.py b/account_easy_reconcile/__openerp__.py
index 674d9fe1..302d3888 100755
--- a/account_easy_reconcile/__openerp__.py
+++ b/account_easy_reconcile/__openerp__.py
@@ -23,7 +23,7 @@
     "name": "Easy Reconcile",
     "version": "1.3.2",
     "depends": ["account"],
-    "author": "Akretion,Camptocamp",
+    "author": "Akretion,Camptocamp,Odoo Community Association (OCA)",
     "description": """
 Easy Reconcile
 ==============
diff --git a/account_invoice_reference/__openerp__.py b/account_invoice_reference/__openerp__.py
index cda206a0..fe8ad141 100644
--- a/account_invoice_reference/__openerp__.py
+++ b/account_invoice_reference/__openerp__.py
@@ -21,7 +21,7 @@
 
 {'name': 'Invoices Reference',
  'version': '1.0',
- 'author': 'Camptocamp',
+ 'author': "Camptocamp,Odoo Community Association (OCA)",
  'maintainer': 'Camptocamp',
  'license': 'AGPL-3',
  'category': 'category',
diff --git a/account_payment_transaction_id/__openerp__.py b/account_payment_transaction_id/__openerp__.py
index a0eec8c5..f6cb491e 100644
--- a/account_payment_transaction_id/__openerp__.py
+++ b/account_payment_transaction_id/__openerp__.py
@@ -22,7 +22,7 @@
 
 {'name': 'Account Payment - Transaction ID',
  'version': '1.0',
- 'author': 'Camptocamp',
+ 'author': "Camptocamp,Odoo Community Association (OCA)",
  'maintainer': 'Camptocamp',
  'license': 'AGPL-3',
  'category': 'Hidden',
diff --git a/account_statement_bankaccount_completion/__openerp__.py b/account_statement_bankaccount_completion/__openerp__.py
index c4f4b06e..46ce2b6a 100644
--- a/account_statement_bankaccount_completion/__openerp__.py
+++ b/account_statement_bankaccount_completion/__openerp__.py
@@ -21,7 +21,7 @@
 
 {'name': "Bank statement completion from bank account number",
  'version': '1.0.1',
- 'author': 'ACSONE SA/NV',
+ 'author': "ACSONE SA/NV,Odoo Community Association (OCA)",
  'maintainer': 'ACSONE SA/NV',
  'category': 'Finance',
  'complexity': 'normal',
diff --git a/account_statement_base_completion/__openerp__.py b/account_statement_base_completion/__openerp__.py
index 9fc0fb0e..18953831 100644
--- a/account_statement_base_completion/__openerp__.py
+++ b/account_statement_base_completion/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': "Bank statement base completion",
     'version': '1.0.3',
-    'author': 'Camptocamp',
+    'author': "Camptocamp,Odoo Community Association (OCA)",
     'maintainer': 'Camptocamp',
     'category': 'Finance',
     'complexity': 'normal',
diff --git a/account_statement_base_import/__openerp__.py b/account_statement_base_import/__openerp__.py
index f7989ce3..7d83a8fd 100644
--- a/account_statement_base_import/__openerp__.py
+++ b/account_statement_base_import/__openerp__.py
@@ -21,7 +21,7 @@
 
 {'name': "Bank statement base import",
  'version': '1.2',
- 'author': 'Camptocamp',
+ 'author': "Camptocamp,Odoo Community Association (OCA)",
  'maintainer': 'Camptocamp',
  'category': 'Finance',
  'complexity': 'normal',
diff --git a/account_statement_cancel_line/__openerp__.py b/account_statement_cancel_line/__openerp__.py
index 35833051..108d5bb6 100644
--- a/account_statement_cancel_line/__openerp__.py
+++ b/account_statement_cancel_line/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': "Account Statement Cancel Line",
     'version': '0.3',
-    'author': 'Camptocamp',
+    'author': "Camptocamp,Odoo Community Association (OCA)",
     'maintainer': 'Camptocamp',
     'category': 'Finance',
     'complexity': 'normal',
diff --git a/account_statement_commission/__openerp__.py b/account_statement_commission/__openerp__.py
index 9a4e0792..bee80a14 100644
--- a/account_statement_commission/__openerp__.py
+++ b/account_statement_commission/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': "Bank statement import - commissions",
     'version': '1.0',
-    'author': 'Camptocamp',
+    'author': "Camptocamp,Odoo Community Association (OCA)",
     'maintainer': 'Camptocamp',
     'category': 'Finance',
     'complexity': 'normal',
diff --git a/account_statement_completion_label/__openerp__.py b/account_statement_completion_label/__openerp__.py
index d79546be..efe4ea13 100644
--- a/account_statement_completion_label/__openerp__.py
+++ b/account_statement_completion_label/__openerp__.py
@@ -35,7 +35,7 @@
     partner and an account.
 
     """,
-    'author': 'Akretion',
+    'author': "Akretion,Odoo Community Association (OCA)",
     'website': 'http://www.akretion.com/',
     'depends': ['account_statement_base_completion'],
     'data': [
diff --git a/account_statement_completion_voucher/__openerp__.py b/account_statement_completion_voucher/__openerp__.py
index ef6ec980..a7cec51d 100644
--- a/account_statement_completion_voucher/__openerp__.py
+++ b/account_statement_completion_voucher/__openerp__.py
@@ -21,7 +21,7 @@
 
 {'name': "Bank statement extension with voucher",
  'version': '1.0',
- 'author': 'Camptocamp',
+ 'author': "Camptocamp,Odoo Community Association (OCA)",
  'maintainer': 'Camptocamp',
  'category': 'Finance',
  'complexity': 'normal',
diff --git a/account_statement_ext/__openerp__.py b/account_statement_ext/__openerp__.py
index d48aeb91..f2177774 100644
--- a/account_statement_ext/__openerp__.py
+++ b/account_statement_ext/__openerp__.py
@@ -21,7 +21,7 @@
 
 {'name': "Bank statement extension and profiles",
  'version': '1.3.6',
- 'author': 'Camptocamp',
+ 'author': "Camptocamp,Odoo Community Association (OCA)",
  'maintainer': 'Camptocamp',
  'category': 'Finance',
  'complexity': 'normal',
diff --git a/account_statement_ext_point_of_sale/__openerp__.py b/account_statement_ext_point_of_sale/__openerp__.py
index 6d4b7a8f..1ad166ef 100644
--- a/account_statement_ext_point_of_sale/__openerp__.py
+++ b/account_statement_ext_point_of_sale/__openerp__.py
@@ -21,7 +21,7 @@
 
 {'name': "Bank statement extension and profiles for Point of Sale",
  'version': '1.0.0',
- 'author': 'Camptocamp',
+ 'author': "Camptocamp,Odoo Community Association (OCA)",
  'maintainer': 'Camptocamp',
  'category': 'Point Of Sale',
  'complexity': 'normal',
diff --git a/account_statement_ext_voucher/__openerp__.py b/account_statement_ext_voucher/__openerp__.py
index ab12bbd8..8e10fe3c 100644
--- a/account_statement_ext_voucher/__openerp__.py
+++ b/account_statement_ext_voucher/__openerp__.py
@@ -21,7 +21,7 @@
 
 {'name': "Bank statement extension with voucher",
  'version': '1.0',
- 'author': 'Camptocamp',
+ 'author': "Camptocamp,Odoo Community Association (OCA)",
  'maintainer': 'Camptocamp',
  'category': 'Finance',
  'complexity': 'normal',
diff --git a/account_statement_no_invoice_import/__openerp__.py b/account_statement_no_invoice_import/__openerp__.py
index 44028e96..34dc9445 100644
--- a/account_statement_no_invoice_import/__openerp__.py
+++ b/account_statement_no_invoice_import/__openerp__.py
@@ -28,7 +28,7 @@
     'description': """
     Module that remove the 'Import invoices' button on bank statement
     """,
-    'author': 'Akretion',
+    'author': "Akretion,Odoo Community Association (OCA)",
     'website': 'http://www.akretion.com/',
     'depends': [
         'account_voucher',
diff --git a/account_statement_ofx_import/__openerp__.py b/account_statement_ofx_import/__openerp__.py
index 862e7b44..41247371 100644
--- a/account_statement_ofx_import/__openerp__.py
+++ b/account_statement_ofx_import/__openerp__.py
@@ -22,7 +22,7 @@
 
 {'name': "Bank statement OFX import",
     'version': '1.0.1',
-    'author': 'Servicios Tecnológicos Avanzados - Pedro M. Baeza',
+    'author': "Servicios Tecnológicos Avanzados - Pedro M. Baeza,Odoo Community Association (OCA)",
     'maintainer': 'Pedro M. Baeza',
     'category': 'Finance',
     'complexity': 'normal',
diff --git a/account_statement_one_move/__openerp__.py b/account_statement_one_move/__openerp__.py
index ed9275ab..5a56984d 100644
--- a/account_statement_one_move/__openerp__.py
+++ b/account_statement_one_move/__openerp__.py
@@ -32,7 +32,7 @@
     example, you won't have a move for each line.
 
     """,
-    'author': 'Akretion',
+    'author': "Akretion,Odoo Community Association (OCA)",
     'website': 'http://www.akretion.com/',
     'depends': ['account_statement_ext'],
     'data': [
diff --git a/account_statement_regex_account_completion/__openerp__.py b/account_statement_regex_account_completion/__openerp__.py
index 6567b826..850d85d9 100644
--- a/account_statement_regex_account_completion/__openerp__.py
+++ b/account_statement_regex_account_completion/__openerp__.py
@@ -30,7 +30,7 @@
 {
     "name": "Account Statement Regex Account Completion addon",
     "version": "0.1",
-    "author": "ACSONE SA/NV",
+    "author": "ACSONE SA/NV,Odoo Community Association (OCA)",
     "category": "Other",
     "website": "http://www.acsone.eu",
     "depends": ["account_statement_base_completion",
diff --git a/account_statement_so_completion/__openerp__.py b/account_statement_so_completion/__openerp__.py
index 30a7f581..20720b79 100644
--- a/account_statement_so_completion/__openerp__.py
+++ b/account_statement_so_completion/__openerp__.py
@@ -24,7 +24,7 @@
 
 {'name': "Bank statement Sale Order completion",
  'version': '0.1',
- 'author': 'Camptocamp',
+ 'author': "Camptocamp,Odoo Community Association (OCA)",
  'maintainer': 'Camptocamp',
  'category': 'Finance',
  'complexity': 'easy',
diff --git a/account_statement_transactionid_completion/__openerp__.py b/account_statement_transactionid_completion/__openerp__.py
index 91285762..5d2f050b 100644
--- a/account_statement_transactionid_completion/__openerp__.py
+++ b/account_statement_transactionid_completion/__openerp__.py
@@ -21,7 +21,7 @@
 
 {'name': "Bank statement completion from transaction ID",
  'version': '1.0',
- 'author': 'Camptocamp',
+ 'author': "Camptocamp,Odoo Community Association (OCA)",
  'maintainer': 'Camptocamp',
  'category': 'Finance',
  'complexity': 'normal',
diff --git a/account_statement_transactionid_import/__openerp__.py b/account_statement_transactionid_import/__openerp__.py
index 29104fbb..c4b975c6 100644
--- a/account_statement_transactionid_import/__openerp__.py
+++ b/account_statement_transactionid_import/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': "Bank statement transactionID import",
     'version': '1.0',
-    'author': 'Camptocamp',
+    'author': "Camptocamp,Odoo Community Association (OCA)",
     'maintainer': 'Camptocamp',
     'category': 'Finance',
     'complexity': 'normal',
diff --git a/base_transaction_id/__openerp__.py b/base_transaction_id/__openerp__.py
index 03b68df0..83737d75 100644
--- a/base_transaction_id/__openerp__.py
+++ b/base_transaction_id/__openerp__.py
@@ -21,7 +21,7 @@
 
 {'name': 'Base transaction id for financial institutes',
  'version': '1.0',
- 'author': 'Camptocamp',
+ 'author': "Camptocamp,Odoo Community Association (OCA)",
  'maintainer': 'Camptocamp',
  'category': 'Hidden/Dependency',
  'complexity': 'easy',
diff --git a/invoicing_voucher_killer/__openerp__.py b/invoicing_voucher_killer/__openerp__.py
index 1f5779df..2223d890 100644
--- a/invoicing_voucher_killer/__openerp__.py
+++ b/invoicing_voucher_killer/__openerp__.py
@@ -27,7 +27,7 @@ Prevent the usage of voucher from invoices
 ##########################################
 This add-on will disable "Register Payment" button
 """,
- 'author': 'Camptocamp',
+ 'author': "Camptocamp,Odoo Community Association (OCA)",
  'website': 'http://www.camptocamp.com',
  'depends': ['account_voucher'],
  'data': ['invoice_data.xml',
diff --git a/statement_voucher_killer/__openerp__.py b/statement_voucher_killer/__openerp__.py
index d82792a8..ccc2b79f 100644
--- a/statement_voucher_killer/__openerp__.py
+++ b/statement_voucher_killer/__openerp__.py
@@ -36,7 +36,7 @@ line will be take from imported line in this order:
  * Related statement date
 
 """,
- 'author': 'Camptocamp',
+ 'author': "Camptocamp,Odoo Community Association (OCA)",
  'website': 'http://www.camptocamp.com',
  'depends': ['account_voucher', 'account_payment'],
  'data': [