diff --git a/addons/base_setup/i18n/base_setup.pot b/addons/base_setup/i18n/base_setup.pot
index f951b54dcbf7899d3307cdebd114c15333f2ab8a..8c92f849122346e5556d9cdddbbf8dbd6dddb59c 100644
--- a/addons/base_setup/i18n/base_setup.pot
+++ b/addons/base_setup/i18n/base_setup.pot
@@ -58,7 +58,7 @@ msgstr ""
 
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
-msgid "Automate inter-companies transactions"
+msgid "Automate inter-company transactions"
 msgstr ""
 
 #. module: base_setup
@@ -198,7 +198,7 @@ msgstr ""
 
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
-msgid "Inter-Companies Transactions"
+msgid "Inter-Company Transactions"
 msgstr ""
 
 #. module: base_setup
@@ -224,7 +224,7 @@ msgstr ""
 
 #. module: base_setup
 #: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
-msgid "Multi-Companies"
+msgid "Multi-company"
 msgstr ""
 
 #. module: base_setup
diff --git a/addons/base_setup/views/res_config_settings_views.xml b/addons/base_setup/views/res_config_settings_views.xml
index 7cf8fa57dde5088202e8da7a39f60e6c6f46dd83..ac31d1553d633b72e6f9156520a9f6126150bc90 100644
--- a/addons/base_setup/views/res_config_settings_views.xml
+++ b/addons/base_setup/views/res_config_settings_views.xml
@@ -80,14 +80,14 @@
                             </div>
                         </div>
                         <field name="company_id" invisible="1"/>
-                        <h2>Multi-Companies</h2>
+                        <h2>Multi-company</h2>
                         <div class="row mt16 o_settings_container" name="multi_company">
                             <div class="col-xs-12 col-md-6 o_setting_box">
                                 <div class="o_setting_left_pane">
                                     <field name="group_multi_company"/>
                                 </div>
                                 <div class="o_setting_right_pane">
-                                    <label string="Multi-Companies" for="group_multi_company"/>
+                                    <label string="Multi-company" for="group_multi_company"/>
                                     <div class="text-muted">
                                         Manage multiple legal entities with separate accounting
                                     </div>
@@ -107,9 +107,9 @@
                                     <field name="module_inter_company_rules" widget="upgrade_boolean"/>
                                 </div>
                                 <div class="o_setting_right_pane">
-                                    <label string="Inter-Companies Transactions" for="module_inter_company_rules"/>
+                                    <label string="Inter-Company Transactions" for="module_inter_company_rules"/>
                                     <div class="text-muted">
-                                        Automate inter-companies transactions
+                                        Automate inter-company transactions
                                     </div>
                                     <div class="content-group" attrs="{'invisible': [('module_inter_company_rules','=',False)]}" id="inter_companies_rules">
                                         <div class="mt16 text-warning"><strong>Save</strong> this page and come back here to set up the feature.</div>
diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot
index 4587faf8dd57244d2cc61e1a6b8e8e493ee7ac15..335246e77a76f07362da7e56fefb3a7823d064ce 100644
--- a/addons/stock/i18n/stock.pot
+++ b/addons/stock/i18n/stock.pot
@@ -74,7 +74,7 @@ msgid "* Vendor Location: Virtual location representing the source location for
 "* Inventory Loss: Virtual location serving as counterpart for inventory operations used to correct stock levels (Physical inventories)\n"
 "* Procurement: Virtual location serving as temporary counterpart for procurement operations when the source (vendor or production) is not known yet. This location should be empty when the procurement scheduler has finished running.\n"
 "* Production: Virtual counterpart location for production operations: this location consumes the raw material and produces finished products\n"
-"* Transit Location: Counterpart location that should be used in inter-companies or inter-warehouses operations"
+"* Transit Location: Counterpart location that should be used in inter-company or inter-warehouses operations"
 msgstr ""
 
 #. module: stock
diff --git a/addons/stock/models/stock_location.py b/addons/stock/models/stock_location.py
index 76bc2aec17229fb2a84d8fc65c4a821cee2c8934..35329d1616ac6be0efb72cb32f7e744d4fbbb12e 100644
--- a/addons/stock/models/stock_location.py
+++ b/addons/stock/models/stock_location.py
@@ -44,7 +44,7 @@ class Location(models.Model):
              "\n* Inventory Loss: Virtual location serving as counterpart for inventory operations used to correct stock levels (Physical inventories)"
              "\n* Procurement: Virtual location serving as temporary counterpart for procurement operations when the source (vendor or production) is not known yet. This location should be empty when the procurement scheduler has finished running."
              "\n* Production: Virtual counterpart location for production operations: this location consumes the raw material and produces finished products"
-             "\n* Transit Location: Counterpart location that should be used in inter-companies or inter-warehouses operations")
+             "\n* Transit Location: Counterpart location that should be used in inter-company or inter-warehouses operations")
     location_id = fields.Many2one(
         'stock.location', 'Parent Location', index=True, ondelete='cascade',
         help="The parent location that includes this location. Example : The 'Dispatch Zone' is the 'Gate 1' parent location.")