diff --git a/account_asset_management/__openerp__.py b/account_asset_management/__openerp__.py
index b6a23442b..16920f526 100644
--- a/account_asset_management/__openerp__.py
+++ b/account_asset_management/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '2.4',
     'depends': ['account'],
     'conflicts': ['account_asset'],
-    'author': 'OpenERP & Noviat',
+    'author': "OpenERP & Noviat,Odoo Community Association (OCA)",
     'description': """
 Financial asset management.
 ===========================
diff --git a/account_asset_management_xls/__openerp__.py b/account_asset_management_xls/__openerp__.py
index 3e52242d6..00a8257bd 100644
--- a/account_asset_management_xls/__openerp__.py
+++ b/account_asset_management_xls/__openerp__.py
@@ -24,7 +24,7 @@
     'name': 'Assets Management Excel reporting',
     'version': '0.1',
     'license': 'AGPL-3',
-    'author': 'Noviat',
+    'author': "Noviat,Odoo Community Association (OCA)",
     'category': 'Accounting & Finance',
     'description': """
 Assets Management Excel reporting
diff --git a/account_auto_fy_sequence/__openerp__.py b/account_auto_fy_sequence/__openerp__.py
index 7ff20c7d9..f3de7674f 100644
--- a/account_auto_fy_sequence/__openerp__.py
+++ b/account_auto_fy_sequence/__openerp__.py
@@ -46,7 +46,7 @@
     The module also replaces %(year)s by %(fy)s in the default prefix
     for new journals, assuming it is a safer default.
     """,
-    'author': 'ACSONE SA/NV',
+    'author': "ACSONE SA/NV,Odoo Community Association (OCA)",
     'website': 'http://acsone.eu',
     'depends': ['account'],
     'data': [
diff --git a/account_balance_line/__openerp__.py b/account_balance_line/__openerp__.py
index 91e780676..c8dd959c9 100644
--- a/account_balance_line/__openerp__.py
+++ b/account_balance_line/__openerp__.py
@@ -21,7 +21,7 @@
 {'name': 'Balance on lines',
  'summary': 'Display balance totals in move line view',
  'version': '1.1',
- 'author': 'Camptocamp',
+ 'author': "Camptocamp,Odoo Community Association (OCA)",
  'maintainter': 'Camptocamp',
  'category': 'Accounting',
  'depends': ['account'],
diff --git a/account_cancel_invoice_check_payment_order/__openerp__.py b/account_cancel_invoice_check_payment_order/__openerp__.py
index 57e3805a8..019b6d0a1 100644
--- a/account_cancel_invoice_check_payment_order/__openerp__.py
+++ b/account_cancel_invoice_check_payment_order/__openerp__.py
@@ -23,7 +23,7 @@
     "depends": ["account",
                 "account_payment",
                 "account_cancel"],
-    "author": "Camptocamp",
+    "author": "Camptocamp,Odoo Community Association (OCA)",
     "description": """
 Prevents to cancel an invoice which has already been imported in a
 payment order.
diff --git a/account_cancel_invoice_check_voucher/__openerp__.py b/account_cancel_invoice_check_voucher/__openerp__.py
index 9bc1e16f3..82abfca0f 100644
--- a/account_cancel_invoice_check_voucher/__openerp__.py
+++ b/account_cancel_invoice_check_voucher/__openerp__.py
@@ -24,7 +24,7 @@
                 "account",
                 "account_voucher",
                 "account_cancel"],
-    "author": "Camptocamp",
+    "author": "Camptocamp,Odoo Community Association (OCA)",
     "description": """
 Constraint forbidding to cancel an invoice already
 imported in bank statement with a voucher.
diff --git a/account_chart_update/__openerp__.py b/account_chart_update/__openerp__.py
index 1ebdbfc86..14d4ae660 100644
--- a/account_chart_update/__openerp__.py
+++ b/account_chart_update/__openerp__.py
@@ -27,7 +27,7 @@
 {
     'name': "Detect changes and update the Account Chart from a template",
     'version': "1.2",
-    'author': "Zikzakmedia SL",
+    'author': "Zikzakmedia SL,Odoo Community Association (OCA)",
     'website': "www.zikzakmedia.com",
     'depends': ["account"],
     'category': "Generic Modules/Accounting",
diff --git a/account_check_deposit/__openerp__.py b/account_check_deposit/__openerp__.py
index 136b6dc1d..5ad969cdd 100644
--- a/account_check_deposit/__openerp__.py
+++ b/account_check_deposit/__openerp__.py
@@ -40,7 +40,7 @@ You must configure on this journal the default debit account and the default
 credit account. You must also configure on the company the account for
 check deposits.
 """,
