diff --git a/addons/base_import_module/views/base_import_module.xml b/addons/base_import_module/views/base_import_module.xml
index d29cb341dd2..14ca4c699e1 100644
--- a/addons/base_import_module/views/base_import_module.xml
+++ b/addons/base_import_module/views/base_import_module.xml
@@ -20,7 +20,7 @@
                     </group>
                     <footer>
                         <div states="init">
-                            <button name="import_module" string="Import Module" type="object" class="btn-primary"/>
+                            <button name="import_module" string="Import App" type="object" class="btn-primary"/>
                             <button special="cancel" string="Cancel" class="btn-default"/>
                         </div>
                         <div states="done">
diff --git a/openerp/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py
index a2a4d45d91b..607a67abfdf 100644
--- a/openerp/addons/base/ir/ir_model.py
+++ b/openerp/addons/base/ir/ir_model.py
@@ -83,7 +83,7 @@ class ir_model(osv.osv):
         'state': fields.selection([('manual','Custom Object'),('base','Base Object')],'Type', readonly=True),
         'access_ids': fields.one2many('ir.model.access', 'model_id', 'Access'),
         'transient': fields.boolean(string="Transient Model"),
-        'modules': fields.function(_in_modules, type='char', string='In Modules', help='List of modules in which the object is defined or inherited'),
+        'modules': fields.function(_in_modules, type='char', string='In Apps', help='List of modules in which the object is defined or inherited'),
         'view_ids': fields.function(_view_ids, type='one2many', obj='ir.ui.view', string='Views'),
     }
 
@@ -236,7 +236,7 @@ class ir_model_fields(osv.osv):
             "For example: [('color','=','red')]"),
         'groups': fields.many2many('res.groups', 'ir_model_fields_group_rel', 'field_id', 'group_id', 'Groups'),
         'selectable': fields.boolean('Selectable'),
