diff --git a/addons/account_qr_code_sepa/__manifest__.py b/addons/account_qr_code_sepa/__manifest__.py
index 19d8188a96b..f1033550719 100644
--- a/addons/account_qr_code_sepa/__manifest__.py
+++ b/addons/account_qr_code_sepa/__manifest__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 {
-    'name': "account_qr_code_sepa",
+    'name': "Account SEPA QR Code",
 
     'description': """
         This module adds support for SEPA Credit Transfer QR-code generation.
diff --git a/addons/l10n_ar_website_sale/__manifest__.py b/addons/l10n_ar_website_sale/__manifest__.py
index bff8108c428..9f90541aa32 100644
--- a/addons/l10n_ar_website_sale/__manifest__.py
+++ b/addons/l10n_ar_website_sale/__manifest__.py
@@ -4,7 +4,7 @@
     'version': '1.0',
     'category': 'Accounting/Localizations/Website',
     'sequence': 14,
-    'author': 'Odoo, ADHOC SA',
+    'author': 'Odoo S.A., ADHOC SA',
     'description': """Be able to see Identification Type and AFIP Responsibility in ecommerce checkout form.""",
     'depends': [
         'website_sale',
diff --git a/addons/l10n_be/__manifest__.py b/addons/l10n_be/__manifest__.py
index a5e75cf6d94..025da614498 100644
--- a/addons/l10n_be/__manifest__.py
+++ b/addons/l10n_be/__manifest__.py
@@ -34,7 +34,7 @@ Wizards provided by this module:
         **Path to access :** Invoicing/Reporting/Legal Reports/Belgium Statements/Annual Listing Of VAT-Subjected Customers
 
     """,
-    'author': 'Noviat, Odoo SA',
+    'author': 'Noviat, Odoo S.A.',
     'depends': [
         'account',
         'base_iban',
diff --git a/addons/l10n_din5008/__manifest__.py b/addons/l10n_din5008/__manifest__.py
index b6529e1ee9b..5a2547116aa 100644
--- a/addons/l10n_din5008/__manifest__.py
+++ b/addons/l10n_din5008/__manifest__.py
@@ -6,7 +6,7 @@
     'version': '1.0',
     'category': 'Accounting/Localizations',
     'description': "This is the base module that defines the DIN 5008 standard in Odoo.",
-    'author': 'Odoo SA',
+    'author': 'Odoo S.A.',
     'depends': ['account'],
     'data': [
         'report/din5008_report.xml',
diff --git a/addons/l10n_eg/__manifest__.py b/addons/l10n_eg/__manifest__.py
index cac5629e4e1..94809db7739 100644
--- a/addons/l10n_eg/__manifest__.py
+++ b/addons/l10n_eg/__manifest__.py
@@ -4,7 +4,7 @@
 This is the base module to manage the accounting chart for Egypt in Odoo.
 ==============================================================================
     """,
-    'author': "Odoo SA",
+    'author': "Odoo S.A.",
     'category': 'Accounting/Localizations/Account Charts',
     'version': '1.0',
     'depends': ['account', 'l10n_multilang'],
diff --git a/addons/l10n_eg_edi_eta/__manifest__.py b/addons/l10n_eg_edi_eta/__manifest__.py
index 0a6ba1e69a2..d238cb0a4df 100644
--- a/addons/l10n_eg_edi_eta/__manifest__.py
+++ b/addons/l10n_eg_edi_eta/__manifest__.py
@@ -8,7 +8,7 @@
        This module integrate with the ETA Portal to automatically sign and send your invoices to the tax Authority.
        Special thanks to Plementus <info@plementus.com> for their help in developing this module.
     """,
-    'author': 'odoo',
+    'author': 'Odoo S.A.',
     'website': 'https://www.odoo.com',
     'category': 'account',
     'version': '0.1',
diff --git a/addons/l10n_gcc_invoice/__manifest__.py b/addons/l10n_gcc_invoice/__manifest__.py
index 0ac35562f89..b3f78866f44 100644
--- a/addons/l10n_gcc_invoice/__manifest__.py
+++ b/addons/l10n_gcc_invoice/__manifest__.py
@@ -3,7 +3,7 @@
 {
     'name': 'G.C.C. - Arabic/English Invoice',
     'version': '1.0.0',
-    'author': 'Odoo',
+    'author': 'Odoo S.A.',
     'category': 'Accounting/Localizations',
     'description': """
     Arabic/English for GCC
diff --git a/addons/l10n_gcc_pos/__manifest__.py b/addons/l10n_gcc_pos/__manifest__.py
index 34c3e0b8c23..7082641dfb1 100644
--- a/addons/l10n_gcc_pos/__manifest__.py
+++ b/addons/l10n_gcc_pos/__manifest__.py
@@ -2,7 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Gulf Cooperation Council - Point of Sale',
-    'author': 'Odoo S.A',
+    'author': 'Odoo S.A.',
     'category': 'Accounting/Localizations/Point of Sale',
     'description': """
 GCC POS Localization
diff --git a/addons/l10n_gr/__manifest__.py b/addons/l10n_gr/__manifest__.py
index 8a9ce699c63..f793706e215 100644
--- a/addons/l10n_gr/__manifest__.py
+++ b/addons/l10n_gr/__manifest__.py
@@ -5,7 +5,7 @@
 
 {
     'name': 'Greece - Accounting',
-    'author': 'P. Christeas, OpenERP SA.',
+    'author': 'P. Christeas, Odoo S.A.',
     'website': 'http://openerp.hellug.gr/',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
diff --git a/addons/l10n_hk/__manifest__.py b/addons/l10n_hk/__manifest__.py
index 881c38874fa..f618a13a177 100644
--- a/addons/l10n_hk/__manifest__.py
+++ b/addons/l10n_hk/__manifest__.py
@@ -6,7 +6,7 @@
     'version': '1.0',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """ This is the base module to manage chart of accounting and localization for Hong Kong """,
-    'author': 'Odoo SA',
+    'author': 'Odoo S.A.',
     'depends': ['account'],
     'data': [
         'data/account_chart_template_data.xml',
diff --git a/addons/l10n_in_purchase_stock/__manifest__.py b/addons/l10n_in_purchase_stock/__manifest__.py
index 3ed9000c982..8127611ec50 100644
--- a/addons/l10n_in_purchase_stock/__manifest__.py
+++ b/addons/l10n_in_purchase_stock/__manifest__.py
@@ -15,7 +15,7 @@
         useful when you setup the multiple GSTIN units.
     """,
 
-    'author': "Odoo",
+    'author': "Odoo S.A.",
     'website': "https://www.odoo.com",
     'category': 'Accounting/Localizations/Purchase',
     'version': '1.0',
diff --git a/addons/l10n_in_sale_stock/__manifest__.py b/addons/l10n_in_sale_stock/__manifest__.py
index de66aa3aaf3..ae4321bcd48 100644
--- a/addons/l10n_in_sale_stock/__manifest__.py
+++ b/addons/l10n_in_sale_stock/__manifest__.py
@@ -15,7 +15,7 @@
         useful when you setup the multiple GSTIN units.
     """,
 
-    'author': "Odoo",
+    'author': "Odoo S.A.",
     'website': "https://www.odoo.com",
     'category': 'Accounting/Localizations/Sale',
     'version': '0.1',
diff --git a/addons/l10n_it_edi/__manifest__.py b/addons/l10n_it_edi/__manifest__.py
index c0ba05dd435..9e372c98ff5 100644
--- a/addons/l10n_it_edi/__manifest__.py
+++ b/addons/l10n_it_edi/__manifest__.py
@@ -13,7 +13,7 @@
         'account_edi_proxy_client',
     ],
     'auto_install': ['l10n_it', 'account_edi'],
-    'author': 'Odoo',
+    'author': 'Odoo S.A.',
     'description': """
 E-invoice implementation
     """,
diff --git a/addons/l10n_latam_base/__manifest__.py b/addons/l10n_latam_base/__manifest__.py
index 78387147a01..c48123b7c99 100644
--- a/addons/l10n_latam_base/__manifest__.py
+++ b/addons/l10n_latam_base/__manifest__.py
@@ -4,7 +4,7 @@
     'version': '1.0',
     'category': 'Accounting/Localizations',
     'sequence': 14,
-    'author': 'Odoo, ADHOC SA',
+    'author': 'Odoo S.A., ADHOC SA',
     'summary': 'LATAM Identification Types',
     'description': """
 Add a new model named "Identification Type" that extend the vat field functionality in the partner and let the user to identify (an eventually invoice) to contacts not only with their fiscal tax ID (VAT) but with other types of identifications like national document, passport, foreign ID, etc. With this module installed you will see now in the partner form view two fields:
diff --git a/addons/l10n_lu/__manifest__.py b/addons/l10n_lu/__manifest__.py
index 6dcff5b45f9..54178923efd 100644
--- a/addons/l10n_lu/__manifest__.py
+++ b/addons/l10n_lu/__manifest__.py
@@ -23,7 +23,7 @@ Notes:
       see the first sheet of tax.xls for details of coverage
     * to update the chart of tax template, update tax.xls and run tax2csv.py
 """,
-    'author': 'OpenERP SA, ADN, ACSONE SA/NV',
+    'author': 'Odoo S.A., ADN, ACSONE SA/NV',
     'depends': [
         'account',
         'base_iban',
diff --git a/addons/l10n_pe/__manifest__.py b/addons/l10n_pe/__manifest__.py
index f15aaebcca5..c93b4053df2 100644
--- a/addons/l10n_pe/__manifest__.py
+++ b/addons/l10n_pe/__manifest__.py
@@ -4,7 +4,7 @@
     "version": "2.0",
     'summary': "PCGE Simplified",
     'category': 'Accounting/Localizations/Account Charts',
-    'author': 'Vauxoo, Odoo',
+    'author': 'Vauxoo, Odoo S.A.',
     'website': 'https://www.odoo.com/documentation/master/accounting/fiscal_localizations/localizations/peru.html',
     'license': 'LGPL-3',
     'depends': [
diff --git a/addons/l10n_sa_pos/__manifest__.py b/addons/l10n_sa_pos/__manifest__.py
index d2fd0166e96..a34a93d8dd2 100644
--- a/addons/l10n_sa_pos/__manifest__.py
+++ b/addons/l10n_sa_pos/__manifest__.py
@@ -2,7 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Saudi Arabia - Point of Sale',
-    'author': 'Odoo S.A',
+    'author': 'Odoo S.A.',
     'category': 'Accounting/Localizations/Point of Sale',
     'description': """
 K.S.A. POS Localization
diff --git a/addons/l10n_se/__manifest__.py b/addons/l10n_se/__manifest__.py
index ae66bb140fb..9fa54019ca2 100644
--- a/addons/l10n_se/__manifest__.py
+++ b/addons/l10n_se/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Sweden - Accounting",
     "version": "1.0",
-    "author": "XCLUDE, Odoo SA",
+    "author": "XCLUDE, Odoo S.A.",
     "category": "Accounting/Localizations/Account Charts",
     'description': """
 Swedish Accounting
diff --git a/addons/l10n_ve/__manifest__.py b/addons/l10n_ve/__manifest__.py
index 28793c289b4..2f5408a1222 100644
--- a/addons/l10n_ve/__manifest__.py
+++ b/addons/l10n_ve/__manifest__.py
@@ -8,7 +8,7 @@
 
 {
     'name' : 'Venezuela - Accounting',
-    'author': ['Odoo S.A.', 'Vauxoo'],
+    'author': 'Odoo S.A., Vauxoo',
     'category': 'Accounting/Localizations/Account Charts',
     'description':
 """
diff --git a/addons/mail_bot_hr/__manifest__.py b/addons/mail_bot_hr/__manifest__.py
index f9b2d95feab..fe7c11f7855 100644
--- a/addons/mail_bot_hr/__manifest__.py
+++ b/addons/mail_bot_hr/__manifest__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 {
-    'name': "mail_bot_hr",
+    'name': "OdooBot - HR",
     'summary': """Bridge module between hr and mailbot.""",
     'description': """This module adds the OdooBot state and notifications in the user form modified by hr.""",
     'website': "https://www.odoo.com/app/discuss",
diff --git a/addons/mrp_subcontracting/__manifest__.py b/addons/mrp_subcontracting/__manifest__.py
index 1d9009276db..9ad197244e5 100644
--- a/addons/mrp_subcontracting/__manifest__.py
+++ b/addons/mrp_subcontracting/__manifest__.py
@@ -2,7 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
-    'name': "mrp_subcontracting",
+    'name': "MRP Subcontracting",
     'version': '0.1',
     'summary': "Subcontract Productions",
     'website': 'https://www.odoo.com/app/manufacturing',
diff --git a/addons/onboarding/__manifest__.py b/addons/onboarding/__manifest__.py
index 05402a416de..82b077628a3 100644
--- a/addons/onboarding/__manifest__.py
+++ b/addons/onboarding/__manifest__.py
@@ -2,7 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
-    'name': 'Onboarding toolbox',
+    'name': 'Onboarding Toolbox',
     'version': '1.0',
     'category': 'Hidden',
     'sequence': 9001,
diff --git a/addons/payment_mollie/__manifest__.py b/addons/payment_mollie/__manifest__.py
index 92810eea438..7797e79ab38 100755
--- a/addons/payment_mollie/__manifest__.py
+++ b/addons/payment_mollie/__manifest__.py
@@ -6,7 +6,7 @@
     'category': 'Accounting/Payment Providers',
     'sequence': 350,
     'summary': "A Dutch payment provider covering several European countries.",
-    'author': 'Odoo S.A, Applix BV, Droggol Infotech Pvt. Ltd.',
+    'author': 'Odoo S.A., Applix BV, Droggol Infotech Pvt. Ltd.',
     'website': 'https://www.mollie.com',
     'depends': ['payment'],
     'data': [
diff --git a/addons/pos_epson_printer/__manifest__.py b/addons/pos_epson_printer/__manifest__.py
index 778d142a801..65d2da36b3c 100644
--- a/addons/pos_epson_printer/__manifest__.py
+++ b/addons/pos_epson_printer/__manifest__.py
@@ -3,7 +3,7 @@
 
 
 {
-    'name': 'pos_epson_printer',
+    'name': 'POS Epson Printer',
     'version': '1.0',
     'category': 'Sales/Point of Sale',
     'sequence': 6,
diff --git a/addons/pos_epson_printer_restaurant/__manifest__.py b/addons/pos_epson_printer_restaurant/__manifest__.py
index 7142f8081c3..ed22a1e4bfc 100644
--- a/addons/pos_epson_printer_restaurant/__manifest__.py
+++ b/addons/pos_epson_printer_restaurant/__manifest__.py
@@ -3,7 +3,7 @@
 
 
 {
-    'name': 'pos_epson_printer_restaurant',
+    'name': 'POS Epson Printer Restaurant',
     'version': '1.0',
     'category': 'Sales/Point of Sale',
     'sequence': 6,
diff --git a/addons/pos_hr/__manifest__.py b/addons/pos_hr/__manifest__.py
index 82945f8ecbf..a5f18813439 100644
--- a/addons/pos_hr/__manifest__.py
+++ b/addons/pos_hr/__manifest__.py
@@ -2,7 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
-    'name': "pos_hr",
+    'name': "POS - HR",
     'category': "Hidden",
     'summary': 'Link module between Point of Sale and HR',
 
diff --git a/addons/pos_hr_restaurant/__manifest__.py b/addons/pos_hr_restaurant/__manifest__.py
index a0cbf142a49..a2c56c7002c 100644
--- a/addons/pos_hr_restaurant/__manifest__.py
+++ b/addons/pos_hr_restaurant/__manifest__.py
@@ -3,7 +3,7 @@
 
 
 {
-    'name': 'PoS HR Restaurant',
+    'name': 'POS HR Restaurant',
     'version': '1.0',
     'category': 'Hidden',
     'summary': 'Link module between pos_hr and pos_restaurant',
diff --git a/addons/pos_sale/__manifest__.py b/addons/pos_sale/__manifest__.py
index ed121f6f668..bb00e76b06c 100644
--- a/addons/pos_sale/__manifest__.py
+++ b/addons/pos_sale/__manifest__.py
@@ -3,7 +3,7 @@
 
 
 {
-    'name': 'pos_sale',
+    'name': 'POS - Sales',
     'version': '1.1',
     'category': 'Hidden',
     'sequence': 6,
diff --git a/addons/pos_sale_loyalty/__manifest__.py b/addons/pos_sale_loyalty/__manifest__.py
index 071e997c157..31eb517b087 100644
--- a/addons/pos_sale_loyalty/__manifest__.py
+++ b/addons/pos_sale_loyalty/__manifest__.py
@@ -3,7 +3,7 @@
 
 
 {
-    'name': 'pos_sale_loyalty',
+    'name': 'POS - Sales Loyality',
     'version': '1.0',
     'category': 'Hidden',
     'sequence': 6,
diff --git a/addons/pos_sale_margin/__manifest__.py b/addons/pos_sale_margin/__manifest__.py
index 334e8cd3b27..3bf132b7e58 100644
--- a/addons/pos_sale_margin/__manifest__.py
+++ b/addons/pos_sale_margin/__manifest__.py
@@ -3,7 +3,7 @@
 
 
 {
-    'name': 'pos_sale_margin',
+    'name': 'POS - Sale Margin',
     'version': '1.1',
     'category': 'Hidden',
     'summary': 'Link module between Point of Sale and Sales Margin',
diff --git a/addons/pos_sale_product_configurator/__manifest__.py b/addons/pos_sale_product_configurator/__manifest__.py
index 28c5b54389d..ea03bfd525d 100644
--- a/addons/pos_sale_product_configurator/__manifest__.py
+++ b/addons/pos_sale_product_configurator/__manifest__.py
@@ -3,7 +3,7 @@
 
 
 {
-    'name': 'pos_sale_product_configurator',
+    'name': 'POS - Sale Product Configurator',
     'version': '1.0',
     'category': 'Hidden',
     'summary': 'Link module between point_of_sale and sale_product_configurator',
diff --git a/addons/snailmail_account/__manifest__.py b/addons/snailmail_account/__manifest__.py
index 976b26d7fee..9374924d126 100644
--- a/addons/snailmail_account/__manifest__.py
+++ b/addons/snailmail_account/__manifest__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 {
-    'name': "snailmail_account",
+    'name': "Snail Mail - Account",
     'description': """
 Allows users to send invoices by post
 =====================================================
diff --git a/addons/website_sale_comparison/__manifest__.py b/addons/website_sale_comparison/__manifest__.py
index 86e9d28f420..de436fb2546 100644
--- a/addons/website_sale_comparison/__manifest__.py
+++ b/addons/website_sale_comparison/__manifest__.py
@@ -10,7 +10,7 @@ To configure product attributes, activate *Attributes & Variants* in the Website
 
 Finally, the module comes with an option to display an attribute summary table in product web pages (available in Customize menu).
     """,
-    'author': 'Odoo SA',
+    'author': 'Odoo S.A.',
     'category': 'Website/Website',
     'version': '1.0',
     'depends': ['website_sale'],
diff --git a/addons/website_sale_delivery_mondialrelay/__manifest__.py b/addons/website_sale_delivery_mondialrelay/__manifest__.py
index 9619f7fa15e..b51fc63fdf2 100644
--- a/addons/website_sale_delivery_mondialrelay/__manifest__.py
+++ b/addons/website_sale_delivery_mondialrelay/__manifest__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 {
-    'name': "website_sale_delivery_mondialrelay",
+    'name': "eCommerce Mondialrelay Delivery",
     'summary': """ Let's choose Point Relais® on your ecommerce """,
 
     'description': """
diff --git a/addons/website_sale_wishlist/__manifest__.py b/addons/website_sale_wishlist/__manifest__.py
index 9d85baecbb3..f44c75b5e7b 100644
--- a/addons/website_sale_wishlist/__manifest__.py
+++ b/addons/website_sale_wishlist/__manifest__.py
@@ -6,7 +6,7 @@
     'description': """
 Allow shoppers of your eCommerce store to create personalized collections of products they want to buy and save them for future reference.
     """,
-    'author': 'Odoo SA',
+    'author': 'Odoo S.A.',
     'category': 'Website/Website',
     'version': '1.0',
     'depends': ['website_sale'],