-    'author': 'Akretion',
+    'author': "Akretion,Odoo Community Association (OCA)",
     'website': 'http://www.akretion.com/',
     'depends': [
         'account_accountant',
diff --git a/account_compute_tax_amount/__openerp__.py b/account_compute_tax_amount/__openerp__.py
index 9806ebeec..78d55db26 100644
--- a/account_compute_tax_amount/__openerp__.py
+++ b/account_compute_tax_amount/__openerp__.py
@@ -22,7 +22,7 @@
     "version": "1.0",
     "depends": ["base",
                 "account"],
-    "author": "Camptocamp",
+    "author": "Camptocamp,Odoo Community Association (OCA)",
     "description": """Recompute tax_amount to avoid sign problem""",
     'website': 'http://www.camptocamp.com',
     'data': [],
diff --git a/account_constraints/__openerp__.py b/account_constraints/__openerp__.py
index 073f48b30..aca0765b1 100644
--- a/account_constraints/__openerp__.py
+++ b/account_constraints/__openerp__.py
@@ -21,7 +21,7 @@
     'name': 'Account Constraints',
     'version': '1.1',
     'depends': ['account'],
-    'author': 'Camptocamp',
+    'author': "Camptocamp,Odoo Community Association (OCA)",
     'license': 'AGPL-3',
     'category': 'Generic Modules/Accounting',
     'description': """
diff --git a/account_credit_control/__openerp__.py b/account_credit_control/__openerp__.py
index 72379a7bd..ecd26b10e 100644
--- a/account_credit_control/__openerp__.py
+++ b/account_credit_control/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 {'name': 'Account Credit Control',
  'version': '0.2.0',
- 'author': 'Camptocamp',
+ 'author': "Camptocamp,Odoo Community Association (OCA)",
  'maintainer': 'Camptocamp',
  'category': 'Finance',
  'complexity': "normal",
diff --git a/account_credit_control_dunning_fees/__openerp__.py b/account_credit_control_dunning_fees/__openerp__.py
index 8f0f153fc..b0e1efe15 100644
--- a/account_credit_control_dunning_fees/__openerp__.py
+++ b/account_credit_control_dunning_fees/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 {'name': 'Credit control dunning fees',
  'version': '0.1.0',
- 'author': 'Camptocamp',
+ 'author': "Camptocamp,Odoo Community Association (OCA)",
  'maintainer': 'Camptocamp',
  'category': 'Accounting',
  'complexity': 'normal',
diff --git a/account_default_draft_move/__openerp__.py b/account_default_draft_move/__openerp__.py
index 942e80594..291a7a07f 100644
--- a/account_default_draft_move/__openerp__.py
+++ b/account_default_draft_move/__openerp__.py
@@ -21,7 +21,7 @@
     "name": "Move in draft state by default",
     "version": "1.0",
     "depends": ["base", "account", "account_constraints"],
-    "author": "Camptocamp",
+    "author": "Camptocamp,Odoo Community Association (OCA)",
     'license': 'AGPL-3',
     "description": """
 Let the generated move in draft on invoice and bank statement
diff --git a/account_fiscal_position_vat_check/__openerp__.py b/account_fiscal_position_vat_check/__openerp__.py
index 8ee2d8210..1fe3bbd84 100644
--- a/account_fiscal_position_vat_check/__openerp__.py
+++ b/account_fiscal_position_vat_check/__openerp__.py
@@ -55,7 +55,7 @@ a fiscal position with the option
 Please contact Alexis de Lattre from Akretion <alexis.delattre@akretion.com>
  for any help or question about this module.
     """,
-    'author': 'Akretion',
+    'author': "Akretion,Odoo Community Association (OCA)",
     'website': 'http://www.akretion.com',
     'depends': ['account'],
     'data': [
diff --git a/account_invoice_currency/__openerp__.py b/account_invoice_currency/__openerp__.py
index 70d67f92a..d4506452d 100644
--- a/account_invoice_currency/__openerp__.py
+++ b/account_invoice_currency/__openerp__.py
@@ -24,7 +24,7 @@
 {
     'name': "Company currency in invoices",
     'version': "1.0",
-    'author': "Zikzakmedia SL",
+    'author': "Zikzakmedia SL,Odoo Community Association (OCA)",
     'website': "http://www.zikzakmedia.com",
     'category': "Localisation / Accounting",
     'contributors': ['Joaquín Gutierrez'],
diff --git a/account_journal_always_check_date/__openerp__.py b/account_journal_always_check_date/__openerp__.py
index 1969e4c06..9f57cbc0d 100644
--- a/account_journal_always_check_date/__openerp__.py
+++ b/account_journal_always_check_date/__openerp__.py
@@ -45,7 +45,7 @@ move, the date must be inside the period.
 Please contact Alexis de Lattre from Akretion <alexis.delattre@akretion.com>
 for any help or question about this module.
     """,
-    'author': 'Akretion',
+    'author': "Akretion,Odoo Community Association (OCA)",
     'website': 'http://www.akretion.com',
     'depends': ['account'],
     'data': [],
diff --git a/account_journal_period_close/__openerp__.py b/account_journal_period_close/__openerp__.py
index fa90ca293..6d7989ecd 100644
--- a/account_journal_period_close/__openerp__.py
+++ b/account_journal_period_close/__openerp__.py
@@ -30,7 +30,7 @@
 {
     "name": "Account Journal Period Close",
     "version": "1.0",
-    "author": "ACSONE SA/NV",
+    "author": "ACSONE SA/NV,Odoo Community Association (OCA)",
     "maintainer": "ACSONE SA/NV",
     "website": "http://www.acsone.eu",
     "images": [],
diff --git a/account_move_batch_validate/__openerp__.py b/account_move_batch_validate/__openerp__.py
index a3e1db130..f565af162 100644
--- a/account_move_batch_validate/__openerp__.py
+++ b/account_move_batch_validate/__openerp__.py
@@ -21,7 +21,7 @@
 {
     'name': "Account Move Batch Validate",
     'version': '0.2',
-    'author': 'Camptocamp',
+    'author': "Camptocamp,Odoo Community Association (OCA)",
     'maintainer': 'Camptocamp',
     'category': 'Finance',
     'complexity': 'normal',
diff --git a/account_move_line_no_default_search/__openerp__.py b/account_move_line_no_default_search/__openerp__.py
index cc762affe..04d574a4e 100644
--- a/account_move_line_no_default_search/__openerp__.py
+++ b/account_move_line_no_default_search/__openerp__.py
@@ -21,7 +21,7 @@
 {
     "name": "Move line search view - disable defaults for period and journal",
     "version": "0.1",
-    "author": "Therp BV",
+    "author": "Therp BV,Odoo Community Association (OCA)",
     "category": 'Accounting & Finance',
     'description': """
 OpenERP 7.0 implements a custom javascript search view for move lines. This
diff --git a/account_move_line_search_extension/__openerp__.py b/account_move_line_search_extension/__openerp__.py
index 28dec980a..00cc59f62 100644
--- a/account_move_line_search_extension/__openerp__.py
+++ b/account_move_line_search_extension/__openerp__.py
@@ -24,7 +24,7 @@
     'name': 'Journal Items Search Extension',
     'version': '0.1',
     'license': 'AGPL-3',
-    'author': 'Noviat',
+    'author': "Noviat,Odoo Community Association (OCA)",
     'category': 'Generic Modules',
     'description': """
 Journal Items Search Extension
diff --git a/account_move_template/__openerp__.py b/account_move_template/__openerp__.py
index a4119bf0d..ca6cc470a 100644
--- a/account_move_template/__openerp__.py
+++ b/account_move_template/__openerp__.py
@@ -38,7 +38,7 @@ The journal entry form allows lo load, through a wizard,
 the template to use and the amounts to fill.
 
 """,
-    'author': 'Agile Business Group',
+    'author': "Agile Business Group,Odoo Community Association (OCA)",
     'website': 'http://www.agilebg.com',
     'license': 'AGPL-3',
     'depends': ['account_accountant', 'analytic'],
diff --git a/account_move_validation_improvement/__openerp__.py b/account_move_validation_improvement/__openerp__.py
index 1163dc0bf..ef60f0657 100644
--- a/account_move_validation_improvement/__openerp__.py
+++ b/account_move_validation_improvement/__openerp__.py
@@ -21,7 +21,7 @@
     "name": "Wizard to validate multiple moves",
     "version": "1.0",
     "depends": ["base", "account", "account_constraints"],
-    "author": "Camptocamp",
+    "author": "Camptocamp,Odoo Community Association (OCA)",
     'license': 'AGPL-3',
     "description": """
 Re-defining a base wizard (validate all moves in a period for a journal),
diff --git a/account_partner_required/__openerp__.py b/account_partner_required/__openerp__.py
index 961c36f39..4e69e83dc 100644
--- a/account_partner_required/__openerp__.py
+++ b/account_partner_required/__openerp__.py
@@ -38,7 +38,7 @@ Module developed by Stéphane Bidoul <stephane.bidoul@acsone.eu>,
 inspired by Alexis de Lattre <alexis.delattre@akretion.com>'s
 account_analytic_required module.
 """,
-    'author': 'ACSONE SA/NV',
+    'author': "ACSONE SA/NV,Odoo Community Association (OCA)",
     'website': 'http://acsone.eu/',
     'depends': ['account'],
     'data': ['account_view.xml'],
diff --git a/account_renumber/__openerp__.py b/account_renumber/__openerp__.py
index c0924de1f..ccf8aff10 100644
--- a/account_renumber/__openerp__.py
+++ b/account_renumber/__openerp__.py
@@ -27,7 +27,7 @@
 {
     'name': "Account renumber wizard",
     'version': "1.0",
-    'author': "Pexego",
+    'author': "Pexego,Odoo Community Association (OCA)",
     'website': "http://www.pexego.es",
     'category': "Enterprise Specific Modules",
     'contributors': ['Pedro M. Baeza', 'Joaquín Gutierrez'],
diff --git a/account_reversal/__openerp__.py b/account_reversal/__openerp__.py
index 48abefbc8..c486f7689 100644
--- a/account_reversal/__openerp__.py
+++ b/account_reversal/__openerp__.py
@@ -42,7 +42,7 @@ Module originally developped by Alexis de Lattre <alexis.delattre@akretion.com>
 during the Akretion-Camptocamp code sprint of June 2011.
 
 """,
-    'author': 'Akretion,Camptocamp',
+    'author': "Akretion,Camptocamp,Odoo Community Association (OCA)",
     'website': 'http://www.akretion.com/',
     'depends': ['account'],
     'data': [
diff --git a/account_tax_analysis/__openerp__.py b/account_tax_analysis/__openerp__.py
index 1071ba282..69091e074 100644
--- a/account_tax_analysis/__openerp__.py
+++ b/account_tax_analysis/__openerp__.py
@@ -20,7 +20,7 @@
 {"name": "Tax analysis",
  "version": "1.0",
  "depends": ["base", "account"],
- "author": "CamptoCamp SA",
+ "author": "CamptoCamp SA,Odoo Community Association (OCA)",
  "category": 'Accounting & Finance',
  "description": """
 Tax analysis view
diff --git a/account_tax_update/__openerp__.py b/account_tax_update/__openerp__.py
index 355306a1f..b1a8974bc 100644
--- a/account_tax_update/__openerp__.py
+++ b/account_tax_update/__openerp__.py
@@ -22,7 +22,7 @@
 {
     "name": "Update tax wizard",
     "version": "1.0.44",
-    "author": "Therp BV, Camptocamp SA",
+    "author": "Therp BV, Camptocamp SA,Odoo Community Association (OCA)",
     "category": 'Base',
     'complexity': "normal",
     "description": """
diff --git a/async_move_line_importer/__openerp__.py b/async_move_line_importer/__openerp__.py
index 95b2a1a43..3bd93fc41 100644
--- a/async_move_line_importer/__openerp__.py
+++ b/async_move_line_importer/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 {'name': 'Asynchronous move/move line CSV importer',
  'version': '0.1.2',
- 'author': 'Camptocamp',
+ 'author': "Camptocamp,Odoo Community Association (OCA)",
  'maintainer': 'Camptocamp',
  'category': 'Accounting',
  'complexity': 'normal',
diff --git a/currency_rate_date_check/__openerp__.py b/currency_rate_date_check/__openerp__.py
index 6e24e81f4..35a5e2b5b 100644
--- a/currency_rate_date_check/__openerp__.py
+++ b/currency_rate_date_check/__openerp__.py
@@ -42,7 +42,7 @@ configured on the company form.
 Please contact Alexis de Lattre from Akretion <alexis.delattre@akretion.com>
 for any help or question about this module.
     """,
-    'author': 'Akretion',
+    'author': "Akretion,Odoo Community Association (OCA)",
     'website': 'http://www.akretion.com',
     'depends': ['base'],
     'data': ['company_view.xml'],
diff --git a/currency_rate_update/__openerp__.py b/currency_rate_update/__openerp__.py
index 1294a3f80..1c1a703cf 100644
--- a/currency_rate_update/__openerp__.py
+++ b/currency_rate_update/__openerp__.py
@@ -25,7 +25,7 @@
 {
     "name": "Currency Rate Update",
     "version": "0.7",
-    "author": "Camptocamp",
+    "author": "Camptocamp,Odoo Community Association (OCA)",
     "website": "http://camptocamp.com",
     "category": "Financial Management/Configuration",
     "description": """Import exchange rates from the Internet.