-        'modules': fields.function(_in_modules, type='char', string='In Modules', help='List of modules in which the field is defined'),
+        'modules': fields.function(_in_modules, type='char', string='In Apps', help='List of modules in which the field is defined'),
         'serialization_field_id': fields.many2one('ir.model.fields', 'Serialization Field', domain = "[('ttype','=','serialized')]",
                                                   ondelete='cascade', help="If set, this field will be stored in the sparse "
                                                                            "structure of the serialization field, instead "
diff --git a/openerp/addons/base/ir/report_ir_model.xml b/openerp/addons/base/ir/report_ir_model.xml
index 86036e97e89..86803944fcc 100644
--- a/openerp/addons/base/ir/report_ir_model.xml
+++ b/openerp/addons/base/ir/report_ir_model.xml
@@ -15,7 +15,7 @@
                             <p>Type: <span t-field="o.state"/></p>
                             <p t-if="o.transient">Transient: True</p>
                             <p t-if="not o.transient">Transient: False</p>
-                            <p>Modules: <span t-field="o.modules"/></p>
+                            <p>Apps: <span t-field="o.modules"/></p>
                         </td>
                     </tr>
                     <tr>
@@ -49,7 +49,7 @@
                         <td><strong>Ro</strong></td>
                         <td><strong>Tr</strong></td>
                         <td><strong>Idx</strong></td>
-                        <td colspan="4"><strong>Modules</strong></td>
+                        <td colspan="4"><strong>Apps</strong></td>
                     </tr>
                     <tr t-foreach="o.field_id" t-as="field">
                         <td colspan="3"><span t-field="field.name"/></td>
diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 5ad35924e8c..35cf8150edd 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -83,7 +83,7 @@ class module_category(osv.osv):
         'name': fields.char("Name", required=True, translate=True, select=True),
         'parent_id': fields.many2one('ir.module.category', 'Parent Application', select=True),
         'child_ids': fields.one2many('ir.module.category', 'parent_id', 'Child Applications'),
-        'module_nr': fields.function(_module_nbr, string='Number of Modules', type='integer'),
+        'module_nr': fields.function(_module_nbr, string='Number of Apps', type='integer'),
         'module_ids': fields.one2many('ir.module.module', 'category_id', 'Modules'),
         'description': fields.text("Description", translate=True),
         'sequence': fields.integer('Sequence'),
diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index faa463c42b5..0f56b5c39b7 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -51,7 +51,7 @@
             </field>
         </record>
         <record id="action_module_open_categ" model="ir.actions.act_window">
-            <field name="name">Modules</field>
+            <field name="name">Apps</field>
             <field name="res_model">ir.module.module</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,kanban</field>
@@ -60,7 +60,7 @@
         <record id="ir_action_module_category" model="ir.values">
             <field eval="'tree_but_open'" name="key2"/>
             <field eval="'ir.module.category'" name="model"/>
-            <field name="name">Categorized Modules</field>
+            <field name="name">Categorized Apps</field>
             <field eval="'ir.actions.act_window,%d'%action_module_open_categ" name="value"/>
         </record>
 
@@ -140,7 +140,7 @@
             <field name="name">ir.module.module.tree</field>
             <field name="model">ir.module.module</field>
             <field name="arch" type="xml">
-                <tree decoration-info="state=='to upgrade' or state=='to install'" decoration-danger="state=='uninstalled'" decoration-muted="state=='uninstallable'" create="false" string="Modules">
+                <tree decoration-info="state=='to upgrade' or state=='to install'" decoration-danger="state=='uninstalled'" decoration-muted="state=='uninstallable'" create="false" string="Apps">
                     <field name="shortdesc"/>
                     <field name="name" groups="base.group_no_one"/>
                     <field name="author"/>
@@ -151,7 +151,7 @@
             </field>
         </record>
         <record model="ir.ui.view" id="module_view_kanban">
-            <field name="name">Modules Kanban</field>
+            <field name="name">Apps Kanban</field>
             <field name="model">ir.module.module</field>
             <field name="arch" type="xml">
                 <kanban create="false">
@@ -180,7 +180,7 @@
             </field>
         </record>
         <record id="open_module_tree" model="ir.actions.act_window">
-            <field name="name">Modules</field>
+            <field name="name">Apps</field>
             <field name="res_model">ir.module.module</field>
             <field name="view_type">form</field>
             <field name="view_mode">kanban,tree,form</field>
@@ -191,7 +191,7 @@
               <p>You should try others search criteria.</p>
             </field>
         </record>
-        <menuitem id="menu_module_tree" parent="menu_management" name="Modules" sequence="5" action="open_module_tree" />
+        <menuitem id="menu_module_tree" parent="menu_management" name="Apps" sequence="5" action="open_module_tree" />
 
 
         <!-- Apps modules -->
@@ -199,7 +199,7 @@
             <field name="name">Apps</field>
             <field name="tag">apps</field>
         </record>
-        <menuitem id="module_mi" parent="base.menu_management" sequence="10" action="modules_act_cl"/>
+        <menuitem id="module_mi" parent="base.menu_management" sequence="10" action="modules_act_cl" groups="base.group_no_one"/>
 
         <record model="ir.actions.client" id="modules_updates_act_cl">
             <field name="name">Updates</field>
diff --git a/openerp/addons/base/module/wizard/base_export_language.py b/openerp/addons/base/module/wizard/base_export_language.py
index cb4dd9d1a14..b2fa8077481 100644
--- a/openerp/addons/base/module/wizard/base_export_language.py
+++ b/openerp/addons/base/module/wizard/base_export_language.py
@@ -27,7 +27,7 @@ class base_language_export(osv.osv_memory):
             'format': fields.selection([('csv','CSV File'),
                                         ('po','PO File'),
                                         ('tgz', 'TGZ Archive')], 'File Format', required=True),
-            'modules': fields.many2many('ir.module.module', 'rel_modules_langexport', 'wiz_id', 'module_id', 'Modules To Export', domain=[('state','=','installed')]),
+            'modules': fields.many2many('ir.module.module', 'rel_modules_langexport', 'wiz_id', 'module_id', 'Apps To Export', domain=[('state','=','installed')]),
             'data': fields.binary('File', readonly=True),
             'state': fields.selection([('choose', 'choose'),   # choose language
                                        ('get', 'get')])        # get the file
diff --git a/openerp/addons/base/module/wizard/base_module_update_view.xml b/openerp/addons/base/module/wizard/base_module_update_view.xml
index 92e4d17ce55..1eb6bdfdc41 100644
--- a/openerp/addons/base/module/wizard/base_module_update_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_update_view.xml
@@ -22,7 +22,7 @@
                             <button special="cancel" string="Cancel" class="btn-default"/>
                         </div>
                         <div states="done">
-                            <button name="action_module_open" string="Open Modules" type="object" class="btn-primary"/>
+                            <button name="action_module_open" string="Open Apps" type="object" class="btn-primary"/>
                             <button special="cancel" string="Close" class="btn-default"/>
                         </div>
                     </footer>
@@ -40,7 +40,7 @@
         </record>
 
         <menuitem
-            name="Update Modules List"
+            name="Update Apps List"
             action="action_view_base_module_update"
             id="menu_view_base_module_update"
             groups="base.group_no_one"
diff --git a/openerp/addons/base/module/wizard/base_module_upgrade.py b/openerp/addons/base/module/wizard/base_module_upgrade.py
index ded6a0cdd42..5104e94a720 100644
--- a/openerp/addons/base/module/wizard/base_module_upgrade.py
+++ b/openerp/addons/base/module/wizard/base_module_upgrade.py
@@ -13,7 +13,7 @@ class base_module_upgrade(osv.osv_memory):
     _description = "Module Upgrade"
 
     _columns = {
-        'module_info': fields.text('Modules to Update',readonly=True),
+        'module_info': fields.text('Apps to Update',readonly=True),
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
diff --git a/openerp/addons/base/module/wizard/base_module_upgrade_view.xml b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
index c87e3190ed9..b3eda83f556 100644
--- a/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
@@ -10,7 +10,7 @@
                     <p>This module will trigger the uninstallation of below modules.</p>
                     <p><strong>This operation will permanently erase all data currently stored by the modules!</strong></p>
                     <p>If you wish to cancel the process, press the cancel button below</p>
-                    <separator string="Impacted Modules"/>
+                    <separator string="Impacted Apps"/>
                     <field name="module_info"/>
                     <footer>
                         <button name="upgrade_module" string="Confirm" type="object" class="btn-primary"/>
diff --git a/openerp/addons/base/res/res_config.xml b/openerp/addons/base/res/res_config.xml
index 678e5b00ef4..342c00111f7 100644
--- a/openerp/addons/base/res/res_config.xml
+++ b/openerp/addons/base/res/res_config.xml
@@ -23,7 +23,7 @@
                 <form string="Configuration Installer">
                     <separator string="title" colspan="4"/>
                     <footer>
-                        <button name="action_next" type="object" string="Install Modules" class="btn-primary"/>
+                        <button name="action_next" type="object" string="Install Apps" class="btn-primary"/>
                         <button string="Skip" class="btn-default" special="cancel" />
                     </footer>
                 </form>